适配4.0.1版本

zhaoyongqiang · zhaoyongqiang · commit 1fb05d6a3f93 · 2022-08-23T17:01:53.000+08:00
diff --git a/iOS/APIExample-Audio/APIExample-Audio/Common/ExternalAudio/ExternalAudio.mm b/iOS/APIExample-Audio/APIExample-Audio/Common/ExternalAudio/ExternalAudio.mm
@@ -171,6 +171,10 @@ int readAudioData(void* data, int bytesLength)
         
     }
     
+    virtual bool onEarMonitoringAudioFrame(AudioFrame& audioFrame) override {
+        return true;
+    }
+    
     // recive remote audio stream, push audio data to byteBuffer_play
     virtual bool onPlaybackAudioFrame(const char* channelId, AudioFrame& audioFrame) override
     {
@@ -211,6 +215,10 @@ virtual bool onPlaybackAudioFrame(const char* channelId, AudioFrame& audioFrame)
     
     }
     
+    virtual AudioParams getEarMonitoringAudioParams() override {
+        return AudioParams();
+    }
+    
     virtual bool onPlaybackAudioFrameBeforeMixing(const char* channelId, agora::rtc::uid_t uid, AudioFrame& audioFrame) override { return true; }
     
     virtual bool onMixedAudioFrame(const char* channelId, AudioFrame& audioFrame) override { return true; }
diff --git a/iOS/APIExample-Audio/APIExample-Audio/Common/RawDataApi/AgoraMediaDataPlugin.h b/iOS/APIExample-Audio/APIExample-Audio/Common/RawDataApi/AgoraMediaDataPlugin.h
@@ -52,6 +52,9 @@ typedef NS_OPTIONS(NSInteger, ObserverPacketType) {
 - (AgoraAudioRawData * _Nonnull)mediaDataPlugin:(AgoraMediaDataPlugin * _Nonnull)mediaDataPlugin willPlaybackAudioRawData:(AgoraAudioRawData * _Nonnull)audioRawData;
 - (AgoraAudioRawData * _Nonnull)mediaDataPlugin:(AgoraMediaDataPlugin * _Nonnull)mediaDataPlugin willPlaybackBeforeMixingAudioRawData:(AgoraAudioRawData * _Nonnull)audioRawData ofUid:(uint)uid;
 - (AgoraAudioRawData * _Nonnull)mediaDataPlugin:(AgoraMediaDataPlugin * _Nonnull)mediaDataPlugin didMixedAudioRawData:(AgoraAudioRawData * _Nonnull)audioRawData;
+
+- (AgoraAudioRawData * _Nonnull)mediaDataPlugin:(AgoraMediaDataPlugin * _Nonnull)mediaDataPlugin onEarMonitoringAudioFrame:(AgoraAudioRawData * _Nonnull)audioRawData;
+
 @end
 
 @protocol AgoraPacketDataPluginDelegate <NSObject>
diff --git a/iOS/APIExample-Audio/APIExample-Audio/Common/RawDataApi/AgoraMediaDataPlugin.mm b/iOS/APIExample-Audio/APIExample-Audio/Common/RawDataApi/AgoraMediaDataPlugin.mm
@@ -212,6 +212,19 @@ virtual bool onRecordAudioFrame(const char* channelId, AudioFrame& audioFrame) o
         return true;
     }
     
+    virtual bool onEarMonitoringAudioFrame(AudioFrame& audioFrame) override {
+        
+            if (!mediaDataPlugin && ((mediaDataPlugin.observerAudioType >> 0) == 0)) return true;
+            @autoreleasepool {
+                if ([mediaDataPlugin.audioDelegate respondsToSelector:@selector(mediaDataPlugin:onEarMonitoringAudioFrame:)]) {
+                    AgoraAudioRawData *data = getAudioRawDataWithAudioFrame(audioFrame);
+                    AgoraAudioRawData *newData = [mediaDataPlugin.audioDelegate mediaDataPlugin:mediaDataPlugin onEarMonitoringAudioFrame:data];
+                    modifiedAudioFrameWithNewAudioRawData(audioFrame, newData);
+                }
+            }
+            return true;
+    }
+    
     virtual bool onPlaybackAudioFrame(const char* channelId, AudioFrame& audioFrame) override
     {
         if (!mediaDataPlugin && ((mediaDataPlugin.observerAudioType >> 1) == 0)) return true;
@@ -251,6 +264,10 @@ virtual bool onMixedAudioFrame(const char* channelId, AudioFrame& audioFrame) ov
         return true;
     }
     
