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

Unified Diff: remoting/protocol/webrtc_video_stream.h

Issue 1846893002: Interface with webrtc through encoded frames (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: remoting/protocol/webrtc_video_stream.h
diff --git a/remoting/protocol/webrtc_video_stream.h b/remoting/protocol/webrtc_video_stream.h
index 83d71cd3eea50ff95d3e5627903ff0379c5c29e5..6ab206711b0af894b64fd5b87ed142c634ca69ca 100644
--- a/remoting/protocol/webrtc_video_stream.h
+++ b/remoting/protocol/webrtc_video_stream.h
@@ -11,7 +11,9 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
+#include "remoting/codec/video_encoder.h"
#include "remoting/protocol/video_stream.h"
+#include "remoting/protocol/webrtc_frame_scheduler.h"
namespace webrtc {
class DesktopSize;
@@ -32,10 +34,11 @@ class WebrtcVideoStream : public VideoStream {
WebrtcVideoStream();
~WebrtcVideoStream() override;
- bool Start(scoped_ptr<webrtc::DesktopCapturer> desktop_capturer,
- scoped_refptr<webrtc::PeerConnectionInterface> connection,
- scoped_refptr<webrtc::PeerConnectionFactoryInterface>
- peer_connection_factory);
+ bool Start(
+ scoped_ptr<webrtc::DesktopCapturer> desktop_capturer,
+ WebrtcTransport* webrtc_transport,
+ scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner,
+ scoped_ptr<VideoEncoder> video_encoder);
// VideoStream interface.
void Pause(bool pause) override;
@@ -48,8 +51,8 @@ class WebrtcVideoStream : public VideoStream {
scoped_refptr<webrtc::PeerConnectionInterface> connection_;
scoped_refptr<webrtc::MediaStreamInterface> stream_;
- // Owned by the |stream_|.
- base::WeakPtr<WebrtcVideoCapturerAdapter> capturer_adapter_;
+ // Owned by the dummy video capturer.
+ WebRtcFrameScheduler* webrtc_frame_scheduler_;
DISALLOW_COPY_AND_ASSIGN(WebrtcVideoStream);
};

Powered by Google App Engine
This is Rietveld 408576698