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

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

Issue 2767963002: Revert of Remove |remote| and |readonly| members of MediaStreamTrack. (Closed)
Patch Set: rebase Created 3 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/webmediaplayer_ms_compositor.cc
diff --git a/content/renderer/media/webmediaplayer_ms_compositor.cc b/content/renderer/media/webmediaplayer_ms_compositor.cc
index 763b1833fee3e4c58cfb3a222561d654ed189105..5244efd1dd1c6e5d0a102d19a34b3e470cfce100 100644
--- a/content/renderer/media/webmediaplayer_ms_compositor.cc
+++ b/content/renderer/media/webmediaplayer_ms_compositor.cc
@@ -145,9 +145,11 @@ WebMediaPlayerMSCompositor::WebMediaPlayerMSCompositor(
if (!web_stream.isNull())
web_stream.videoTracks(video_tracks);
- if (video_tracks.size() > 0 &&
- !base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableRTCSmoothnessAlgorithm)) {
+ const bool remote_video =
+ video_tracks.size() && video_tracks[0].source().remote();
+
+ if (remote_video && !base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableRTCSmoothnessAlgorithm)) {
base::AutoLock auto_lock(current_frame_lock_);
rendering_frame_buffer_.reset(new media::VideoRendererAlgorithm(
base::Bind(&WebMediaPlayerMSCompositor::MapTimestampsToRenderTimeTicks,
@@ -157,7 +159,8 @@ WebMediaPlayerMSCompositor::WebMediaPlayerMSCompositor(
// Just for logging purpose.
std::string stream_id =
web_stream.isNull() ? std::string() : web_stream.id().utf8();
- serial_ = base::Hash(stream_id);;
+ const uint32_t hash_value = base::Hash(stream_id);
+ serial_ = (hash_value << 1) | (remote_video ? 1 : 0);
}
WebMediaPlayerMSCompositor::~WebMediaPlayerMSCompositor() {

Powered by Google App Engine
This is Rietveld 408576698