fix: fix issues

Author: zhangqianze

iOS/APIExample/Common/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;

iOS/APIExample/Common/ExternalVideo/AgoraMetalRender.swift

@@ -8,6 +8,7 @@
 
 import CoreMedia
 import Metal
+import MetalKit
 
 
 #if os(iOS) && (!arch(i386) && !arch(x86_64))
@@ -283,7 +284,7 @@ extension AgoraMetalRender: MTKViewDelegate {
 #endif
 
 extension AgoraVideoRotation {
-    func renderedCoordinates(mirror: Bool, videoSize: CGSize, viewSize: CGSize) -> [float4]? {
+    func renderedCoordinates(mirror: Bool, videoSize: CGSize, viewSize: CGSize) -> [simd_float4]? {
         guard viewSize.width > 0, viewSize.height > 0, videoSize.width > 0, videoSize.height > 0 else {
             return nil
         }

iOS/APIExample/Common/KeyCenter.swift

@@ -7,8 +7,8 @@
 //
 
 struct KeyCenter {
-    static let AppId: String = <#Your App Id#>
+    static let AppId: String = "YOUR APP ID"
 
     // assign token to nil if you have not enabled app certificate
-    static var Token: String? = <#Temp Access Token#>
+    static var Token: String? = nil
 }

iOS/APIExample/Common/RawDataApi/AgoraMediaDataPlugin.h

@@ -27,7 +27,8 @@ typedef NS_OPTIONS(NSInteger, ObserverAudioType) {
     ObserverAudioTypeRecordAudio                     = 1 << 0,
     ObserverAudioTypePlaybackAudio                   = 1 << 1,
     ObserverAudioTypePlaybackAudioFrameBeforeMixing  = 1 << 2,
-    ObserverAudioTypeMixedAudio                      = 1 << 3
+    ObserverAudioTypeMixedAudio                      = 1 << 3,
+    ObserverAudioTypeEarMonitoring                   = 1 << 4
 };
 
 typedef NS_OPTIONS(NSInteger, ObserverPacketType) {
@@ -52,6 +53,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>

iOS/APIExample/Common/RawDataApi/AgoraMediaDataPlugin.mm

@@ -250,6 +250,19 @@ 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

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

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

iOS/Agora-ScreenShare-Extension/AgoraAudioProcessing.mm

@@ -67,6 +67,9 @@ virtual bool onMixedAudioFrame(const char* channelId, AudioFrame& audioFrame) ov
     virtual bool onPlaybackAudioFrameBeforeMixing(const char* channelId, agora::rtc::uid_t userId, AudioFrame& audioFrame) override {
         return true;
     }
+    virtual bool onEarMonitoringAudioFrame(AudioFrame& audioFrame) override {
+        return true;
+    }
 };
 
 static AgoraAudioFrameObserver s_audioFrameObserver;

iOS/Podfile

@@ -7,17 +7,17 @@ target 'APIExample' do
   pod 'Floaty', '~> 4.2.0'
   pod 'AGEVideoLayout', '~> 1.0.2'
   pod 'CocoaAsyncSocket', '7.6.5'
-  pod 'AgoraRtcEngine_iOS_Beta', '4.0.0-beta.1'
+  pod 'AgoraRtcEngine_iOS_Beta', '4.0.0-beta.2'
 end
 
 target 'Agora-ScreenShare-Extension' do
   use_frameworks!
 
-  pod 'AgoraRtcEngine_iOS_Beta', '4.0.0-beta.1'
+  pod 'AgoraRtcEngine_iOS_Beta', '4.0.0-beta.2'
 end
 
 target 'SimpleFilter' do
   use_frameworks!
 
-  pod 'AgoraRtcEngine_iOS_Beta', '4.0.0-beta.1'
+  pod 'AgoraRtcEngine_iOS_Beta', '4.0.0-beta.2'
 end