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

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

Issue 1689923002: Reland of Make cricket::VideoCapturer implement VideoSourceInterface (patchset #14 id:30000… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 4 years, 10 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/media/base/capturemanager.cc ('k') | webrtc/media/base/capturerenderadapter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/base/capturerenderadapter.h
diff --git a/webrtc/media/base/capturerenderadapter.h b/webrtc/media/base/capturerenderadapter.h
index ea457688ef1ced118eed26f72674450f3d749f4f..4eb738b0dbe601f76e514d495af393f5cb4eca3e 100644
--- a/webrtc/media/base/capturerenderadapter.h
+++ b/webrtc/media/base/capturerenderadapter.h
@@ -8,51 +8,4 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-// This file contains the class CaptureRenderAdapter. The class connects a
-// VideoCapturer to any number of VideoRenders such that the former feeds the
-// latter.
-// CaptureRenderAdapter is Thread-unsafe. This means that none of its APIs may
-// be called concurrently.
-
-#ifndef WEBRTC_MEDIA_BASE_CAPTURERENDERADAPTER_H_
-#define WEBRTC_MEDIA_BASE_CAPTURERENDERADAPTER_H_
-
-#include <vector>
-
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/media/base/videocapturer.h"
-#include "webrtc/media/base/videosinkinterface.h"
-
-namespace cricket {
-
-class VideoCapturer;
-class VideoProcessor;
-
-class CaptureRenderAdapter : public sigslot::has_slots<> {
- public:
- static CaptureRenderAdapter* Create(VideoCapturer* video_capturer);
- ~CaptureRenderAdapter();
-
- void AddSink(rtc::VideoSinkInterface<VideoFrame>* sink);
- void RemoveSink(rtc::VideoSinkInterface<VideoFrame>* sink);
-
- VideoCapturer* video_capturer() { return video_capturer_; }
- private:
-
- explicit CaptureRenderAdapter(VideoCapturer* video_capturer);
- void Init();
-
- // Callback for frames received from the capturer.
- void OnVideoFrame(VideoCapturer* capturer, const VideoFrame* video_frame);
-
- // Just pointers since ownership is not handed over to this class.
- std::vector<rtc::VideoSinkInterface<VideoFrame>*> sinks_;
- VideoCapturer* video_capturer_;
- // Critical section synchronizing the capture thread.
- rtc::CriticalSection capture_crit_;
-};
-
-} // namespace cricket
-
-#endif // WEBRTC_MEDIA_BASE_CAPTURERENDERADAPTER_H_
+// TODO(perkj): Remove this dummy file once Chrome is not depending on it.
« no previous file with comments | « webrtc/media/base/capturemanager.cc ('k') | webrtc/media/base/capturerenderadapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698