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

Side by Side Diff: content/renderer/media/webrtc_audio_renderer.cc

Issue 1647773002: MediaStream audio sourcing: Bypass audio processing for non-WebRTC cases. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: NOT FOR REVIEW -- This will be broken-up across multiple CLs. Created 4 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/webrtc_audio_renderer.h" 5 #include "content/renderer/media/webrtc_audio_renderer.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
11 #include "base/strings/string_util.h" 11 #include "base/strings/string_util.h"
12 #include "base/strings/stringprintf.h" 12 #include "base/strings/stringprintf.h"
13 #include "build/build_config.h" 13 #include "build/build_config.h"
14 #include "content/renderer/media/audio_device_factory.h" 14 #include "content/renderer/media/audio_device_factory.h"
15 #include "content/renderer/media/media_stream_audio_track.h" 15 #include "content/renderer/media/media_stream_audio_track.h"
16 #include "content/renderer/media/media_stream_dispatcher.h" 16 #include "content/renderer/media/media_stream_dispatcher.h"
17 #include "content/renderer/media/media_stream_track.h" 17 #include "content/renderer/media/media_stream_track.h"
18 #include "content/renderer/media/webrtc/peer_connection_remote_audio_source.h"
18 #include "content/renderer/media/webrtc_audio_device_impl.h" 19 #include "content/renderer/media/webrtc_audio_device_impl.h"
19 #include "content/renderer/media/webrtc_logging.h" 20 #include "content/renderer/media/webrtc_logging.h"
20 #include "content/renderer/render_frame_impl.h" 21 #include "content/renderer/render_frame_impl.h"
21 #include "media/audio/audio_output_device.h" 22 #include "media/audio/audio_output_device.h"
22 #include "media/audio/audio_parameters.h" 23 #include "media/audio/audio_parameters.h"
23 #include "media/audio/sample_rates.h" 24 #include "media/audio/sample_rates.h"
24 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" 25 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
25 #include "third_party/webrtc/api/mediastreaminterface.h" 26 #include "third_party/webrtc/api/mediastreaminterface.h"
26 #include "third_party/webrtc/media/base/audiorenderer.h" 27 #include "third_party/webrtc/media/base/audiorenderer.h"
27 28
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
579 } 580 }
580 581
581 void WebRtcAudioRenderer::OnPlayStateChanged( 582 void WebRtcAudioRenderer::OnPlayStateChanged(
582 const blink::WebMediaStream& media_stream, 583 const blink::WebMediaStream& media_stream,
583 PlayingState* state) { 584 PlayingState* state) {
584 DCHECK(thread_checker_.CalledOnValidThread()); 585 DCHECK(thread_checker_.CalledOnValidThread());
585 blink::WebVector<blink::WebMediaStreamTrack> web_tracks; 586 blink::WebVector<blink::WebMediaStreamTrack> web_tracks;
586 media_stream.audioTracks(web_tracks); 587 media_stream.audioTracks(web_tracks);
587 588
588 for (const blink::WebMediaStreamTrack& web_track : web_tracks) { 589 for (const blink::WebMediaStreamTrack& web_track : web_tracks) {
589 MediaStreamAudioTrack* track = MediaStreamAudioTrack::GetTrack(web_track);
590 // WebRtcAudioRenderer can only render audio tracks received from a remote 590 // WebRtcAudioRenderer can only render audio tracks received from a remote
591 // peer. Since the actual MediaStream is mutable from JavaScript, we need 591 // peer. Since the actual MediaStream is mutable from JavaScript, we need
592 // to make sure |web_track| is actually a remote track. 592 // to make sure |web_track| is actually a remote track.
593 if (track->is_local_track()) 593 PeerConnectionRemoteAudioTrack* const remote_track =
594 PeerConnectionRemoteAudioTrack::From(
595 MediaStreamAudioTrack::Get(web_track));
596 if (!remote_track)
594 continue; 597 continue;
595 webrtc::AudioSourceInterface* source = 598 webrtc::AudioSourceInterface* source =
596 track->GetAudioAdapter()->GetSource(); 599 static_cast<webrtc::AudioTrackInterface*>(remote_track->track_interface( ))
600 ->GetSource();
597 DCHECK(source); 601 DCHECK(source);
598 if (!state->playing()) { 602 if (!state->playing()) {
599 if (RemovePlayingState(source, state)) 603 if (RemovePlayingState(source, state))
600 EnterPauseState(); 604 EnterPauseState();
601 } else if (AddPlayingState(source, state)) { 605 } else if (AddPlayingState(source, state)) {
602 EnterPlayState(); 606 EnterPlayState();
603 } 607 }
604 UpdateSourceVolume(source); 608 UpdateSourceVolume(source);
605 } 609 }
606 } 610 }
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
663 base::Bind(&WebRtcAudioRenderer::SourceCallback, 667 base::Bind(&WebRtcAudioRenderer::SourceCallback,
664 base::Unretained(this)))); 668 base::Unretained(this))));
665 } 669 }
666 sink_params_ = new_sink_params; 670 sink_params_ = new_sink_params;
667 } 671 }
668 672
669 sink_->Initialize(new_sink_params, this); 673 sink_->Initialize(new_sink_params, this);
670 } 674 }
671 675
672 } // namespace content 676 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/webrtc_audio_device_impl.cc ('k') | content/renderer/media/webrtc_local_audio_source_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698