Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(153)

Side by Side Diff: chromecast/browser/media/media_pipeline_host.cc

Issue 1148253006: Chromecast: Use std::vector to pass video config in CMA (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove DCHECK when config is updated. Will create another CL for the change Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chromecast/browser/media/media_pipeline_host.h ('k') | chromecast/common/media/cma_messages.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chromecast/browser/media/media_pipeline_host.h" 5 #include "chromecast/browser/media/media_pipeline_host.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 DCHECK(thread_checker_.CalledOnValidThread()); 111 DCHECK(thread_checker_.CalledOnValidThread());
112 CHECK(track_id == kAudioTrackId); 112 CHECK(track_id == kAudioTrackId);
113 media_pipeline_->GetAudioPipeline()->SetClient(client); 113 media_pipeline_->GetAudioPipeline()->SetClient(client);
114 media_pipeline_->InitializeAudio( 114 media_pipeline_->InitializeAudio(
115 config, scoped_ptr<CodedFrameProvider>(), status_cb); 115 config, scoped_ptr<CodedFrameProvider>(), status_cb);
116 } 116 }
117 117
118 void MediaPipelineHost::VideoInitialize( 118 void MediaPipelineHost::VideoInitialize(
119 TrackId track_id, 119 TrackId track_id,
120 const VideoPipelineClient& client, 120 const VideoPipelineClient& client,
121 const ::media::VideoDecoderConfig& config, 121 const std::vector<::media::VideoDecoderConfig>& configs,
122 const ::media::PipelineStatusCB& status_cb) { 122 const ::media::PipelineStatusCB& status_cb) {
123 DCHECK(thread_checker_.CalledOnValidThread()); 123 DCHECK(thread_checker_.CalledOnValidThread());
124 CHECK(track_id == kVideoTrackId); 124 CHECK(track_id == kVideoTrackId);
125 media_pipeline_->GetVideoPipeline()->SetClient(client); 125 media_pipeline_->GetVideoPipeline()->SetClient(client);
126 media_pipeline_->InitializeVideo( 126 media_pipeline_->InitializeVideo(
127 config, scoped_ptr<CodedFrameProvider>(), status_cb); 127 configs, scoped_ptr<CodedFrameProvider>(), status_cb);
128 } 128 }
129 129
130 void MediaPipelineHost::StartPlayingFrom(base::TimeDelta time) { 130 void MediaPipelineHost::StartPlayingFrom(base::TimeDelta time) {
131 DCHECK(thread_checker_.CalledOnValidThread()); 131 DCHECK(thread_checker_.CalledOnValidThread());
132 media_pipeline_->StartPlayingFrom(time); 132 media_pipeline_->StartPlayingFrom(time);
133 } 133 }
134 134
135 void MediaPipelineHost::Flush(const ::media::PipelineStatusCB& status_cb) { 135 void MediaPipelineHost::Flush(const ::media::PipelineStatusCB& status_cb) {
136 DCHECK(thread_checker_.CalledOnValidThread()); 136 DCHECK(thread_checker_.CalledOnValidThread());
137 media_pipeline_->Flush(status_cb); 137 media_pipeline_->Flush(status_cb);
(...skipping 26 matching lines...) Expand all
164 if (it == media_track_map_.end()) 164 if (it == media_track_map_.end())
165 return; 165 return;
166 166
167 MediaTrackHost* media_track_host = it->second; 167 MediaTrackHost* media_track_host = it->second;
168 if (!media_track_host->pipe_write_cb.is_null()) 168 if (!media_track_host->pipe_write_cb.is_null())
169 media_track_host->pipe_write_cb.Run(); 169 media_track_host->pipe_write_cb.Run();
170 } 170 }
171 171
172 } // namespace media 172 } // namespace media
173 } // namespace chromecast 173 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/browser/media/media_pipeline_host.h ('k') | chromecast/common/media/cma_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698