| 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 d4a05a9d2607261ad115c0adf53fe119ebdf76be..f6735733229ba8e3ccc382099e13561d6355011f 100644
|
| --- a/content/renderer/media/android/webmediaplayer_android.cc
|
| +++ b/content/renderer/media/android/webmediaplayer_android.cc
|
| @@ -226,7 +226,6 @@ WebMediaPlayerAndroid::WebMediaPlayerAndroid(
|
| DCHECK(player_manager_);
|
|
|
| DCHECK(main_thread_checker_.CalledOnValidThread());
|
| - stream_texture_factory_->AddObserver(this);
|
|
|
| if (delegate_)
|
| delegate_id_ = delegate_->AddObserver(this);
|
| @@ -284,8 +283,6 @@ WebMediaPlayerAndroid::~WebMediaPlayerAndroid() {
|
| 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
|
| @@ -1308,21 +1305,6 @@ scoped_refptr<media::VideoFrame> WebMediaPlayerAndroid::GetCurrentFrame() {
|
| 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());
|
|
|
|
|