adjust rtmp error code handling

Author: xianing

Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/RTMPStreaming.java

@@ -44,6 +44,7 @@
 import static io.agora.rtc.Constants.RTMP_STREAM_PUBLISH_ERROR_INTERNAL_SERVER_ERROR;
 import static io.agora.rtc.Constants.RTMP_STREAM_PUBLISH_ERROR_NET_DOWN;
 import static io.agora.rtc.Constants.RTMP_STREAM_PUBLISH_ERROR_OK;
+import static io.agora.rtc.Constants.RTMP_STREAM_PUBLISH_ERROR_RTMP_SERVER_ERROR;
 import static io.agora.rtc.Constants.RTMP_STREAM_PUBLISH_ERROR_STREAM_NOT_FOUND;
 import static io.agora.rtc.video.VideoCanvas.RENDER_MODE_HIDDEN;
 import static io.agora.rtc.video.VideoEncoderConfiguration.STANDARD_BITRATE;
@@ -528,10 +529,15 @@ public void onRtmpStreamingStateChanged(String url, int state, int errorType) {
                 engine.stopRtmpStream(et_url.getText().toString());
                 if((errorType == RTMP_STREAM_PUBLISH_ERROR_CONNECTION_TIMEOUT
                         || errorType == RTMP_STREAM_PUBLISH_ERROR_INTERNAL_SERVER_ERROR
+                        || errorType == RTMP_STREAM_PUBLISH_ERROR_RTMP_SERVER_ERROR
                         || errorType == RTMP_STREAM_PUBLISH_ERROR_STREAM_NOT_FOUND
                         || errorType == RTMP_STREAM_PUBLISH_ERROR_NET_DOWN))
                 {
-                    /**if failed, make changes to the UI.*/
+                    /**need republishing.*/
+                    Log.w(TAG, "RTMP publish failure ->" + url + ", state->" + state + ", errorType->" + errorType);
+                }
+                else{
+                    /**Other failures which can't be recover by republishing, make changes to the UI.*/
                     retryTask.cancel(true);
                     unpublishing = true;
                 }

iOS/APIExample/Examples/Advanced/RTMPStreaming/RTMPStreaming.swift

@@ -334,8 +334,11 @@ extension RTMPStreamingMain: AgoraRtcEngineDelegate {
             if errorCode == .streamingErrorCodeInternalServerError
                 || errorCode == .streamingErrorCodeStreamNotFound
                 || errorCode == .streamPublishErrorNetDown
+                || errorCode == .streamingErrorCodeRtmpServerError
                 || errorCode == .streamingErrorCodeConnectionTimeout {
                 self.showAlert(title: "Error", message: "RTMP Publish Failed: \(errorCode.rawValue)")
+            }
+            else{
                 stopRetryTimer()
                 unpublishing = true
             }

macOS/APIExample/Examples/Advanced/RTMPStreaming/RTMPStreaming.swift

@@ -352,8 +352,11 @@ extension RTMPStreaming: AgoraRtcEngineDelegate {
             if errorCode == .streamingErrorCodeInternalServerError
                 || errorCode == .streamingErrorCodeStreamNotFound
                 || errorCode == .streamPublishErrorNetDown
+                || errorCode == .streamingErrorCodeRtmpServerError
                 || errorCode == .streamingErrorCodeConnectionTimeout {
                 self.showAlert(title: "Error", message: "\(url) Publish Failed: \(errorCode.rawValue)")
+            }
+            else{
                 unpublishing = true
             }
         } else if(state == .idle) {

windows/APIExample/APIExample/Advanced/RTMPStream/AgoraRtmpStreaming.cpp

@@ -513,7 +513,7 @@ LRESULT CAgoraRtmpStreamingDlg::OnEIDRtmpStateChanged(WPARAM wParam, LPARAM lPar
 	{
 	case RTMP_STREAM_PUBLISH_STATE_IDLE:
 	{
-		strInfo.Format(_T("%s:%S¡£"), agoraRtmpStateIdle, rtmpState->url);
+		strInfo.Format(_T("%s:%S��"), agoraRtmpStateIdle, rtmpState->url);
 		CString strUrl;
 		strUrl.Format(_T("%S"), rtmpState->url);
 		int sel = m_cmbRtmpUrl.GetCurSel();
@@ -574,8 +574,19 @@ LRESULT CAgoraRtmpStreamingDlg::OnEIDRtmpStateChanged(WPARAM wParam, LPARAM lPar
 		if (error == RTMP_STREAM_PUBLISH_ERROR_CONNECTION_TIMEOUT
 			|| error == RTMP_STREAM_PUBLISH_ERROR_INTERNAL_SERVER_ERROR
 			|| error == RTMP_STREAM_PUBLISH_ERROR_STREAM_NOT_FOUND
+			|| error == RTMP_STREAM_PUBLISH_ERROR_RTMP_SERVER_ERROR
 			|| error == RTMP_STREAM_PUBLISH_ERROR_NET_DOWN) {
-
+			if (m_mapRepublishFlag.find(szUrl.c_str()) != m_mapRepublishFlag.end()
+				&& m_mapRemoveFlag.find(szUrl.c_str()) != m_mapRemoveFlag.end()) {
+				if (m_mapRepublishFlag[szUrl.c_str()]
+					&& !m_mapRemoveFlag[szUrl.c_str()]) {
+					//republish, removePublish when error
+					m_rtcEngine->startRtmpStreamWithoutTranscoding(szUrl.c_str());
+				}
+			}
+		}
+		else {
+		    // stop retrying
 			m_mapRemoveFlag[szUrl.c_str()] = false;
 			m_mapRepublishFlag[szUrl.c_str()] = true;
 			CString  strUrl;
@@ -596,15 +607,6 @@ LRESULT CAgoraRtmpStreamingDlg::OnEIDRtmpStateChanged(WPARAM wParam, LPARAM lPar
 			if (m_cmbRtmpUrl.GetCurSel() < 0 && m_cmbRtmpUrl.GetCount() > 0)
 				m_cmbRtmpUrl.SetCurSel(0);
 		}
-		else {
-			if (m_mapRepublishFlag.find(szUrl.c_str()) != m_mapRepublishFlag.end()
-				&& m_mapRemoveFlag.find(szUrl.c_str()) != m_mapRemoveFlag.end()) {
-				if (m_mapRepublishFlag[szUrl.c_str()]
-					&& !m_mapRemoveFlag[szUrl.c_str()]) {//republish, removePublish when error
-					m_rtcEngine->startRtmpStreamWithoutTranscoding(szUrl.c_str());
-				}
-			}
-		}
 
 
 		switch (rtmpState->state)