admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix memory leaks in Windows core audio

Browse Source 
BUG=webrtc:7270

Review-Url: https://codereview.webrtc.org/2727273002
Cr-Commit-Position: refs/heads/master@{#17056}
This commit is contained in:
jens.nielsen 2017-03-06 02:24:42 -08:00 committed by Commit bot
parent 3b2fb203fd
commit 5571ee9465
1 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
webrtc/modules/audio_device/win/audio_device_core_win.cc
View File

@ -878,6 +878,7 @@ int32_t AudioDeviceWindowsCore::InitMicrophone()
return -1;
}
SAFE_RELEASE(_ptrCaptureVolume);
ret = _ptrDeviceIn->Activate(__uuidof(IAudioEndpointVolume),
CLSCTX_ALL,
NULL,
@ -2258,8 +2259,22 @@ int32_t AudioDeviceWindowsCore::InitPlayout()
}
else
{
WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "nChannels=%d, nSamplesPerSec=%d is not supported",
Wfx.nChannels, Wfx.nSamplesPerSec);
if (pWfxClosestMatch)
{
LOG(INFO) << "nChannels=" << Wfx.nChannels <<
", nSamplesPerSec=" << Wfx.nSamplesPerSec <<
" is not supported. Closest match: " <<
"nChannels=" << pWfxClosestMatch->nChannels <<
", nSamplesPerSec=" << pWfxClosestMatch->nSamplesPerSec;
CoTaskMemFree(pWfxClosestMatch);
pWfxClosestMatch = NULL;
}
else
{
LOG(INFO) << "nChannels=" << Wfx.nChannels <<
", nSamplesPerSec=" << Wfx.nSamplesPerSec <<
" is not supported. No closest match.";
}
}
}
if (hr == S_OK)
@ -2330,15 +2345,6 @@ int32_t AudioDeviceWindowsCore::InitPlayout()
if (FAILED(hr))
{
WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, "IAudioClient::Initialize() failed:");
if (pWfxClosestMatch != NULL)
{
WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, "closest mix format: #channels=%d, samples/sec=%d, bits/sample=%d",
pWfxClosestMatch->nChannels, pWfxClosestMatch->nSamplesPerSec, pWfxClosestMatch->wBitsPerSample);
}
else
{
WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, "no format suggested");
}
}
EXIT_ON_ERROR(hr);
@ -2600,8 +2606,22 @@ int32_t AudioDeviceWindowsCore::InitRecording()
}
else
{
WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "nChannels=%d, nSamplesPerSec=%d is not supported",
Wfx.Format.nChannels, Wfx.Format.nSamplesPerSec);
if (pWfxClosestMatch)
{
LOG(INFO) << "nChannels=" << Wfx.Format.nChannels <<
", nSamplesPerSec=" << Wfx.Format.nSamplesPerSec <<
" is not supported. Closest match: " <<
"nChannels=" << pWfxClosestMatch->nChannels <<
", nSamplesPerSec=" << pWfxClosestMatch->nSamplesPerSec;
CoTaskMemFree(pWfxClosestMatch);
pWfxClosestMatch = NULL;
}
else
{
LOG(INFO) << "nChannels=" << Wfx.Format.nChannels <<
", nSamplesPerSec=" << Wfx.Format.nSamplesPerSec <<
" is not supported. No closest match.";
}
}
}
if (hr == S_OK)
@ -2644,15 +2664,6 @@ int32_t AudioDeviceWindowsCore::InitRecording()
if (hr != S_OK)
{
WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, "IAudioClient::Initialize() failed:");
if (pWfxClosestMatch != NULL)
{
WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, "closest mix format: #channels=%d, samples/sec=%d, bits/sample=%d",
pWfxClosestMatch->nChannels, pWfxClosestMatch->nSamplesPerSec, pWfxClosestMatch->wBitsPerSample);
}
else
{
WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, "no format suggested");
}
}
EXIT_ON_ERROR(hr);