| Index: webrtc/voice_engine/voe_hardware_impl.cc
|
| diff --git a/webrtc/voice_engine/voe_hardware_impl.cc b/webrtc/voice_engine/voe_hardware_impl.cc
|
| index b4a39f37fcf9463c06b4cdf6fb1bc1f9400e5a0b..b2bb87143e8532d7c2e8104e48921dd76872914d 100644
|
| --- a/webrtc/voice_engine/voe_hardware_impl.cc
|
| +++ b/webrtc/voice_engine/voe_hardware_impl.cc
|
| @@ -82,9 +82,6 @@ int VoEHardwareImpl::SetAudioDeviceLayer(AudioLayers audioLayer) {
|
| }
|
|
|
| int VoEHardwareImpl::GetAudioDeviceLayer(AudioLayers& audioLayer) {
|
| - WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
|
| - "GetAudioDeviceLayer(devices=?)");
|
| -
|
| // Can always be called regardless of VoE state
|
|
|
| AudioDeviceModule::AudioLayer activeLayer(
|
| @@ -124,15 +121,9 @@ int VoEHardwareImpl::GetAudioDeviceLayer(AudioLayers& audioLayer) {
|
| " unknown audio layer");
|
| }
|
|
|
| - WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
|
| - " Output: audioLayer=%d", audioLayer);
|
| -
|
| return 0;
|
| }
|
| int VoEHardwareImpl::GetNumOfRecordingDevices(int& devices) {
|
| - WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
|
| - "GetNumOfRecordingDevices(devices=?)");
|
| -
|
| if (!_shared->statistics().Initialized()) {
|
| _shared->SetLastError(VE_NOT_INITED, kTraceError);
|
| return -1;
|
| @@ -140,16 +131,10 @@ int VoEHardwareImpl::GetNumOfRecordingDevices(int& devices) {
|
|
|
| devices = static_cast<int>(_shared->audio_device()->RecordingDevices());
|
|
|
| - WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
|
| - " Output: devices=%d", devices);
|
| -
|
| return 0;
|
| }
|
|
|
| int VoEHardwareImpl::GetNumOfPlayoutDevices(int& devices) {
|
| - WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
|
| - "GetNumOfPlayoutDevices(devices=?)");
|
| -
|
| if (!_shared->statistics().Initialized()) {
|
| _shared->SetLastError(VE_NOT_INITED, kTraceError);
|
| return -1;
|
| @@ -157,18 +142,12 @@ int VoEHardwareImpl::GetNumOfPlayoutDevices(int& devices) {
|
|
|
| devices = static_cast<int>(_shared->audio_device()->PlayoutDevices());
|
|
|
| - WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
|
| - " Output: devices=%d", devices);
|
| -
|
| return 0;
|
| }
|
|
|
| int VoEHardwareImpl::GetRecordingDeviceName(int index,
|
| char strNameUTF8[128],
|
| char strGuidUTF8[128]) {
|
| - WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
|
| - "GetRecordingDeviceName(index=%d)", index);
|
| -
|
| if (!_shared->statistics().Initialized()) {
|
| _shared->SetLastError(VE_NOT_INITED, kTraceError);
|
| return -1;
|
| @@ -200,14 +179,9 @@ int VoEHardwareImpl::GetRecordingDeviceName(int index,
|
|
|
| // Copy to vectors supplied by user
|
| strncpy(strNameUTF8, name, strLen);
|
| - WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
|
| - " Output: strNameUTF8=%s", strNameUTF8);
|
|
|
| if (strGuidUTF8 != NULL) {
|
| strncpy(strGuidUTF8, guid, strLen);
|
| - WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
|
| - VoEId(_shared->instance_id(), -1), " Output: strGuidUTF8=%s",
|
| - strGuidUTF8);
|
| }
|
|
|
| return 0;
|
| @@ -216,9 +190,6 @@ int VoEHardwareImpl::GetRecordingDeviceName(int index,
|
| int VoEHardwareImpl::GetPlayoutDeviceName(int index,
|
| char strNameUTF8[128],
|
| char strGuidUTF8[128]) {
|
| - WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
|
| - "GetPlayoutDeviceName(index=%d)", index);
|
| -
|
| if (!_shared->statistics().Initialized()) {
|
| _shared->SetLastError(VE_NOT_INITED, kTraceError);
|
| return -1;
|
| @@ -250,14 +221,9 @@ int VoEHardwareImpl::GetPlayoutDeviceName(int index,
|
|
|
| // Copy to vectors supplied by user
|
| strncpy(strNameUTF8, name, strLen);
|
| - WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
|
| - " Output: strNameUTF8=%s", strNameUTF8);
|
|
|
| if (strGuidUTF8 != NULL) {
|
| strncpy(strGuidUTF8, guid, strLen);
|
| - WEBRTC_TRACE(kTraceStateInfo, kTraceVoice,
|
| - VoEId(_shared->instance_id(), -1), " Output: strGuidUTF8=%s",
|
| - strGuidUTF8);
|
| }
|
|
|
| return 0;
|
| @@ -473,8 +439,6 @@ int VoEHardwareImpl::SetRecordingSampleRate(unsigned int samples_per_sec) {
|
| }
|
|
|
| int VoEHardwareImpl::RecordingSampleRate(unsigned int* samples_per_sec) const {
|
| - WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
|
| - "%s", __FUNCTION__);
|
| if (!_shared->statistics().Initialized()) {
|
| _shared->SetLastError(VE_NOT_INITED, kTraceError);
|
| return false;
|
| @@ -493,8 +457,6 @@ int VoEHardwareImpl::SetPlayoutSampleRate(unsigned int samples_per_sec) {
|
| }
|
|
|
| int VoEHardwareImpl::PlayoutSampleRate(unsigned int* samples_per_sec) const {
|
| - WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
|
| - "%s", __FUNCTION__);
|
| if (!_shared->statistics().Initialized()) {
|
| _shared->SetLastError(VE_NOT_INITED, kTraceError);
|
| return false;
|
|
|