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

Unified Diff: content/renderer/media/android/webmediaplayer_android.cc

Issue 1385883002: Leave CreateStreamTexture route id out of the GL interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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/android/webmediaplayer_android.cc
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc
index ceecc0809b3085e699c344df172e5bbee3cb611f..ec5ee7778e584cefc485757f49490ffd6359b288 100644
--- a/content/renderer/media/android/webmediaplayer_android.cc
+++ b/content/renderer/media/android/webmediaplayer_android.cc
@@ -161,6 +161,7 @@ WebMediaPlayerAndroid::WebMediaPlayerAndroid(
RendererMediaPlayerManager* player_manager,
media::CdmFactory* cdm_factory,
scoped_refptr<StreamTextureFactory> factory,
+ int frame_id,
const media::WebMediaPlayerParams& params)
: RenderFrameObserver(RenderFrame::FromWebFrame(frame)),
frame_(frame),
@@ -186,10 +187,9 @@ WebMediaPlayerAndroid::WebMediaPlayerAndroid(
needs_establish_peer_(true),
has_size_info_(false),
// Threaded compositing isn't enabled universally yet.
- compositor_task_runner_(
- params.compositor_task_runner()
- ? params.compositor_task_runner()
- : base::ThreadTaskRunnerHandle::Get()),
+ compositor_task_runner_(params.compositor_task_runner()
+ ? params.compositor_task_runner()
+ : base::ThreadTaskRunnerHandle::Get()),
stream_texture_factory_(factory),
needs_external_surface_(false),
is_fullscreen_(false),
@@ -202,6 +202,7 @@ WebMediaPlayerAndroid::WebMediaPlayerAndroid(
allow_stored_credentials_(false),
is_local_resource_(false),
interpolator_(&default_tick_clock_),
+ frame_id_(frame_id),
weak_factory_(this) {
DCHECK(player_manager_);
DCHECK(cdm_factory_);
@@ -1389,7 +1390,7 @@ void WebMediaPlayerAndroid::EstablishSurfaceTexturePeer() {
return;
if (stream_texture_factory_.get() && stream_id_)
- stream_texture_factory_->EstablishPeer(stream_id_, player_id_);
+ stream_texture_factory_->EstablishPeer(stream_id_, player_id_, frame_id_);
// Set the deferred size because the size was changed in remote mode.
if (!is_remote_ && cached_stream_texture_size_ != natural_size_) {

Powered by Google App Engine
This is Rietveld 408576698