update iOS: rtmp streaming, video processor

Author: xianing

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

@@ -282,7 +282,7 @@ protected Object doInBackground(Object[] objects) {
                             Log.e(TAG, e.getMessage());
                             break;
                         }
-                        result = engine.addPublishStreamUrl(et_url.getText().toString(), transCodeSwitch.isChecked());
+                        result = startRtmpStreaming();
                     }
                     return result;
                 }
@@ -528,32 +528,33 @@ public void onRtmpStreamingStateChanged(String url, int state, int errorType) {
                         || errorType == RTMP_STREAM_PUBLISH_ERROR_INTERNAL_SERVER_ERROR))
                 {
                     /**if failed, make changes to the UI.*/
-                    publishing = true;
                     retryTask.cancel(true);
+                    unpublishing = true;
+                }
+            } else if (state == Constants.RTMP_STREAM_PUBLISH_STATE_IDLE) {
+                if(unpublishing){
+                    unpublishing = false;
+                    /**Push stream not started or ended, make changes to the UI.*/
                     handler.post(() -> {
                         publish.setEnabled(true);
                         publish.setText(getString(R.string.publish));
                         transCodeSwitch.setEnabled(true);
-                        publishing = false;
                     });
                 }
-                else if(url != null && !unpublishing && retried < MAX_RETRY_TIMES
-                    ){
-                    startRtmpStreaming();
-                    retried++;
+                else if( retried >= MAX_RETRY_TIMES){
+                    retryTask.cancel(true);
+                    retried = 0;
+                    /**Push stream not started or ended, make changes to the UI.*/
+                    handler.post(() -> {
+                        publish.setEnabled(true);
+                        publish.setText(getString(R.string.publish));
+                        transCodeSwitch.setEnabled(true);
+                    });
                 }
-            } else if (state == Constants.RTMP_STREAM_PUBLISH_STATE_IDLE) {
-                if(unpublishing){
-                    unpublishing = false;
+                else{
+                    retried++;
+                    startRtmpStreaming();
                 }
-                /**Push stream not started or ended, make changes to the UI.*/
-                publishing = true;
-                handler.post(() -> {
-                    publish.setEnabled(true);
-                    publish.setText(getString(R.string.publish));
-                    transCodeSwitch.setEnabled(true);
-                    publishing = false;
-                });
             }
         }
 

Android/APIExample/app/src/main/res/layout/fragment_rtmp_streaming.xml

@@ -93,7 +93,7 @@
             android:layout_weight="1"
             android:hint="@string/url"
             android:singleLine="true"
-            android:text="rtmp://webdemo-push.agora.io/lbhd/xxx" />
+            android:text="" />
 
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_publish"

iOS/APIExample.xcodeproj/project.pbxproj

@@ -184,7 +184,7 @@ extension JoinMultiChannelMain: AgoraRtcEngineDelegate {
 extension JoinMultiChannelMain: AgoraRtcChannelDelegate
 {
     func rtcChannelDidJoin(_ rtcChannel: AgoraRtcChannel, withUid uid: UInt, elapsed: Int) {
-        LogUtils.log(message: "Join \(rtcChannel.getId() ?? "") with uid \(uid) elapsed \(elapsed)ms", level: .info)
+        LogUtils.log(message: "Join \(rtcChannel.getChannelId() ?? "") with uid \(uid) elapsed \(elapsed)ms", level: .info)
     }
     /// callback when warning occured for a channel, warning can usually be ignored, still it's nice to check out
     /// what is happening
@@ -193,7 +193,7 @@ extension JoinMultiChannelMain: AgoraRtcChannelDelegate
     /// cn: https://docs.agora.io/cn/Voice/API%20Reference/oc/Constants/AgoraWarningCode.html
     /// @param warningCode warning code of the problem
     func rtcChannel(_ rtcChannel: AgoraRtcChannel, didOccurWarning warningCode: AgoraWarningCode) {
-        LogUtils.log(message: "channel: \(rtcChannel.getId() ?? ""), warning: \(warningCode.description)", level: .warning)
+        LogUtils.log(message: "channel: \(rtcChannel.getChannelId() ?? ""), warning: \(warningCode.description)", level: .warning)
     }
 
     /// callback when error occured for a channel, you are recommended to display the error descriptions on demand
@@ -222,7 +222,7 @@ extension JoinMultiChannelMain: AgoraRtcChannelDelegate
         videoCanvas.view = channel1 == rtcChannel ? channel1RemoteVideo.videoView : channel2RemoteVideo.videoView
         videoCanvas.renderMode = .hidden
         // set channelId so that it knows which channel the video belongs to
-        videoCanvas.channelId = rtcChannel.getId()
+        videoCanvas.channelId = rtcChannel.getChannelId()
         agoraKit.setupRemoteVideo(videoCanvas)
     }
 
@@ -242,7 +242,7 @@ extension JoinMultiChannelMain: AgoraRtcChannelDelegate
         videoCanvas.view = nil
         videoCanvas.renderMode = .hidden
         // set channelId so that it knows which channel the video belongs to
-        videoCanvas.channelId = rtcChannel.getId()
+        videoCanvas.channelId = rtcChannel.getChannelId()
         agoraKit.setupRemoteVideo(videoCanvas)
     }
 }

