Merge branch 'dev/3.4.5' of https://github.i.agoralab.co/AgoraIO/API-Examples into dev/3.4.5

xianing · xianing · commit 8340b4791e5d · 2021-06-04T12:07:16.000+08:00
diff --git a/iOS/APIExample/Common/AgoraExtension.swift b/iOS/APIExample/Common/AgoraExtension.swift
@@ -113,17 +113,15 @@ extension AgoraAudioScenario {
 extension AgoraEncryptionMode {
     func description() -> String {
         switch self {
-        case .AES128XTS: return "AES128XTS"
-        case .AES256XTS: return "AES256XTS"
-        case .AES128ECB: return "AES128ECB"
-        case .SM4128ECB: return "SM4128ECB"
+        case .AES128GCM2: return "AES128GCM2"
+        case .AES256GCM2: return "AES256GCM2"
         default:
             return "\(self.rawValue)"
         }
     }
     
     static func allValues() -> [AgoraEncryptionMode] {
-        return [.AES128XTS, .AES256XTS, .AES128ECB, .SM4128ECB]
+        return [.AES128GCM2, .AES256GCM2]
     }
 }
 
diff --git a/iOS/APIExample/Examples/Advanced/JoinMultiChannel/JoinMultiChannel.swift b/iOS/APIExample/Examples/Advanced/JoinMultiChannel/JoinMultiChannel.swift
@@ -105,6 +105,8 @@ class JoinMultiChannelMain: BaseViewController {
         let mediaOptions = AgoraRtcChannelMediaOptions()
         mediaOptions.autoSubscribeAudio = true
         mediaOptions.autoSubscribeVideo = true
+        mediaOptions.publishLocalAudio = true
+        mediaOptions.publishLocalVideo = true
         
         // start joining channel
         // 1. Users can only see each other after they join the
@@ -116,9 +118,6 @@ class JoinMultiChannelMain: BaseViewController {
         channel1?.setClientRole(.broadcaster)
         label1.text = channelName1
         channel1?.setRtcChannelDelegate(self)
-        // a channel will only upstream video if you call publish
-        // there can be only 1 channel upstreaming at the same time, but you can have multiple channel downstreaming
-        channel1?.publish()
         var result = channel1?.join(byToken: nil, info: nil, uid: 0, options: mediaOptions) ?? -1
         if result != 0 {
             // Usually happens with invalid parameters
@@ -128,10 +127,16 @@ class JoinMultiChannelMain: BaseViewController {
             self.showAlert(title: "Error", message: "joinChannel1 call failed: \(result), please check your params")
         }
         
+        // auto subscribe options after join channel
+        let mediaOptions2 = AgoraRtcChannelMediaOptions()
+        mediaOptions2.autoSubscribeAudio = true
+        mediaOptions2.autoSubscribeVideo = true
+        mediaOptions2.publishLocalAudio = false
+        mediaOptions2.publishLocalVideo = false
         channel2 = agoraKit.createRtcChannel(channelName2)
         label2.text = channelName2
         channel2?.setRtcChannelDelegate(self)
-        result = channel2?.join(byToken: nil, info: nil, uid: 0, options: mediaOptions) ?? -1
+        result = channel2?.join(byToken: nil, info: nil, uid: 0, options: mediaOptions2) ?? -1
         if result != 0 {
             // Usually happens with invalid parameters
             // Error code description can be found at:
diff --git a/iOS/APIExample/Examples/Advanced/RTMPStreaming/RTMPStreaming.swift b/iOS/APIExample/Examples/Advanced/RTMPStreaming/RTMPStreaming.swift
@@ -328,6 +328,12 @@ extension RTMPStreamingMain: AgoraRtcEngineDelegate {
         }
     }
     
+    func rtcEngine(_ engine: AgoraRtcEngineKit, rtmpStreamingEventWithUrl url: String, eventCode: AgoraRtmpStreamingEvent) {
+        if(eventCode == .urlAlreadyInUse) {
+            self.showAlert(title: "Error", message: "The URL is already in Use.")
+        }
+    }
+    
     func rtcEngine(_ engine: AgoraRtcEngineKit, streamPublishedWithUrl url: String, errorCode: AgoraErrorCode) {
         if(errorCode == AgoraErrorCode.noError){
             retried = 0
diff --git a/iOS/APIExample/Examples/Advanced/StreamEncryption/StreamEncryption.swift b/iOS/APIExample/Examples/Advanced/StreamEncryption/StreamEncryption.swift
@@ -15,7 +15,7 @@ class StreamEncryptionEntry : UIViewController
     @IBOutlet weak var channelTextField: UITextField!
     @IBOutlet weak var encryptSecretField: UITextField!
     @IBOutlet weak var encryptModeBtn: UIButton!
-    var mode:AgoraEncryptionMode = .AES128XTS
+    var mode:AgoraEncryptionMode = .AES128GCM2
     var useCustom:Bool = false
     let identifier = "StreamEncryption"
     
@@ -110,6 +110,7 @@ class StreamEncryptionMain: BaseViewController {
             let config = AgoraEncryptionConfig()
             config.encryptionMode = mode
             config.encryptionKey = secret
+            config.encryptionKdfSalt = getEncryptionSaltFromServer()
             let ret = agoraKit.enableEncryption(true, encryptionConfig: config)
             if ret != 0 {
                 // for errors please take a look at:
@@ -157,6 +158,11 @@ class StreamEncryptionMain: BaseViewController {
         }
     }
     
+    func getEncryptionSaltFromServer() -> Data {
+        
+        return "EncryptionKdfSaltInBase64Strings".data(using: .utf8)!
+    }
+    
     override func willMove(toParent parent: UIViewController?) {
         if parent == nil {
             // leave channel when exiting the view
diff --git a/iOS/Agora-ScreenShare-Extension/AgoraAudioCriticalSection.h b/iOS/Agora-ScreenShare-Extension/AgoraAudioCriticalSection.h
@@ -0,0 +1,94 @@
+//
+//  AudioFrameCriticalSection.h
+//  Agora-Screen-Sharing-iOS-Broadcast
+//
+//  Created by GongYuhua on 16/11/19.
+//  Copyright © 2016年 Agora. All rights reserved.
+//
+
+#ifndef AGDCAudioFrameCriticalSection_h
+#define AGDCAudioFrameCriticalSection_h
+
+#include <pthread.h>
+
+class CriticalSectionWrapper {
+public:
+  // Factory method, constructor disabled
+  static CriticalSectionWrapper* CreateCriticalSection();
+  
+  virtual ~CriticalSectionWrapper() {}
+  
+  // Tries to grab lock, beginning of a critical section. Will wait for the
+  // lock to become available if the grab failed.
+  virtual void Enter() = 0;
+  
+  // Returns a grabbed lock, end of critical section.
+  virtual void Leave() = 0;
+};
+
+// RAII extension of the critical section. Prevents Enter/Leave mismatches and
+// provides more compact critical section syntax.
+class CriticalSectionScoped {
+public:
+  explicit CriticalSectionScoped(CriticalSectionWrapper* critsec)
+  : ptr_crit_sec_(critsec) {
+    ptr_crit_sec_->Enter();
+  }
+  
+  ~CriticalSectionScoped() {
+    if (ptr_crit_sec_) {
+      Leave();
+    }
+  }
+  
+private:
+  void Leave() {
+    ptr_crit_sec_->Leave();
+    ptr_crit_sec_ = 0;
+  }
+  
+  CriticalSectionWrapper* ptr_crit_sec_;
+};
+
+class CriticalSectionPosix : public CriticalSectionWrapper {
+public:
+  //  CriticalSectionPosix();
+  //
+  //  virtual ~CriticalSectionPosix();
+  //
+  //  virtual void Enter() override;
+  //  virtual void Leave() override;
+  
+  CriticalSectionPosix() {
+    pthread_mutexattr_t attr;
+    (void) pthread_mutexattr_init(&attr);
+    (void) pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+    (void) pthread_mutex_init(&mutex_, &attr);
+  }
+  
+  ~CriticalSectionPosix() {
+    (void) pthread_mutex_destroy(&mutex_);
+  }
+  
+  void
+  Enter() {
+    (void) pthread_mutex_lock(&mutex_);
+  }
+  
+  void
+  Leave() {
+    (void) pthread_mutex_unlock(&mutex_);
+  }
+  
+private:
+  pthread_mutex_t mutex_;
+  friend class ConditionVariablePosix;
+};
+
+
+CriticalSectionWrapper* CriticalSectionWrapper::CreateCriticalSection() {
+  return new CriticalSectionPosix();
+}
+
+
+#endif /* AGDCAudioFrame_hpp */
diff --git a/iOS/Agora-ScreenShare-Extension/AgoraAudioProcessing.h b/iOS/Agora-ScreenShare-Extension/AgoraAudioProcessing.h
@@ -0,0 +1,16 @@
+//
+//  AGVideoPreProcessing.h
+//  Agora-Screen-Sharing-iOS-Broadcast
+//
+//  Created by Alex Zheng on 7/28/16.
+//  Copyright © 2016 Agora.io All rights reserved.
+//
+
+#import <CoreMedia/CoreMedia.h>
+#import <AgoraRtcKit/AgoraRtcEngineKit.h>
+
+@interface AgoraAudioProcessing : NSObject
++ (void)registerAudioPreprocessing:(AgoraRtcEngineKit*) kit;
++ (void)deregisterAudioPreprocessing:(AgoraRtcEngineKit*) kit;
++ (void)pushAudioFrame:(unsigned char *)inAudioFrame withFrameSize:(int64_t)frameSize;
+@end
diff --git a/iOS/Agora-ScreenShare-Extension/AgoraAudioProcessing.mm b/iOS/Agora-ScreenShare-Extension/AgoraAudioProcessing.mm
@@ -0,0 +1,107 @@
+//
+//  AGVideoPreProcessing.m
+//  Agora-Screen-Sharing-iOS-Broadcast
+//
+//  Created by Alex Zheng on 7/28/16.
+//  Copyright © 2016 Agora.io All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <AgoraRtcKit/IAgoraRtcEngine.h>
+#import <AgoraRtcKit/IAgoraMediaEngine.h>
+#import <string.h>
+
+#import "AgoraAudioProcessing.h"
+#import "AgoraAudioCriticalSection.h"
+
+static const int kAudioBufferPoolSize = 48000 * 8;
+static unsigned char mRecordingAudioAppPool[kAudioBufferPoolSize];
+static int mRecordingAppBufferBytes = 0;
+static CriticalSectionWrapper *CritSect = CriticalSectionWrapper::CreateCriticalSection();
+
+void pushAudioAppFrame(unsigned char *inAudioFrame, int64_t frameSize)
+{
+    CriticalSectionScoped lock(CritSect);
+    
+    int remainedSize = kAudioBufferPoolSize - mRecordingAppBufferBytes;
+    if (remainedSize >= frameSize) {
+        memcpy(mRecordingAudioAppPool+mRecordingAppBufferBytes, inAudioFrame, frameSize);
+    } else {
+        mRecordingAppBufferBytes = 0;
+        memcpy(mRecordingAudioAppPool+mRecordingAppBufferBytes, inAudioFrame, frameSize);
+    }
+    
+    mRecordingAppBufferBytes += frameSize;
+}
+
+class AgoraAudioFrameObserver : public agora::media::IAudioFrameObserver
+{
+public:
+    virtual bool onRecordAudioFrame(AudioFrame& audioFrame) override
+    {
+        CriticalSectionScoped lock(CritSect);
+        
+        int bytes = audioFrame.samples * audioFrame.channels * audioFrame.bytesPerSample;
+                
+        if (mRecordingAppBufferBytes < bytes) {
+            return false;
+        }
+                
+        if (mRecordingAppBufferBytes >= bytes) {
+            memcpy(audioFrame.buffer, mRecordingAudioAppPool, bytes);
+            mRecordingAppBufferBytes -= bytes;
+            memmove(mRecordingAudioAppPool, mRecordingAudioAppPool+bytes, mRecordingAppBufferBytes);
+        }
+        
+        return true;
+    }
+    
+    virtual bool onPlaybackAudioFrame(AudioFrame& audioFrame) override {
+        return true;
+    }
+    
+    virtual bool onMixedAudioFrame(AudioFrame& audioFrame) override {
+        return true;
+    }
+    
+    virtual bool onPlaybackAudioFrameBeforeMixing(unsigned int uid, AudioFrame& audioFrame) override {
+        return true;
+    }
+};
+
+static AgoraAudioFrameObserver s_audioFrameObserver;
+
+@implementation AgoraAudioProcessing
++ (void)registerAudioPreprocessing: (AgoraRtcEngineKit*) kit
+{
+    if (!kit) {
+        return;
+    }
+    agora::rtc::IRtcEngine* rtc_engine = (agora::rtc::IRtcEngine*)kit.getNativeHandle;
+    agora::util::AutoPtr<agora::media::IMediaEngine> mediaEngine;
+    mediaEngine.queryInterface(rtc_engine, agora::AGORA_IID_MEDIA_ENGINE);
+    if (mediaEngine) {
+        mediaEngine->registerAudioFrameObserver(&s_audioFrameObserver);
+    }
+}
+
++ (void)deregisterAudioPreprocessing:(AgoraRtcEngineKit*)kit
+{
+    if (!kit) {
+        return;
+    }
+    
+    agora::rtc::IRtcEngine* rtc_engine = (agora::rtc::IRtcEngine*)kit.getNativeHandle;
+    agora::util::AutoPtr<agora::media::IMediaEngine> mediaEngine;
+    mediaEngine.queryInterface(rtc_engine, agora::AGORA_IID_MEDIA_ENGINE);
+    if (mediaEngine) {
+        mediaEngine->registerAudioFrameObserver(NULL);
+    }
+}
+
++ (void)pushAudioFrame:(unsigned char *)inAudioFrame withFrameSize:(int64_t)frameSize
+{
+    pushAudioAppFrame(inAudioFrame, frameSize);
+}
+
+@end
diff --git a/macOS/APIExample/Examples/Advanced/JoinMultiChannel/JoinMultiChannel.swift b/macOS/APIExample/Examples/Advanced/JoinMultiChannel/JoinMultiChannel.swift
@@ -49,6 +49,8 @@ class JoinMultipleChannel: BaseViewController {
             let mediaOptions = AgoraRtcChannelMediaOptions()
             mediaOptions.autoSubscribeAudio = true
             mediaOptions.autoSubscribeVideo = true
+            mediaOptions.publishLocalAudio = false
+            mediaOptions.publishLocalVideo = false
             
             var channel: AgoraRtcChannel?
             if channel1 == nil {
@@ -77,7 +79,8 @@ class JoinMultipleChannel: BaseViewController {
                 if isPublished && channelName == selectedChannel {
                     if let channel = getChannelByName(selectedChannel) {
                         channel.setClientRole(.audience)
-                        channel.unpublish()
+                        channel.muteLocalAudioStream(true)
+                        channel.muteLocalVideoStream(true)
                         isPublished = false
                     }
                 }
@@ -148,7 +151,8 @@ class JoinMultipleChannel: BaseViewController {
                 if isPublished && channelName == selectedChannel {
                     if let channel = getChannelByName(selectedChannel) {
                         channel.setClientRole(.audience)
-                        channel.unpublish()
+                        channel.muteLocalAudioStream(true)
+                        channel.muteLocalVideoStream(true)
                         isPublished = false
                     }
                 }
@@ -187,13 +191,15 @@ class JoinMultipleChannel: BaseViewController {
         if !isPublished {
             if let channel = getChannelByName(selectedChannel) {
                 channel.setClientRole(.broadcaster)
-                channel.publish()
+                channel.muteLocalAudioStream(false)
+                channel.muteLocalVideoStream(false)
                 isPublished = true
             }
         } else {
             if let channel = getChannelByName(selectedChannel) {
                 channel.setClientRole(.audience)
-                channel.unpublish()
+                channel.muteLocalAudioStream(true)
+                channel.muteLocalVideoStream(true)
                 isPublished = false
             }
         }
diff --git a/macOS/APIExample/Resources/bg.jpg b/macOS/APIExample/Resources/bg.jpg

Original file line number	Diff line number	Diff line change
`@@ -113,17 +113,15 @@ extension AgoraAudioScenario {`
`113`	`113`	`extension AgoraEncryptionMode {`
`114`	`114`	`func description() -> String {`
`115`	`115`	`switch self {`
`116`		`- case .AES128XTS: return "AES128XTS"`
`117`		`- case .AES256XTS: return "AES256XTS"`
`118`		`- case .AES128ECB: return "AES128ECB"`
`119`		`- case .SM4128ECB: return "SM4128ECB"`
	`116`	`+ case .AES128GCM2: return "AES128GCM2"`
	`117`	`+ case .AES256GCM2: return "AES256GCM2"`
`120`	`118`	`default:`
`121`	`119`	`return "\(self.rawValue)"`
`122`	`120`	`}`
`123`	`121`	`}`
`124`	`122`
`125`	`123`	`static func allValues() -> [AgoraEncryptionMode] {`
`126`		`- return [.AES128XTS, .AES256XTS, .AES128ECB, .SM4128ECB]`
	`124`	`+ return [.AES128GCM2, .AES256GCM2]`
`127`	`125`	`}`
`128`	`126`	`}`
`129`	`127`
Original file line number	Diff line number	Diff line change
`@@ -328,6 +328,12 @@ extension RTMPStreamingMain: AgoraRtcEngineDelegate {`
`328`	`328`	`}`
`329`	`329`	`}`
`330`	`330`
	`331`	`+ func rtcEngine(_ engine: AgoraRtcEngineKit, rtmpStreamingEventWithUrl url: String, eventCode: AgoraRtmpStreamingEvent) {`
	`332`	`+ if(eventCode == .urlAlreadyInUse) {`
	`333`	`+ self.showAlert(title: "Error", message: "The URL is already in Use.")`
	`334`	`+ }`
	`335`	`+ }`
	`336`	`+`
`331`	`337`	`func rtcEngine(_ engine: AgoraRtcEngineKit, streamPublishedWithUrl url: String, errorCode: AgoraErrorCode) {`
`332`	`338`	`if(errorCode == AgoraErrorCode.noError){`
`333`	`339`	`retried = 0`