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

Unified Diff: content/renderer/media/webrtc/media_stream_video_webrtc_sink.cc

Issue 1729683002: Remove old-style constraints from Chrome internals (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Complete the interface change Created 4 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/webrtc/media_stream_video_webrtc_sink.cc
diff --git a/content/renderer/media/webrtc/media_stream_video_webrtc_sink.cc b/content/renderer/media/webrtc/media_stream_video_webrtc_sink.cc
index 5cb5bac30e838f57870f8e17bb3fd8cc560df0c1..c767c41dda8add8cdc698424308eef28210d8a8f 100644
--- a/content/renderer/media/webrtc/media_stream_video_webrtc_sink.cc
+++ b/content/renderer/media/webrtc/media_stream_video_webrtc_sink.cc
@@ -10,20 +10,10 @@
#include "base/synchronization/lock.h"
#include "base/thread_task_runner_handle.h"
#include "content/common/media/media_stream_options.h"
+#include "content/renderer/media/media_stream_constraints_util.h"
#include "content/renderer/media/media_stream_video_track.h"
#include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
-namespace {
-
-bool ConstraintKeyExists(const blink::WebMediaConstraints& constraints,
- const blink::WebString& name) {
- blink::WebString value_str;
- return constraints.getMandatoryConstraintValue(name, value_str) ||
- constraints.getOptionalConstraintValue(name, value_str);
-}
-
-} // anonymouse namespace
-
namespace content {
// Simple help class used for receiving video frames on the IO-thread from a
@@ -138,15 +128,17 @@ MediaStreamVideoWebRtcSink::MediaStreamVideoWebRtcSink(
const blink::WebMediaConstraints& constraints =
MediaStreamVideoTrack::GetVideoTrack(track)->constraints();
- bool is_screencast = ConstraintKeyExists(
- constraints, base::UTF8ToUTF16(kMediaStreamSource));
+ // Check for presence of mediaStreamSource constraint. The value is ignored.
+ std::string value;
+ bool is_screencast = GetConstraintValueAsString(
+ constraints, &blink::WebMediaTrackConstraintSet::mediaStreamSource,
+ &value);
WebRtcVideoCapturerAdapter* capture_adapter =
factory->CreateVideoCapturer(is_screencast);
// |video_source| owns |capture_adapter|
scoped_refptr<webrtc::VideoTrackSourceInterface> video_source(
- factory->CreateVideoSource(capture_adapter,
- track.source().constraints()));
+ factory->CreateVideoSource(capture_adapter));
video_track_ = factory->CreateLocalVideoTrack(web_track_.id().utf8(),
video_source.get());

Powered by Google App Engine
This is Rietveld 408576698