适配4.0.0.3版本

zhaoyongqiang · zhaoyongqiang · commit b1a33b061d30 · 2022-09-01T19:20:11.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
@@ -170,11 +170,7 @@ 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
     {
@@ -215,10 +211,6 @@ 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.mm b/iOS/APIExample-Audio/APIExample-Audio/Common/RawDataApi/AgoraMediaDataPlugin.mm
@@ -212,19 +212,6 @@ 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;
@@ -264,10 +251,6 @@ 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/APIExample/Common/ExternalAudio/ExternalAudio.mm b/iOS/APIExample/APIExample/Common/ExternalAudio/ExternalAudio.mm
@@ -171,10 +171,6 @@ 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
     {
@@ -215,10 +211,6 @@ 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/APIExample/Common/RawDataApi/AgoraMediaDataPlugin.mm b/iOS/APIExample/APIExample/Common/RawDataApi/AgoraMediaDataPlugin.mm
@@ -212,19 +212,6 @@ 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;
@@ -263,11 +250,7 @@ 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/macOS/APIExample/Commons/ExternalAudio/ExternalAudio.mm b/macOS/APIExample/Commons/ExternalAudio/ExternalAudio.mm
@@ -171,10 +171,6 @@ 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
     {
@@ -215,10 +211,6 @@ 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/macOS/APIExample/Commons/RawDataApi/AgoraMediaDataPlugin.mm b/macOS/APIExample/Commons/RawDataApi/AgoraMediaDataPlugin.mm
@@ -214,19 +214,6 @@ 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;
@@ -265,9 +252,6 @@ 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;
     }

Original file line number	Diff line number	Diff line change
`@@ -170,11 +170,7 @@ int readAudioData(void* data, int bytesLength)`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`}`
`173`		`-`
`174`		`- virtual bool onEarMonitoringAudioFrame(AudioFrame& audioFrame) override {`
`175`		`- return true;`
`176`		`- }`
`177`		`-`
	`173`	`+`
`178`	`174`	`// recive remote audio stream, push audio data to byteBuffer_play`
`179`	`175`	`virtual bool onPlaybackAudioFrame(const char* channelId, AudioFrame& audioFrame) override`
`180`	`176`	`{`
`@@ -215,10 +211,6 @@ virtual bool onPlaybackAudioFrame(const char* channelId, AudioFrame& audioFrame)`
`215`	`211`
`216`	`212`	`}`
`217`	`213`
`218`		`- virtual AudioParams getEarMonitoringAudioParams() override {`
`219`		`- return AudioParams();`
`220`		`- }`
`221`		`-`
`222`	`214`	`virtual bool onPlaybackAudioFrameBeforeMixing(const char* channelId, agora::rtc::uid_t uid, AudioFrame& audioFrame) override { return true; }`
`223`	`215`
`224`	`216`	`virtual bool onMixedAudioFrame(const char* channelId, AudioFrame& audioFrame) override { return true; }`
Original file line number	Diff line number	Diff line change
`@@ -171,10 +171,6 @@ int readAudioData(void* data, int bytesLength)`
`171`	`171`
`172`	`172`	`}`
`173`	`173`
`174`		`- virtual bool onEarMonitoringAudioFrame(AudioFrame& audioFrame) override {`
`175`		`- return true;`
`176`		`- }`
`177`		`-`
`178`	`174`	`// recive remote audio stream, push audio data to byteBuffer_play`
`179`	`175`	`virtual bool onPlaybackAudioFrame(const char* channelId, AudioFrame& audioFrame) override`
`180`	`176`	`{`
`@@ -215,10 +211,6 @@ virtual bool onPlaybackAudioFrame(const char* channelId, AudioFrame& audioFrame)`
`215`	`211`
`216`	`212`	`}`
`217`	`213`
`218`		`- virtual AudioParams getEarMonitoringAudioParams() override {`
`219`		`- return AudioParams();`
`220`		`- }`
`221`		`-`
`222`	`214`	`virtual bool onPlaybackAudioFrameBeforeMixing(const char* channelId, agora::rtc::uid_t uid, AudioFrame& audioFrame) override { return true; }`
`223`	`215`
`224`	`216`	`virtual bool onMixedAudioFrame(const char* channelId, AudioFrame& audioFrame) override { return true; }`
Original file line number	Diff line number	Diff line change
`@@ -214,19 +214,6 @@ virtual bool onRecordAudioFrame(const char* channelId, AudioFrame& audioFrame) o`
`214`	`214`	`return true;`
`215`	`215`	`}`
`216`	`216`
`217`		`- virtual bool onEarMonitoringAudioFrame(AudioFrame& audioFrame) override {`
`218`		`-`
`219`		`- if (!mediaDataPlugin && ((mediaDataPlugin.observerAudioType >> 0) == 0)) return true;`
`220`		`- @autoreleasepool {`
`221`		`- if ([mediaDataPlugin.audioDelegate respondsToSelector:@selector(mediaDataPlugin:onEarMonitoringAudioFrame:)]) {`
`222`		`- AgoraAudioRawData *data = getAudioRawDataWithAudioFrame(audioFrame);`
`223`		`- AgoraAudioRawData *newData = [mediaDataPlugin.audioDelegate mediaDataPlugin:mediaDataPlugin onEarMonitoringAudioFrame:data];`
`224`		`- modifiedAudioFrameWithNewAudioRawData(audioFrame, newData);`
`225`		`- }`
`226`		`- }`
`227`		`- return true;`
`228`		`- }`
`229`		`-`
`230`	`217`	`virtual bool onPlaybackAudioFrame(const char* channelId, AudioFrame& audioFrame) override`
`231`	`218`	`{`
`232`	`219`	`if (!mediaDataPlugin && ((mediaDataPlugin.observerAudioType >> 1) == 0)) return true;`
`@@ -265,9 +252,6 @@ virtual bool onMixedAudioFrame(const char* channelId, AudioFrame& audioFrame) ov`
`265`	`252`	`}`
`266`	`253`	`return true;`
`267`	`254`	`}`
`268`		`- virtual AudioParams getEarMonitoringAudioParams() override {`
`269`		`- return AudioParams();`
`270`		`- }`
`271`	`255`	`virtual int getObservedAudioFramePosition() override {`
`272`	`256`	`return AUDIO_FRAME_POSITION_NONE;`
`273`	`257`	`}`