content/renderer/media/webrtc_local_audio_track.cc - Issue 857093002: Set audio format before adding pepper sink to audio track.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 857093002: Set audio format before adding pepper sink to audio track. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Compile fix. Created 5 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/renderer/media/webrtc_local_audio_track.h ('k') | content/renderer/pepper/pepper_media_stream_audio_track_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/webrtc_local_audio_track.cc

diff --git a/content/renderer/media/webrtc_local_audio_track.cc b/content/renderer/media/webrtc_local_audio_track.cc

index 13aee2d50cd9af4b08edd0ebe9248d791b7ec879..6c3f23ef80a3502f2a2031333066e8b7256f71ff 100644

--- a/content/renderer/media/webrtc_local_audio_track.cc

+++ b/content/renderer/media/webrtc_local_audio_track.cc

@@ -40,6 +40,15 @@ WebRtcLocalAudioTrack::~WebRtcLocalAudioTrack() {

Stop();

}

+media::AudioParameters WebRtcLocalAudioTrack::GetOutputFormat() const {

+ DCHECK(main_render_thread_checker_.CalledOnValidThread());

+ if (webaudio_source_.get()) {

+ return media::AudioParameters();

+ } else {

+ return capturer_->GetOutputFormat();

+ }

void WebRtcLocalAudioTrack::Capture(const media::AudioBus& audio_bus,

base::TimeTicks estimated_capture_time,

bool force_report_nonzero_energy) {