From 1a59cb610892a25c15a3d0392c7dd203bfdc2740 Mon Sep 17 00:00:00 2001 From: Peter Hanspers Date: Thu, 15 Sep 2022 13:52:07 +0200 Subject: [PATCH] Renamed methods. Renaming inputSampleRate, outputSampleRate, terminate to avoid triggering Apple's private API check. Change-Id: I9857fb374bf30c4a6ef937fb183ef4858af7e0c1 Bug: webrtc:14193 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/275641 Commit-Queue: Peter Hanspers Reviewed-by: Mirko Bonadei Reviewed-by: Henrik Andreassson Cr-Commit-Position: refs/heads/main@{#38094} --- sdk/objc/components/audio/RTCAudioDevice.h | 6 +++--- sdk/objc/native/src/objc_audio_device.mm | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/objc/components/audio/RTCAudioDevice.h b/sdk/objc/components/audio/RTCAudioDevice.h index 7f4509ebb0..f445825ff0 100644 --- a/sdk/objc/components/audio/RTCAudioDevice.h +++ b/sdk/objc/components/audio/RTCAudioDevice.h @@ -171,7 +171,7 @@ RTC_OBJC_EXPORT @protocol RTC_OBJC_TYPE * must be notified back to native ADM via `-[RTCAudioDeviceDelegate * notifyAudioParametersChange]`. */ - @property(readonly) double inputSampleRate; + @property(readonly) double deviceInputSampleRate; /** * Indicates current size of record buffer. Changes to this property @@ -194,7 +194,7 @@ RTC_OBJC_EXPORT @protocol RTC_OBJC_TYPE * Indicates current sample rate of audio playback. Changes to this property * must be notified back to native ADM via `-[RTCAudioDeviceDelegate notifyAudioParametersChange]`. */ -@property(readonly) double outputSampleRate; +@property(readonly) double deviceOutputSampleRate; /** * Indicates current size of playback buffer. Changes to this property @@ -230,7 +230,7 @@ RTC_OBJC_EXPORT @protocol RTC_OBJC_TYPE * De-initializes RTCAudioDevice. Implementation should forget about `delegate` provided in * `initializeWithDelegate`. */ -- (BOOL)terminate; +- (BOOL)terminateDevice; /** * Property to indicate if `initializePlayout` call required before invocation of `startPlayout`. diff --git a/sdk/objc/native/src/objc_audio_device.mm b/sdk/objc/native/src/objc_audio_device.mm index 5133346063..d629fae20f 100644 --- a/sdk/objc/native/src/objc_audio_device.mm +++ b/sdk/objc/native/src/objc_audio_device.mm @@ -22,7 +22,7 @@ namespace { webrtc::AudioParameters RecordParameters(id audio_device) { - const double sample_rate = static_cast([audio_device inputSampleRate]); + const double sample_rate = static_cast([audio_device deviceInputSampleRate]); const size_t channels = static_cast([audio_device inputNumberOfChannels]); const size_t frames_per_buffer = static_cast(sample_rate * [audio_device inputIOBufferDuration] + .5); @@ -30,7 +30,7 @@ webrtc::AudioParameters RecordParameters(id audio } webrtc::AudioParameters PlayoutParameters(id audio_device) { - const double sample_rate = static_cast([audio_device outputSampleRate]); + const double sample_rate = static_cast([audio_device deviceOutputSampleRate]); const size_t channels = static_cast([audio_device outputNumberOfChannels]); const size_t frames_per_buffer = static_cast(sample_rate * [audio_device outputIOBufferDuration] + .5); @@ -112,7 +112,7 @@ int32_t ObjCAudioDeviceModule::Terminate() { } if ([audio_device_ isInitialized]) { - if (![audio_device_ terminate]) { + if (![audio_device_ terminateDevice]) { RTC_LOG_F(LS_ERROR) << "Failed to terminate audio device"; return -1; }