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

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

Issue 133903004: Cleaned up the WebRtcAudioCapturer a bit. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased and fixed the comment. Created 6 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
Index: content/renderer/media/media_stream_impl.cc
diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc
index f659aaf9c93188385bbe257acea278284f1033cc..f50432c64ef346d483279474c17afca7341359f9 100644
--- a/content/renderer/media/media_stream_impl.cc
+++ b/content/renderer/media/media_stream_impl.cc
@@ -728,9 +728,8 @@ void MediaStreamImpl::StopLocalSource(
<< "{device_id = " << extra_data->device_info().device.id << "})";
if (source.type() == blink::WebMediaStreamSource::TypeAudio) {
- if (extra_data->GetAudioCapturer()) {
+ if (extra_data->GetAudioCapturer())
extra_data->GetAudioCapturer()->Stop();
- }
}
if (notify_dispatcher)
@@ -801,19 +800,13 @@ bool MediaStreamImpl::GetAuthorizedDeviceInfoForAudioRenderer(
int* output_sample_rate,
int* output_frames_per_buffer) {
DCHECK(CalledOnValidThread());
-
WebRtcAudioDeviceImpl* audio_device =
dependency_factory_->GetWebRtcAudioDevice();
if (!audio_device)
return false;
- if (!audio_device->GetDefaultCapturer())
- return false;
-
- return audio_device->GetDefaultCapturer()->GetPairedOutputParameters(
- session_id,
- output_sample_rate,
- output_frames_per_buffer);
+ return audio_device->GetAuthorizedDeviceInfoForAudioRenderer(
+ session_id, output_sample_rate, output_frames_per_buffer);
}
MediaStreamSourceExtraData::MediaStreamSourceExtraData(

Powered by Google App Engine
This is Rietveld 408576698