Index: content/renderer/media/rtc_video_decoder_factory.h |
diff --git a/content/renderer/media/rtc_video_decoder_factory.h b/content/renderer/media/rtc_video_decoder_factory.h |
index 1974701cf58867fdea5b5cd98af8addbd29c9700..ee4aebf3fad9a9352e8917d7964af80e83f21217 100644 |
--- a/content/renderer/media/rtc_video_decoder_factory.h |
+++ b/content/renderer/media/rtc_video_decoder_factory.h |
@@ -8,7 +8,7 @@ |
#include "base/message_loop/message_loop_proxy.h" |
#include "base/threading/thread.h" |
#include "content/common/content_export.h" |
-#include "media/filters/gpu_video_decoder.h" |
+#include "content/renderer/media/renderer_gpu_video_decoder_factories.h" |
#include "third_party/libjingle/source/talk/media/webrtc/webrtcvideodecoderfactory.h" |
#include "third_party/webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" |
@@ -22,7 +22,9 @@ class CONTENT_EXPORT RTCVideoDecoderFactory |
: NON_EXPORTED_BASE(public cricket::WebRtcVideoDecoderFactory) { |
public: |
RTCVideoDecoderFactory( |
- const scoped_refptr<media::GpuVideoDecoder::Factories>& gpu_factories); |
+ scoped_ptr<base::Thread> vda_thread, |
+ const scoped_refptr<content::RendererGpuVideoDecoderFactories>& |
+ gpu_factories); |
virtual ~RTCVideoDecoderFactory(); |
// Runs on Chrome_libJingle_WorkerThread. The child thread is blocked while |
@@ -35,8 +37,8 @@ class CONTENT_EXPORT RTCVideoDecoderFactory |
virtual void DestroyVideoDecoder(webrtc::VideoDecoder* decoder) OVERRIDE; |
private: |
- scoped_refptr<base::MessageLoopProxy> vda_loop_proxy_; |
- scoped_ptr<webrtc::VideoDecoder> decoder_; |
+ scoped_ptr<base::Thread> vda_thread_; |
+ scoped_refptr<content::RendererGpuVideoDecoderFactories> gpu_factories_; |
DISALLOW_COPY_AND_ASSIGN(RTCVideoDecoderFactory); |
}; |