Commit db78c310 authored by gunsch's avatar gunsch Committed by Commit bot

Revert of Chromecast: Cma should has_audio/video after initialization...

Revert of Chromecast: Cma should has_audio/video after initialization finishes. (patchset #1 id:1 of https://codereview.chromium.org/1125033003/)

Reason for revert:
This wasn't the right fix. It was reverted downstream but not upstream.

Original issue's description:
> Chromecast: Cma should has_audio/video after initialization finishes.
>
> R=lcwu@chromium.org,servolk@chromium.org,damienv@chromium.org
> BUG=internal b/19868692
>
> Committed: https://crrev.com/23b6c79d53147e704074c624bc6326bef4933ba4
> Cr-Commit-Position: refs/heads/master@{#329949}

TBR=damienv@chromium.org,lcwu@chromium.org,servolk@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=internal b/19868692

Review URL: https://codereview.chromium.org/1162333005

Cr-Commit-Position: refs/heads/master@{#333132}
parent a31d646e
......@@ -261,6 +261,7 @@ void CmaRenderer::InitializeAudioPipeline() {
if (config.codec() == ::media::kCodecAAC)
stream->EnableBitstreamConverter();
has_audio_ = true;
media_pipeline_->InitializeAudio(
config, frame_provider.Pass(), audio_initialization_done_cb);
}
......@@ -276,10 +277,10 @@ void CmaRenderer::OnAudioPipelineInitializeDone(
DCHECK_EQ(state_, kUninitialized) << state_;
DCHECK(!init_cb_.is_null());
if (status != ::media::PIPELINE_OK) {
has_audio_ = false;
base::ResetAndReturn(&init_cb_).Run(status);
return;
}
has_audio_ = true;
InitializeVideoPipeline();
}
......@@ -321,6 +322,7 @@ void CmaRenderer::InitializeVideoPipeline() {
initial_natural_size_ = config.natural_size();
has_video_ = true;
media_pipeline_->InitializeVideo(
config,
frame_provider.Pass(),
......@@ -338,10 +340,10 @@ void CmaRenderer::OnVideoPipelineInitializeDone(
DCHECK_EQ(state_, kUninitialized) << state_;
DCHECK(!init_cb_.is_null());
if (status != ::media::PIPELINE_OK) {
has_video_ = false;
base::ResetAndReturn(&init_cb_).Run(status);
return;
}
has_video_ = true;
CompleteStateTransition(kFlushed);
base::ResetAndReturn(&init_cb_).Run(::media::PIPELINE_OK);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment