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

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

Issue 11270012: Adding audio support to the new webmediaplyer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed the nits from Andrew and fixed the chromeOS testbot error Created 8 years, 2 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.h
diff --git a/content/renderer/media/media_stream_impl.h b/content/renderer/media/media_stream_impl.h
index 4f6ad680894bd06ef468bf466cff9dababd390ec..4775fecc94c3d521a82e7b5eb3b970d4f7ee599a 100644
--- a/content/renderer/media/media_stream_impl.h
+++ b/content/renderer/media/media_stream_impl.h
@@ -24,10 +24,15 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaRequest.h"
#include "webkit/media/media_stream_client.h"
+namespace webkit_media {
+class MediaStreamAudioRenderer;
+}
+
namespace content {
class MediaStreamDependencyFactory;
class MediaStreamDispatcher;
class VideoCaptureImplManager;
+class WebRtcAudioRenderer;
// MediaStreamImpl is a delegate for the Media Stream API messages used by
// WebKit. It ties together WebKit, native PeerConnection in libjingle and
@@ -74,6 +79,8 @@ class CONTENT_EXPORT MediaStreamImpl
virtual scoped_refptr<media::VideoDecoder> GetVideoDecoder(
const GURL& url,
media::MessageLoopFactory* message_loop_factory) OVERRIDE;
+ virtual scoped_refptr<webkit_media::MediaStreamAudioRenderer>
+ GetAudioRenderer(const GURL& url) OVERRIDE;
// MediaStreamDispatcherEventHandler implementation.
virtual void OnStreamGenerated(
@@ -160,6 +167,8 @@ class CONTENT_EXPORT MediaStreamImpl
scoped_refptr<media::VideoDecoder> CreateVideoDecoder(
webrtc::MediaStreamInterface* stream,
media::MessageLoopFactory* message_loop_factory);
+ scoped_refptr<WebRtcAudioRenderer> CreateRemoteAudioRenderer(
+ webrtc::MediaStreamInterface* stream);
// Weak ref to a MediaStreamDependencyFactory, owned by the RenderThread.
// It's valid for the lifetime of RenderThread.

Powered by Google App Engine
This is Rietveld 408576698