Squashed recent progress

Fix adm selection

Fixes

Revert adm selection in audio_device_impl

Rename IsManualRenderingMode

Simplify pcm buffer delegate

Fixes

Fixes

Ducking config

Strip manual rendering logic

Runtime-ducking config

Fix compile

Fix start recording

Connect output

Buffer logic

Enable output when input is enabled

Author: hiroshihorie

modules/audio_device/audio_device_data_observer.cc

@@ -307,7 +307,7 @@ class ADMWrapper : public AudioDeviceModule, public AudioTransport {
   }
 #endif  // WEBRTC_IOS
 
-  int32_t SetObserver(AudioDeviceObserver* observer) const override {
+  int32_t SetObserver(AudioDeviceObserver* observer) override {
     return impl_->SetObserver(observer);
   }
 

modules/audio_device/audio_device_impl.cc

@@ -34,12 +34,11 @@
 #if defined(WEBRTC_ENABLE_LINUX_PULSE)
 #include "modules/audio_device/linux/audio_device_pulse_linux.h"
 #endif
+#elif defined(WEBRTC_IOS)
+#include "sdk/objc/native/src/audio/audio_device_ios.h"
+#elif defined(WEBRTC_MAC)
+#include "modules/audio_device/mac/audio_device_mac.h"
 #endif
-
-#if defined(WEBRTC_IOS) || defined(WEBRTC_MAC)
-#include "modules/audio_device/audio_engine_device.h"
-#endif
-
 #if defined(WEBRTC_DUMMY_FILE_DEVICES)
 #include "modules/audio_device/dummy/file_audio_device.h"
 #include "modules/audio_device/dummy/file_audio_device_factory.h"
@@ -247,15 +246,16 @@ int32_t AudioDeviceModuleImpl::CreatePlatformSpecificObjects() {
 // iOS ADM implementation.
 #if defined(WEBRTC_IOS)
   if (audio_layer == kPlatformDefaultAudio) {
-    audio_device_.reset(new AudioEngineDevice(/*bypass_voice_processing=*/bypass_voice_processing_));
+    audio_device_.reset(
+        new ios_adm::AudioDeviceIOS(/*bypass_voice_processing=*/bypass_voice_processing_));
     RTC_LOG(LS_INFO) << "iPhone Audio APIs will be utilized.";
   }
 // END #if defined(WEBRTC_IOS)
 
 // Mac OS X ADM implementation.
 #elif defined(WEBRTC_MAC)
   if (audio_layer == kPlatformDefaultAudio) {
-    audio_device_.reset(new AudioEngineDevice(/*bypass_voice_processing=*/false));
+    audio_device_.reset(new AudioDeviceMac());
     RTC_LOG(LS_INFO) << "Mac OS X Audio APIs will be utilized.";
   }
 #endif  // WEBRTC_MAC
@@ -902,7 +902,7 @@ int AudioDeviceModuleImpl::GetRecordAudioParameters(
 }
 #endif  // WEBRTC_IOS
 
-int32_t AudioDeviceModuleImpl::SetObserver(AudioDeviceObserver* observer) const {
+int32_t AudioDeviceModuleImpl::SetObserver(AudioDeviceObserver* observer) {
   RTC_LOG(LS_INFO) << __FUNCTION__ << "(" << observer << ")";
   int32_t ok = audio_device_->SetObserver(observer);
   RTC_LOG(LS_INFO) << "output: " << ok;

modules/audio_device/audio_device_impl.h

@@ -156,7 +156,7 @@ class AudioDeviceModuleImpl : public AudioDeviceModuleForTest {
   int GetRecordAudioParameters(AudioParameters* params) const override;
 #endif  // WEBRTC_IOS
 
-  int32_t SetObserver(AudioDeviceObserver* observer) const override;
+  int32_t SetObserver(AudioDeviceObserver* observer) override;
   int32_t GetPlayoutDevice() const override;
   int32_t GetRecordingDevice() const override;
 

modules/audio_device/audio_engine_device.h

@@ -17,6 +17,8 @@
 #ifndef SDK_OBJC_NATIVE_SRC_AUDIO_AUDIO_DEVICE_AUDIOENGINE_H_
 #define SDK_OBJC_NATIVE_SRC_AUDIO_AUDIO_DEVICE_AUDIOENGINE_H_
 
+#import <AVFAudio/AVFAudio.h>
+
 #include <atomic>
 #include <memory>
 
@@ -31,26 +33,18 @@
 #include "sdk/objc/native/src/audio/audio_session_observer.h"
 
 RTC_FWD_DECL_OBJC_CLASS(RTC_OBJC_TYPE(RTCNativeAudioSessionDelegateAdapter));
-RTC_FWD_DECL_OBJC_CLASS(AVAudioEngine);
-RTC_FWD_DECL_OBJC_CLASS(AVAudioSourceNode);
-RTC_FWD_DECL_OBJC_CLASS(AVAudioSinkNode);
-RTC_FWD_DECL_OBJC_CLASS(AVAudioFormat);
-RTC_FWD_DECL_OBJC_CLASS(AVAudioMixerNode);
-RTC_FWD_DECL_OBJC_CLASS(AVAudioUnitEQ);
 
 namespace webrtc {
 
 class FineAudioBuffer;
 
-class AudioEngineDevice : public AudioDeviceGeneric,
+class AudioEngineDevice : public AudioDeviceModule,
                           public AudioSessionObserver {
  public:
   explicit AudioEngineDevice(bool bypass_voice_processing);
   ~AudioEngineDevice() override;
 
-  void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) override;
-
-  InitStatus Init() override;
+  int32_t Init() override;
   int32_t Terminate() override;
   bool Initialized() const override;
 
@@ -68,16 +62,18 @@ class AudioEngineDevice : public AudioDeviceGeneric,
   int32_t StopRecording() override;
   bool Recording() const override;
 
-  int32_t PlayoutDelay(uint16_t& delayMS) const override;
+  int32_t PlayoutDelay(uint16_t* delayMS) const override;
   int32_t GetPlayoutUnderrunCount() const override { return -1; }
 
-  // int GetPlayoutAudioParameters(AudioParameters* params) const override;
-  // int GetRecordAudioParameters(AudioParameters* params) const override;
+#if defined(WEBRTC_IOS)
+  int GetPlayoutAudioParameters(AudioParameters* params) const override;
+  int GetRecordAudioParameters(AudioParameters* params) const override;
+#endif
 
   int32_t ActiveAudioLayer(
-      AudioDeviceModule::AudioLayer& audioLayer) const override;
-  int32_t PlayoutIsAvailable(bool& available) override;
-  int32_t RecordingIsAvailable(bool& available) override;
+      AudioDeviceModule::AudioLayer* audioLayer) const override;
+  int32_t PlayoutIsAvailable(bool* available) override;
+  int32_t RecordingIsAvailable(bool* available) override;
   int16_t PlayoutDevices() override;
   int16_t RecordingDevices() override;
   int32_t PlayoutDeviceName(uint16_t index, char name[kAdmMaxDeviceNameSize],
@@ -94,28 +90,40 @@ class AudioEngineDevice : public AudioDeviceGeneric,
   bool SpeakerIsInitialized() const override;
   int32_t InitMicrophone() override;
   bool MicrophoneIsInitialized() const override;
-  int32_t SpeakerVolumeIsAvailable(bool& available) override;
+  int32_t SpeakerVolumeIsAvailable(bool* available) override;
   int32_t SetSpeakerVolume(uint32_t volume) override;
-  int32_t SpeakerVolume(uint32_t& volume) const override;
-  int32_t MaxSpeakerVolume(uint32_t& maxVolume) const override;
-  int32_t MinSpeakerVolume(uint32_t& minVolume) const override;
-  int32_t MicrophoneVolumeIsAvailable(bool& available) override;
+  int32_t SpeakerVolume(uint32_t* volume) const override;
+  int32_t MaxSpeakerVolume(uint32_t* maxVolume) const override;
+  int32_t MinSpeakerVolume(uint32_t* minVolume) const override;
+  int32_t MicrophoneVolumeIsAvailable(bool* available) override;
   int32_t SetMicrophoneVolume(uint32_t volume) override;
-  int32_t MicrophoneVolume(uint32_t& volume) const override;
-  int32_t MaxMicrophoneVolume(uint32_t& maxVolume) const override;
-  int32_t MinMicrophoneVolume(uint32_t& minVolume) const override;
-  int32_t MicrophoneMuteIsAvailable(bool& available) override;
+  int32_t MicrophoneVolume(uint32_t* volume) const override;
+  int32_t MaxMicrophoneVolume(uint32_t* maxVolume) const override;
+  int32_t MinMicrophoneVolume(uint32_t* minVolume) const override;
+  int32_t MicrophoneMuteIsAvailable(bool* available) override;
   int32_t SetMicrophoneMute(bool enable) override;
-  int32_t MicrophoneMute(bool& enabled) const override;
-  int32_t SpeakerMuteIsAvailable(bool& available) override;
+  int32_t MicrophoneMute(bool* enabled) const override;
+  int32_t SpeakerMuteIsAvailable(bool* available) override;
   int32_t SetSpeakerMute(bool enable) override;
-  int32_t SpeakerMute(bool& enabled) const override;
-  int32_t StereoPlayoutIsAvailable(bool& available) override;
+  int32_t SpeakerMute(bool* enabled) const override;
+  int32_t StereoPlayoutIsAvailable(bool* available) const override;
   int32_t SetStereoPlayout(bool enable) override;
-  int32_t StereoPlayout(bool& enabled) const override;
-  int32_t StereoRecordingIsAvailable(bool& available) override;
+  int32_t StereoPlayout(bool* enabled) const override;
+  int32_t StereoRecordingIsAvailable(bool* available) const override;
   int32_t SetStereoRecording(bool enable) override;
-  int32_t StereoRecording(bool& enabled) const override;
+  int32_t StereoRecording(bool* enabled) const override;
+
+  int32_t RegisterAudioCallback(AudioTransport* audioCallback) override;
+
+  // Only supported on Android.
+  bool BuiltInAECIsAvailable() const override;
+  bool BuiltInAGCIsAvailable() const override;
+  bool BuiltInNSIsAvailable() const override;
+
+  // Enables the built-in audio effects. Only supported on Android.
+  int32_t EnableBuiltInAEC(bool enable) override;
+  int32_t EnableBuiltInAGC(bool enable) override;
+  int32_t EnableBuiltInNS(bool enable) override;
 
   // AudioSessionObserver methods. May be called from any thread.
   void OnInterruptionBegin() override;
@@ -128,6 +136,17 @@ class AudioEngineDevice : public AudioDeviceGeneric,
 
   int32_t SetObserver(AudioDeviceObserver* observer) override;
 
+  int32_t SetManualRenderingMode(bool enable);
+  int32_t ManualRenderingMode(bool* enabled);
+
+  int32_t SetAdvancedDucking(bool enable);
+  int32_t AdvancedDucking(bool* enabled);
+
+  int32_t SetDuckingLevel(long level);
+  int32_t DuckingLevel(long* level);
+
+  int32_t InitAndStartRecording();
+
  private:
   struct EngineState {
     bool input_enabled = false;
@@ -138,6 +157,11 @@ class AudioEngineDevice : public AudioDeviceGeneric,
     bool input_muted = false;
     bool is_interrupted = false;
 
+    bool is_manual_mode = false;
+    bool voice_processing = true;
+    bool advanced_ducking = true;
+    long ducking_level = 0; // 0 = Default
+
     bool operator==(const EngineState& rhs) const;
     bool operator!=(const EngineState& rhs) const;
 
@@ -150,40 +174,36 @@ class AudioEngineDevice : public AudioDeviceGeneric,
 
   EngineState engine_state_ RTC_GUARDED_BY(thread_);
 
+  AVAudioInputNode* InputNode();
+  AVAudioOutputNode* OutputNode();
+
   bool IsMicrophonePermissionGranted();
   void SetEngineState(std::function<EngineState(EngineState)> state_transform);
   void UpdateEngineState(EngineState old_state, EngineState new_state);
 
-  // Configures the audio session for WebRTC.
-  bool ConfigureAudioSession();
-
-  // Like above, but requires caller to already hold session lock.
-  bool ConfigureAudioSessionLocked();
-
-  // Unconfigures the audio session.
-  void UnconfigureAudioSession();
-
   // AudioEngine observer methods. May be called from any thread.
   void OnEngineConfigurationChange();
 
   void DebugAudioEngine();
 
+  void StartRenderLoop();
+  AVAudioEngineManualRenderingBlock render_block_;
+
   // Determines whether voice processing should be enabled or disabled.
   const bool bypass_voice_processing_;
 
-  // Native I/O audio thread checker.
-  SequenceChecker io_thread_checker_;
-
   // Thread that this object is created on.
   rtc::Thread* thread_;
+  std::unique_ptr<rtc::Thread> render_thread_;
+  AVAudioPCMBuffer* render_buffer_;
 
-  AudioDeviceBuffer* audio_device_buffer_;
+  const std::unique_ptr<TaskQueueFactory> task_queue_factory_;
+  std::unique_ptr<AudioDeviceBuffer> audio_device_buffer_;
+  std::unique_ptr<FineAudioBuffer> fine_audio_buffer_;
 
   AudioParameters playout_parameters_;
   AudioParameters record_parameters_;
 
-  std::unique_ptr<FineAudioBuffer> fine_audio_buffer_;
-
   // Set to true after successful call to Init(), false otherwise.
   bool initialized_ RTC_GUARDED_BY(thread_);
 
@@ -193,9 +213,6 @@ class AudioEngineDevice : public AudioDeviceGeneric,
   RTC_OBJC_TYPE(RTCNativeAudioSessionDelegateAdapter) * audio_session_observer_
       RTC_GUARDED_BY(thread_);
 
-  // Set to true if we've activated the audio session.
-  bool has_configured_session_ RTC_GUARDED_BY(thread_);
-
   // Avoids running pending task after `this` is Terminated.
   rtc::scoped_refptr<PendingTaskSafetyFlag> safety_ =
       PendingTaskSafetyFlag::Create();
@@ -206,8 +223,7 @@ class AudioEngineDevice : public AudioDeviceGeneric,
 
   // AVAudioEngine objects
   AVAudioEngine* audio_engine_;
-  AVAudioFormat* rtc_internal_format_;     // Int16
-  AVAudioFormat* engine_internal_format_;  // Float32
+  AVAudioFormat* manual_render_rtc_format_;     // Int16
 
   // Output related
   AVAudioSourceNode* source_node_;