| Index: content/renderer/media/android/media_player_renderer_client.cc
|
| diff --git a/content/renderer/media/android/media_player_renderer_client.cc b/content/renderer/media/android/media_player_renderer_client.cc
|
| index 85d782f4e27984c785412a936fcd7fc58c5b396c..3bd225c7cff3b0717d4075cb8d59b5a36f4c4468 100644
|
| --- a/content/renderer/media/android/media_player_renderer_client.cc
|
| +++ b/content/renderer/media/android/media_player_renderer_client.cc
|
| @@ -45,16 +45,23 @@ void MediaPlayerRendererClient::Initialize(
|
| base::Bind(&MediaPlayerRendererClient::OnFrameAvailable,
|
| base::Unretained(this)),
|
| gfx::Size(1, 1), compositor_task_runner_,
|
| - base::Bind(&MediaPlayerRendererClient::InitializeRemoteRenderer,
|
| + base::Bind(&MediaPlayerRendererClient::OnStreamTextureWrapperInitialized,
|
| weak_factory_.GetWeakPtr(), demuxer_stream_provider));
|
| }
|
|
|
| -void MediaPlayerRendererClient::InitializeRemoteRenderer(
|
| - media::DemuxerStreamProvider* demuxer_stream_provider) {
|
| +void MediaPlayerRendererClient::OnStreamTextureWrapperInitialized(
|
| + media::DemuxerStreamProvider* demuxer_stream_provider,
|
| + bool success) {
|
| DCHECK(media_task_runner_->BelongsToCurrentThread());
|
| + if (!success) {
|
| + base::ResetAndReturn(&init_cb_).Run(
|
| + media::PipelineStatus::PIPELINE_ERROR_INITIALIZATION_FAILED);
|
| + return;
|
| + }
|
| +
|
| mojo_renderer_->Initialize(
|
| demuxer_stream_provider, this,
|
| - base::Bind(&MediaPlayerRendererClient::CompleteInitialization,
|
| + base::Bind(&MediaPlayerRendererClient::OnRemoteRendererInitialized,
|
| weak_factory_.GetWeakPtr()));
|
| }
|
|
|
| @@ -64,7 +71,7 @@ void MediaPlayerRendererClient::OnScopedSurfaceRequested(
|
| stream_texture_wrapper_->ForwardStreamTextureForSurfaceRequest(request_token);
|
| }
|
|
|
| -void MediaPlayerRendererClient::CompleteInitialization(
|
| +void MediaPlayerRendererClient::OnRemoteRendererInitialized(
|
| media::PipelineStatus status) {
|
| DCHECK(media_task_runner_->BelongsToCurrentThread());
|
| DCHECK(!init_cb_.is_null());
|
|
|