iOS/APIExample/Examples/Advanced/JoinMultiChannel/JoinMultiChannel.swift

@@ -60,7 +60,7 @@ class RTMPStreamingMain: BaseViewController {
         didSet {
             rtmpTextField.isEnabled = !isPublished
             transcodingSwitch.isEnabled = !isPublished
-            publishButton.title = isPublished ? "stop" : "push"
+            publishButton.title = isPublished ? "stop".localized : "push".localized
         }
     }
 
@@ -164,25 +164,29 @@ class RTMPStreamingMain: BaseViewController {
         if(isPublished) {
             // stop rtmp streaming
             unpublishing = true
-            agoraKit.removePublishStreamUrl(rtmpURL)
+            agoraKit.stopRtmpStream(rtmpURL)
         } else {
             // resign rtmp text field
             rtmpTextField.resignFirstResponder()
-            
-            // check whether we need to enable transcoding
-            let transcodingEnabled = transcodingSwitch.isOn
-            if(transcodingEnabled){
-                // we will use transcoding to composite multiple hosts' video
-                // therefore we have to create a livetranscoding object and call before addPublishStreamUrl
-                transcoding.size = CGSize(width: CANVAS_WIDTH, height: CANVAS_HEIGHT)
-                agoraKit.setLiveTranscoding(transcoding)
-            }
-            agoraKit.addPublishStreamUrl(rtmpURL, transcodingEnabled: transcodingEnabled)
+            startRtmpStreaming(isTranscoding: transcodingSwitch.isOn, rtmpURL: rtmpURL)
             startRetryTimer()
             self.rtmpURL = rtmpURL
         }
     }
 
+    func startRtmpStreaming(isTranscoding: Bool, rtmpURL: String) {
+        if(isTranscoding){
+            // we will use transcoding to composite multiple hosts' video
+            // therefore we have to create a livetranscoding object and call before addPublishStreamUrl
+            transcoding.size = CGSize(width: CANVAS_WIDTH, height: CANVAS_HEIGHT)
+            agoraKit.setLiveTranscoding(transcoding)
+            agoraKit.startRtmpStreamWithTranscoding(rtmpURL, transcoding: transcoding)
+        }
+        else{
+            agoraKit.startRtmpStreamWithoutTranscoding(rtmpURL)
+        }
+    }
+    
     func startRetryTimer() {
         // begin timer to update progress
         if(timer == nil) {
@@ -192,7 +196,7 @@ class RTMPStreamingMain: BaseViewController {
                     return
                 }
                 let transcodingEnabled = weakself.transcodingSwitch.isOn
-                weakself.agoraKit.addPublishStreamUrl(rtmpURL, transcodingEnabled: transcodingEnabled)
+                self?.startRtmpStreaming(isTranscoding: transcodingEnabled, rtmpURL: rtmpURL)
             })
         }
     }
@@ -275,7 +279,7 @@ extension RTMPStreamingMain: AgoraRtcEngineDelegate {
             user.uid = uid
             self.transcoding.add(user)
             // remember you need to call setLiveTranscoding again if you changed the layout
-            agoraKit.setLiveTranscoding(transcoding)
+            agoraKit.updateRtmpTranscoding(transcoding)
         }
     }
 
@@ -305,7 +309,7 @@ extension RTMPStreamingMain: AgoraRtcEngineDelegate {
             }
             remoteUid = nil
             // remember you need to call setLiveTranscoding again if you changed the layout
-            agoraKit.setLiveTranscoding(transcoding)
+            agoraKit.updateRtmpTranscoding(transcoding)
         }
     }
 
