android: Remove in-process video path

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 <stddef.h>
 
 #include <limits>
 
@@ skipping 208 matching lines @@
       frame_id_(frame_id),
       enable_texture_copy_(enable_texture_copy),
       suppress_deleting_texture_(false),
       playback_completed_(false),
       volume_(1.0),
       volume_multiplier_(1.0),
       weak_factory_(this) {
   DCHECK(player_manager_);
 
   DCHECK(main_thread_checker_.CalledOnValidThread());
-  stream_texture_factory_->AddObserver(this);
 
   if (delegate_)
     delegate_id_ = delegate_->AddObserver(this);
 
   player_id_ = player_manager_->RegisterMediaPlayer(this);
 
 #if defined(VIDEO_HOLE)
   const RendererPreferences& prefs = RenderFrameImpl::FromRoutingID(frame_id)
                                          ->render_view()
                                          ->renderer_preferences();
@@ skipping 37 matching lines @@
   {
     base::AutoLock auto_lock(current_frame_lock_);
     current_frame_ = NULL;
   }
 
   if (delegate_) {
     delegate_->PlayerGone(delegate_id_);
     delegate_->RemoveObserver(delegate_id_);
   }
 
-  stream_texture_factory_->RemoveObserver(this);
-
   if (media_source_delegate_) {
     // Part of |media_source_delegate_| needs to be stopped on the media thread.
     // Wait until |media_source_delegate_| is fully stopped before tearing
     // down other objects.
     base::WaitableEvent waiter(false, false);
     media_source_delegate_->Stop(
         base::Bind(&base::WaitableEvent::Signal, base::Unretained(&waiter)));
     waiter.Wait();
   }
 }
@@ skipping 1002 matching lines @@
     base::AutoLock auto_lock(current_frame_lock_);
     video_frame = current_frame_;
   }
 
   return video_frame;
 }
 
 void WebMediaPlayerAndroid::PutCurrentFrame() {
 }
 
-void WebMediaPlayerAndroid::ResetStreamTextureProxy() {
-  DCHECK(main_thread_checker_.CalledOnValidThread());
-  // When suppress_deleting_texture_ is true,  OnDidExitFullscreen has already
-  // re-connected surface texture for embedded playback. There is no need to
-  // delete them and create again. In fact, Android gives MediaPlayer erorr
-  // code: what == 1, extra == -19 when Android WebView tries to create, delete
-  // then create the surface textures for a video in quick succession.
-  if (!suppress_deleting_texture_)
-    RemoveSurfaceTextureAndProxy();
-
-  TryCreateStreamTextureProxyIfNeeded();
-  if (needs_establish_peer_ && is_playing_)
-    EstablishSurfaceTexturePeer();
-}
-
 void WebMediaPlayerAndroid::RemoveSurfaceTextureAndProxy() {
   DCHECK(main_thread_checker_.CalledOnValidThread());
 
   if (stream_id_) {
     GLES2Interface* gl = stream_texture_factory_->ContextGL();
     gl->DeleteTextures(1, &texture_id_);
     // Flush to ensure that the stream texture gets deleted in a timely fashion.
     gl->ShallowFlushCHROMIUM();
     texture_id_ = 0;
     texture_mailbox_ = gpu::Mailbox();
@@ skipping 346 matching lines @@
     result = PREDICTION_RESULT_PATH_BASED_WAS_BETTER;
   } else if (is_hls_url == is_hls) {
     result = PREDICTION_RESULT_URL_BASED_WAS_BETTER;
   }
   UMA_HISTOGRAM_ENUMERATION(
       "Media.Android.IsHttpLiveStreamingMediaPredictionResult",
       result, PREDICTION_RESULT_MAX);
 }
 
 }  // namespace content