适配新版SDK

Author: zhaoyongqiang

iOS/APIExample/Examples/Advanced/RawAudioData/RawAudioData.swift

@@ -63,6 +63,10 @@ class RawAudioDataViewController: BaseViewController {
 
 // MARK: - AgoraAudioFrameDelegate
 extension RawAudioDataViewController: AgoraAudioFrameDelegate {
+    func onEarMonitoringAudioFrame(_ frame: AgoraAudioFrame) -> Bool {
+        return true
+    }
+    
     func onRecord(_ frame: AgoraAudioFrame, channelId: String) -> Bool {
         return true
     }
@@ -78,10 +82,6 @@ extension RawAudioDataViewController: AgoraAudioFrameDelegate {
     func onPlaybackAudioFrame(beforeMixing frame: AgoraAudioFrame, channelId: String, uid: UInt) -> Bool {
         return true
     }
-    
-    func onEarMonitoringAudioFrame(_ frame: AgoraAudioFrame) -> Bool {
-        return true
-    }
 }
 
 // MARK: - AgoraRtcEngineDelegate

macOS/APIExample/Commons/ExternalAudio/ExternalAudio.mm

@@ -214,6 +214,8 @@ virtual bool onPlaybackAudioFrame(const char* channelId, AudioFrame& audioFrame)
     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; }
+    
+    virtual bool onEarMonitoringAudioFrame(AudioFrame& audioFrame) override {return true;}
 };
 
 static ExternalAudioFrameObserver* s_audioFrameObserver;

macOS/APIExample/Commons/RawDataApi/AgoraMediaDataPlugin.h

@@ -54,6 +54,7 @@ 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 didEarMonitoringRawData:(AgoraAudioRawData * _Nonnull)audioRawData;
 @end
 
 @protocol AgoraPacketDataPluginDelegate <NSObject>

macOS/APIExample/Commons/RawDataApi/AgoraMediaDataPlugin.mm

@@ -252,6 +252,18 @@ virtual bool onMixedAudioFrame(const char* channelId, AudioFrame& audioFrame) ov
         }
         return true;
     }
+    virtual bool onEarMonitoringAudioFrame(AudioFrame& audioFrame) override
+    {
+        if (!mediaDataPlugin && ((mediaDataPlugin.observerAudioType >> 4) == 0)) return true;
+        @autoreleasepool {
+            if ([mediaDataPlugin.audioDelegate respondsToSelector:@selector(mediaDataPlugin:didEarMonitoringRawData:)]) {
+                AgoraAudioRawData *data = getAudioRawDataWithAudioFrame(audioFrame);
+                AgoraAudioRawData *newData = [mediaDataPlugin.audioDelegate mediaDataPlugin:mediaDataPlugin didEarMonitoringRawData:data];
+                modifiedAudioFrameWithNewAudioRawData(audioFrame, newData);
+            }
+        }
+        return true;
+    }
 };
 
 class AgoraMediaDataPluginPacketObserver : public agora::rtc::IPacketObserver

macOS/APIExample/Examples/Advanced/RawAudioData/RawAudioData.swift

@@ -303,6 +303,10 @@ extension RawAudioData: AgoraRtcEngineDelegate {
 // audio data plugin, here you can process raw audio data
 // note this all happens in CPU so it comes with a performance cost
 extension RawAudioData: AgoraAudioFrameDelegate {
+    func onEarMonitoringAudioFrame(_ frame: AgoraAudioFrame) -> Bool {
+        true
+    }
+    
     func onRecord(_ frame: AgoraAudioFrame, channelId: String) -> Bool {
         return true
     }

macOS/Podfile

@@ -5,11 +5,11 @@ target 'APIExample' do
   use_frameworks!
 
   pod 'AGEVideoLayout', '~> 1.0.2'
-  pod 'AgoraRtcEngine_macOS_Beta', '4.0.0-beta.1'
+  pod 'AgoraRtcEngine_macOS_Beta', '4.0.0-beta.2'
 end
 
 target 'SimpleFilter' do
   use_frameworks!
 
-  pod 'AgoraRtcEngine_macOS_Beta', '4.0.0-beta.1'
+  pod 'AgoraRtcEngine_macOS_Beta', '4.0.0-beta.2'
 end