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

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

Issue 21421002: Revert EVS revisions 209760, 298753, 213143. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased at 216225, prepare to land Created 7 years, 4 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/video_capture_impl_manager.cc
diff --git a/content/renderer/media/video_capture_impl_manager.cc b/content/renderer/media/video_capture_impl_manager.cc
index 3a25378700e98c656fe758ea17b8ca2579d236c1..672fbd403c3374b0ed97a645119027e29808e7a9 100644
--- a/content/renderer/media/video_capture_impl_manager.cc
+++ b/content/renderer/media/video_capture_impl_manager.cc
@@ -9,10 +9,6 @@
#include "content/renderer/media/video_capture_impl.h"
#include "content/renderer/media/video_capture_message_filter.h"
-#if defined(ENABLE_WEBRTC)
-#include "content/renderer/media/rtc_encoding_video_capturer_factory.h"
-#endif
-
namespace content {
VideoCaptureImplManager::VideoCaptureImplManager()
@@ -34,12 +30,6 @@ media::VideoCapture* VideoCaptureImplManager::AddDevice(
new VideoCaptureImpl(id, message_loop_proxy_.get(), filter_.get());
devices_[id] = new Device(vc, handler);
vc->Init();
-
-#if defined(ENABLE_WEBRTC)
- if (encoding_capturer_factory_)
- encoding_capturer_factory_->OnEncodedVideoSourceAdded(vc);
-#endif
-
return vc;
}
@@ -69,11 +59,6 @@ void VideoCaptureImplManager::RemoveDevice(
if (size == it->second->clients.size() || size > 1)
return;
-#if defined(ENABLE_WEBRTC)
- if (encoding_capturer_factory_)
- encoding_capturer_factory_->OnEncodedVideoSourceRemoved(devices_[id]->vc);
-#endif
-
devices_[id]->vc->DeInit(base::Bind(&VideoCaptureImplManager::FreeDevice,
this, devices_[id]->vc));
delete devices_[id];
« no previous file with comments | « content/renderer/media/video_capture_impl_manager.h ('k') | content/renderer/media/video_capture_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698