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

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

Issue 13890012: Integrate VDA with WebRTC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add VDA and gpu_factories mocks. Update unittest. Created 7 years, 7 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.cc
diff --git a/content/renderer/media/media_stream_dependency_factory.cc b/content/renderer/media/media_stream_dependency_factory.cc
index 421bfacfb8e34bdc5c8a0827b5a886f712e0a01a..c11e85370565764180964c7685863886f3b7f122 100644
--- a/content/renderer/media/media_stream_dependency_factory.cc
+++ b/content/renderer/media/media_stream_dependency_factory.cc
@@ -12,6 +12,7 @@
#include "content/renderer/media/rtc_media_constraints.h"
#include "content/renderer/media/rtc_peer_connection_handler.h"
#include "content/renderer/media/rtc_video_capturer.h"
+#include "content/renderer/media/rtc_video_decoder_factory.h"
#include "content/renderer/media/video_capture_impl_manager.h"
#include "content/renderer/media/webaudio_capturer_source.h"
#include "content/renderer/media/webrtc_audio_device_impl.h"
@@ -200,9 +201,11 @@ class SourceStateObserver : public webrtc::ObserverInterface,
MediaStreamDependencyFactory::MediaStreamDependencyFactory(
VideoCaptureImplManager* vc_manager,
+ const scoped_refptr<media::GpuVideoDecoder::Factories>& gpu_factories,
P2PSocketDispatcher* p2p_socket_dispatcher)
: network_manager_(NULL),
vc_manager_(vc_manager),
+ gpu_factories_(gpu_factories),
p2p_socket_dispatcher_(p2p_socket_dispatcher),
signaling_thread_(NULL),
worker_thread_(NULL),
@@ -459,10 +462,17 @@ bool MediaStreamDependencyFactory::CreatePeerConnectionFactory() {
if (!pc_factory_) {
DCHECK(!audio_device_);
audio_device_ = new WebRtcAudioDeviceImpl();
+
+ scoped_ptr<RTCVideoDecoderFactory> decoder_factory;
+ if (gpu_factories_ != NULL) {
+ decoder_factory.reset(new RTCVideoDecoderFactory(gpu_factories_));
Ami GONE FROM CHROMIUM 2013/05/29 21:11:46 There's an off-reviewlog thread about this, so I'm
wuchengli 2013/06/10 12:33:42 Now gpu_factories_ is copied for every video decod
+ }
+
scoped_refptr<webrtc::PeerConnectionFactoryInterface> factory(
webrtc::CreatePeerConnectionFactory(worker_thread_,
signaling_thread_,
- audio_device_));
+ audio_device_,
+ decoder_factory.release()));
if (factory)
pc_factory_ = factory;
else

Powered by Google App Engine
This is Rietveld 408576698