zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clang-format audio_device/mac.

Browse Source 
NOTRY=true

Review URL: https://codereview.webrtc.org/1570063003

Cr-Commit-Position: refs/heads/master@{#11212}
This commit is contained in:
andrew
2016-01-11 15:59:17 -08:00
committed by Commit bot
parent a7446d2a50
commit 2bc63a1dd3
4 changed files with 3417 additions and 4044 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1845
webrtc/modules/audio_device/mac/audio_device_mac.cc
View File

File diff suppressed because it is too large Load Diff

122
webrtc/modules/audio_device/mac/audio_device_mac.h
View File

@ -27,8 +27,7 @@ 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;
@ -58,15 +57,14 @@ 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();
@ -76,19 +74,16 @@ public:
// 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( virtual int32_t RecordingDeviceName(uint16_t index,
uint16_t index,
char name[kAdmMaxDeviceNameSize], char name[kAdmMaxDeviceNameSize],
char guid[kAdmMaxGuidSize]); 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);
@ -138,8 +133,7 @@ public:
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);
@ -165,8 +159,7 @@ public:
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;
@ -187,7 +180,7 @@ public:
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);
@ -196,86 +189,89 @@ private:
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,
UInt32 numberAddresses,
const AudioObjectPropertyAddress addresses[], const AudioObjectPropertyAddress addresses[],
void* clientData); 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); AudioObjectPropertyAddress propertyAddress);
int32_t int32_t HandleDataSourceChange(AudioObjectID objectId,
HandleDataSourceChange(AudioObjectID objectId,
AudioObjectPropertyAddress propertyAddress); AudioObjectPropertyAddress propertyAddress);
int32_t int32_t HandleProcessorOverload(AudioObjectPropertyAddress propertyAddress);
HandleProcessorOverload(AudioObjectPropertyAddress propertyAddress);
static OSStatus deviceIOProc(AudioDeviceID device, static OSStatus deviceIOProc(AudioDeviceID device,
const AudioTimeStamp *now, const AudioTimeStamp* now,
const AudioBufferList *inputData, const AudioBufferList* inputData,
const AudioTimeStamp *inputTime, const AudioTimeStamp* inputTime,
AudioBufferList *outputData, AudioBufferList* outputData,
const AudioTimeStamp* outputTime, const AudioTimeStamp* outputTime,
void *clientData); void* clientData);
static OSStatus static OSStatus outConverterProc(
outConverterProc(AudioConverterRef audioConverter, AudioConverterRef audioConverter,
UInt32 *numberDataPackets, AudioBufferList *data, UInt32* numberDataPackets,
AudioStreamPacketDescription **dataPacketDescription, AudioBufferList* data,
void *userData); AudioStreamPacketDescription** dataPacketDescription,
void* userData);
static OSStatus inDeviceIOProc(AudioDeviceID device, static OSStatus inDeviceIOProc(AudioDeviceID device,
const AudioTimeStamp *now, const AudioTimeStamp* now,
const AudioBufferList *inputData, const AudioBufferList* inputData,
const AudioTimeStamp *inputTime, const AudioTimeStamp* inputTime,
AudioBufferList *outputData, AudioBufferList* outputData,
const AudioTimeStamp *outputTime, const AudioTimeStamp* outputTime,
void *clientData); void* clientData);
static OSStatus static OSStatus inConverterProc(
inConverterProc(AudioConverterRef audioConverter, AudioConverterRef audioConverter,
UInt32 *numberDataPackets, AudioBufferList *data, UInt32* numberDataPackets,
AudioStreamPacketDescription **dataPacketDescription, AudioBufferList* data,
void *inUserData); AudioStreamPacketDescription** dataPacketDescription,
void* inUserData);
OSStatus implDeviceIOProc(const AudioBufferList *inputData, OSStatus implDeviceIOProc(const AudioBufferList* inputData,
const AudioTimeStamp *inputTime, const AudioTimeStamp* inputTime,
AudioBufferList *outputData, AudioBufferList* outputData,
const AudioTimeStamp *outputTime); const AudioTimeStamp* outputTime);
OSStatus implOutConverterProc(UInt32 *numberDataPackets, OSStatus implOutConverterProc(UInt32* numberDataPackets,
AudioBufferList *data); AudioBufferList* data);
OSStatus implInDeviceIOProc(const AudioBufferList *inputData, OSStatus implInDeviceIOProc(const AudioBufferList* inputData,
const AudioTimeStamp *inputTime); const AudioTimeStamp* inputTime);
OSStatus implInConverterProc(UInt32 *numberDataPackets, OSStatus implInConverterProc(UInt32* numberDataPackets,
AudioBufferList *data); AudioBufferList* data);
static bool RunCapture(void*); static bool RunCapture(void*);
static bool RunRender(void*); static bool RunRender(void*);

607
webrtc/modules/audio_device/mac/audio_mixer_manager_mac.cc
View File

File diff suppressed because it is too large Load Diff

17
webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h
View File

@ -19,9 +19,8 @@
namespace webrtc { namespace webrtc {
class AudioMixerManagerMac class AudioMixerManagerMac {
{ public:
public:
int32_t OpenSpeaker(AudioDeviceID deviceID); int32_t OpenSpeaker(AudioDeviceID deviceID);
int32_t OpenMicrophone(AudioDeviceID deviceID); int32_t OpenMicrophone(AudioDeviceID deviceID);
int32_t SetSpeakerVolume(uint32_t volume); int32_t SetSpeakerVolume(uint32_t volume);
@ -53,17 +52,18 @@ public:
bool SpeakerIsInitialized() const; bool SpeakerIsInitialized() const;
bool MicrophoneIsInitialized() const; bool MicrophoneIsInitialized() const;
public: public:
AudioMixerManagerMac(const int32_t id); AudioMixerManagerMac(const int32_t id);
~AudioMixerManagerMac(); ~AudioMixerManagerMac();
private: private:
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);
private: private:
CriticalSectionWrapper& _critSect; CriticalSectionWrapper& _critSect;
int32_t _id; int32_t _id;
@ -72,7 +72,6 @@ private:
uint16_t _noInputChannels; uint16_t _noInputChannels;
uint16_t _noOutputChannels; uint16_t _noOutputChannels;
}; };
} // namespace webrtc } // namespace webrtc