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

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

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
Index: content/renderer/media/media_stream_dependency_factory.cc
diff --git a/content/renderer/media/media_stream_dependency_factory.cc b/content/renderer/media/media_stream_dependency_factory.cc
index 5dd84bffa87429a02ba16ee992e8ce2127f00643..fc0cc0dc80b80c74b11d7050a857a626d1cec1e2 100644
--- a/content/renderer/media/media_stream_dependency_factory.cc
+++ b/content/renderer/media/media_stream_dependency_factory.cc
@@ -39,6 +39,10 @@
#include "net/socket/nss_ssl_util.h"
#endif
+#if defined(GOOGLE_TV)
+#include "content/renderer/media/rtc_video_decoder_factory_tv.h"
+#endif
+
namespace content {
// The constraint key for the PeerConnection constructor for enabling diagnostic
@@ -212,6 +216,9 @@ MediaStreamDependencyFactory::MediaStreamDependencyFactory(
VideoCaptureImplManager* vc_manager,
P2PSocketDispatcher* p2p_socket_dispatcher)
: network_manager_(NULL),
+#if defined(GOOGLE_TV)
+ decoder_factory_tv_(NULL),
+#endif
vc_manager_(vc_manager),
p2p_socket_dispatcher_(p2p_socket_dispatcher),
signaling_thread_(NULL),
@@ -477,12 +484,20 @@ bool MediaStreamDependencyFactory::CreatePeerConnectionFactory() {
if (!pc_factory_.get()) {
DCHECK(!audio_device_.get());
audio_device_ = new WebRtcAudioDeviceImpl();
+
+ cricket::WebRtcVideoDecoderFactory* decoder_factory = NULL;
+#if defined(GOOGLE_TV)
+ // PeerConnectionFactory will hold the ownership of this
+ // VideoDecoderFactory.
+ decoder_factory = decoder_factory_tv_ = new RTCVideoDecoderFactoryTv;
+#endif
+
scoped_refptr<webrtc::PeerConnectionFactoryInterface> factory(
webrtc::CreatePeerConnectionFactory(worker_thread_,
signaling_thread_,
audio_device_.get(),
NULL,
- NULL));
+ decoder_factory));
if (factory.get())
pc_factory_ = factory;
else
« no previous file with comments | « content/renderer/media/media_stream_dependency_factory.h ('k') | content/renderer/media/rtc_video_decoder_bridge_tv.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698