Index: content/renderer/media/media_stream_dependency_factory.h |
diff --git a/content/renderer/media/media_stream_dependency_factory.h b/content/renderer/media/media_stream_dependency_factory.h |
index a56177ac08781dfc9a1d30f7967bf06edad4b131..a0e9b8030ec5de5e33bd67c16acd777348b4d9c7 100644 |
--- a/content/renderer/media/media_stream_dependency_factory.h |
+++ b/content/renderer/media/media_stream_dependency_factory.h |
@@ -13,6 +13,7 @@ |
#include "content/common/content_export.h" |
#include "content/renderer/media/media_stream_extra_data.h" |
#include "content/renderer/p2p/socket_dispatcher.h" |
+#include "media/filters/gpu_video_decoder.h" |
#include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h" |
#include "third_party/libjingle/source/talk/app/webrtc/videosourceinterface.h" |
@@ -55,6 +56,7 @@ class CONTENT_EXPORT MediaStreamDependencyFactory |
bool live)> MediaSourcesCreatedCallback; |
MediaStreamDependencyFactory( |
VideoCaptureImplManager* vc_manager, |
+ const scoped_refptr<media::GpuVideoDecoder::Factories>& gpu_factories, |
P2PSocketDispatcher* p2p_socket_dispatcher); |
virtual ~MediaStreamDependencyFactory(); |
@@ -202,6 +204,7 @@ class CONTENT_EXPORT MediaStreamDependencyFactory |
scoped_refptr<webrtc::PeerConnectionFactoryInterface> pc_factory_; |
scoped_refptr<VideoCaptureImplManager> vc_manager_; |
+ scoped_refptr<media::GpuVideoDecoder::Factories> gpu_factories_; |
scoped_refptr<P2PSocketDispatcher> p2p_socket_dispatcher_; |
scoped_refptr<WebRtcAudioDeviceImpl> audio_device_; |
@@ -210,6 +213,7 @@ class CONTENT_EXPORT MediaStreamDependencyFactory |
talk_base::Thread* signaling_thread_; |
talk_base::Thread* worker_thread_; |
base::Thread chrome_worker_thread_; |
+ base::Thread decoder_worker_thread_; |
DISALLOW_COPY_AND_ASSIGN(MediaStreamDependencyFactory); |
}; |