| Index: chromecast/browser/media/media_pipeline_host.cc
|
| diff --git a/chromecast/browser/media/media_pipeline_host.cc b/chromecast/browser/media/media_pipeline_host.cc
|
| index 013a40bfbe7cc8c4e45401ee558c111f9daf1f45..45cc897a0bcc5bb818de3512846c8c5043416ae8 100644
|
| --- a/chromecast/browser/media/media_pipeline_host.cc
|
| +++ b/chromecast/browser/media/media_pipeline_host.cc
|
| @@ -53,10 +53,9 @@ MediaPipelineHost::~MediaPipelineHost() {
|
| media_track_map_.clear();
|
| }
|
|
|
| -void MediaPipelineHost::Initialize(
|
| - LoadType load_type,
|
| - const MediaPipelineClient& client,
|
| - const CreateDeviceComponentsCB& create_device_components_cb) {
|
| +void MediaPipelineHost::Initialize(LoadType load_type,
|
| + const MediaPipelineClient& client,
|
| + const CreateBackendCB& create_backend_cb) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| media_pipeline_.reset(new MediaPipelineImpl());
|
| task_runner_.reset(new TaskRunnerImpl());
|
| @@ -67,8 +66,8 @@ void MediaPipelineHost::Initialize(
|
| MediaPipelineDeviceParams default_parameters(sync_type, task_runner_.get());
|
|
|
| media_pipeline_->SetClient(client);
|
| - media_pipeline_->Initialize(
|
| - load_type, create_device_components_cb.Run(default_parameters).Pass());
|
| + media_pipeline_->Initialize(load_type,
|
| + create_backend_cb.Run(default_parameters).Pass());
|
| }
|
|
|
| void MediaPipelineHost::SetAvPipe(
|
| @@ -99,13 +98,10 @@ void MediaPipelineHost::SetAvPipe(
|
| }
|
| media_track_host->pipe_write_cb = frame_provider_host->GetFifoWriteEventCb();
|
|
|
| - scoped_ptr<CodedFrameProvider> frame_provider(frame_provider_host.release());
|
| if (track_id == kAudioTrackId) {
|
| - media_pipeline_->GetAudioPipelineImpl()->SetCodedFrameProvider(
|
| - frame_provider.Pass());
|
| + audio_frame_provider_ = frame_provider_host.Pass();
|
| } else {
|
| - media_pipeline_->GetVideoPipelineImpl()->SetCodedFrameProvider(
|
| - frame_provider.Pass());
|
| + video_frame_provider_ = frame_provider_host.Pass();
|
| }
|
| av_pipe_set_cb.Run();
|
| }
|
| @@ -117,21 +113,19 @@ void MediaPipelineHost::AudioInitialize(
|
| const ::media::PipelineStatusCB& status_cb) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| CHECK(track_id == kAudioTrackId);
|
| - media_pipeline_->GetAudioPipeline()->SetClient(client);
|
| media_pipeline_->InitializeAudio(
|
| - config, scoped_ptr<CodedFrameProvider>(), status_cb);
|
| + config, client, audio_frame_provider_.Pass(), status_cb);
|
| }
|
|
|
| void MediaPipelineHost::VideoInitialize(
|
| TrackId track_id,
|
| const VideoPipelineClient& client,
|
| - const std::vector<::media::VideoDecoderConfig>& configs,
|
| + const std::vector< ::media::VideoDecoderConfig>& configs,
|
| const ::media::PipelineStatusCB& status_cb) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| CHECK(track_id == kVideoTrackId);
|
| - media_pipeline_->GetVideoPipeline()->SetClient(client);
|
| media_pipeline_->InitializeVideo(
|
| - configs, scoped_ptr<CodedFrameProvider>(), status_cb);
|
| + configs, client, video_frame_provider_.Pass(), status_cb);
|
| }
|
|
|
| void MediaPipelineHost::StartPlayingFrom(base::TimeDelta time) {
|
| @@ -157,7 +151,7 @@ void MediaPipelineHost::SetPlaybackRate(double playback_rate) {
|
| void MediaPipelineHost::SetVolume(TrackId track_id, float volume) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| CHECK(track_id == kAudioTrackId);
|
| - media_pipeline_->GetAudioPipeline()->SetVolume(volume);
|
| + media_pipeline_->SetVolume(volume);
|
| }
|
|
|
| void MediaPipelineHost::SetCdm(BrowserCdmCast* cdm) {
|
|
|