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

Unified Diff: content/renderer/media/mock_media_stream_video_source.cc

Issue 2790823002: Spec compliant video constraints for getUserMedia behind flag. (Closed)
Patch Set: rebase Created 3 years, 8 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/mock_media_stream_video_source.cc
diff --git a/content/renderer/media/mock_media_stream_video_source.cc b/content/renderer/media/mock_media_stream_video_source.cc
index 3cfa3c0b91432ee63bdf935deacc63bcd298bbc8..1e36c2fc0c4a068aca2aed5bf74cf81cb7917dfc 100644
--- a/content/renderer/media/mock_media_stream_video_source.cc
+++ b/content/renderer/media/mock_media_stream_video_source.cc
@@ -29,6 +29,17 @@ MockMediaStreamVideoSource::MockMediaStreamVideoSource(
MediaStreamVideoSource::kDefaultFrameRate, media::PIXEL_FORMAT_I420));
}
+MockMediaStreamVideoSource::MockMediaStreamVideoSource(
+ const media::VideoCaptureFormat& format,
+ bool respond_to_request_refresh_frame)
+ : format_(format),
+ manual_get_supported_formats_(false),
+ respond_to_request_refresh_frame_(respond_to_request_refresh_frame),
+ max_requested_height_(format.frame_size.height()),
+ max_requested_width_(format.frame_size.width()),
+ max_requested_frame_rate_(format.frame_rate),
+ attempted_to_start_(false) {}
+
MockMediaStreamVideoSource::~MockMediaStreamVideoSource() {}
void MockMediaStreamVideoSource::StartMockedSource() {
@@ -81,7 +92,9 @@ void MockMediaStreamVideoSource::StartSourceImpl(
const blink::WebMediaConstraints& constraints,
const VideoCaptureDeliverFrameCB& frame_callback) {
DCHECK(frame_callback_.is_null());
- format_ = format;
+ if (IsOldVideoConstraints())
+ format_ = format;
+
attempted_to_start_ = true;
frame_callback_ = frame_callback;
}
@@ -89,6 +102,11 @@ void MockMediaStreamVideoSource::StartSourceImpl(
void MockMediaStreamVideoSource::StopSourceImpl() {
}
+base::Optional<media::VideoCaptureFormat>
+MockMediaStreamVideoSource::GetCurrentFormatImpl() const {
+ return format_;
+}
+
void MockMediaStreamVideoSource::DeliverVideoFrame(
const scoped_refptr<media::VideoFrame>& frame) {
DCHECK(!frame_callback_.is_null());
« no previous file with comments | « content/renderer/media/mock_media_stream_video_source.h ('k') | content/renderer/media/pepper_to_video_track_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698