content/renderer/media/webrtc_audio_renderer.h - Issue 12383016: Merge AssociateStreamWithProducer message into CreateStream message for both audio output and input.

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_audio_renderer.h

Issue 12383016: Merge AssociateStreamWithProducer message into CreateStream message for both audio output and input. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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 side-by-side diff with in-line comments

Download patch

« content/renderer/media/audio_message_filter.h ('K') | « content/renderer/media/renderer_webaudiodevice_impl.cc ('k') | content/renderer/media/webrtc_audio_renderer.cc » ('j') | media/audio/audio_output_device.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/webrtc_audio_renderer.h

diff --git a/content/renderer/media/webrtc_audio_renderer.h b/content/renderer/media/webrtc_audio_renderer.h

index e0b19c707f234c871d9a0bd02707067b26a9cbf7..42aa170a97a7c9cc509ab9a406a31eb76c73d544 100644

--- a/content/renderer/media/webrtc_audio_renderer.h

+++ b/content/renderer/media/webrtc_audio_renderer.h

@@ -14,9 +14,12 @@

#include "media/base/audio_renderer_sink.h"

#include "webkit/media/media_stream_audio_renderer.h"

+namespace media {

+class AudioOutputDevice;

namespace content {

-class RendererAudioOutputDevice;

class WebRtcAudioRendererSource;

// This renderer handles calls from the pipeline and WebRtc ADM. It is used

@@ -71,7 +74,7 @@ class CONTENT_EXPORT WebRtcAudioRenderer

const int source_render_view_id_;

// The sink (destination) for rendered audio.

- scoped_refptr<RendererAudioOutputDevice> sink_;

+ scoped_refptr<media::AudioOutputDevice> sink_;

// Audio data source from the browser process.

WebRtcAudioRendererSource* source_;