5b6afc0ce6
Second round of the new Windows ADM is now ready for review. Main changes are: Supports internal (automatic) restart of audio streams when an active audio stream disconnects (happens when a device is removed). Adds support for IAudioClient3 and IAudioClient2 for platforms which supports it (>Win8 and >Win10). Modifies the threading model to support restart "from the inside" on the native audio thread. Adds two new test methods for the ADM to emulate restart events or stream-switch events. Adds two new test methods to support rate conversion to ensure that audio can be tested in loopback even if devices runs at different sample rates. Added initial components for low-latency support. Verified that it works but disabled it with a flag for now. Bug: webrtc:9265 Change-Id: Ia8e577daabea6b433f2c2eabab4e46ce8added6a Reviewed-on: https://webrtc-review.googlesource.com/86020 Reviewed-by: Oskar Sundbom <ossu@webrtc.org> Commit-Queue: Henrik Andreassson <henrika@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24578}
86 lines
2.9 KiB
C++
86 lines
2.9 KiB
C++
/*
|
|
* Copyright (c) 2018 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.
|
|
*/
|
|
|
|
#ifndef MODULES_AUDIO_DEVICE_WIN_AUDIO_DEVICE_MODULE_WIN_H_
|
|
#define MODULES_AUDIO_DEVICE_WIN_AUDIO_DEVICE_MODULE_WIN_H_
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
|
|
#include "modules/audio_device/include/audio_device.h"
|
|
#include "rtc_base/scoped_ref_ptr.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class AudioDeviceBuffer;
|
|
|
|
namespace webrtc_win {
|
|
|
|
// This interface represents the main input-related parts of the complete
|
|
// AudioDeviceModule interface.
|
|
class AudioInput {
|
|
public:
|
|
virtual ~AudioInput() {}
|
|
|
|
virtual int Init() = 0;
|
|
virtual int Terminate() = 0;
|
|
virtual int NumDevices() const = 0;
|
|
virtual int SetDevice(int index) = 0;
|
|
virtual int SetDevice(AudioDeviceModule::WindowsDeviceType device) = 0;
|
|
virtual int DeviceName(int index, std::string* name, std::string* guid) = 0;
|
|
virtual void AttachAudioBuffer(AudioDeviceBuffer* audio_buffer) = 0;
|
|
virtual bool RecordingIsInitialized() const = 0;
|
|
virtual int InitRecording() = 0;
|
|
virtual int StartRecording() = 0;
|
|
virtual int StopRecording() = 0;
|
|
virtual bool Recording() = 0;
|
|
virtual int VolumeIsAvailable(bool* available) = 0;
|
|
virtual int RestartRecording() = 0;
|
|
virtual bool Restarting() const = 0;
|
|
virtual int SetSampleRate(uint32_t sample_rate) = 0;
|
|
};
|
|
|
|
// This interface represents the main output-related parts of the complete
|
|
// AudioDeviceModule interface.
|
|
class AudioOutput {
|
|
public:
|
|
virtual ~AudioOutput() {}
|
|
|
|
virtual int Init() = 0;
|
|
virtual int Terminate() = 0;
|
|
virtual int NumDevices() const = 0;
|
|
virtual int SetDevice(int index) = 0;
|
|
virtual int SetDevice(AudioDeviceModule::WindowsDeviceType device) = 0;
|
|
virtual int DeviceName(int index, std::string* name, std::string* guid) = 0;
|
|
virtual void AttachAudioBuffer(AudioDeviceBuffer* audio_buffer) = 0;
|
|
virtual bool PlayoutIsInitialized() const = 0;
|
|
virtual int InitPlayout() = 0;
|
|
virtual int StartPlayout() = 0;
|
|
virtual int StopPlayout() = 0;
|
|
virtual bool Playing() = 0;
|
|
virtual int VolumeIsAvailable(bool* available) = 0;
|
|
virtual int RestartPlayout() = 0;
|
|
virtual bool Restarting() const = 0;
|
|
virtual int SetSampleRate(uint32_t sample_rate) = 0;
|
|
};
|
|
|
|
// Combines an AudioInput and an AudioOutput implementation to build an
|
|
// AudioDeviceModule. Hides most parts of the full ADM interface.
|
|
rtc::scoped_refptr<AudioDeviceModuleForTest>
|
|
CreateWindowsCoreAudioAudioDeviceModuleFromInputAndOutput(
|
|
std::unique_ptr<AudioInput> audio_input,
|
|
std::unique_ptr<AudioOutput> audio_output);
|
|
|
|
} // namespace webrtc_win
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_AUDIO_DEVICE_WIN_AUDIO_DEVICE_MODULE_WIN_H_
|