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 421bfacfb8e34bdc5c8a0827b5a886f712e0a01a..47b0ad3c838127b880645cb42ab217e221133a4b 100644 |
--- a/content/renderer/media/media_stream_dependency_factory.cc |
+++ b/content/renderer/media/media_stream_dependency_factory.cc |
@@ -33,6 +33,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 { |
// Constant constraint keys which disables all audio constraints. |
@@ -459,10 +463,19 @@ bool MediaStreamDependencyFactory::CreatePeerConnectionFactory() { |
if (!pc_factory_) { |
DCHECK(!audio_device_); |
audio_device_ = new WebRtcAudioDeviceImpl(); |
+ |
+ cricket::WebRtcVideoDecoderFactory* decoder_factory = NULL; |
+#if defined(GOOGLE_TV) |
+ // PeerConnectionFactory will hold the ownership of this |
+ // VideoDecoderFactory. |
+ decoder_factory = new RTCVideoDecoderFactoryTv(this); |
+#endif |
+ |
scoped_refptr<webrtc::PeerConnectionFactoryInterface> factory( |
webrtc::CreatePeerConnectionFactory(worker_thread_, |
signaling_thread_, |
- audio_device_)); |
+ audio_device_, |
+ decoder_factory)); |
if (factory) |
pc_factory_ = factory; |
else |