work-in-progress patch to fix context lost black video

content/renderer/media/android/webmediaplayer_android.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/android/webmediaplayer_android.h"
 
 #include <limits>
 
 #include "base/android/build_info.h"
 #include "base/bind.h"
@@ skipping 104 matching lines @@
     RendererMediaPlayerManager* player_manager,
     RendererCdmManager* cdm_manager,
     scoped_refptr<StreamTextureFactory> factory,
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
     media::MediaLog* media_log)
     : RenderFrameObserver(RenderFrame::FromWebFrame(frame)),
       frame_(frame),
       client_(client),
       delegate_(delegate),
       buffered_(static_cast<size_t>(1)),
+      stream_texture_proxy_initialized_(false),
       media_task_runner_(task_runner),
       ignore_metadata_duration_change_(false),
       pending_seek_(false),
       seeking_(false),
       did_loading_progress_(false),
       player_manager_(player_manager),
       cdm_manager_(cdm_manager),
       network_state_(WebMediaPlayer::NetworkStateEmpty),
       ready_state_(WebMediaPlayer::ReadyStateHaveNothing),
       texture_id_(0),
       stream_id_(0),
       is_playing_(false),
       needs_establish_peer_(true),
-      stream_texture_proxy_initialized_(false),
       has_size_info_(false),
       stream_texture_factory_(factory),
       needs_external_surface_(false),
       video_frame_provider_client_(NULL),
       pending_playback_(false),
       player_type_(MEDIA_PLAYER_TYPE_URL),
       current_time_(0),
       is_remote_(false),
       media_log_(media_log),
       web_cdm_(NULL),
       allow_stored_credentials_(false),
       is_local_resource_(false),
       weak_factory_(this) {
   DCHECK(player_manager_);
   DCHECK(cdm_manager_);
 
   DCHECK(main_thread_checker_.CalledOnValidThread());
+  stream_texture_factory_->AddObserver(this);
 
   player_id_ = player_manager_->RegisterMediaPlayer(this);
 
 #if defined(VIDEO_HOLE)
   force_use_overlay_embedded_video_ = CommandLine::ForCurrentProcess()->
       HasSwitch(switches::kForceUseOverlayEmbeddedVideo);
   if (force_use_overlay_embedded_video_ ||
     player_manager_->ShouldUseVideoOverlayForEmbeddedEncryptedVideo()) {
     // Defer stream texture creation until we are sure it's necessary.
     needs_establish_peer_ = false;
@@ skipping 21 matching lines @@
     stream_id_ = 0;
   }
 
   {
     base::AutoLock auto_lock(current_frame_lock_);
     current_frame_ = NULL;
   }
 
   if (player_type_ == MEDIA_PLAYER_TYPE_MEDIA_SOURCE && delegate_)
     delegate_->PlayerGone(this);
+
+  stream_texture_factory_->RemoveObserver(this);
 }
 
 void WebMediaPlayerAndroid::load(LoadType load_type,
                                  const blink::WebURL& url,
                                  CORSMode cors_mode) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
   media::ReportMediaSchemeUma(GURL(url));
 
   switch (load_type) {
     case LoadTypeURL:
@@ skipping 108 matching lines @@
       !player_manager_->IsInFullscreen(frame_)) {
     EstablishSurfaceTexturePeer();
   }
 
   if (paused())
     player_manager_->Start(player_id_);
   UpdatePlayingState(true);
   UpdateNetworkState(WebMediaPlayer::NetworkStateLoading);
 }
 
