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

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

Issue 14247018: Implement WebRTC in Chrome for TV (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: build fix Created 7 years, 7 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/content_tests.gypi ('k') | content/renderer/media/media_stream_dependency_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/media_stream_dependency_factory.h
diff --git a/content/renderer/media/media_stream_dependency_factory.h b/content/renderer/media/media_stream_dependency_factory.h
index 5f569878cd5b41f207453ea2a403eaa266845e93..7750276d290018856633649f0a8df3adca1a6254 100644
--- a/content/renderer/media/media_stream_dependency_factory.h
+++ b/content/renderer/media/media_stream_dependency_factory.h
@@ -48,6 +48,10 @@ class WebRtcLoggingHandlerImpl;
class WebRtcLoggingMessageFilter;
struct StreamDeviceInfo;
+#if defined(GOOGLE_TV)
+class RTCVideoDecoderFactoryTv;
+#endif
+
// Object factory for RTC MediaStreams and RTC PeerConnections.
class CONTENT_EXPORT MediaStreamDependencyFactory
: NON_EXPORTED_BASE(public base::NonThreadSafe) {
@@ -136,6 +140,10 @@ class CONTENT_EXPORT MediaStreamDependencyFactory
// own source.
void StopLocalAudioSource(const WebKit::WebMediaStream& description);
+#if defined(GOOGLE_TV)
+ RTCVideoDecoderFactoryTv* decoder_factory_tv() { return decoder_factory_tv_; }
+#endif
+
protected:
// Asks the PeerConnection factory to create a Local MediaStream object.
virtual scoped_refptr<webrtc::MediaStreamInterface>
@@ -207,6 +215,12 @@ class CONTENT_EXPORT MediaStreamDependencyFactory
scoped_refptr<webrtc::PeerConnectionFactoryInterface> pc_factory_;
+#if defined(GOOGLE_TV)
+ // |pc_factory_| will hold the ownership of this object, and |pc_factory_|
+ // outlives this object. Thus weak pointer is sufficient.
+ RTCVideoDecoderFactoryTv* decoder_factory_tv_;
+#endif
+
scoped_refptr<VideoCaptureImplManager> vc_manager_;
scoped_refptr<P2PSocketDispatcher> p2p_socket_dispatcher_;
scoped_refptr<WebRtcAudioDeviceImpl> audio_device_;
« no previous file with comments | « content/content_tests.gypi ('k') | content/renderer/media/media_stream_dependency_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698