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

Unified Diff: content/renderer/media/webrtc_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
Index: content/renderer/media/webrtc_audio_renderer.cc
diff --git a/content/renderer/media/webrtc_audio_renderer.cc b/content/renderer/media/webrtc_audio_renderer.cc
index 9d2b2011058510573517792046d959d8736b32fd..0cd3bf2f346fc4882a5fb0b8390bf146370ffd4d 100644
--- a/content/renderer/media/webrtc_audio_renderer.cc
+++ b/content/renderer/media/webrtc_audio_renderer.cc
@@ -131,21 +131,6 @@ class SharedAudioRenderer : public MediaStreamAudioRenderer {
OnPlayStateChanged on_play_state_changed_;
};
-// Returns either AudioParameters::NO_EFFECTS or AudioParameters::DUCKING
-// depending on whether or not an input element is currently open with
-// ducking enabled.
-int GetCurrentDuckingFlag(int render_frame_id) {
- RenderFrameImpl* const frame =
- RenderFrameImpl::FromRoutingID(render_frame_id);
- MediaStreamDispatcher* const dispatcher = frame ?
- frame->GetMediaStreamDispatcher() : NULL;
- if (dispatcher && dispatcher->IsAudioDuckingActive()) {
- return media::AudioParameters::DUCKING;
- }
-
- return media::AudioParameters::NO_EFFECTS;
-}
-
} // namespace
int WebRtcAudioRenderer::GetOptimalBufferSize(int sample_rate,
@@ -200,8 +185,7 @@ WebRtcAudioRenderer::WebRtcAudioRenderer(
fifo_delay_milliseconds_(0),
sink_params_(media::AudioParameters::AUDIO_PCM_LOW_LATENCY,
media::CHANNEL_LAYOUT_STEREO, sample_rate, 16,
- frames_per_buffer,
- GetCurrentDuckingFlag(source_render_frame_id)),
+ frames_per_buffer),
render_callback_count_(0) {
WebRtcLogMessage(base::StringPrintf(
"WAR::WAR. source_render_frame_id=%d"

Powered by Google App Engine
This is Rietveld 408576698