| 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 bbc25863583510a7e6800274f3a7d6e87f43c046..55819d3aeeac370ac1b2857e4caf69f15999e42c 100644
|
| --- a/content/renderer/media/webmediaplayer_ms_compositor.cc
|
| +++ b/content/renderer/media/webmediaplayer_ms_compositor.cc
|
| @@ -5,6 +5,7 @@
|
| #include "content/renderer/media/webmediaplayer_ms_compositor.h"
|
|
|
| #include <stdint.h>
|
| +#include <string>
|
|
|
| #include "base/command_line.h"
|
| #include "base/hash.h"
|
| @@ -22,8 +23,6 @@
|
| #include "third_party/WebKit/public/platform/WebMediaStream.h"
|
| #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
|
| #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
|
| -#include "third_party/WebKit/public/platform/WebURL.h"
|
| -#include "third_party/WebKit/public/web/WebMediaStreamRegistry.h"
|
| #include "third_party/libyuv/include/libyuv/convert.h"
|
| #include "third_party/libyuv/include/libyuv/video_common.h"
|
|
|
| @@ -116,7 +115,7 @@ scoped_refptr<media::VideoFrame> CopyFrame(
|
|
|
| WebMediaPlayerMSCompositor::WebMediaPlayerMSCompositor(
|
| const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
|
| - const blink::WebURL& url,
|
| + const blink::WebMediaStream& web_stream,
|
| const base::WeakPtr<WebMediaPlayerMS>& player)
|
| : compositor_task_runner_(compositor_task_runner),
|
| player_(player),
|
| @@ -129,8 +128,6 @@ WebMediaPlayerMSCompositor::WebMediaPlayerMSCompositor(
|
| weak_ptr_factory_(this) {
|
| main_message_loop_ = base::MessageLoop::current();
|
|
|
| - const blink::WebMediaStream web_stream(
|
| - blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url));
|
| blink::WebVector<blink::WebMediaStreamTrack> video_tracks;
|
| if (!web_stream.isNull())
|
| web_stream.videoTracks(video_tracks);
|
| @@ -148,7 +145,9 @@ WebMediaPlayerMSCompositor::WebMediaPlayerMSCompositor(
|
| }
|
|
|
| // Just for logging purpose.
|
| - const uint32_t hash_value = base::Hash(url.string().utf8());
|
| + std::string stream_id =
|
| + web_stream.isNull() ? std::string() : web_stream.id().utf8();
|
| + const uint32_t hash_value = base::Hash(stream_id);
|
| serial_ = (hash_value << 1) | (remote_video ? 1 : 0);
|
| }
|
|
|
|
|