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

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

Issue 2922013002: Update constraints processing for video content capture. (Closed)
Patch Set: Rebase Created 3 years, 6 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_track.h
diff --git a/content/renderer/media/media_stream_video_track.h b/content/renderer/media/media_stream_video_track.h
index 6668585b9a1ecddd213043f834218944bd780604..5bd53b5ab1d3ba4b32fafeacea14e663d137f0b9 100644
--- a/content/renderer/media/media_stream_video_track.h
+++ b/content/renderer/media/media_stream_video_track.h
@@ -52,7 +52,7 @@ class CONTENT_EXPORT MediaStreamVideoTrack : public MediaStreamTrack {
const VideoTrackAdapterSettings& adapter_settings,
const base::Optional<bool>& noise_reduction,
bool is_screencast,
- double min_frame_rate,
+ const base::Optional<double>& min_frame_rate,
const MediaStreamVideoSource::ConstraintsCallback& callback,
bool enabled);
@@ -76,7 +76,7 @@ class CONTENT_EXPORT MediaStreamVideoTrack : public MediaStreamTrack {
const VideoTrackAdapterSettings& adapter_settings,
const base::Optional<bool>& noise_reduction,
bool is_screen_cast,
- double min_frame_rate,
+ const base::Optional<double>& min_frame_rate,
const MediaStreamVideoSource::ConstraintsCallback& callback,
bool enabled);
~MediaStreamVideoTrack() override;
@@ -102,10 +102,14 @@ class CONTENT_EXPORT MediaStreamVideoTrack : public MediaStreamTrack {
DCHECK(!IsOldVideoConstraints());
return is_screencast_;
}
- double min_frame_rate() const {
+ const base::Optional<double>& min_frame_rate() const {
DCHECK(!IsOldVideoConstraints());
return min_frame_rate_;
}
+ const base::Optional<double>& max_frame_rate() const {
+ DCHECK(!IsOldVideoConstraints());
+ return max_frame_rate_;
+ }
const VideoTrackAdapterSettings& adapter_settings() const {
DCHECK(!IsOldVideoConstraints());
return *adapter_settings_;
@@ -152,7 +156,8 @@ class CONTENT_EXPORT MediaStreamVideoTrack : public MediaStreamTrack {
std::unique_ptr<VideoTrackAdapterSettings> adapter_settings_;
base::Optional<bool> noise_reduction_;
bool is_screencast_;
- double min_frame_rate_;
+ base::Optional<double> min_frame_rate_;
+ base::Optional<double> max_frame_rate_;
// Weak ref to the source this tracks is connected to.
base::WeakPtr<MediaStreamVideoSource> source_;

Powered by Google App Engine
This is Rietveld 408576698