| 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 8d4fe56bdd811ccc2d6f4a1c6a07fbb25044fdb0..a7f43fb1309ca1e3cea640f73e69e4ba4106952d 100644
|
| --- a/content/renderer/media/media_stream_dependency_factory.cc
|
| +++ b/content/renderer/media/media_stream_dependency_factory.cc
|
| @@ -46,10 +46,6 @@
|
| #include "net/socket/nss_ssl_util.h"
|
| #endif
|
|
|
| -#if defined(GOOGLE_TV)
|
| -#include "content/renderer/media/rtc_video_decoder_factory_tv.h"
|
| -#endif
|
| -
|
| #if defined(OS_ANDROID)
|
| #include "media/base/android/media_codec_bridge.h"
|
| #endif
|
| @@ -244,9 +240,6 @@ 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),
|
| @@ -625,16 +618,10 @@ bool MediaStreamDependencyFactory::CreatePeerConnectionFactory() {
|
| const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
|
| scoped_refptr<RendererGpuVideoAcceleratorFactories> gpu_factories =
|
| RenderThreadImpl::current()->GetGpuFactories();
|
| -#if !defined(GOOGLE_TV)
|
| if (!cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding)) {
|
| if (gpu_factories)
|
| decoder_factory.reset(new RTCVideoDecoderFactory(gpu_factories));
|
| }
|
| -#else
|
| - // PeerConnectionFactory will hold the ownership of this
|
| - // VideoDecoderFactory.
|
| - decoder_factory.reset(decoder_factory_tv_ = new RTCVideoDecoderFactoryTv());
|
| -#endif
|
|
|
| if (!cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) {
|
| if (gpu_factories)
|
|
|