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

Unified Diff: webrtc/media/base/capturemanager.h

Issue 1757843003: Remove CaptureManager and related calls in ChannelManager. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 4 years, 9 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
« no previous file with comments | « webrtc/api/webrtcsession_unittest.cc ('k') | webrtc/media/base/capturemanager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/base/capturemanager.h
diff --git a/webrtc/media/base/capturemanager.h b/webrtc/media/base/capturemanager.h
index 9445f27cf3db14ab9199a91d9b8e06fee3648c1a..8d27d82cfc1600897d537deb5dbcb41b321bf1fb 100644
--- a/webrtc/media/base/capturemanager.h
+++ b/webrtc/media/base/capturemanager.h
@@ -8,74 +8,4 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-// The CaptureManager class manages VideoCapturers to make it possible to share
-// the same VideoCapturers across multiple instances. E.g. if two instances of
-// some class want to listen to same VideoCapturer they can't individually stop
-// and start capturing as doing so will affect the other instance.
-// The class employs reference counting on starting and stopping of capturing of
-// frames such that if anyone is still listening it will not be stopped. The
-// class also provides APIs for attaching VideoRenderers to a specific capturer
-// such that the VideoRenderers are fed frames directly from the capturer.
-// CaptureManager is Thread-unsafe. This means that none of its APIs may be
-// called concurrently. Note that callbacks are called by the VideoCapturer's
-// thread which is normally a separate unmarshalled thread and thus normally
-// require lock protection.
-
-#ifndef WEBRTC_MEDIA_BASE_CAPTUREMANAGER_H_
-#define WEBRTC_MEDIA_BASE_CAPTUREMANAGER_H_
-
-#include <map>
-#include <vector>
-
-#include "webrtc/base/sigslotrepeater.h"
-#include "webrtc/base/thread_checker.h"
-#include "webrtc/media/base/videocommon.h"
-#include "webrtc/media/base/videocapturer.h"
-#include "webrtc/media/base/videosinkinterface.h"
-
-namespace cricket {
-
-class VideoFrame;
-class VideoCapturerState;
-
-class CaptureManager : public sigslot::has_slots<> {
- public:
- enum RestartOptions {
- kRequestRestart,
- kForceRestart
- };
-
- CaptureManager();
- virtual ~CaptureManager();
-
- virtual bool StartVideoCapture(VideoCapturer* video_capturer,
- const VideoFormat& desired_format);
- virtual bool StopVideoCapture(VideoCapturer* video_capturer,
- const VideoFormat& format);
-
- virtual void AddVideoSink(VideoCapturer* video_capturer,
- rtc::VideoSinkInterface<VideoFrame>* sink);
- virtual void RemoveVideoSink(VideoCapturer* video_capturer,
- rtc::VideoSinkInterface<VideoFrame>* sink);
-
- sigslot::repeater2<VideoCapturer*, CaptureState> SignalCapturerStateChange;
-
- private:
- typedef std::map<VideoCapturer*, VideoCapturerState*> CaptureStates;
-
- bool IsCapturerRegistered(VideoCapturer* video_capturer) const;
- bool RegisterVideoCapturer(VideoCapturer* video_capturer);
- void UnregisterVideoCapturer(VideoCapturerState* capture_state);
-
- bool StartWithBestCaptureFormat(VideoCapturerState* capture_info,
- VideoCapturer* video_capturer);
-
- VideoCapturerState* GetCaptureState(VideoCapturer* video_capturer) const;
-
- rtc::ThreadChecker thread_checker_;
- CaptureStates capture_states_;
-};
-
-} // namespace cricket
-
-#endif // WEBRTC_MEDIA_BASE_CAPTUREMANAGER_H_
+// TODO(perkj): Remove this file once Chrome's gyp file doesn't depend on it.
« no previous file with comments | « webrtc/api/webrtcsession_unittest.cc ('k') | webrtc/media/base/capturemanager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698