summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorhenrika@chromium.org <henrika@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-28 11:39:36 +0000
committerhenrika@chromium.org <henrika@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-28 11:39:36 +0000
commit2f606239c901c6c464ae0323a9eb577401cdaacc (patch)
tree693b5f1b5f500c8bef98f742e03539fb3d4fbfc9 /media
parentb90f9b3187d5f65c2279710816ced6f1bb8b310c (diff)
downloadchromium_src-2f606239c901c6c464ae0323a9eb577401cdaacc.zip
chromium_src-2f606239c901c6c464ae0323a9eb577401cdaacc.tar.gz
chromium_src-2f606239c901c6c464ae0323a9eb577401cdaacc.tar.bz2
Removes call to invalid error handler during audio initialization for Windows WASAPI.
BUG=none TEST=content_unittests --gtest_filter=WebRTCAudioDeviceTest* Review URL: http://codereview.chromium.org/8684002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111692 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/audio/win/audio_low_latency_input_win.cc6
-rw-r--r--media/audio/win/audio_low_latency_output_win.cc6
2 files changed, 0 insertions, 12 deletions
diff --git a/media/audio/win/audio_low_latency_input_win.cc b/media/audio/win/audio_low_latency_input_win.cc
index d5998ed..dd83f7e 100644
--- a/media/audio/win/audio_low_latency_input_win.cc
+++ b/media/audio/win/audio_low_latency_input_win.cc
@@ -82,7 +82,6 @@ bool WASAPIAudioInputStream::Open() {
// device with the specified role.
HRESULT hr = SetCaptureDevice(device_role_);
if (FAILED(hr)) {
- HandleError(hr);
return false;
}
@@ -90,7 +89,6 @@ bool WASAPIAudioInputStream::Open() {
// an audio stream between an audio application and the audio engine.
hr = ActivateCaptureDevice();
if (FAILED(hr)) {
- HandleError(hr);
return false;
}
@@ -98,15 +96,12 @@ bool WASAPIAudioInputStream::Open() {
// processing/mixing of shared-mode streams.
hr = GetAudioEngineStreamFormat();
if (FAILED(hr)) {
- HandleError(hr);
return false;
}
// Verify that the selected audio endpoint supports the specified format
// set during construction.
if (!DesiredFormatIsSupported()) {
- hr = E_INVALIDARG;
- HandleError(hr);
return false;
}
@@ -114,7 +109,6 @@ bool WASAPIAudioInputStream::Open() {
// shared mode and a lowest possible glitch-free latency.
hr = InitializeAudioEngine();
if (FAILED(hr)) {
- HandleError(hr);
return false;
}
diff --git a/media/audio/win/audio_low_latency_output_win.cc b/media/audio/win/audio_low_latency_output_win.cc
index 6877b64..dc9c6ec 100644
--- a/media/audio/win/audio_low_latency_output_win.cc
+++ b/media/audio/win/audio_low_latency_output_win.cc
@@ -79,7 +79,6 @@ bool WASAPIAudioOutputStream::Open() {
// device with the specified role.
HRESULT hr = SetRenderDevice(device_role_);
if (FAILED(hr)) {
- HandleError(hr);
return false;
}
@@ -87,7 +86,6 @@ bool WASAPIAudioOutputStream::Open() {
// an audio stream between an audio application and the audio engine.
hr = ActivateRenderDevice();
if (FAILED(hr)) {
- HandleError(hr);
return false;
}
@@ -95,15 +93,12 @@ bool WASAPIAudioOutputStream::Open() {
// processing/mixing of shared-mode streams.
hr = GetAudioEngineStreamFormat();
if (FAILED(hr)) {
- HandleError(hr);
return false;
}
// Verify that the selected audio endpoint supports the specified format
// set during construction.
if (!DesiredFormatIsSupported()) {
- hr = E_INVALIDARG;
- HandleError(hr);
return false;
}
@@ -111,7 +106,6 @@ bool WASAPIAudioOutputStream::Open() {
// shared mode and a lowest possible glitch-free latency.
hr = InitializeAudioEngine();
if (FAILED(hr)) {
- HandleError(hr);
return false;
}