Adding AudioDeviceDataObserver interface

webrtc/modules/audio_device/audio_transport_capture.cc

Index: webrtc/modules/audio_device/audio_transport_capture.cc
diff --git a/webrtc/modules/audio_device/audio_transport_capture.cc b/webrtc/modules/audio_device/audio_transport_capture.cc
new file mode 100644
index 0000000000000000000000000000000000000000..8eeacd9a24dacf03ed439fa54bc1a8eb26cf19bd
--- /dev/null
+++ b/webrtc/modules/audio_device/audio_transport_capture.cc
@@ -0,0 +1,389 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "webrtc/modules/audio_device/include/audio_transport_capture.h"
+
+namespace webrtc {
+
+namespace {
+
+// A wrapper over AudioDeviceModule that registers itself as AudioTransport
+// callback and redirects the PCM data to AudioTransportCapture callback.
+class ADMWrapper : public AudioDeviceModule, public AudioTransport {

[the sun, 2017/04/05 15:49:39]

nit: final class

[lliuu, 2017/04/05 19:45:46]

Unfortunately ADMWrapper cannot be final due to RefCountedModule methods that
are not implemented in this class

[the sun, 2017/04/06 06:58:37]

Ah!

+ public:
+  explicit ADMWrapper(const int32_t id,

[the sun, 2017/04/05 15:49:39]

nit: explicit not needed with 3 args

[lliuu, 2017/04/05 19:45:46]

Done.

+                      const AudioLayer audio_layer,
+                      AudioTransportCapture* capture_cb)
+      : impl_(AudioDeviceModule::Create(id, audio_layer)),
+        capture_callback_(capture_cb) {
+    // Register self as the audio transport callback for underlying ADM impl.
+    auto res = impl_->RegisterAudioCallback(this);
+    is_valid_ = (impl_.get() != nullptr) && (res == 0);
+  }
+  virtual ~ADMWrapper() {
+    audio_transport_ = nullptr;
+    capture_callback_ = nullptr;
+  }
+
+  bool IsValid() { return is_valid_; }
+
+  // RefCountedModule methods overrides.
+  int64_t TimeUntilNextProcess() override {
+    return impl_->TimeUntilNextProcess();
+  }
+  void Process() override { return impl_->Process(); }
+
+  // AudioTransport methods overrides.
+  int32_t RecordedDataIsAvailable(const void* audioSamples,
+                                  const size_t nSamples,
+                                  const size_t nBytesPerSample,
+                                  const size_t nChannels,
+                                  const uint32_t samplesPerSec,
+                                  const uint32_t totalDelayMS,
+                                  const int32_t clockDrift,
+                                  const uint32_t currentMicLevel,
+                                  const bool keyPressed,
+                                  uint32_t& newMicLevel) override {
+    int32_t res = 0;
+    // Capture PCM data before sending to sink.
+    if (capture_callback_) {
+      capture_callback_->CaptureRecordedData(
+          audioSamples, nSamples, nBytesPerSample, nChannels, samplesPerSec);
+    }
+
+    // Send to sink.
+    if (audio_transport_) {
+      res = audio_transport_->RecordedDataIsAvailable(
+          audioSamples, nSamples, nBytesPerSample, nChannels, samplesPerSec,
+          totalDelayMS, clockDrift, currentMicLevel, keyPressed, newMicLevel);
+    }
+
+    return res;
+  }
+
+  int32_t NeedMorePlayData(const size_t nSamples,
+                           const size_t nBytesPerSample,
+                           const size_t nChannels,
+                           const uint32_t samplesPerSec,
+                           void* audioSamples,
+                           size_t& nSamplesOut,
+                           int64_t* elapsed_time_ms,
+                           int64_t* ntp_time_ms) override {
+    int32_t res = 0;
+    // Request data from sink.
+    if (audio_transport_) {
+      res = audio_transport_->NeedMorePlayData(
+          nSamples, nBytesPerSample, nChannels, samplesPerSec, audioSamples,
+          nSamplesOut, elapsed_time_ms, ntp_time_ms);
+    }
+
+    // Capture after data requested.
+    if (capture_callback_) {
+      capture_callback_->CapturePlayoutData(
+          audioSamples, nSamples, nBytesPerSample, nChannels, samplesPerSec);
+    }
+
+    return res;
+  }
+
+  void PushCaptureData(int voe_channel,
+                       const void* audio_data,
+                       int bits_per_sample,
+                       int sample_rate,
+                       size_t number_of_channels,
+                       size_t number_of_frames) override {
+    if (audio_transport_) {

[the sun, 2017/04/05 15:49:39]

Won't be called from the default ADM implementation. Add RTC_NOTREACHED()
instead of forwarding call.

[lliuu, 2017/04/05 19:45:46]

Done.

+      audio_transport_->PushCaptureData(voe_channel, audio_data,
+                                        bits_per_sample, sample_rate,
+                                        number_of_channels, number_of_frames);
+    }
+  }
+
+  void PullRenderData(int bits_per_sample,
+                      int sample_rate,
+                      size_t number_of_channels,
+                      size_t number_of_frames,
+                      void* audio_data,
+                      int64_t* elapsed_time_ms,
+                      int64_t* ntp_time_ms) override {
+    if (audio_transport_) {

[the sun, 2017/04/05 15:49:39]

Won't be called from the default ADM implementation. Add RTC_NOTREACHED()
instead of forwarding call.

[lliuu, 2017/04/05 19:45:46]

Done.

[lliuu, 2017/04/05 19:45:46]

Done.

+      audio_transport_->PullRenderData(
+          bits_per_sample, sample_rate, number_of_channels, number_of_frames,
+          audio_data, elapsed_time_ms, ntp_time_ms);
+    }
+  }
+
+  // Override AudioDeviceModule's RegisterAudioCallback method to remember the
+  // actual audio transport sink (e.g.: voice engine).
+  int32_t RegisterAudioCallback(AudioTransport* audioCallback) override {

[the sun, 2017/04/05 15:49:39]

nit: no need to copy obsolete casing; use audio_callback, etc

[lliuu, 2017/04/05 19:45:46]

Done.

+    // Remember the audio callback to forward PCM data
+    audio_transport_ = audioCallback;
+    return 0;
+  }
+
+  // AudioDeviceModule pass through method overrides.
+  int32_t ActiveAudioLayer(AudioLayer* audioLayer) const override {
+    return impl_->ActiveAudioLayer(audioLayer);
+  }
+  ErrorCode LastError() const override { return impl_->LastError(); }
+  int32_t RegisterEventObserver(AudioDeviceObserver* eventCallback) override {
+    return impl_->RegisterEventObserver(eventCallback);
+  }
+  int32_t Init() override { return impl_->Init(); }
+  int32_t Terminate() override { return impl_->Terminate(); }
+  bool Initialized() const override { return impl_->Initialized(); }
+  int16_t PlayoutDevices() override { return impl_->PlayoutDevices(); }
+  int16_t RecordingDevices() override { return impl_->RecordingDevices(); }
+  int32_t PlayoutDeviceName(uint16_t index,
+                            char name[kAdmMaxDeviceNameSize],
+                            char guid[kAdmMaxGuidSize]) override {
+    return impl_->PlayoutDeviceName(index, name, guid);
+  }
+  int32_t RecordingDeviceName(uint16_t index,
+                              char name[kAdmMaxDeviceNameSize],
+                              char guid[kAdmMaxGuidSize]) override {
+    return impl_->RecordingDeviceName(index, name, guid);
+  }
+  int32_t SetPlayoutDevice(uint16_t index) override {
+    return impl_->SetPlayoutDevice(index);
+  }
+  int32_t SetPlayoutDevice(WindowsDeviceType device) override {
+    return impl_->SetPlayoutDevice(device);
+  }
+  int32_t SetRecordingDevice(uint16_t index) override {
+    return impl_->SetRecordingDevice(index);
+  }
+  int32_t SetRecordingDevice(WindowsDeviceType device) override {
+    return impl_->SetRecordingDevice(device);
+  }
+  int32_t PlayoutIsAvailable(bool* available) override {
+    return impl_->PlayoutIsAvailable(available);
+  }
+  int32_t InitPlayout() override { return impl_->InitPlayout(); }
+  bool PlayoutIsInitialized() const override {
+    return impl_->PlayoutIsInitialized();
+  }
+  int32_t RecordingIsAvailable(bool* available) override {
+    return impl_->RecordingIsAvailable(available);
+  }
+  int32_t InitRecording() override { return impl_->InitRecording(); }
+  bool RecordingIsInitialized() const override {
+    return impl_->RecordingIsInitialized();
+  }
+  int32_t StartPlayout() override { return impl_->StartPlayout(); }
+  int32_t StopPlayout() override { return impl_->StopPlayout(); }
+  bool Playing() const override { return impl_->Playing(); }
+  int32_t StartRecording() override { return impl_->StartRecording(); }
+  int32_t StopRecording() override { return impl_->StopRecording(); }
+  bool Recording() const override { return impl_->Recording(); }
+  int32_t SetAGC(bool enable) override { return impl_->SetAGC(enable); }
+  bool AGC() const override { return impl_->AGC(); }
+  int32_t SetWaveOutVolume(uint16_t volumeLeft, uint16_t volumeRight) override {
+    return impl_->SetWaveOutVolume(volumeLeft, volumeRight);
+  }
+  int32_t WaveOutVolume(uint16_t* volumeLeft,
+                        uint16_t* volumeRight) const override {
+    return impl_->WaveOutVolume(volumeLeft, volumeRight);
+  }
+  int32_t InitSpeaker() override { return impl_->InitSpeaker(); }
+  bool SpeakerIsInitialized() const override {
+    return impl_->SpeakerIsInitialized();
+  }
+  int32_t InitMicrophone() override { return impl_->InitMicrophone(); }
+  bool MicrophoneIsInitialized() const override {
+    return impl_->MicrophoneIsInitialized();
+  }
+  int32_t SpeakerVolumeIsAvailable(bool* available) override {
+    return impl_->SpeakerVolumeIsAvailable(available);
+  }
+  int32_t SetSpeakerVolume(uint32_t volume) override {
+    return impl_->SetSpeakerVolume(volume);
+  }
+  int32_t SpeakerVolume(uint32_t* volume) const override {
+    return impl_->SpeakerVolume(volume);
+  }
+  int32_t MaxSpeakerVolume(uint32_t* maxVolume) const override {
+    return impl_->MaxSpeakerVolume(maxVolume);
+  }
+  int32_t MinSpeakerVolume(uint32_t* minVolume) const override {
+    return impl_->MinSpeakerVolume(minVolume);
+  }
+  int32_t SpeakerVolumeStepSize(uint16_t* stepSize) const override {
+    return impl_->SpeakerVolumeStepSize(stepSize);
+  }
+  int32_t MicrophoneVolumeIsAvailable(bool* available) override {
+    return impl_->MicrophoneVolumeIsAvailable(available);
+  }
+  int32_t SetMicrophoneVolume(uint32_t volume) override {
+    return impl_->SetMicrophoneVolume(volume);
+  }
+  int32_t MicrophoneVolume(uint32_t* volume) const override {
+    return impl_->MicrophoneVolume(volume);
+  }
+  int32_t MaxMicrophoneVolume(uint32_t* maxVolume) const override {
+    return impl_->MaxMicrophoneVolume(maxVolume);
+  }
+  int32_t MinMicrophoneVolume(uint32_t* minVolume) const override {
+    return impl_->MinMicrophoneVolume(minVolume);
+  }
+  int32_t MicrophoneVolumeStepSize(uint16_t* stepSize) const override {
+    return impl_->MicrophoneVolumeStepSize(stepSize);
+  }
+  int32_t SpeakerMuteIsAvailable(bool* available) override {
+    return impl_->SpeakerMuteIsAvailable(available);
+  }
+  int32_t SetSpeakerMute(bool enable) override {
+    return impl_->SetSpeakerMute(enable);
+  }
+  int32_t SpeakerMute(bool* enabled) const override {
+    return impl_->SpeakerMute(enabled);
+  }
+  int32_t MicrophoneMuteIsAvailable(bool* available) override {
+    return impl_->MicrophoneMuteIsAvailable(available);
+  }
+  int32_t SetMicrophoneMute(bool enable) override {
+    return impl_->SetMicrophoneMute(enable);
+  }
+  int32_t MicrophoneMute(bool* enabled) const override {
+    return impl_->MicrophoneMute(enabled);
+  }
+  int32_t MicrophoneBoostIsAvailable(bool* available) override {
+    return impl_->MicrophoneBoostIsAvailable(available);
+  }
+  int32_t SetMicrophoneBoost(bool enable) override {
+    return impl_->SetMicrophoneBoost(enable);
+  }
+  int32_t MicrophoneBoost(bool* enabled) const override {
+    return impl_->MicrophoneBoost(enabled);
+  }
+  int32_t StereoPlayoutIsAvailable(bool* available) const override {
+    return impl_->StereoPlayoutIsAvailable(available);
+  }
+  int32_t SetStereoPlayout(bool enable) override {
+    return impl_->SetStereoPlayout(enable);
+  }
+  int32_t StereoPlayout(bool* enabled) const override {
+    return impl_->StereoPlayout(enabled);
+  }
+  int32_t StereoRecordingIsAvailable(bool* available) const override {
+    return impl_->StereoRecordingIsAvailable(available);
+  }
+  int32_t SetStereoRecording(bool enable) override {
+    return impl_->SetStereoRecording(enable);
+  }
+  int32_t StereoRecording(bool* enabled) const override {
+    return impl_->StereoRecording(enabled);
+  }
+  int32_t SetRecordingChannel(const ChannelType channel) override {
+    return impl_->SetRecordingChannel(channel);
+  }
+  int32_t RecordingChannel(ChannelType* channel) const override {
+    return impl_->RecordingChannel(channel);
+  }
+  int32_t SetPlayoutBuffer(const BufferType type, uint16_t sizeMS) override {
+    return impl_->SetPlayoutBuffer(type, sizeMS);
+  }
+  int32_t PlayoutBuffer(BufferType* type, uint16_t* sizeMS) const override {
+    return impl_->PlayoutBuffer(type, sizeMS);
+  }
+  int32_t PlayoutDelay(uint16_t* delayMS) const override {
+    return impl_->PlayoutDelay(delayMS);
+  }
+  int32_t RecordingDelay(uint16_t* delayMS) const override {
+    return impl_->RecordingDelay(delayMS);
+  }
+  int32_t CPULoad(uint16_t* load) const override {
+    return impl_->CPULoad(load);
+  }
+  int32_t StartRawOutputFileRecording(
+      const char pcmFileNameUTF8[kAdmMaxFileNameSize]) override {
+    return impl_->StartRawOutputFileRecording(pcmFileNameUTF8);
+  }
+  int32_t StopRawOutputFileRecording() override {
+    return impl_->StopRawOutputFileRecording();
+  }
+  int32_t StartRawInputFileRecording(
+      const char pcmFileNameUTF8[kAdmMaxFileNameSize]) override {
+    return impl_->StartRawInputFileRecording(pcmFileNameUTF8);
+  }
+  int32_t StopRawInputFileRecording() override {
+    return impl_->StopRawInputFileRecording();
+  }
+  int32_t SetRecordingSampleRate(const uint32_t samplesPerSec) override {
+    return impl_->SetRecordingSampleRate(samplesPerSec);
+  }
+  int32_t RecordingSampleRate(uint32_t* samplesPerSec) const override {
+    return impl_->RecordingSampleRate(samplesPerSec);
+  }
+  int32_t SetPlayoutSampleRate(const uint32_t samplesPerSec) override {
+    return impl_->SetPlayoutSampleRate(samplesPerSec);
+  }
+  int32_t PlayoutSampleRate(uint32_t* samplesPerSec) const override {
+    return impl_->PlayoutSampleRate(samplesPerSec);
+  }
+  int32_t ResetAudioDevice() override { return impl_->ResetAudioDevice(); }
+  int32_t SetLoudspeakerStatus(bool enable) override {
+    return impl_->SetLoudspeakerStatus(enable);
+  }
+  int32_t GetLoudspeakerStatus(bool* enabled) const override {
+    return impl_->GetLoudspeakerStatus(enabled);
+  }
+  bool BuiltInAECIsAvailable() const override {
+    return impl_->BuiltInAECIsAvailable();
+  }
+  bool BuiltInAGCIsAvailable() const override {
+    return impl_->BuiltInAGCIsAvailable();
+  }
+  bool BuiltInNSIsAvailable() const override {
+    return impl_->BuiltInNSIsAvailable();
+  }
+  int32_t EnableBuiltInAEC(bool enable) override {
+    return impl_->EnableBuiltInAEC(enable);
+  }
+  int32_t EnableBuiltInAGC(bool enable) override {
+    return impl_->EnableBuiltInAGC(enable);
+  }
+  int32_t EnableBuiltInNS(bool enable) override {
+    return impl_->EnableBuiltInNS(enable);
+  }
+// Only supported on iOS.
+#if defined(WEBRTC_IOS)
+  int GetPlayoutAudioParameters(AudioParameters* params) const override {
+    return impl_->GetPlayoutAudioParameters(params);
+  }
+  int GetRecordAudioParameters(AudioParameters* params) const override {
+    return impl_->GetRecordAudioParameters(params);
+  }
+#endif  // WEBRTC_IOS
+
+ protected:
+  rtc::scoped_refptr<AudioDeviceModule> impl_;
+  AudioTransportCapture* capture_callback_ = nullptr;
+  AudioTransport* audio_transport_ = nullptr;
+  bool is_valid_ = false;
+};
+
+}  // namespace
+
+rtc::scoped_refptr<AudioDeviceModule> CreateAudioDeviceWithTransportCapture(
+    const int32_t id,
+    const AudioDeviceModule::AudioLayer audio_layer,
+    AudioTransportCapture* proc_callback) {
+  rtc::scoped_refptr<ADMWrapper> audio_device(
+      new rtc::RefCountedObject<ADMWrapper>(id, audio_layer, proc_callback));
+
+  if (!audio_device->IsValid()) {
+    return nullptr;
+  }
+
+  return audio_device;
+}
+
+}  // namespace webrtc