| 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 106dfc3648e99941781d9139af245d8576466cfc..1a1fa5ba02c380388679aa6de8aa518097b9264a 100644
|
| --- a/content/renderer/media/media_stream_dependency_factory.cc
|
| +++ b/content/renderer/media/media_stream_dependency_factory.cc
|
| @@ -32,6 +32,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.
|
| @@ -424,10 +428,17 @@ bool MediaStreamDependencyFactory::CreatePeerConnectionFactory() {
|
| if (!pc_factory_) {
|
| DCHECK(!audio_device_);
|
| audio_device_ = new WebRtcAudioDeviceImpl();
|
| +
|
| + cricket::WebRtcVideoDecoderFactory* decoder_factory = NULL;
|
| +#if defined(GOOGLE_TV)
|
| + decoder_factory = new RTCVideoDecoderFactoryTv();
|
| +#endif
|
| +
|
| scoped_refptr<webrtc::PeerConnectionFactoryInterface> factory(
|
| webrtc::CreatePeerConnectionFactory(worker_thread_,
|
| signaling_thread_,
|
| - audio_device_));
|
| + audio_device_,
|
| + decoder_factory));
|
| if (factory)
|
| pc_factory_ = factory;
|
| else
|
|
|