mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 19:35:51 +00:00
Bug 1226146: fix sndio audio_device backend after webrtc 43 landing in bug 1198458 r=jesup NPOTB
This commit is contained in:
Landry Breuil
parent
e93d20c81c
commit
f468ad9584
@ -17,7 +17,6 @@
|
||||
|
||||
#include "webrtc/system_wrappers/interface/event_wrapper.h"
|
||||
#include "webrtc/system_wrappers/interface/sleep.h"
|
||||
#include "webrtc/system_wrappers/interface/thread_wrapper.h"
|
||||
#include "webrtc/system_wrappers/interface/trace.h"
|
||||
|
||||
#include "Latency.h"
|
||||
@ -688,7 +687,6 @@ int32_t AudioDeviceSndio::InitRecording()
|
||||
|
||||
int32_t AudioDeviceSndio::StartRecording()
|
||||
{
|
||||
unsigned int unused_thread_id;
|
||||
const char* threadName = "webrtc_audio_module_capture_thread";
|
||||
|
||||
if (_recHandle == NULL)
|
||||
@ -703,7 +701,6 @@ int32_t AudioDeviceSndio::StartRecording()
|
||||
|
||||
_ptrThreadRec = ThreadWrapper::CreateThread(RecThreadFunc,
|
||||
this,
|
||||
kRealtimePriority,
|
||||
threadName);
|
||||
if (_ptrThreadRec == NULL)
|
||||
{
|
||||
@ -721,21 +718,19 @@ int32_t AudioDeviceSndio::StartRecording()
|
||||
{
|
||||
WEBRTC_TRACE(kTraceCritical, kTraceAudioDevice, _id,
|
||||
" couldn't start recording");
|
||||
delete _ptrThreadRec;
|
||||
_ptrThreadRec = NULL;
|
||||
_ptrThreadRec.reset();
|
||||
delete [] _recordingBuffer;
|
||||
_recordingBuffer = NULL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!_ptrThreadRec->Start(unused_thread_id))
|
||||
if (!_ptrThreadRec->Start())
|
||||
{
|
||||
WEBRTC_TRACE(kTraceCritical, kTraceAudioDevice, _id,
|
||||
" failed to start the rec audio thread");
|
||||
_recording = false;
|
||||
sio_stop(_recHandle);
|
||||
delete _ptrThreadRec;
|
||||
_ptrThreadRec = NULL;
|
||||
_ptrThreadRec.reset();
|
||||
delete [] _recordingBuffer;
|
||||
_recordingBuffer = NULL;
|
||||
return -1;
|
||||
@ -758,8 +753,10 @@ int32_t AudioDeviceSndio::StopRecording()
|
||||
_recording = false;
|
||||
}
|
||||
|
||||
if (_ptrThreadRec && !_ptrThreadRec->Stop())
|
||||
if (_ptrThreadRec)
|
||||
{
|
||||
_ptrThreadRec->Stop();
|
||||
_ptrThreadRec.reset();
|
||||
WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id,
|
||||
" failed to stop the rec audio thread");
|
||||
return -1;
|
||||
@ -767,8 +764,6 @@ int32_t AudioDeviceSndio::StopRecording()
|
||||
|
||||
sio_stop(_recHandle);
|
||||
|
||||
delete _ptrThreadRec;
|
||||
_ptrThreadRec = NULL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -789,7 +784,6 @@ bool AudioDeviceSndio::PlayoutIsInitialized() const
|
||||
|
||||
int32_t AudioDeviceSndio::StartPlayout()
|
||||
{
|
||||
unsigned int unused_thread_id;
|
||||
const char* threadName = "webrtc_audio_module_play_thread";
|
||||
|
||||
if (_playHandle == NULL)
|
||||
@ -804,7 +798,6 @@ int32_t AudioDeviceSndio::StartPlayout()
|
||||
|
||||
_ptrThreadPlay = ThreadWrapper::CreateThread(PlayThreadFunc,
|
||||
this,
|
||||
kRealtimePriority,
|
||||
threadName);
|
||||
if (_ptrThreadPlay == NULL)
|
||||
{
|
||||
@ -819,19 +812,18 @@ int32_t AudioDeviceSndio::StartPlayout()
|
||||
if (!sio_start(_playHandle)) {
|
||||
WEBRTC_TRACE(kTraceCritical, kTraceAudioDevice, _id,
|
||||
" failed to start audio playback");
|
||||
delete _ptrThreadPlay;
|
||||
_ptrThreadPlay = NULL;
|
||||
_ptrThreadPlay.reset();
|
||||
delete [] _playoutBuffer;
|
||||
_playoutBuffer = NULL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!_ptrThreadPlay->Start(unused_thread_id))
|
||||
if (!_ptrThreadPlay->Start())
|
||||
{
|
||||
WEBRTC_TRACE(kTraceCritical, kTraceAudioDevice, _id,
|
||||
" failed to start the play audio thread");
|
||||
sio_stop(_playHandle);
|
||||
delete _ptrThreadPlay;
|
||||
_ptrThreadPlay.reset();
|
||||
_ptrThreadPlay = NULL;
|
||||
delete [] _playoutBuffer;
|
||||
_playoutBuffer = NULL;
|
||||
@ -853,14 +845,10 @@ int32_t AudioDeviceSndio::StopPlayout()
|
||||
_playing = false;
|
||||
}
|
||||
|
||||
if (_ptrThreadPlay && !_ptrThreadPlay->Stop())
|
||||
if (_ptrThreadPlay)
|
||||
{
|
||||
WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id,
|
||||
" failed to stop the play audio thread");
|
||||
return -1;
|
||||
} else {
|
||||
delete _ptrThreadPlay;
|
||||
_ptrThreadPlay = NULL;
|
||||
_ptrThreadPlay->Stop();
|
||||
_ptrThreadPlay.reset();
|
||||
}
|
||||
|
||||
sio_stop(_playHandle);
|
||||
@ -869,8 +857,6 @@ int32_t AudioDeviceSndio::StopPlayout()
|
||||
|
||||
delete [] _playoutBuffer;
|
||||
_playoutBuffer = NULL;
|
||||
delete _ptrThreadPlay;
|
||||
_ptrThreadPlay = NULL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@ -27,128 +27,128 @@ public:
|
||||
|
||||
// Retrieve the currently utilized audio layer
|
||||
virtual int32_t ActiveAudioLayer(
|
||||
AudioDeviceModule::AudioLayer& audioLayer) const OVERRIDE;
|
||||
AudioDeviceModule::AudioLayer& audioLayer) const override;
|
||||
|
||||
// Main initializaton and termination
|
||||
virtual int32_t Init() OVERRIDE;
|
||||
virtual int32_t Terminate() OVERRIDE;
|
||||
virtual bool Initialized() const OVERRIDE;
|
||||
virtual int32_t Init() override;
|
||||
virtual int32_t Terminate() override;
|
||||
virtual bool Initialized() const override;
|
||||
|
||||
// Device enumeration
|
||||
virtual int16_t PlayoutDevices() OVERRIDE;
|
||||
virtual int16_t RecordingDevices() OVERRIDE;
|
||||
virtual int16_t PlayoutDevices() override;
|
||||
virtual int16_t RecordingDevices() override;
|
||||
virtual int32_t PlayoutDeviceName(
|
||||
uint16_t index,
|
||||
char name[kAdmMaxDeviceNameSize],
|
||||
char guid[kAdmMaxGuidSize]) OVERRIDE;
|
||||
char guid[kAdmMaxGuidSize]) override;
|
||||
virtual int32_t RecordingDeviceName(
|
||||
uint16_t index,
|
||||
char name[kAdmMaxDeviceNameSize],
|
||||
char guid[kAdmMaxGuidSize]) OVERRIDE;
|
||||
char guid[kAdmMaxGuidSize]) override;
|
||||
|
||||
// Device selection
|
||||
virtual int32_t SetPlayoutDevice(uint16_t index) OVERRIDE;
|
||||
virtual int32_t SetPlayoutDevice(uint16_t index) override;
|
||||
virtual int32_t SetPlayoutDevice(
|
||||
AudioDeviceModule::WindowsDeviceType device) OVERRIDE;
|
||||
virtual int32_t SetRecordingDevice(uint16_t index) OVERRIDE;
|
||||
AudioDeviceModule::WindowsDeviceType device) override;
|
||||
virtual int32_t SetRecordingDevice(uint16_t index) override;
|
||||
virtual int32_t SetRecordingDevice(
|
||||
AudioDeviceModule::WindowsDeviceType device) OVERRIDE;
|
||||
AudioDeviceModule::WindowsDeviceType device) override;
|
||||
|
||||
// Audio transport initialization
|
||||
virtual int32_t PlayoutIsAvailable(bool& available) OVERRIDE;
|
||||
virtual int32_t InitPlayout() OVERRIDE;
|
||||
virtual bool PlayoutIsInitialized() const OVERRIDE;
|
||||
virtual int32_t RecordingIsAvailable(bool& available) OVERRIDE;
|
||||
virtual int32_t InitRecording() OVERRIDE;
|
||||
virtual bool RecordingIsInitialized() const OVERRIDE;
|
||||
virtual int32_t PlayoutIsAvailable(bool& available) override;
|
||||
virtual int32_t InitPlayout() override;
|
||||
virtual bool PlayoutIsInitialized() const override;
|
||||
virtual int32_t RecordingIsAvailable(bool& available) override;
|
||||
virtual int32_t InitRecording() override;
|
||||
virtual bool RecordingIsInitialized() const override;
|
||||
|
||||
// Audio transport control
|
||||
virtual int32_t StartPlayout() OVERRIDE;
|
||||
virtual int32_t StopPlayout() OVERRIDE;
|
||||
virtual bool Playing() const OVERRIDE;
|
||||
virtual int32_t StartRecording() OVERRIDE;
|
||||
virtual int32_t StopRecording() OVERRIDE;
|
||||
virtual bool Recording() const OVERRIDE;
|
||||
virtual int32_t StartPlayout() override;
|
||||
virtual int32_t StopPlayout() override;
|
||||
virtual bool Playing() const override;
|
||||
virtual int32_t StartRecording() override;
|
||||
virtual int32_t StopRecording() override;
|
||||
virtual bool Recording() const override;
|
||||
|
||||
// Microphone Automatic Gain Control (AGC)
|
||||
virtual int32_t SetAGC(bool enable) OVERRIDE;
|
||||
virtual bool AGC() const OVERRIDE;
|
||||
virtual int32_t SetAGC(bool enable) override;
|
||||
virtual bool AGC() const override;
|
||||
|
||||
// Volume control based on the Windows Wave API (Windows only)
|
||||
virtual int32_t SetWaveOutVolume(uint16_t volumeLeft,
|
||||
uint16_t volumeRight) OVERRIDE;
|
||||
uint16_t volumeRight) override;
|
||||
virtual int32_t WaveOutVolume(uint16_t& volumeLeft,
|
||||
uint16_t& volumeRight) const OVERRIDE;
|
||||
uint16_t& volumeRight) const override;
|
||||
|
||||
// Audio mixer initialization
|
||||
virtual int32_t InitSpeaker() OVERRIDE;
|
||||
virtual bool SpeakerIsInitialized() const OVERRIDE;
|
||||
virtual int32_t InitMicrophone() OVERRIDE;
|
||||
virtual bool MicrophoneIsInitialized() const OVERRIDE;
|
||||
virtual int32_t InitSpeaker() override;
|
||||
virtual bool SpeakerIsInitialized() const override;
|
||||
virtual int32_t InitMicrophone() override;
|
||||
virtual bool MicrophoneIsInitialized() const override;
|
||||
|
||||
// Speaker volume controls
|
||||
virtual int32_t SpeakerVolumeIsAvailable(bool& available) OVERRIDE;
|
||||
virtual int32_t SetSpeakerVolume(uint32_t volume) OVERRIDE;
|
||||
virtual int32_t SpeakerVolume(uint32_t& volume) const OVERRIDE;
|
||||
virtual int32_t MaxSpeakerVolume(uint32_t& maxVolume) const OVERRIDE;
|
||||
virtual int32_t MinSpeakerVolume(uint32_t& minVolume) const OVERRIDE;
|
||||
virtual int32_t SpeakerVolumeStepSize(uint16_t& stepSize) const OVERRIDE;
|
||||
virtual int32_t SpeakerVolumeIsAvailable(bool& available) override;
|
||||
virtual int32_t SetSpeakerVolume(uint32_t volume) override;
|
||||
virtual int32_t SpeakerVolume(uint32_t& volume) const override;
|
||||
virtual int32_t MaxSpeakerVolume(uint32_t& maxVolume) const override;
|
||||
virtual int32_t MinSpeakerVolume(uint32_t& minVolume) const override;
|
||||
virtual int32_t SpeakerVolumeStepSize(uint16_t& stepSize) const override;
|
||||
|
||||
// Microphone volume controls
|
||||
virtual int32_t MicrophoneVolumeIsAvailable(bool& available) OVERRIDE;
|
||||
virtual int32_t SetMicrophoneVolume(uint32_t volume) OVERRIDE;
|
||||
virtual int32_t MicrophoneVolume(uint32_t& volume) const OVERRIDE;
|
||||
virtual int32_t MaxMicrophoneVolume(uint32_t& maxVolume) const OVERRIDE;
|
||||
virtual int32_t MinMicrophoneVolume(uint32_t& minVolume) const OVERRIDE;
|
||||
virtual int32_t MicrophoneVolumeIsAvailable(bool& available) override;
|
||||
virtual int32_t SetMicrophoneVolume(uint32_t volume) override;
|
||||
virtual int32_t MicrophoneVolume(uint32_t& volume) const override;
|
||||
virtual int32_t MaxMicrophoneVolume(uint32_t& maxVolume) const override;
|
||||
virtual int32_t MinMicrophoneVolume(uint32_t& minVolume) const override;
|
||||
virtual int32_t MicrophoneVolumeStepSize(
|
||||
uint16_t& stepSize) const OVERRIDE;
|
||||
uint16_t& stepSize) const override;
|
||||
|
||||
// Speaker mute control
|
||||
virtual int32_t SpeakerMuteIsAvailable(bool& available) OVERRIDE;
|
||||
virtual int32_t SetSpeakerMute(bool enable) OVERRIDE;
|
||||
virtual int32_t SpeakerMute(bool& enabled) const OVERRIDE;
|
||||
virtual int32_t SpeakerMuteIsAvailable(bool& available) override;
|
||||
virtual int32_t SetSpeakerMute(bool enable) override;
|
||||
virtual int32_t SpeakerMute(bool& enabled) const override;
|
||||
|
||||
// Microphone mute control
|
||||
virtual int32_t MicrophoneMuteIsAvailable(bool& available) OVERRIDE;
|
||||
virtual int32_t SetMicrophoneMute(bool enable) OVERRIDE;
|
||||
virtual int32_t MicrophoneMute(bool& enabled) const OVERRIDE;
|
||||
virtual int32_t MicrophoneMuteIsAvailable(bool& available) override;
|
||||
virtual int32_t SetMicrophoneMute(bool enable) override;
|
||||
virtual int32_t MicrophoneMute(bool& enabled) const override;
|
||||
|
||||
// Microphone boost control
|
||||
virtual int32_t MicrophoneBoostIsAvailable(bool& available) OVERRIDE;
|
||||
virtual int32_t SetMicrophoneBoost(bool enable) OVERRIDE;
|
||||
virtual int32_t MicrophoneBoost(bool& enabled) const OVERRIDE;
|
||||
virtual int32_t MicrophoneBoostIsAvailable(bool& available) override;
|
||||
virtual int32_t SetMicrophoneBoost(bool enable) override;
|
||||
virtual int32_t MicrophoneBoost(bool& enabled) const override;
|
||||
|
||||
// Stereo support
|
||||
virtual int32_t StereoPlayoutIsAvailable(bool& available) OVERRIDE;
|
||||
virtual int32_t SetStereoPlayout(bool enable) OVERRIDE;
|
||||
virtual int32_t StereoPlayout(bool& enabled) const OVERRIDE;
|
||||
virtual int32_t StereoRecordingIsAvailable(bool& available) OVERRIDE;
|
||||
virtual int32_t SetStereoRecording(bool enable) OVERRIDE;
|
||||
virtual int32_t StereoRecording(bool& enabled) const OVERRIDE;
|
||||
virtual int32_t StereoPlayoutIsAvailable(bool& available) override;
|
||||
virtual int32_t SetStereoPlayout(bool enable) override;
|
||||
virtual int32_t StereoPlayout(bool& enabled) const override;
|
||||
virtual int32_t StereoRecordingIsAvailable(bool& available) override;
|
||||
virtual int32_t SetStereoRecording(bool enable) override;
|
||||
virtual int32_t StereoRecording(bool& enabled) const override;
|
||||
|
||||
// Delay information and control
|
||||
virtual int32_t SetPlayoutBuffer(
|
||||
const AudioDeviceModule::BufferType type,
|
||||
uint16_t sizeMS) OVERRIDE;
|
||||
uint16_t sizeMS) override;
|
||||
virtual int32_t PlayoutBuffer(
|
||||
AudioDeviceModule::BufferType& type,
|
||||
uint16_t& sizeMS) const OVERRIDE;
|
||||
virtual int32_t PlayoutDelay(uint16_t& delayMS) const OVERRIDE;
|
||||
virtual int32_t RecordingDelay(uint16_t& delayMS) const OVERRIDE;
|
||||
uint16_t& sizeMS) const override;
|
||||
virtual int32_t PlayoutDelay(uint16_t& delayMS) const override;
|
||||
virtual int32_t RecordingDelay(uint16_t& delayMS) const override;
|
||||
|
||||
virtual int32_t CPULoad(uint16_t& load) const OVERRIDE;
|
||||
virtual int32_t CPULoad(uint16_t& load) const override;
|
||||
|
||||
public:
|
||||
virtual bool PlayoutWarning() const OVERRIDE;
|
||||
virtual bool PlayoutError() const OVERRIDE;
|
||||
virtual bool RecordingWarning() const OVERRIDE;
|
||||
virtual bool RecordingError() const OVERRIDE;
|
||||
virtual void ClearPlayoutWarning() OVERRIDE;
|
||||
virtual void ClearPlayoutError() OVERRIDE;
|
||||
virtual void ClearRecordingWarning() OVERRIDE;
|
||||
virtual void ClearRecordingError() OVERRIDE;
|
||||
virtual bool PlayoutWarning() const override;
|
||||
virtual bool PlayoutError() const override;
|
||||
virtual bool RecordingWarning() const override;
|
||||
virtual bool RecordingError() const override;
|
||||
virtual void ClearPlayoutWarning() override;
|
||||
virtual void ClearPlayoutError() override;
|
||||
virtual void ClearRecordingWarning() override;
|
||||
virtual void ClearRecordingError() override;
|
||||
|
||||
virtual void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) OVERRIDE;
|
||||
virtual void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) override;
|
||||
|
||||
// needs to be public because playOnmove/recOnmove are extern "C" ?
|
||||
int _recDelay, _playDelay;
|
||||
@ -169,8 +169,8 @@ private:
|
||||
|
||||
CriticalSectionWrapper& _critSect;
|
||||
|
||||
ThreadWrapper* _ptrThreadRec;
|
||||
ThreadWrapper* _ptrThreadPlay;
|
||||
rtc::scoped_ptr<ThreadWrapper> _ptrThreadRec;
|
||||
rtc::scoped_ptr<ThreadWrapper> _ptrThreadPlay;
|
||||
|
||||
int32_t _id;
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@ public:
|
||||
AudioDeviceUtilitySndio(const int32_t id);
|
||||
virtual ~AudioDeviceUtilitySndio();
|
||||
|
||||
virtual int32_t Init() OVERRIDE;
|
||||
virtual int32_t Init() override;
|
||||
|
||||
private:
|
||||
CriticalSectionWrapper& _critSect;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user