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

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

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/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 14c1fb3a1a1cd9184a2a0b1453ee7bc34be27e2b..8161949241efb71db83dda4d8ca61655612c32b4 100644
--- a/content/renderer/media/media_stream_video_capturer_source.h
+++ b/content/renderer/media/media_stream_video_capturer_source.h
@@ -5,6 +5,8 @@
#ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_CAPTURER_SOURCE_H_
#define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_CAPTURER_SOURCE_H_
+#include <memory>
+
#include "base/callback.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
@@ -30,9 +32,15 @@ class CONTENT_EXPORT MediaStreamVideoCapturerSource
MediaStreamVideoCapturerSource(
const SourceStoppedCallback& stop_callback,
std::unique_ptr<media::VideoCapturerSource> source);
+ // TODO(guidou): Remove this constructor. http://crbug.com/706408
MediaStreamVideoCapturerSource(const SourceStoppedCallback& stop_callback,
const StreamDeviceInfo& device_info,
RenderFrame* render_frame);
+ MediaStreamVideoCapturerSource(
+ const SourceStoppedCallback& stop_callback,
+ const StreamDeviceInfo& device_info,
+ const media::VideoCaptureParams& capture_params,
+ RenderFrame* render_frame);
~MediaStreamVideoCapturerSource() override;
private:
@@ -53,6 +61,8 @@ class CONTENT_EXPORT MediaStreamVideoCapturerSource
const blink::WebMediaConstraints& constraints,
const VideoCaptureDeliverFrameCB& frame_callback) override;
void StopSourceImpl() override;
+ base::Optional<media::VideoCaptureFormat> GetCurrentFormatImpl()
+ const override;
// RenderFrameObserver implementation.
void OnDestruct() final {}
@@ -70,6 +80,8 @@ class CONTENT_EXPORT MediaStreamVideoCapturerSource
// is completed.
bool is_capture_starting_ = false;
+ media::VideoCaptureParams capture_params_;
+
DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoCapturerSource);
};
« no previous file with comments | « content/renderer/media/media_stream_constraints_util.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