Index: webkit/renderer/media/android/webmediaplayer_android.cc |
diff --git a/webkit/renderer/media/android/webmediaplayer_android.cc b/webkit/renderer/media/android/webmediaplayer_android.cc |
index bd1f1f008c2969f6f92bc21d27cf5138b531b7fa..247b8c3c2647e95e42d8937ab3812bfb7ebc1e5a 100644 |
--- a/webkit/renderer/media/android/webmediaplayer_android.cc |
+++ b/webkit/renderer/media/android/webmediaplayer_android.cc |
@@ -74,6 +74,9 @@ WebMediaPlayerAndroid::WebMediaPlayerAndroid( |
manager_(manager), |
network_state_(WebMediaPlayer::NetworkStateEmpty), |
ready_state_(WebMediaPlayer::ReadyStateHaveNothing), |
+ texture_id_(0), |
+ texture_mailbox_sync_point_(0), |
+ stream_id_(0), |
is_playing_(false), |
needs_establish_peer_(true), |
stream_texture_proxy_initialized_(false), |
@@ -98,7 +101,11 @@ WebMediaPlayerAndroid::WebMediaPlayerAndroid( |
if (stream_texture_factory_) { |
stream_texture_proxy_.reset(stream_texture_factory_->CreateProxy()); |
- stream_id_ = stream_texture_factory_->CreateStreamTexture(&texture_id_); |
+ stream_id_ = stream_texture_factory_->CreateStreamTexture( |
+ kGLTextureExternalOES, |
+ &texture_id_, |
+ &texture_mailbox_, |
+ &texture_mailbox_sync_point_); |
ReallocateVideoFrame(); |
} |
@@ -743,9 +750,11 @@ void WebMediaPlayerAndroid::ReallocateVideoFrame() { |
#endif |
} else if (texture_id_) { |
current_frame_ = VideoFrame::WrapNativeTexture( |
- texture_id_, kGLTextureExternalOES, natural_size_, |
+ texture_mailbox_, texture_mailbox_sync_point_, |
+ kGLTextureExternalOES, natural_size_, |
gfx::Rect(natural_size_), natural_size_, base::TimeDelta(), |
VideoFrame::ReadPixelsCB(), |
+ VideoFrame::TextureNoLongerNeededCallback(), |
base::Closure()); |
} |
} |