Index: content/renderer/media/rtc_video_decoder_factory.cc |
diff --git a/content/renderer/media/rtc_video_decoder_factory.cc b/content/renderer/media/rtc_video_decoder_factory.cc |
index 57b6a580c3a1528fc03f945a28cc5e6adf6d24e4..845a64177129ba7545c02376e2f147bf9446cf70 100644 |
--- a/content/renderer/media/rtc_video_decoder_factory.cc |
+++ b/content/renderer/media/rtc_video_decoder_factory.cc |
@@ -6,13 +6,13 @@ |
#include "base/location.h" |
#include "base/memory/scoped_ptr.h" |
-#include "content/renderer/media/renderer_gpu_video_accelerator_factories.h" |
#include "content/renderer/media/rtc_video_decoder.h" |
+#include "media/filters/gpu_video_accelerator_factories.h" |
namespace content { |
RTCVideoDecoderFactory::RTCVideoDecoderFactory( |
- const scoped_refptr<RendererGpuVideoAcceleratorFactories>& gpu_factories) |
+ const scoped_refptr<media::GpuVideoAcceleratorFactories>& gpu_factories) |
: gpu_factories_(gpu_factories) { |
DVLOG(2) << "RTCVideoDecoderFactory"; |
} |
@@ -24,12 +24,8 @@ RTCVideoDecoderFactory::~RTCVideoDecoderFactory() { |
webrtc::VideoDecoder* RTCVideoDecoderFactory::CreateVideoDecoder( |
webrtc::VideoCodecType type) { |
DVLOG(2) << "CreateVideoDecoder"; |
- // GpuVideoAcceleratorFactories is not thread safe. It cannot be shared |
- // by different decoders. This method runs on Chrome_libJingle_WorkerThread |
- // and the child thread is blocked while this runs. We cannot create new gpu |
- // factories here. Clone one instead. |
scoped_ptr<RTCVideoDecoder> decoder = |
- RTCVideoDecoder::Create(type, gpu_factories_->Clone()); |
+ RTCVideoDecoder::Create(type, gpu_factories_); |
return decoder.release(); |
} |