clang-format audio_device/mac.
NOTRY=true Review URL: https://codereview.webrtc.org/1570063003 Cr-Commit-Position: refs/heads/master@{#11212}
This commit is contained in:
andrew
File diff suppressed because it is too large
Load Diff
@ -27,15 +27,14 @@ namespace rtc {
|
|||||||
class PlatformThread;
|
class PlatformThread;
|
||||||
} // namespace rtc
|
} // namespace rtc
|
||||||
|
|
||||||
namespace webrtc
|
namespace webrtc {
|
||||||
{
|
|
||||||
class EventWrapper;
|
class EventWrapper;
|
||||||
|
|
||||||
const uint32_t N_REC_SAMPLES_PER_SEC = 48000;
|
const uint32_t N_REC_SAMPLES_PER_SEC = 48000;
|
||||||
const uint32_t N_PLAY_SAMPLES_PER_SEC = 48000;
|
const uint32_t N_PLAY_SAMPLES_PER_SEC = 48000;
|
||||||
|
|
||||||
const uint32_t N_REC_CHANNELS = 1; // default is mono recording
|
const uint32_t N_REC_CHANNELS = 1; // default is mono recording
|
||||||
const uint32_t N_PLAY_CHANNELS = 2; // default is stereo playout
|
const uint32_t N_PLAY_CHANNELS = 2; // default is stereo playout
|
||||||
const uint32_t N_DEVICE_CHANNELS = 64;
|
const uint32_t N_DEVICE_CHANNELS = 64;
|
||||||
|
|
||||||
const int kBufferSizeMs = 10;
|
const int kBufferSizeMs = 10;
|
||||||
@ -46,7 +45,7 @@ const uint32_t ENGINE_PLAY_BUF_SIZE_IN_SAMPLES =
|
|||||||
N_PLAY_SAMPLES_PER_SEC * kBufferSizeMs / 1000;
|
N_PLAY_SAMPLES_PER_SEC * kBufferSizeMs / 1000;
|
||||||
|
|
||||||
const int N_BLOCKS_IO = 2;
|
const int N_BLOCKS_IO = 2;
|
||||||
const int N_BUFFERS_IN = 2; // Must be at least N_BLOCKS_IO.
|
const int N_BUFFERS_IN = 2; // Must be at least N_BLOCKS_IO.
|
||||||
const int N_BUFFERS_OUT = 3; // Must be at least N_BLOCKS_IO.
|
const int N_BUFFERS_OUT = 3; // Must be at least N_BLOCKS_IO.
|
||||||
|
|
||||||
const uint32_t TIMER_PERIOD_MS = 2 * 10 * N_BLOCKS_IO * 1000000;
|
const uint32_t TIMER_PERIOD_MS = 2 * 10 * N_BLOCKS_IO * 1000000;
|
||||||
@ -58,328 +57,325 @@ const uint32_t PLAY_BUF_SIZE_IN_SAMPLES =
|
|||||||
|
|
||||||
const int kGetMicVolumeIntervalMs = 1000;
|
const int kGetMicVolumeIntervalMs = 1000;
|
||||||
|
|
||||||
class AudioDeviceMac: public AudioDeviceGeneric
|
class AudioDeviceMac : public AudioDeviceGeneric {
|
||||||
{
|
public:
|
||||||
public:
|
AudioDeviceMac(const int32_t id);
|
||||||
AudioDeviceMac(const int32_t id);
|
~AudioDeviceMac();
|
||||||
~AudioDeviceMac();
|
|
||||||
|
|
||||||
// Retrieve the currently utilized audio layer
|
// Retrieve the currently utilized audio layer
|
||||||
virtual int32_t
|
virtual int32_t ActiveAudioLayer(
|
||||||
ActiveAudioLayer(AudioDeviceModule::AudioLayer& audioLayer) const;
|
AudioDeviceModule::AudioLayer& audioLayer) const;
|
||||||
|
|
||||||
// Main initializaton and termination
|
// Main initializaton and termination
|
||||||
virtual int32_t Init();
|
virtual int32_t Init();
|
||||||
virtual int32_t Terminate();
|
virtual int32_t Terminate();
|
||||||
virtual bool Initialized() const;
|
virtual bool Initialized() const;
|
||||||
|
|
||||||
// Device enumeration
|
// Device enumeration
|
||||||
virtual int16_t PlayoutDevices();
|
virtual int16_t PlayoutDevices();
|
||||||
virtual int16_t RecordingDevices();
|
virtual int16_t RecordingDevices();
|
||||||
virtual int32_t PlayoutDeviceName(
|
virtual int32_t PlayoutDeviceName(uint16_t index,
|
||||||
uint16_t index,
|
char name[kAdmMaxDeviceNameSize],
|
||||||
char name[kAdmMaxDeviceNameSize],
|
char guid[kAdmMaxGuidSize]);
|
||||||
char guid[kAdmMaxGuidSize]);
|
virtual int32_t RecordingDeviceName(uint16_t index,
|
||||||
virtual int32_t RecordingDeviceName(
|
char name[kAdmMaxDeviceNameSize],
|
||||||
uint16_t index,
|
char guid[kAdmMaxGuidSize]);
|
||||||
char name[kAdmMaxDeviceNameSize],
|
|
||||||
char guid[kAdmMaxGuidSize]);
|
|
||||||
|
|
||||||
// Device selection
|
// Device selection
|
||||||
virtual int32_t SetPlayoutDevice(uint16_t index);
|
virtual int32_t SetPlayoutDevice(uint16_t index);
|
||||||
virtual int32_t SetPlayoutDevice(
|
virtual int32_t SetPlayoutDevice(AudioDeviceModule::WindowsDeviceType device);
|
||||||
AudioDeviceModule::WindowsDeviceType device);
|
virtual int32_t SetRecordingDevice(uint16_t index);
|
||||||
virtual int32_t SetRecordingDevice(uint16_t index);
|
virtual int32_t SetRecordingDevice(
|
||||||
virtual int32_t SetRecordingDevice(
|
AudioDeviceModule::WindowsDeviceType device);
|
||||||
AudioDeviceModule::WindowsDeviceType device);
|
|
||||||
|
|
||||||
// Audio transport initialization
|
// Audio transport initialization
|
||||||
virtual int32_t PlayoutIsAvailable(bool& available);
|
virtual int32_t PlayoutIsAvailable(bool& available);
|
||||||
virtual int32_t InitPlayout();
|
virtual int32_t InitPlayout();
|
||||||
virtual bool PlayoutIsInitialized() const;
|
virtual bool PlayoutIsInitialized() const;
|
||||||
virtual int32_t RecordingIsAvailable(bool& available);
|
virtual int32_t RecordingIsAvailable(bool& available);
|
||||||
virtual int32_t InitRecording();
|
virtual int32_t InitRecording();
|
||||||
virtual bool RecordingIsInitialized() const;
|
virtual bool RecordingIsInitialized() const;
|
||||||
|
|
||||||
// Audio transport control
|
// Audio transport control
|
||||||
virtual int32_t StartPlayout();
|
virtual int32_t StartPlayout();
|
||||||
virtual int32_t StopPlayout();
|
virtual int32_t StopPlayout();
|
||||||
virtual bool Playing() const;
|
virtual bool Playing() const;
|
||||||
virtual int32_t StartRecording();
|
virtual int32_t StartRecording();
|
||||||
virtual int32_t StopRecording();
|
virtual int32_t StopRecording();
|
||||||
virtual bool Recording() const;
|
virtual bool Recording() const;
|
||||||
|
|
||||||
// Microphone Automatic Gain Control (AGC)
|
// Microphone Automatic Gain Control (AGC)
|
||||||
virtual int32_t SetAGC(bool enable);
|
virtual int32_t SetAGC(bool enable);
|
||||||
virtual bool AGC() const;
|
virtual bool AGC() const;
|
||||||
|
|
||||||
// Volume control based on the Windows Wave API (Windows only)
|
// Volume control based on the Windows Wave API (Windows only)
|
||||||
virtual int32_t SetWaveOutVolume(uint16_t volumeLeft, uint16_t volumeRight);
|
virtual int32_t SetWaveOutVolume(uint16_t volumeLeft, uint16_t volumeRight);
|
||||||
virtual int32_t WaveOutVolume(uint16_t& volumeLeft,
|
virtual int32_t WaveOutVolume(uint16_t& volumeLeft,
|
||||||
uint16_t& volumeRight) const;
|
uint16_t& volumeRight) const;
|
||||||
|
|
||||||
// Audio mixer initialization
|
// Audio mixer initialization
|
||||||
virtual int32_t InitSpeaker();
|
virtual int32_t InitSpeaker();
|
||||||
virtual bool SpeakerIsInitialized() const;
|
virtual bool SpeakerIsInitialized() const;
|
||||||
virtual int32_t InitMicrophone();
|
virtual int32_t InitMicrophone();
|
||||||
virtual bool MicrophoneIsInitialized() const;
|
virtual bool MicrophoneIsInitialized() const;
|
||||||
|
|
||||||
// Speaker volume controls
|
// Speaker volume controls
|
||||||
virtual int32_t SpeakerVolumeIsAvailable(bool& available);
|
virtual int32_t SpeakerVolumeIsAvailable(bool& available);
|
||||||
virtual int32_t SetSpeakerVolume(uint32_t volume);
|
virtual int32_t SetSpeakerVolume(uint32_t volume);
|
||||||
virtual int32_t SpeakerVolume(uint32_t& volume) const;
|
virtual int32_t SpeakerVolume(uint32_t& volume) const;
|
||||||
virtual int32_t MaxSpeakerVolume(uint32_t& maxVolume) const;
|
virtual int32_t MaxSpeakerVolume(uint32_t& maxVolume) const;
|
||||||
virtual int32_t MinSpeakerVolume(uint32_t& minVolume) const;
|
virtual int32_t MinSpeakerVolume(uint32_t& minVolume) const;
|
||||||
virtual int32_t SpeakerVolumeStepSize(uint16_t& stepSize) const;
|
virtual int32_t SpeakerVolumeStepSize(uint16_t& stepSize) const;
|
||||||
|
|
||||||
// Microphone volume controls
|
// Microphone volume controls
|
||||||
virtual int32_t MicrophoneVolumeIsAvailable(bool& available);
|
virtual int32_t MicrophoneVolumeIsAvailable(bool& available);
|
||||||
virtual int32_t SetMicrophoneVolume(uint32_t volume);
|
virtual int32_t SetMicrophoneVolume(uint32_t volume);
|
||||||
virtual int32_t MicrophoneVolume(uint32_t& volume) const;
|
virtual int32_t MicrophoneVolume(uint32_t& volume) const;
|
||||||
virtual int32_t MaxMicrophoneVolume(uint32_t& maxVolume) const;
|
virtual int32_t MaxMicrophoneVolume(uint32_t& maxVolume) const;
|
||||||
virtual int32_t MinMicrophoneVolume(uint32_t& minVolume) const;
|
virtual int32_t MinMicrophoneVolume(uint32_t& minVolume) const;
|
||||||
virtual int32_t
|
virtual int32_t MicrophoneVolumeStepSize(uint16_t& stepSize) const;
|
||||||
MicrophoneVolumeStepSize(uint16_t& stepSize) const;
|
|
||||||
|
|
||||||
// Microphone mute control
|
// Microphone mute control
|
||||||
virtual int32_t MicrophoneMuteIsAvailable(bool& available);
|
virtual int32_t MicrophoneMuteIsAvailable(bool& available);
|
||||||
virtual int32_t SetMicrophoneMute(bool enable);
|
virtual int32_t SetMicrophoneMute(bool enable);
|
||||||
virtual int32_t MicrophoneMute(bool& enabled) const;
|
virtual int32_t MicrophoneMute(bool& enabled) const;
|
||||||
|
|
||||||
// Speaker mute control
|
// Speaker mute control
|
||||||
virtual int32_t SpeakerMuteIsAvailable(bool& available);
|
virtual int32_t SpeakerMuteIsAvailable(bool& available);
|
||||||
virtual int32_t SetSpeakerMute(bool enable);
|
virtual int32_t SetSpeakerMute(bool enable);
|
||||||
virtual int32_t SpeakerMute(bool& enabled) const;
|
virtual int32_t SpeakerMute(bool& enabled) const;
|
||||||
|
|
||||||
// Microphone boost control
|
// Microphone boost control
|
||||||
virtual int32_t MicrophoneBoostIsAvailable(bool& available);
|
virtual int32_t MicrophoneBoostIsAvailable(bool& available);
|
||||||
virtual int32_t SetMicrophoneBoost(bool enable);
|
virtual int32_t SetMicrophoneBoost(bool enable);
|
||||||
virtual int32_t MicrophoneBoost(bool& enabled) const;
|
virtual int32_t MicrophoneBoost(bool& enabled) const;
|
||||||
|
|
||||||
// Stereo support
|
// Stereo support
|
||||||
virtual int32_t StereoPlayoutIsAvailable(bool& available);
|
virtual int32_t StereoPlayoutIsAvailable(bool& available);
|
||||||
virtual int32_t SetStereoPlayout(bool enable);
|
virtual int32_t SetStereoPlayout(bool enable);
|
||||||
virtual int32_t StereoPlayout(bool& enabled) const;
|
virtual int32_t StereoPlayout(bool& enabled) const;
|
||||||
virtual int32_t StereoRecordingIsAvailable(bool& available);
|
virtual int32_t StereoRecordingIsAvailable(bool& available);
|
||||||
virtual int32_t SetStereoRecording(bool enable);
|
virtual int32_t SetStereoRecording(bool enable);
|
||||||
virtual int32_t StereoRecording(bool& enabled) const;
|
virtual int32_t StereoRecording(bool& enabled) const;
|
||||||
|
|
||||||
// Delay information and control
|
// Delay information and control
|
||||||
virtual int32_t
|
virtual int32_t SetPlayoutBuffer(const AudioDeviceModule::BufferType type,
|
||||||
SetPlayoutBuffer(const AudioDeviceModule::BufferType type,
|
uint16_t sizeMS);
|
||||||
uint16_t sizeMS);
|
virtual int32_t PlayoutBuffer(AudioDeviceModule::BufferType& type,
|
||||||
virtual int32_t PlayoutBuffer(AudioDeviceModule::BufferType& type,
|
uint16_t& sizeMS) const;
|
||||||
uint16_t& sizeMS) const;
|
virtual int32_t PlayoutDelay(uint16_t& delayMS) const;
|
||||||
virtual int32_t PlayoutDelay(uint16_t& delayMS) const;
|
virtual int32_t RecordingDelay(uint16_t& delayMS) const;
|
||||||
virtual int32_t RecordingDelay(uint16_t& delayMS) const;
|
|
||||||
|
|
||||||
// CPU load
|
// CPU load
|
||||||
virtual int32_t CPULoad(uint16_t& load) const;
|
virtual int32_t CPULoad(uint16_t& load) const;
|
||||||
|
|
||||||
virtual bool PlayoutWarning() const;
|
virtual bool PlayoutWarning() const;
|
||||||
virtual bool PlayoutError() const;
|
virtual bool PlayoutError() const;
|
||||||
virtual bool RecordingWarning() const;
|
virtual bool RecordingWarning() const;
|
||||||
virtual bool RecordingError() const;
|
virtual bool RecordingError() const;
|
||||||
virtual void ClearPlayoutWarning();
|
virtual void ClearPlayoutWarning();
|
||||||
virtual void ClearPlayoutError();
|
virtual void ClearPlayoutError();
|
||||||
virtual void ClearRecordingWarning();
|
virtual void ClearRecordingWarning();
|
||||||
virtual void ClearRecordingError();
|
virtual void ClearRecordingError();
|
||||||
|
|
||||||
virtual void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer);
|
virtual void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
virtual int32_t MicrophoneIsAvailable(bool& available);
|
virtual int32_t MicrophoneIsAvailable(bool& available);
|
||||||
virtual int32_t SpeakerIsAvailable(bool& available);
|
virtual int32_t SpeakerIsAvailable(bool& available);
|
||||||
|
|
||||||
static void AtomicSet32(int32_t* theValue, int32_t newValue);
|
static void AtomicSet32(int32_t* theValue, int32_t newValue);
|
||||||
static int32_t AtomicGet32(int32_t* theValue);
|
static int32_t AtomicGet32(int32_t* theValue);
|
||||||
|
|
||||||
static void logCAMsg(const TraceLevel level,
|
static void logCAMsg(const TraceLevel level,
|
||||||
const TraceModule module,
|
const TraceModule module,
|
||||||
const int32_t id, const char *msg,
|
const int32_t id,
|
||||||
const char *err);
|
const char* msg,
|
||||||
|
const char* err);
|
||||||
|
|
||||||
int32_t GetNumberDevices(const AudioObjectPropertyScope scope,
|
int32_t GetNumberDevices(const AudioObjectPropertyScope scope,
|
||||||
AudioDeviceID scopedDeviceIds[],
|
AudioDeviceID scopedDeviceIds[],
|
||||||
const uint32_t deviceListLength);
|
const uint32_t deviceListLength);
|
||||||
|
|
||||||
int32_t GetDeviceName(const AudioObjectPropertyScope scope,
|
int32_t GetDeviceName(const AudioObjectPropertyScope scope,
|
||||||
const uint16_t index, char* name);
|
const uint16_t index,
|
||||||
|
char* name);
|
||||||
|
|
||||||
int32_t InitDevice(uint16_t userDeviceIndex,
|
int32_t InitDevice(uint16_t userDeviceIndex,
|
||||||
AudioDeviceID& deviceId, bool isInput);
|
AudioDeviceID& deviceId,
|
||||||
|
bool isInput);
|
||||||
|
|
||||||
// Always work with our preferred playout format inside VoE.
|
// Always work with our preferred playout format inside VoE.
|
||||||
// Then convert the output to the OS setting using an AudioConverter.
|
// Then convert the output to the OS setting using an AudioConverter.
|
||||||
OSStatus SetDesiredPlayoutFormat();
|
OSStatus SetDesiredPlayoutFormat();
|
||||||
|
|
||||||
static OSStatus
|
static OSStatus objectListenerProc(
|
||||||
objectListenerProc(AudioObjectID objectId, UInt32 numberAddresses,
|
AudioObjectID objectId,
|
||||||
const AudioObjectPropertyAddress addresses[],
|
UInt32 numberAddresses,
|
||||||
void* clientData);
|
const AudioObjectPropertyAddress addresses[],
|
||||||
|
void* clientData);
|
||||||
|
|
||||||
OSStatus
|
OSStatus implObjectListenerProc(AudioObjectID objectId,
|
||||||
implObjectListenerProc(AudioObjectID objectId, UInt32 numberAddresses,
|
UInt32 numberAddresses,
|
||||||
const AudioObjectPropertyAddress addresses[]);
|
const AudioObjectPropertyAddress addresses[]);
|
||||||
|
|
||||||
int32_t HandleDeviceChange();
|
int32_t HandleDeviceChange();
|
||||||
|
|
||||||
int32_t
|
int32_t HandleStreamFormatChange(AudioObjectID objectId,
|
||||||
HandleStreamFormatChange(AudioObjectID objectId,
|
AudioObjectPropertyAddress propertyAddress);
|
||||||
|
|
||||||
|
int32_t HandleDataSourceChange(AudioObjectID objectId,
|
||||||
AudioObjectPropertyAddress propertyAddress);
|
AudioObjectPropertyAddress propertyAddress);
|
||||||
|
|
||||||
int32_t
|
int32_t HandleProcessorOverload(AudioObjectPropertyAddress propertyAddress);
|
||||||
HandleDataSourceChange(AudioObjectID objectId,
|
|
||||||
AudioObjectPropertyAddress propertyAddress);
|
|
||||||
|
|
||||||
int32_t
|
static OSStatus deviceIOProc(AudioDeviceID device,
|
||||||
HandleProcessorOverload(AudioObjectPropertyAddress propertyAddress);
|
const AudioTimeStamp* now,
|
||||||
|
const AudioBufferList* inputData,
|
||||||
|
const AudioTimeStamp* inputTime,
|
||||||
|
AudioBufferList* outputData,
|
||||||
|
const AudioTimeStamp* outputTime,
|
||||||
|
void* clientData);
|
||||||
|
|
||||||
static OSStatus deviceIOProc(AudioDeviceID device,
|
static OSStatus outConverterProc(
|
||||||
const AudioTimeStamp *now,
|
AudioConverterRef audioConverter,
|
||||||
const AudioBufferList *inputData,
|
UInt32* numberDataPackets,
|
||||||
const AudioTimeStamp *inputTime,
|
AudioBufferList* data,
|
||||||
AudioBufferList *outputData,
|
AudioStreamPacketDescription** dataPacketDescription,
|
||||||
|
void* userData);
|
||||||
|
|
||||||
|
static OSStatus inDeviceIOProc(AudioDeviceID device,
|
||||||
|
const AudioTimeStamp* now,
|
||||||
|
const AudioBufferList* inputData,
|
||||||
|
const AudioTimeStamp* inputTime,
|
||||||
|
AudioBufferList* outputData,
|
||||||
const AudioTimeStamp* outputTime,
|
const AudioTimeStamp* outputTime,
|
||||||
void *clientData);
|
void* clientData);
|
||||||
|
|
||||||
static OSStatus
|
static OSStatus inConverterProc(
|
||||||
outConverterProc(AudioConverterRef audioConverter,
|
AudioConverterRef audioConverter,
|
||||||
UInt32 *numberDataPackets, AudioBufferList *data,
|
UInt32* numberDataPackets,
|
||||||
AudioStreamPacketDescription **dataPacketDescription,
|
AudioBufferList* data,
|
||||||
void *userData);
|
AudioStreamPacketDescription** dataPacketDescription,
|
||||||
|
void* inUserData);
|
||||||
|
|
||||||
static OSStatus inDeviceIOProc(AudioDeviceID device,
|
OSStatus implDeviceIOProc(const AudioBufferList* inputData,
|
||||||
const AudioTimeStamp *now,
|
const AudioTimeStamp* inputTime,
|
||||||
const AudioBufferList *inputData,
|
AudioBufferList* outputData,
|
||||||
const AudioTimeStamp *inputTime,
|
const AudioTimeStamp* outputTime);
|
||||||
AudioBufferList *outputData,
|
|
||||||
const AudioTimeStamp *outputTime,
|
|
||||||
void *clientData);
|
|
||||||
|
|
||||||
static OSStatus
|
OSStatus implOutConverterProc(UInt32* numberDataPackets,
|
||||||
inConverterProc(AudioConverterRef audioConverter,
|
AudioBufferList* data);
|
||||||
UInt32 *numberDataPackets, AudioBufferList *data,
|
|
||||||
AudioStreamPacketDescription **dataPacketDescription,
|
|
||||||
void *inUserData);
|
|
||||||
|
|
||||||
OSStatus implDeviceIOProc(const AudioBufferList *inputData,
|
OSStatus implInDeviceIOProc(const AudioBufferList* inputData,
|
||||||
const AudioTimeStamp *inputTime,
|
const AudioTimeStamp* inputTime);
|
||||||
AudioBufferList *outputData,
|
|
||||||
const AudioTimeStamp *outputTime);
|
|
||||||
|
|
||||||
OSStatus implOutConverterProc(UInt32 *numberDataPackets,
|
OSStatus implInConverterProc(UInt32* numberDataPackets,
|
||||||
AudioBufferList *data);
|
AudioBufferList* data);
|
||||||
|
|
||||||
OSStatus implInDeviceIOProc(const AudioBufferList *inputData,
|
static bool RunCapture(void*);
|
||||||
const AudioTimeStamp *inputTime);
|
static bool RunRender(void*);
|
||||||
|
bool CaptureWorkerThread();
|
||||||
|
bool RenderWorkerThread();
|
||||||
|
|
||||||
OSStatus implInConverterProc(UInt32 *numberDataPackets,
|
bool KeyPressed();
|
||||||
AudioBufferList *data);
|
|
||||||
|
|
||||||
static bool RunCapture(void*);
|
AudioDeviceBuffer* _ptrAudioBuffer;
|
||||||
static bool RunRender(void*);
|
|
||||||
bool CaptureWorkerThread();
|
|
||||||
bool RenderWorkerThread();
|
|
||||||
|
|
||||||
bool KeyPressed();
|
CriticalSectionWrapper& _critSect;
|
||||||
|
|
||||||
AudioDeviceBuffer* _ptrAudioBuffer;
|
EventWrapper& _stopEventRec;
|
||||||
|
EventWrapper& _stopEvent;
|
||||||
|
|
||||||
CriticalSectionWrapper& _critSect;
|
// TODO(pbos): Replace with direct members, just start/stop, no need to
|
||||||
|
// recreate the thread.
|
||||||
|
// Only valid/running between calls to StartRecording and StopRecording.
|
||||||
|
rtc::scoped_ptr<rtc::PlatformThread> capture_worker_thread_;
|
||||||
|
|
||||||
EventWrapper& _stopEventRec;
|
// Only valid/running between calls to StartPlayout and StopPlayout.
|
||||||
EventWrapper& _stopEvent;
|
rtc::scoped_ptr<rtc::PlatformThread> render_worker_thread_;
|
||||||
|
|
||||||
// TODO(pbos): Replace with direct members, just start/stop, no need to
|
int32_t _id;
|
||||||
// recreate the thread.
|
|
||||||
// Only valid/running between calls to StartRecording and StopRecording.
|
|
||||||
rtc::scoped_ptr<rtc::PlatformThread> capture_worker_thread_;
|
|
||||||
|
|
||||||
// Only valid/running between calls to StartPlayout and StopPlayout.
|
AudioMixerManagerMac _mixerManager;
|
||||||
rtc::scoped_ptr<rtc::PlatformThread> render_worker_thread_;
|
|
||||||
|
|
||||||
int32_t _id;
|
uint16_t _inputDeviceIndex;
|
||||||
|
uint16_t _outputDeviceIndex;
|
||||||
AudioMixerManagerMac _mixerManager;
|
AudioDeviceID _inputDeviceID;
|
||||||
|
AudioDeviceID _outputDeviceID;
|
||||||
uint16_t _inputDeviceIndex;
|
|
||||||
uint16_t _outputDeviceIndex;
|
|
||||||
AudioDeviceID _inputDeviceID;
|
|
||||||
AudioDeviceID _outputDeviceID;
|
|
||||||
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
|
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
|
||||||
AudioDeviceIOProcID _inDeviceIOProcID;
|
AudioDeviceIOProcID _inDeviceIOProcID;
|
||||||
AudioDeviceIOProcID _deviceIOProcID;
|
AudioDeviceIOProcID _deviceIOProcID;
|
||||||
#endif
|
#endif
|
||||||
bool _inputDeviceIsSpecified;
|
bool _inputDeviceIsSpecified;
|
||||||
bool _outputDeviceIsSpecified;
|
bool _outputDeviceIsSpecified;
|
||||||
|
|
||||||
uint8_t _recChannels;
|
uint8_t _recChannels;
|
||||||
uint8_t _playChannels;
|
uint8_t _playChannels;
|
||||||
|
|
||||||
Float32* _captureBufData;
|
Float32* _captureBufData;
|
||||||
SInt16* _renderBufData;
|
SInt16* _renderBufData;
|
||||||
|
|
||||||
SInt16 _renderConvertData[PLAY_BUF_SIZE_IN_SAMPLES];
|
SInt16 _renderConvertData[PLAY_BUF_SIZE_IN_SAMPLES];
|
||||||
|
|
||||||
AudioDeviceModule::BufferType _playBufType;
|
AudioDeviceModule::BufferType _playBufType;
|
||||||
|
|
||||||
bool _initialized;
|
bool _initialized;
|
||||||
bool _isShutDown;
|
bool _isShutDown;
|
||||||
bool _recording;
|
bool _recording;
|
||||||
bool _playing;
|
bool _playing;
|
||||||
bool _recIsInitialized;
|
bool _recIsInitialized;
|
||||||
bool _playIsInitialized;
|
bool _playIsInitialized;
|
||||||
bool _AGC;
|
bool _AGC;
|
||||||
|
|
||||||
// Atomically set varaibles
|
// Atomically set varaibles
|
||||||
int32_t _renderDeviceIsAlive;
|
int32_t _renderDeviceIsAlive;
|
||||||
int32_t _captureDeviceIsAlive;
|
int32_t _captureDeviceIsAlive;
|
||||||
|
|
||||||
bool _twoDevices;
|
bool _twoDevices;
|
||||||
bool _doStop; // For play if not shared device or play+rec if shared device
|
bool _doStop; // For play if not shared device or play+rec if shared device
|
||||||
bool _doStopRec; // For rec if not shared device
|
bool _doStopRec; // For rec if not shared device
|
||||||
bool _macBookPro;
|
bool _macBookPro;
|
||||||
bool _macBookProPanRight;
|
bool _macBookProPanRight;
|
||||||
|
|
||||||
AudioConverterRef _captureConverter;
|
AudioConverterRef _captureConverter;
|
||||||
AudioConverterRef _renderConverter;
|
AudioConverterRef _renderConverter;
|
||||||
|
|
||||||
AudioStreamBasicDescription _outStreamFormat;
|
AudioStreamBasicDescription _outStreamFormat;
|
||||||
AudioStreamBasicDescription _outDesiredFormat;
|
AudioStreamBasicDescription _outDesiredFormat;
|
||||||
AudioStreamBasicDescription _inStreamFormat;
|
AudioStreamBasicDescription _inStreamFormat;
|
||||||
AudioStreamBasicDescription _inDesiredFormat;
|
AudioStreamBasicDescription _inDesiredFormat;
|
||||||
|
|
||||||
uint32_t _captureLatencyUs;
|
uint32_t _captureLatencyUs;
|
||||||
uint32_t _renderLatencyUs;
|
uint32_t _renderLatencyUs;
|
||||||
|
|
||||||
// Atomically set variables
|
// Atomically set variables
|
||||||
mutable int32_t _captureDelayUs;
|
mutable int32_t _captureDelayUs;
|
||||||
mutable int32_t _renderDelayUs;
|
mutable int32_t _renderDelayUs;
|
||||||
|
|
||||||
int32_t _renderDelayOffsetSamples;
|
int32_t _renderDelayOffsetSamples;
|
||||||
|
|
||||||
uint16_t _playBufDelayFixed; // fixed playback delay
|
uint16_t _playBufDelayFixed; // fixed playback delay
|
||||||
|
|
||||||
uint16_t _playWarning;
|
uint16_t _playWarning;
|
||||||
uint16_t _playError;
|
uint16_t _playError;
|
||||||
uint16_t _recWarning;
|
uint16_t _recWarning;
|
||||||
uint16_t _recError;
|
uint16_t _recError;
|
||||||
|
|
||||||
PaUtilRingBuffer* _paCaptureBuffer;
|
PaUtilRingBuffer* _paCaptureBuffer;
|
||||||
PaUtilRingBuffer* _paRenderBuffer;
|
PaUtilRingBuffer* _paRenderBuffer;
|
||||||
|
|
||||||
semaphore_t _renderSemaphore;
|
semaphore_t _renderSemaphore;
|
||||||
semaphore_t _captureSemaphore;
|
semaphore_t _captureSemaphore;
|
||||||
|
|
||||||
int _captureBufSizeSamples;
|
int _captureBufSizeSamples;
|
||||||
int _renderBufSizeSamples;
|
int _renderBufSizeSamples;
|
||||||
|
|
||||||
// Typing detection
|
// Typing detection
|
||||||
// 0x5c is key "9", after that comes function keys.
|
// 0x5c is key "9", after that comes function keys.
|
||||||
bool prev_key_state_[0x5d];
|
bool prev_key_state_[0x5d];
|
||||||
|
|
||||||
int get_mic_volume_counter_ms_;
|
int get_mic_volume_counter_ms_;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace webrtc
|
} // namespace webrtc
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -18,63 +18,62 @@
|
|||||||
#include <CoreAudio/CoreAudio.h>
|
#include <CoreAudio/CoreAudio.h>
|
||||||
|
|
||||||
namespace webrtc {
|
namespace webrtc {
|
||||||
|
|
||||||
class AudioMixerManagerMac
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
int32_t OpenSpeaker(AudioDeviceID deviceID);
|
|
||||||
int32_t OpenMicrophone(AudioDeviceID deviceID);
|
|
||||||
int32_t SetSpeakerVolume(uint32_t volume);
|
|
||||||
int32_t SpeakerVolume(uint32_t& volume) const;
|
|
||||||
int32_t MaxSpeakerVolume(uint32_t& maxVolume) const;
|
|
||||||
int32_t MinSpeakerVolume(uint32_t& minVolume) const;
|
|
||||||
int32_t SpeakerVolumeStepSize(uint16_t& stepSize) const;
|
|
||||||
int32_t SpeakerVolumeIsAvailable(bool& available);
|
|
||||||
int32_t SpeakerMuteIsAvailable(bool& available);
|
|
||||||
int32_t SetSpeakerMute(bool enable);
|
|
||||||
int32_t SpeakerMute(bool& enabled) const;
|
|
||||||
int32_t StereoPlayoutIsAvailable(bool& available);
|
|
||||||
int32_t StereoRecordingIsAvailable(bool& available);
|
|
||||||
int32_t MicrophoneMuteIsAvailable(bool& available);
|
|
||||||
int32_t SetMicrophoneMute(bool enable);
|
|
||||||
int32_t MicrophoneMute(bool& enabled) const;
|
|
||||||
int32_t MicrophoneBoostIsAvailable(bool& available);
|
|
||||||
int32_t SetMicrophoneBoost(bool enable);
|
|
||||||
int32_t MicrophoneBoost(bool& enabled) const;
|
|
||||||
int32_t MicrophoneVolumeIsAvailable(bool& available);
|
|
||||||
int32_t SetMicrophoneVolume(uint32_t volume);
|
|
||||||
int32_t MicrophoneVolume(uint32_t& volume) const;
|
|
||||||
int32_t MaxMicrophoneVolume(uint32_t& maxVolume) const;
|
|
||||||
int32_t MinMicrophoneVolume(uint32_t& minVolume) const;
|
|
||||||
int32_t MicrophoneVolumeStepSize(uint16_t& stepSize) const;
|
|
||||||
int32_t Close();
|
|
||||||
int32_t CloseSpeaker();
|
|
||||||
int32_t CloseMicrophone();
|
|
||||||
bool SpeakerIsInitialized() const;
|
|
||||||
bool MicrophoneIsInitialized() const;
|
|
||||||
|
|
||||||
public:
|
class AudioMixerManagerMac {
|
||||||
AudioMixerManagerMac(const int32_t id);
|
public:
|
||||||
~AudioMixerManagerMac();
|
int32_t OpenSpeaker(AudioDeviceID deviceID);
|
||||||
|
int32_t OpenMicrophone(AudioDeviceID deviceID);
|
||||||
|
int32_t SetSpeakerVolume(uint32_t volume);
|
||||||
|
int32_t SpeakerVolume(uint32_t& volume) const;
|
||||||
|
int32_t MaxSpeakerVolume(uint32_t& maxVolume) const;
|
||||||
|
int32_t MinSpeakerVolume(uint32_t& minVolume) const;
|
||||||
|
int32_t SpeakerVolumeStepSize(uint16_t& stepSize) const;
|
||||||
|
int32_t SpeakerVolumeIsAvailable(bool& available);
|
||||||
|
int32_t SpeakerMuteIsAvailable(bool& available);
|
||||||
|
int32_t SetSpeakerMute(bool enable);
|
||||||
|
int32_t SpeakerMute(bool& enabled) const;
|
||||||
|
int32_t StereoPlayoutIsAvailable(bool& available);
|
||||||
|
int32_t StereoRecordingIsAvailable(bool& available);
|
||||||
|
int32_t MicrophoneMuteIsAvailable(bool& available);
|
||||||
|
int32_t SetMicrophoneMute(bool enable);
|
||||||
|
int32_t MicrophoneMute(bool& enabled) const;
|
||||||
|
int32_t MicrophoneBoostIsAvailable(bool& available);
|
||||||
|
int32_t SetMicrophoneBoost(bool enable);
|
||||||
|
int32_t MicrophoneBoost(bool& enabled) const;
|
||||||
|
int32_t MicrophoneVolumeIsAvailable(bool& available);
|
||||||
|
int32_t SetMicrophoneVolume(uint32_t volume);
|
||||||
|
int32_t MicrophoneVolume(uint32_t& volume) const;
|
||||||
|
int32_t MaxMicrophoneVolume(uint32_t& maxVolume) const;
|
||||||
|
int32_t MinMicrophoneVolume(uint32_t& minVolume) const;
|
||||||
|
int32_t MicrophoneVolumeStepSize(uint16_t& stepSize) const;
|
||||||
|
int32_t Close();
|
||||||
|
int32_t CloseSpeaker();
|
||||||
|
int32_t CloseMicrophone();
|
||||||
|
bool SpeakerIsInitialized() const;
|
||||||
|
bool MicrophoneIsInitialized() const;
|
||||||
|
|
||||||
private:
|
public:
|
||||||
static void logCAMsg(const TraceLevel level,
|
AudioMixerManagerMac(const int32_t id);
|
||||||
const TraceModule module,
|
~AudioMixerManagerMac();
|
||||||
const int32_t id, const char *msg,
|
|
||||||
const char *err);
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
CriticalSectionWrapper& _critSect;
|
static void logCAMsg(const TraceLevel level,
|
||||||
int32_t _id;
|
const TraceModule module,
|
||||||
|
const int32_t id,
|
||||||
|
const char* msg,
|
||||||
|
const char* err);
|
||||||
|
|
||||||
AudioDeviceID _inputDeviceID;
|
private:
|
||||||
AudioDeviceID _outputDeviceID;
|
CriticalSectionWrapper& _critSect;
|
||||||
|
int32_t _id;
|
||||||
|
|
||||||
uint16_t _noInputChannels;
|
AudioDeviceID _inputDeviceID;
|
||||||
uint16_t _noOutputChannels;
|
AudioDeviceID _outputDeviceID;
|
||||||
|
|
||||||
|
uint16_t _noInputChannels;
|
||||||
|
uint16_t _noOutputChannels;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace webrtc
|
} // namespace webrtc
|
||||||
|
|
||||||
#endif // AUDIO_MIXER_MAC_H
|
#endif // AUDIO_MIXER_MAC_H
|
||||||
|
|||||||
Reference in New Issue
Block a user