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

Unified Diff: content/renderer/media/media_stream_video_capturer_source.h

Issue 195363002: VideoCapturerDelegate: Retrieve supported/in-use format(s) for constraint negotiation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Corrected min fps from 30 to 10 in a test. Created 6 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: content/renderer/media/media_stream_video_capturer_source.h
diff --git a/content/renderer/media/media_stream_video_capturer_source.h b/content/renderer/media/media_stream_video_capturer_source.h
index 1d08ff213766c37e8d6125ac89430b63a790a260..6fff76c0205d5f6caeb2ffcbbf8353c94df60918 100644
--- a/content/renderer/media/media_stream_video_capturer_source.h
+++ b/content/renderer/media/media_stream_video_capturer_source.h
@@ -34,7 +34,7 @@ class CONTENT_EXPORT VideoCapturerDelegate
// Collects the formats that can currently be used.
// |max_requested_height| and |max_requested_width| is used by Tab and Screen
// capture to decide what resolution to generate.
- // |callback| is triggered when the formats has been collected.
+ // |callback| is triggered when the formats have been collected.
virtual void GetCurrentSupportedFormats(
int max_requested_width,
int max_requested_height,
@@ -76,6 +76,9 @@ class CONTENT_EXPORT VideoCapturerDelegate
media::VideoCapture* capture,
const scoped_refptr<media::VideoFrame>& frame);
void OnErrorOnRenderThread(media::VideoCapture* capture);
+ void OnDeviceFormatsInUseReceived(const media::VideoCaptureFormats& formats);
+ void OnDeviceSupportedFormatsEnumerated(
+ const media::VideoCaptureFormats& formats);
// The id identifies which video capture device is used for this video
// capture session.
@@ -96,6 +99,8 @@ class CONTENT_EXPORT VideoCapturerDelegate
// Message loop of the caller of StartDeliver.
scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
+ SupportedFormatsCallback source_formats_callback_;
+
DISALLOW_COPY_AND_ASSIGN(VideoCapturerDelegate);
};
« no previous file with comments | « content/browser/media/webrtc_getusermedia_browsertest.cc ('k') | content/renderer/media/media_stream_video_capturer_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698