Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1517)

Unified Diff: content/renderer/media/media_stream_dependency_factory.h

Issue 13890012: Integrate VDA with WebRTC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 2bdd8ffaba98220a385e0e224115c847b5624c93..4a67aa67f4d84fc7bde24994c6b97dba790f02de 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();
@@ -188,6 +190,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_;
@@ -196,6 +199,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);
};

Powered by Google App Engine
This is Rietveld 408576698