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

Unified Diff: remoting/protocol/webrtc_video_capturer_adapter.h

Issue 1844143002: Add VideoLayout message. (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
« no previous file with comments | « remoting/protocol/video_stream.h ('k') | remoting/protocol/webrtc_video_capturer_adapter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/webrtc_video_capturer_adapter.h
diff --git a/remoting/protocol/webrtc_video_capturer_adapter.h b/remoting/protocol/webrtc_video_capturer_adapter.h
index e13c06b6684380265ac9f018b4a3ec2f147aa61f..71c396d22607159e1d001586ea0ebb052254b7da 100644
--- a/remoting/protocol/webrtc_video_capturer_adapter.h
+++ b/remoting/protocol/webrtc_video_capturer_adapter.h
@@ -15,6 +15,7 @@
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
#include "base/timer/timer.h"
+#include "remoting/protocol/video_stream.h"
#include "third_party/webrtc/media/base/videocapturer.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
@@ -43,13 +44,11 @@ namespace protocol {
class WebrtcVideoCapturerAdapter : public cricket::VideoCapturer,
public webrtc::DesktopCapturer::Callback {
public:
- typedef base::Callback<void(const webrtc::DesktopSize& size)> SizeCallback;
-
explicit WebrtcVideoCapturerAdapter(
scoped_ptr<webrtc::DesktopCapturer> capturer);
~WebrtcVideoCapturerAdapter() override;
- void SetSizeCallback(const SizeCallback& size_callback);
+ void SetSizeCallback(const VideoStream::SizeCallback& size_callback);
bool PauseCapturer(bool pause);
base::WeakPtr<WebrtcVideoCapturerAdapter> GetWeakPtr();
@@ -76,7 +75,7 @@ class WebrtcVideoCapturerAdapter : public cricket::VideoCapturer,
scoped_ptr<webrtc::DesktopCapturer> desktop_capturer_;
- SizeCallback size_callback_;
+ VideoStream::SizeCallback size_callback_;
// Timer to call CaptureNextFrame().
scoped_ptr<base::RepeatingTimer> capture_timer_;
« no previous file with comments | « remoting/protocol/video_stream.h ('k') | remoting/protocol/webrtc_video_capturer_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698