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

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

Issue 2964003002: Remove support for old getUserMedia video constraints algorithm. (Closed)
Patch Set: rebase and address hbos@ comments Created 3 years, 5 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.cc
diff --git a/content/renderer/media/media_stream_video_track.cc b/content/renderer/media/media_stream_video_track.cc
index d23adb2d19126a68a59d0401d10207d8309ec4fa..6dce6ab9c483752e50a8fdd21b5203b7886b1b44 100644
--- a/content/renderer/media/media_stream_video_track.cc
+++ b/content/renderer/media/media_stream_video_track.cc
@@ -197,20 +197,6 @@ MediaStreamVideoTrack::FrameDeliverer::GetBlackFrame(
return wrapped_black_frame;
}
-// static
-blink::WebMediaStreamTrack MediaStreamVideoTrack::CreateVideoTrack(
- MediaStreamVideoSource* source,
- const blink::WebMediaConstraints& constraints,
- const MediaStreamVideoSource::ConstraintsCallback& callback,
- bool enabled) {
- DCHECK(IsOldVideoConstraints());
- blink::WebMediaStreamTrack track;
- track.Initialize(source->Owner());
- track.SetTrackData(
- new MediaStreamVideoTrack(source, constraints, callback, enabled));
- return track;
-}
-
// static
blink::WebMediaStreamTrack MediaStreamVideoTrack::CreateVideoTrack(
MediaStreamVideoSource* source,
@@ -261,41 +247,11 @@ MediaStreamVideoTrack::MediaStreamVideoTrack(
VideoTrackAdapterSettings())),
is_screencast_(false),
source_(source->GetWeakPtr()) {
- if (IsOldVideoConstraints()) {
- blink::WebMediaConstraints constraints;
- constraints.Initialize();
- source->AddTrackLegacy(
- this,
- base::Bind(&MediaStreamVideoTrack::FrameDeliverer::DeliverFrameOnIO,
- frame_deliverer_),
- constraints, callback);
- } else {
- source->AddTrack(
- this, VideoTrackAdapterSettings(),
- base::Bind(&MediaStreamVideoTrack::FrameDeliverer::DeliverFrameOnIO,
- frame_deliverer_),
- callback);
- }
-}
-
-MediaStreamVideoTrack::MediaStreamVideoTrack(
- MediaStreamVideoSource* source,
- const blink::WebMediaConstraints& constraints,
- const MediaStreamVideoSource::ConstraintsCallback& callback,
- bool enabled)
- : MediaStreamTrack(true),
- frame_deliverer_(
- new MediaStreamVideoTrack::FrameDeliverer(source->io_task_runner(),
- enabled)),
- constraints_(constraints),
- source_(source->GetWeakPtr()) {
- DCHECK(IsOldVideoConstraints());
- DCHECK(!constraints.IsNull());
- source->AddTrackLegacy(
- this,
+ source->AddTrack(
+ this, VideoTrackAdapterSettings(),
base::Bind(&MediaStreamVideoTrack::FrameDeliverer::DeliverFrameOnIO,
frame_deliverer_),
- constraints, callback);
+ callback);
}
MediaStreamVideoTrack::MediaStreamVideoTrack(
@@ -316,7 +272,6 @@ MediaStreamVideoTrack::MediaStreamVideoTrack(
is_screencast_(is_screen_cast),
min_frame_rate_(min_frame_rate),
source_(source->GetWeakPtr()) {
- DCHECK(!IsOldVideoConstraints());
source->AddTrack(
this, adapter_settings,
base::Bind(&MediaStreamVideoTrack::FrameDeliverer::DeliverFrameOnIO,
« no previous file with comments | « content/renderer/media/media_stream_video_track.h ('k') | content/renderer/media/media_stream_video_track_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698