+void WebMediaPlayerAndroid::ResetStreamTextureProxy() {
+  DCHECK(main_thread_checker_.CalledOnValidThread());
+
+  if (stream_id_) {
+    GLES2Interface* gl = stream_texture_factory_->ContextGL();
+    gl->DeleteTextures(1, &texture_id_);
+    texture_id_ = 0;
+    texture_mailbox_ = gpu::Mailbox();
+    stream_id_ = 0;
+  }
+  stream_texture_proxy_.reset();
+  SetNeedsEstablishPeer(true);
+
+  TryCreateStreamTextureProxyIfNeeded();
+  if (hasVideo() && needs_establish_peer_ &&
+      !player_manager_->IsInFullscreen(frame_)) {
+    EstablishSurfaceTexturePeer();
+  }
+
+  {
+    base::AutoLock auto_lock(current_frame_lock_);
+    if (!stream_texture_proxy_initialized_)
+      return;
+
+    stream_texture_proxy_initialized_ = false;
+    DCHECK(client_bound_loop_.get());
+    client_bound_loop_->PostTask(
+        FROM_HERE,
+        base::Bind(&WebMediaPlayerAndroid::UpdateFrameOnClientThread,
+                   weak_factory_.GetWeakPtr()));
+  }
+}
+
+void WebMediaPlayerAndroid::UpdateFrameOnClientThread() {
+  if (video_frame_provider_client_)
+    video_frame_provider_client_->DidReceiveFrame();
+}
+
 void WebMediaPlayerAndroid::pause() {
   DCHECK(main_thread_checker_.CalledOnValidThread());
   Pause(true);
 }
 
 void WebMediaPlayerAndroid::seek(double seconds) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
   DVLOG(1) << __FUNCTION__ << "(" << seconds << ")";
 
   base::TimeDelta new_seek_time = media::ConvertSecondsToTimestamp(seconds);
@@ skipping 861 matching lines @@
 
   // Set the callback target when a frame is produced.
   if (stream_texture_proxy_) {
     stream_texture_proxy_->SetClient(client);
     // If client exists, the compositor thread calls it. At that time,
     // stream_id_, needs_external_surface_, is_remote_ can be accessed because
     // the main thread is blocked.
     if (client && !stream_texture_proxy_initialized_ && stream_id_ &&
         !needs_external_surface_ && !is_remote_) {
       stream_texture_proxy_->BindToCurrentThread(stream_id_);
       stream_texture_proxy_initialized_ = true;

[boliu, 2014/09/08 15:31:10]

This is not thread safe yet..

     }
   }
 }
 
 void WebMediaPlayerAndroid::SetCurrentFrameInternal(
     scoped_refptr<media::VideoFrame>& video_frame) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
   base::AutoLock auto_lock(current_frame_lock_);
   current_frame_ = video_frame;
 }
 
 scoped_refptr<media::VideoFrame> WebMediaPlayerAndroid::GetCurrentFrame() {
   scoped_refptr<VideoFrame> video_frame;
+  bool proxy_initialized = true;
   {
     base::AutoLock auto_lock(current_frame_lock_);
     video_frame = current_frame_;
+    proxy_initialized = stream_texture_proxy_initialized_;
+  }
+
+  if (!proxy_initialized) {
+    SetVideoFrameProviderClient(video_frame_provider_client_);

[boliu, 2014/09/08 15:31:10]

Back in m37 days, we used to call BindToThread here, but apparently that has
been removed in trunk.

I actually don't think that will work in webview when we could create the stream
texture proxy later. Min, any thoughts on this change?

+    base::AutoLock auto_lock(current_frame_lock_);
+    stream_texture_proxy_initialized_ = true;
   }
 
   return video_frame;
 }
 
 void WebMediaPlayerAndroid::PutCurrentFrame(
     const scoped_refptr<media::VideoFrame>& frame) {
 }
 
 void WebMediaPlayerAndroid::TryCreateStreamTextureProxyIfNeeded() {
@@ skipping 531 matching lines @@
 
 bool WebMediaPlayerAndroid::IsHLSStream() const {
   std::string mime;
   GURL url = redirected_url_.is_empty() ? url_ : redirected_url_;
   if (!net::GetMimeTypeFromFile(base::FilePath(url.path()), &mime))
     return false;
   return !mime.compare("application/x-mpegurl");
 }
 
 }  // namespace content