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

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

Issue 1314803003: Include default communication devices in audio device enumerations. This removes heuristic that pic… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comment Created 5 years, 4 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/renderer/media/webrtc_audio_renderer.cc ('k') | media/audio/audio_manager_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/webrtc_local_audio_renderer.cc
diff --git a/content/renderer/media/webrtc_local_audio_renderer.cc b/content/renderer/media/webrtc_local_audio_renderer.cc
index 6bbdd08889cdf2078e292ae5a195d6f4a23b4d2e..55282c8d62f7fa5c605637a0664fb3dc4d08e694 100644
--- a/content/renderer/media/webrtc_local_audio_renderer.cc
+++ b/content/renderer/media/webrtc_local_audio_renderer.cc
@@ -255,18 +255,6 @@ void WebRtcLocalAudioRenderer::ReconfigureSink(
DVLOG(1) << "WebRtcLocalAudioRenderer::ReconfigureSink()";
- int implicit_ducking_effect = 0;
- RenderFrameImpl* const frame =
- RenderFrameImpl::FromRoutingID(source_render_frame_id_);
- MediaStreamDispatcher* const dispatcher = frame ?
- frame->GetMediaStreamDispatcher() : NULL;
- if (dispatcher && dispatcher->IsAudioDuckingActive()) {
- DVLOG(1) << "Forcing DUCKING to be ON for output";
- implicit_ducking_effect = media::AudioParameters::DUCKING;
- } else {
- DVLOG(1) << "DUCKING not forced ON for output";
- }
-
if (source_params_.Equals(params))
return;
@@ -280,9 +268,7 @@ void WebRtcLocalAudioRenderer::ReconfigureSink(
source_params_.bits_per_sample(),
WebRtcAudioRenderer::GetOptimalBufferSize(source_params_.sample_rate(),
frames_per_buffer_),
- // If DUCKING is enabled on the source, it needs to be enabled on the
- // sink as well.
- source_params_.effects() | implicit_ducking_effect);
+ source_params_.effects());
{
// Note: The max buffer is fairly large, but will rarely be used.
« no previous file with comments | « content/renderer/media/webrtc_audio_renderer.cc ('k') | media/audio/audio_manager_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698