Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(240)

Unified Diff: content/renderer/media/audio_renderer_mixer_manager.cc

Issue 1573753002: Handle invalid hardware output parameters in AudioRendererHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2564
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/media/audio_renderer_host.cc ('k') | media/renderers/audio_renderer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/audio_renderer_mixer_manager.cc
diff --git a/content/renderer/media/audio_renderer_mixer_manager.cc b/content/renderer/media/audio_renderer_mixer_manager.cc
index cc3061cf8c3cf3cfdf8cd624fd3bdcd12ec3119d..9ada5d3c556ff56549e4efc3688181613fd88e89 100644
--- a/content/renderer/media/audio_renderer_mixer_manager.cc
+++ b/content/renderer/media/audio_renderer_mixer_manager.cc
@@ -88,16 +88,24 @@ media::AudioRendererMixer* AudioRendererMixerManager::GetMixer(
#if defined(OS_CHROMEOS)
int sample_rate = params.sample_rate();
#else
- int sample_rate = hardware_params.sample_rate();
+ int sample_rate =
+ hardware_params.format() != media::AudioParameters::AUDIO_FAKE
+ ? hardware_params.sample_rate()
+ : params.sample_rate();
#endif
+ int buffer_size =
+ hardware_params.format() != media::AudioParameters::AUDIO_FAKE
+ ? media::AudioHardwareConfig::GetHighLatencyBufferSize(
+ hardware_params)
+ : params.frames_per_buffer();
+
// Create output parameters based on the audio hardware configuration for
// passing on to the output sink. Force to 16-bit output for now since we
// know that works everywhere; ChromeOS does not support other bit depths.
media::AudioParameters output_params(
media::AudioParameters::AUDIO_PCM_LOW_LATENCY, params.channel_layout(),
- sample_rate, 16,
- media::AudioHardwareConfig::GetHighLatencyBufferSize(hardware_params));
+ sample_rate, 16, buffer_size);
// If we've created invalid output parameters, simply pass on the input
// params and let the browser side handle automatic fallback.
« no previous file with comments | « content/browser/renderer_host/media/audio_renderer_host.cc ('k') | media/renderers/audio_renderer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698