summaryrefslogtreecommitdiffstats
path: root/chromecast/browser
diff options
context:
space:
mode:
authoralokp <alokp@chromium.org>2016-02-05 09:49:25 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-05 17:50:38 +0000
commitaa81990878c7f17c191e93a1812d40dbc831e1fb (patch)
treea74d57d7120394ad4b6a72ed614691b8d8907e0a /chromecast/browser
parentc8bcc871375b33345586272bf408e464aedb4a60 (diff)
downloadchromium_src-aa81990878c7f17c191e93a1812d40dbc831e1fb.zip
chromium_src-aa81990878c7f17c191e93a1812d40dbc831e1fb.tar.gz
chromium_src-aa81990878c7f17c191e93a1812d40dbc831e1fb.tar.bz2
Return PipelineStatus from MediaPipelineImpl::InitiailizeFoo directly.
BUG=571155 Review URL: https://codereview.chromium.org/1668983004 Cr-Commit-Position: refs/heads/master@{#373840}
Diffstat (limited to 'chromecast/browser')
-rw-r--r--chromecast/browser/media/media_pipeline_host.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/chromecast/browser/media/media_pipeline_host.cc b/chromecast/browser/media/media_pipeline_host.cc
index 8ad5c29..370c1a6 100644
--- a/chromecast/browser/media/media_pipeline_host.cc
+++ b/chromecast/browser/media/media_pipeline_host.cc
@@ -115,8 +115,9 @@ void MediaPipelineHost::AudioInitialize(
const ::media::PipelineStatusCB& status_cb) {
DCHECK(thread_checker_.CalledOnValidThread());
CHECK(track_id == kAudioTrackId);
- media_pipeline_->InitializeAudio(config, client,
- std::move(audio_frame_provider_), status_cb);
+ ::media::PipelineStatus status = media_pipeline_->InitializeAudio(
+ config, client, std::move(audio_frame_provider_));
+ status_cb.Run(status);
}
void MediaPipelineHost::VideoInitialize(
@@ -126,8 +127,9 @@ void MediaPipelineHost::VideoInitialize(
const ::media::PipelineStatusCB& status_cb) {
DCHECK(thread_checker_.CalledOnValidThread());
CHECK(track_id == kVideoTrackId);
- media_pipeline_->InitializeVideo(configs, client,
- std::move(video_frame_provider_), status_cb);
+ ::media::PipelineStatus status = media_pipeline_->InitializeVideo(
+ configs, client, std::move(video_frame_provider_));
+ status_cb.Run(status);
}
void MediaPipelineHost::StartPlayingFrom(base::TimeDelta time) {