content/renderer/media/webrtc/webrtc_audio_sink_adapter.cc - Issue 1615433002: Roll WebRTC 11523:11548, Libjingle 11522:11545

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: content/renderer/media/webrtc/webrtc_audio_sink_adapter.cc

Issue 1615433002: Roll WebRTC 11523:11548, Libjingle 11522:11545 (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rolling to webrtc@11548 instead to pull in a fix 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

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 "base/logging.h"	5 #include "base/logging.h"

6 #include "content/renderer/media/webrtc/webrtc_audio_sink_adapter.h"	6 #include "content/renderer/media/webrtc/webrtc_audio_sink_adapter.h"

7 #include "media/base/audio_bus.h"	7 #include "media/base/audio_bus.h"

8 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"	8 #include "third_party/webrtc/api/mediastreaminterface.h"

9	9

10 namespace content {	10 namespace content {

11	11

12 WebRtcAudioSinkAdapter::WebRtcAudioSinkAdapter(	12 WebRtcAudioSinkAdapter::WebRtcAudioSinkAdapter(

13 webrtc::AudioTrackSinkInterface* sink)	13 webrtc::AudioTrackSinkInterface* sink)

14 : sink_(sink) {	14 : sink_(sink) {

15 DCHECK(sink);	15 DCHECK(sink);

16 }	16 }

17	17

18 WebRtcAudioSinkAdapter::~WebRtcAudioSinkAdapter() {	18 WebRtcAudioSinkAdapter::~WebRtcAudioSinkAdapter() {

(...skipping 23 matching lines...) Expand all Loading...
42 void WebRtcAudioSinkAdapter::OnSetFormat(	42 void WebRtcAudioSinkAdapter::OnSetFormat(

43 const media::AudioParameters& params) {	43 const media::AudioParameters& params) {

44 DCHECK(params.IsValid());	44 DCHECK(params.IsValid());

45 params_ = params;	45 params_ = params;

46 const int num_pcm16_data_elements =	46 const int num_pcm16_data_elements =

47 params_.frames_per_buffer() * params_.channels();	47 params_.frames_per_buffer() * params_.channels();

48 interleaved_data_.reset(new int16_t[num_pcm16_data_elements]);	48 interleaved_data_.reset(new int16_t[num_pcm16_data_elements]);

49 }	49 }

50	50

51 } // namespace content	51 } // namespace content

OLD	NEW

« no previous file with comments | « content/renderer/media/webrtc/track_observer.h ('k') | content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h » ('j') | no next file with comments »