+    virtual AudioParams getEarMonitoringAudioParams() override {
+        return AudioParams();
+    }
+    
     virtual int getObservedAudioFramePosition() override {
         return AUDIO_FRAME_POSITION_NONE;
     }
diff --git a/iOS/APIExample-Audio/APIExample-Audio/Examples/Advanced/CustomAudioRender/CustomAudioRender.swift b/iOS/APIExample-Audio/APIExample-Audio/Examples/Advanced/CustomAudioRender/CustomAudioRender.swift
@@ -87,9 +87,9 @@ class CustomAudioRenderMain: BaseViewController {
         // when joining channel. The channel name and uid used to calculate
         // the token has to match the ones used for channel join
         let option = AgoraRtcChannelMediaOptions()
-        option.publishCameraTrack = .of(false)
-        option.publishMicrophoneTrack = .of(true)
-        option.clientRoleType = .of((Int32)(GlobalSettings.shared.getUserRole().rawValue))
+        option.publishCameraTrack = false
+        option.publishMicrophoneTrack = true
+        option.clientRoleType = GlobalSettings.shared.getUserRole()
         
         let result = agoraKit.joinChannel(byToken: KeyCenter.Token, channelId: channelName, uid: 0, mediaOptions: option)
         if result != 0 {
diff --git a/iOS/APIExample-Audio/APIExample-Audio/Examples/Advanced/CustomAudioSource/CustomAudioSource.swift b/iOS/APIExample-Audio/APIExample-Audio/Examples/Advanced/CustomAudioSource/CustomAudioSource.swift
@@ -84,9 +84,9 @@ class CustomAudioSourceMain: BaseViewController {
         // when joining channel. The channel name and uid used to calculate
         // the token has to match the ones used for channel join
         let option = AgoraRtcChannelMediaOptions()
-        option.publishCameraTrack = .of(false)
-        option.publishCustomAudioTrack = .of(true)
-        option.clientRoleType = .of((Int32)(GlobalSettings.shared.getUserRole().rawValue))
+        option.publishCameraTrack = false
+        option.publishCustomAudioTrack = true
+        option.clientRoleType = GlobalSettings.shared.getUserRole()
         let result = agoraKit.joinChannel(byToken: KeyCenter.Token, channelId: channelName, uid: 0, mediaOptions: option)
         if result != 0 {
             // Usually happens with invalid parameters
diff --git a/iOS/APIExample-Audio/APIExample-Audio/Examples/Advanced/CustomPcmAudioSource/CustomPcmAudioSource.swift b/iOS/APIExample-Audio/APIExample-Audio/Examples/Advanced/CustomPcmAudioSource/CustomPcmAudioSource.swift
@@ -91,10 +91,10 @@ class CustomPcmAudioSourceMain: BaseViewController {
         // when joining channel. The channel name and uid used to calculate
         // the token has to match the ones used for channel join
         let option = AgoraRtcChannelMediaOptions()
-        option.publishCameraTrack = .of(false)
-        option.publishMicrophoneTrack = .of(true)
-        option.publishCustomAudioTrack = .of(true)
-        option.clientRoleType = .of((Int32)(GlobalSettings.shared.getUserRole().rawValue))
+        option.publishCameraTrack = false
+        option.publishMicrophoneTrack = true
+        option.publishCustomAudioTrack = true
+        option.clientRoleType = GlobalSettings.shared.getUserRole()
         let result = agoraKit.joinChannel(byToken: KeyCenter.Token, channelId: channelName, uid: 0, mediaOptions: option)
         if result != 0 {
             // Usually happens with invalid parameters
diff --git a/iOS/APIExample-Audio/APIExample-Audio/Examples/Advanced/RawAudioData/RawAudioData.swift b/iOS/APIExample-Audio/APIExample-Audio/Examples/Advanced/RawAudioData/RawAudioData.swift
@@ -65,6 +65,14 @@ class RawAudioDataViewController: BaseViewController {
 
 // MARK: - AgoraAudioFrameDelegate
 extension RawAudioDataViewController: AgoraAudioFrameDelegate {
+    func onEarMonitoringAudioFrame(_ frame: AgoraAudioFrame) -> Bool {
+        true
+    }
+    
+    func getEarMonitoringAudioParams() -> AgoraAudioParams {
+        AgoraAudioParams()
+    }
+    
     func getMixedAudioParams() -> AgoraAudioParams {
         AgoraAudioParams()
     }
diff --git a/iOS/APIExample-Audio/APIExample-Audio/Examples/Advanced/RhythmPlayer/RhythmPlayer.swift b/iOS/APIExample-Audio/APIExample-Audio/Examples/Advanced/RhythmPlayer/RhythmPlayer.swift
@@ -97,9 +97,9 @@ class RhythmPlayerMain : BaseViewController
         // when joining channel. The channel name and uid used to calculate
         // the token has to match the ones used for channel join
         let option = AgoraRtcChannelMediaOptions()
-        option.publishCustomAudioTrack = .of(true)
-        option.publishRhythmPlayerTrack = .of(true)
-        option.clientRoleType = .of((Int32)(GlobalSettings.shared.getUserRole().rawValue))
+        option.publishCustomAudioTrack = true
+        option.publishRhythmPlayerTrack = true
+        option.clientRoleType = GlobalSettings.shared.getUserRole()
         
         let result = agoraKit.joinChannel(byToken: KeyCenter.Token, channelId: channelName, uid: 0, mediaOptions: option)
         if result != 0 {
diff --git a/iOS/APIExample-Audio/APIExample-Audio/Examples/Basic/JoinChannelAudio/JoinChannelAudio.swift b/iOS/APIExample-Audio/APIExample-Audio/Examples/Basic/JoinChannelAudio/JoinChannelAudio.swift
@@ -145,9 +145,9 @@ class JoinChannelAudioMain: BaseViewController {
         // when joining channel. The channel name and uid used to calculate
         // the token has to match the ones used for channel join
         let option = AgoraRtcChannelMediaOptions()
-        option.publishCameraTrack = .of(false)
-        option.publishMicrophoneTrack = .of(true)
-        option.clientRoleType = .of((Int32)(GlobalSettings.shared.getUserRole().rawValue))
+        option.publishCameraTrack = false
+        option.publishMicrophoneTrack = true
+        option.clientRoleType = GlobalSettings.shared.getUserRole()
         
         let result = agoraKit.joinChannel(byToken: KeyCenter.Token, channelId: channelName, uid: 0, mediaOptions: option)
         if result != 0 {
diff --git a/iOS/APIExample-Audio/Podfile b/iOS/APIExample-Audio/Podfile
@@ -7,6 +7,7 @@ target 'APIExample-Audio' do
   
   pod 'Floaty', '~> 4.2.0'
   pod 'AGEVideoLayout', '~> 1.0.2'
-  pod 'AgoraAudio_iOS', '4.0.0-rc.1'
-   # pod 'sdk', :path => 'sdk.podspec'
+#  pod 'AgoraAudio_iOS', '4.0.0-rc.1'
+    pod 'sdk', :path => 'sdk.podspec'
 end
+

Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,10 @@ int readAudioData(void* data, int bytesLength)`
`171`	`171`
`172`	`172`	`}`
`173`	`173`
	`174`	`+ virtual bool onEarMonitoringAudioFrame(AudioFrame& audioFrame) override {`
	`175`	`+ return true;`
	`176`	`+ }`
	`177`	`+`
`174`	`178`	`// recive remote audio stream, push audio data to byteBuffer_play`
`175`	`179`	`virtual bool onPlaybackAudioFrame(const char* channelId, AudioFrame& audioFrame) override`
`176`	`180`	`{`
`@@ -211,6 +215,10 @@ virtual bool onPlaybackAudioFrame(const char* channelId, AudioFrame& audioFrame)`
`211`	`215`
`212`	`216`	`}`
`213`	`217`
	`218`	`+ virtual AudioParams getEarMonitoringAudioParams() override {`
	`219`	`+ return AudioParams();`
	`220`	`+ }`
	`221`	`+`
`214`	`222`	`virtual bool onPlaybackAudioFrameBeforeMixing(const char* channelId, agora::rtc::uid_t uid, AudioFrame& audioFrame) override { return true; }`
`215`	`223`
`216`	`224`	`virtual bool onMixedAudioFrame(const char* channelId, AudioFrame& audioFrame) override { return true; }`