@@ -315,62 +319,45 @@ extension RTMPStreamingMain: AgoraRtcEngineDelegate {
     /// @param reason
     func rtcEngine(_ engine: AgoraRtcEngineKit, rtmpStreamingChangedToState url: String, state: AgoraRtmpStreamingState, errorCode: AgoraRtmpStreamingErrorCode) {
         LogUtils.log(message: "rtmp streaming: \(url) state \(state.rawValue) error \(errorCode.rawValue)", level: .info)
-        if(state == .running) {
-            self.showAlert(title: "Notice", message: "RTMP Publish Success")
-            isPublished = true
-            stopRetryTimer()
-        } else if(state == .failure) {
-            self.showAlert(title: "Error", message: "RTMP Publish Failed: \(errorCode.rawValue)")
-            stopRetryTimer()
-        } else if(state == .idle) {
-            self.showAlert(title: "Notice", message: "RTMP Publish Stopped")
-            isPublished = false
-        }
-    }
-    
-    func rtcEngine(_ engine: AgoraRtcEngineKit, rtmpStreamingEventWithUrl url: String, eventCode: AgoraRtmpStreamingEvent) {
-        if(eventCode == .urlAlreadyInUse) {
-            self.showAlert(title: "Error", message: "The URL is already in Use.")
+        guard let rtmpURL = rtmpTextField.text else {
+            return
         }
-    }
-    
-    func rtcEngine(_ engine: AgoraRtcEngineKit, streamPublishedWithUrl url: String, errorCode: AgoraErrorCode) {
-        if(errorCode == AgoraErrorCode.noError){
-            retried = 0
-            stopRetryTimer()
-        } else {
-            switch errorCode {
-            case .failed ,.timedOut, .publishStreamInternalServerError:
-                engine.removePublishStreamUrl(url)
-                break
-            case .publishStreamNotFound:
-                if retried >= MAX_RETRY_TIMES {
-                    return
-                }
-                guard let rtmpURL = rtmpTextField.text else {
-                    return
-                }
-                let transcodingEnabled = transcodingSwitch.isOn
-                agoraKit.addPublishStreamUrl(rtmpURL, transcodingEnabled: transcodingEnabled)
+        if state == .running {
+            if errorCode == .streamingErrorCodeOK {
+                self.showAlert(title: "Notice", message: "RTMP Publish Success")
+                isPublished = true
+                stopRetryTimer()
+                retried = 0
+            }
+        } else if state == .failure {
+            agoraKit.stopRtmpStream(rtmpURL)
+            if errorCode == .streamingErrorCodeInternalServerError || errorCode == .streamingErrorCodeConnectionTimeout {
+                self.showAlert(title: "Error", message: "RTMP Publish Failed: \(errorCode.rawValue)")
+                stopRetryTimer()
+                unpublishing = true
+            }
+        } else if state == .idle {
+            if unpublishing {
+                unpublishing = false
+                self.showAlert(title: "Notice", message: "RTMP Publish Stopped")
+                isPublished = false
+            }
+            else if retried >= MAX_RETRY_TIMES{
+                stopRetryTimer()
+                retried = 0
+                self.showAlert(title: "Notice", message: "RTMP Publish Stopped")
+                isPublished = false
+            }
+            else {
                 retried += 1
-            default:
-                print("unhandled rtmp streaming error: \(errorCode.rawValue)")
+                startRtmpStreaming(isTranscoding: transcodingSwitch.isOn, rtmpURL: rtmpURL)
             }
         }
     }
 
-    func rtcEngine(_ engine: AgoraRtcEngineKit, streamUnpublishedWithUrl url: String) {
-        if unpublishing || retried >= MAX_RETRY_TIMES {
-            return
-        }
-        guard let rtmpURL = rtmpTextField.text else {
-            return
-        }
-        let transcodingEnabled = transcodingSwitch.isOn
-        agoraKit.addPublishStreamUrl(rtmpURL, transcodingEnabled: transcodingEnabled)
-        retried += 1
-        if(unpublishing){
-            unpublishing = false;
+    func rtcEngine(_ engine: AgoraRtcEngineKit, rtmpStreamingEventWithUrl url: String, eventCode: AgoraRtmpStreamingEvent) {
+        if(eventCode == .urlAlreadyInUse) {
+            self.showAlert(title: "Error", message: "The URL is already in Use.")
         }
     }