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

Unified Diff: webrtc/video_send_stream.h

Issue 2344923002: Revert of Replace interface VideoCapturerInput with VideoSinkInterface. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 3 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/video/vie_encoder_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video_send_stream.h
diff --git a/webrtc/video_send_stream.h b/webrtc/video_send_stream.h
index 2948d46874245962bf3488b2090952abc4f9f2d6..afdec43c745cc2cc877b416ef5150f6d27c0cecb 100644
--- a/webrtc/video_send_stream.h
+++ b/webrtc/video_send_stream.h
@@ -19,13 +19,24 @@
#include "webrtc/common_video/include/frame_callback.h"
#include "webrtc/config.h"
#include "webrtc/media/base/videosinkinterface.h"
-#include "webrtc/media/base/videosourceinterface.h"
#include "webrtc/transport.h"
namespace webrtc {
class LoadObserver;
class VideoEncoder;
+
+// Class to deliver captured frame to the video send stream.
+class VideoCaptureInput {
+ public:
+ // These methods do not lock internally and must be called sequentially.
+ // If your application switches input sources synchronization must be done
+ // externally to make sure that any old frames are not delivered concurrently.
+ virtual void IncomingCapturedFrame(const VideoFrame& video_frame) = 0;
+
+ protected:
+ virtual ~VideoCaptureInput() {}
+};
class VideoSendStream {
public:
@@ -182,8 +193,9 @@
// When a stream is stopped, it can't receive, process or deliver packets.
virtual void Stop() = 0;
- virtual void SetSource(
- rtc::VideoSourceInterface<webrtc::VideoFrame>* source) = 0;
+ // Gets interface used to insert captured frames. Valid as long as the
+ // VideoSendStream is valid.
+ virtual VideoCaptureInput* Input() = 0;
// Set which streams to send. Must have at least as many SSRCs as configured
// in the config. Encoder settings are passed on to the encoder instance along
« no previous file with comments | « webrtc/video/vie_encoder_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698