Chromium Code Reviews| 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..6f71d66ab071501d9054a581fbc96bbc5496b750 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); |
| + const scoped_refptr<base::MessageLoopProxy>& vda_loop_proxy, |
| + const scoped_refptr<content::RendererGpuVideoDecoderFactories>& |
|
scherkus (not reviewing)
2013/07/19 18:13:58
don't need content namespace
wuchengli
2013/07/20 06:04:14
Changed back to media::GpuVideoDecoder::Factories.
|
| + gpu_factories); |
| virtual ~RTCVideoDecoderFactory(); |
| // Runs on Chrome_libJingle_WorkerThread. The child thread is blocked while |
| @@ -36,7 +38,7 @@ class CONTENT_EXPORT RTCVideoDecoderFactory |
| private: |
| scoped_refptr<base::MessageLoopProxy> vda_loop_proxy_; |
| - scoped_ptr<webrtc::VideoDecoder> decoder_; |
| + scoped_refptr<content::RendererGpuVideoDecoderFactories> gpu_factories_; |
|
scherkus (not reviewing)
2013/07/19 18:13:58
don't need content namespace
wuchengli
2013/07/20 06:04:14
Changed back to media::GpuVideoDecoder::Factories.
|
| DISALLOW_COPY_AND_ASSIGN(RTCVideoDecoderFactory); |
| }; |