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

Side by Side Diff: chromecast/media/cma/pipeline/video_pipeline_impl.cc

Issue 1372393007: [Chromecast] Upgrade to new CMA backend API (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Address alokp@ comments Created 5 years, 2 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
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/media/cma/pipeline/video_pipeline_impl.h" 5 #include "chromecast/media/cma/pipeline/video_pipeline_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "chromecast/media/cma/base/buffering_defs.h" 8 #include "chromecast/media/cma/base/buffering_defs.h"
9 #include "chromecast/media/cma/base/cma_logging.h" 9 #include "chromecast/media/cma/base/cma_logging.h"
10 #include "chromecast/media/cma/base/coded_frame_provider.h" 10 #include "chromecast/media/cma/base/coded_frame_provider.h"
11 #include "chromecast/media/cma/base/decoder_config_adapter.h" 11 #include "chromecast/media/cma/base/decoder_config_adapter.h"
12 #include "chromecast/media/cma/pipeline/av_pipeline_impl.h" 12 #include "chromecast/media/cma/pipeline/av_pipeline_impl.h"
13 #include "chromecast/media/cma/pipeline/video_pipeline_device_client_impl.h"
14 #include "chromecast/public/graphics_types.h" 13 #include "chromecast/public/graphics_types.h"
15 #include "chromecast/public/media/decoder_config.h" 14 #include "chromecast/public/media/decoder_config.h"
16 #include "chromecast/public/media/video_pipeline_device.h"
17 #include "media/base/video_decoder_config.h" 15 #include "media/base/video_decoder_config.h"
18 16
19 namespace chromecast { 17 namespace chromecast {
20 namespace media { 18 namespace media {
21 19
22 namespace { 20 namespace {
23 const size_t kMaxVideoFrameSize = 1024 * 1024; 21 const size_t kMaxVideoFrameSize = 1024 * 1024;
24 } 22 }
25 23
26 VideoPipelineImpl::VideoPipelineImpl(VideoPipelineDevice* video_device) 24 VideoPipelineImpl::VideoPipelineImpl(
27 : video_device_(video_device), 25 MediaPipelineBackend::VideoDecoder* video_decoder,
26 const VideoPipelineClient& client)
27 : video_decoder_(video_decoder),
28 video_client_(client),
28 weak_factory_(this) { 29 weak_factory_(this) {
29 weak_this_ = weak_factory_.GetWeakPtr(); 30 weak_this_ = weak_factory_.GetWeakPtr();
30 av_pipeline_impl_.reset(new AvPipelineImpl( 31 av_pipeline_impl_.reset(new AvPipelineImpl(
31 video_device_, 32 video_decoder_,
32 base::Bind(&VideoPipelineImpl::OnUpdateConfig, base::Unretained(this)))); 33 base::Bind(&VideoPipelineImpl::OnUpdateConfig, base::Unretained(this))));
33 } 34 }
34 35
35 VideoPipelineImpl::~VideoPipelineImpl() { 36 VideoPipelineImpl::~VideoPipelineImpl() {
36 } 37 }
37 38
38 void VideoPipelineImpl::SetCodedFrameProvider( 39 void VideoPipelineImpl::SetCodedFrameProvider(
39 scoped_ptr<CodedFrameProvider> frame_provider) { 40 scoped_ptr<CodedFrameProvider> frame_provider) {
40 av_pipeline_impl_->SetCodedFrameProvider( 41 av_pipeline_impl_->SetCodedFrameProvider(
41 frame_provider.Pass(), kAppVideoBufferSize, kMaxVideoFrameSize); 42 frame_provider.Pass(), kAppVideoBufferSize, kMaxVideoFrameSize);
42 } 43 }
43 44
44 bool VideoPipelineImpl::StartPlayingFrom( 45 bool VideoPipelineImpl::StartPlayingFrom(
45 base::TimeDelta time, 46 base::TimeDelta time,
46 const scoped_refptr<BufferingState>& buffering_state) { 47 const scoped_refptr<BufferingState>& buffering_state) {
47 CMALOG(kLogControl) << "VideoPipelineImpl::StartPlayingFrom t0=" 48 CMALOG(kLogControl) << __FUNCTION__ << " t0=" << time.InMilliseconds();
48 << time.InMilliseconds();
49 49
50 // Reset the pipeline statistics. 50 // Reset the pipeline statistics.
51 previous_stats_ = ::media::PipelineStatistics(); 51 previous_stats_ = ::media::PipelineStatistics();
52 52
53 // Start playing. 53 // Start playing.
54 if (av_pipeline_impl_->GetState() == AvPipelineImpl::kError) 54 if (av_pipeline_impl_->GetState() == AvPipelineImpl::kError)
55 return false; 55 return false;
56 DCHECK_EQ(av_pipeline_impl_->GetState(), AvPipelineImpl::kFlushed); 56 DCHECK_EQ(av_pipeline_impl_->GetState(), AvPipelineImpl::kFlushed);
57 57
58 if (!av_pipeline_impl_->StartPlayingFrom(time, buffering_state)) { 58 if (!av_pipeline_impl_->StartPlayingFrom(time, buffering_state)) {
59 av_pipeline_impl_->TransitionToState(AvPipelineImpl::kError); 59 av_pipeline_impl_->TransitionToState(AvPipelineImpl::kError);
60 return false; 60 return false;
61 } 61 }
62 av_pipeline_impl_->TransitionToState(AvPipelineImpl::kPlaying); 62 av_pipeline_impl_->TransitionToState(AvPipelineImpl::kPlaying);
63 63
64 return true; 64 return true;
65 } 65 }
66 66
67 void VideoPipelineImpl::Flush(const ::media::PipelineStatusCB& status_cb) { 67 void VideoPipelineImpl::Flush(const ::media::PipelineStatusCB& status_cb) {
68 CMALOG(kLogControl) << "VideoPipelineImpl::Flush"; 68 CMALOG(kLogControl) << __FUNCTION__;
69 if (av_pipeline_impl_->GetState() == AvPipelineImpl::kError) { 69 if (av_pipeline_impl_->GetState() == AvPipelineImpl::kError) {
70 status_cb.Run(::media::PIPELINE_ERROR_ABORT); 70 status_cb.Run(::media::PIPELINE_ERROR_ABORT);
71 return; 71 return;
72 } 72 }
73 DCHECK_EQ(av_pipeline_impl_->GetState(), AvPipelineImpl::kPlaying); 73 DCHECK_EQ(av_pipeline_impl_->GetState(), AvPipelineImpl::kPlaying);
74 av_pipeline_impl_->TransitionToState(AvPipelineImpl::kFlushing); 74 av_pipeline_impl_->TransitionToState(AvPipelineImpl::kFlushing);
75 av_pipeline_impl_->Flush( 75 av_pipeline_impl_->Flush(
76 base::Bind(&VideoPipelineImpl::OnFlushDone, weak_this_, status_cb)); 76 base::Bind(&VideoPipelineImpl::OnFlushDone, weak_this_, status_cb));
77 } 77 }
78 78
79 void VideoPipelineImpl::OnFlushDone( 79 void VideoPipelineImpl::OnFlushDone(
80 const ::media::PipelineStatusCB& status_cb) { 80 const ::media::PipelineStatusCB& status_cb) {
81 CMALOG(kLogControl) << "VideoPipelineImpl::OnFlushDone"; 81 CMALOG(kLogControl) << __FUNCTION__;
82 if (av_pipeline_impl_->GetState() == AvPipelineImpl::kError) { 82 if (av_pipeline_impl_->GetState() == AvPipelineImpl::kError) {
83 status_cb.Run(::media::PIPELINE_ERROR_ABORT); 83 status_cb.Run(::media::PIPELINE_ERROR_ABORT);
84 return; 84 return;
85 } 85 }
86 av_pipeline_impl_->TransitionToState(AvPipelineImpl::kFlushed); 86 av_pipeline_impl_->TransitionToState(AvPipelineImpl::kFlushed);
87 status_cb.Run(::media::PIPELINE_OK); 87 status_cb.Run(::media::PIPELINE_OK);
88 } 88 }
89 89
90 void VideoPipelineImpl::Stop() { 90 void VideoPipelineImpl::Stop() {
91 CMALOG(kLogControl) << "VideoPipelineImpl::Stop"; 91 CMALOG(kLogControl) << __FUNCTION__;
92 av_pipeline_impl_->Stop(); 92 av_pipeline_impl_->Stop();
93 av_pipeline_impl_->TransitionToState(AvPipelineImpl::kStopped); 93 av_pipeline_impl_->TransitionToState(AvPipelineImpl::kStopped);
94 } 94 }
95 95
96 void VideoPipelineImpl::SetCdm(BrowserCdmCast* media_keys) { 96 void VideoPipelineImpl::SetCdm(BrowserCdmCast* media_keys) {
97 av_pipeline_impl_->SetCdm(media_keys); 97 av_pipeline_impl_->SetCdm(media_keys);
98 } 98 }
99 99
100 void VideoPipelineImpl::SetClient(const VideoPipelineClient& client) { 100 void VideoPipelineImpl::OnBufferPushed(
101 video_client_ = client; 101 MediaPipelineBackend::BufferStatus status) {
102 av_pipeline_impl_->SetClient(client.av_pipeline_client); 102 av_pipeline_impl_->OnBufferPushed(status);
103 }
104
105 void VideoPipelineImpl::OnEndOfStream() {
106 if (!video_client_.av_pipeline_client.eos_cb.is_null())
107 video_client_.av_pipeline_client.eos_cb.Run();
108 }
109
110 void VideoPipelineImpl::OnError() {
111 if (!video_client_.av_pipeline_client.playback_error_cb.is_null()) {
112 video_client_.av_pipeline_client.playback_error_cb.Run(
113 ::media::PIPELINE_ERROR_COULD_NOT_RENDER);
114 }
103 } 115 }
104 116
105 void VideoPipelineImpl::Initialize( 117 void VideoPipelineImpl::Initialize(
106 const std::vector<::media::VideoDecoderConfig>& configs, 118 const std::vector<::media::VideoDecoderConfig>& configs,
107 scoped_ptr<CodedFrameProvider> frame_provider, 119 scoped_ptr<CodedFrameProvider> frame_provider,
108 const ::media::PipelineStatusCB& status_cb) { 120 const ::media::PipelineStatusCB& status_cb) {
109 DCHECK_GT(configs.size(), 0u); 121 DCHECK_GT(configs.size(), 0u);
110 for (const auto& config : configs) { 122 for (const auto& config : configs) {
111 CMALOG(kLogControl) << __FUNCTION__ << " " 123 CMALOG(kLogControl) << __FUNCTION__ << " "
112 << config.AsHumanReadableString(); 124 << config.AsHumanReadableString();
113 } 125 }
114 video_device_->SetVideoClient(new VideoPipelineDeviceClientImpl( 126
115 base::Bind(&VideoPipelineImpl::OnNaturalSizeChanged, weak_this_)));
116 if (frame_provider) 127 if (frame_provider)
117 SetCodedFrameProvider(frame_provider.Pass()); 128 SetCodedFrameProvider(frame_provider.Pass());
118 129
119 if (configs.empty()) { 130 if (configs.empty()) {
120 status_cb.Run(::media::PIPELINE_ERROR_INITIALIZATION_FAILED); 131 status_cb.Run(::media::PIPELINE_ERROR_INITIALIZATION_FAILED);
121 return; 132 return;
122 } 133 }
123 DCHECK(configs.size() <= 2); 134 DCHECK(configs.size() <= 2);
124 DCHECK(configs[0].IsValidConfig()); 135 DCHECK(configs[0].IsValidConfig());
125 VideoConfig video_config = 136 VideoConfig video_config =
126 DecoderConfigAdapter::ToCastVideoConfig(kPrimary, configs[0]); 137 DecoderConfigAdapter::ToCastVideoConfig(kPrimary, configs[0]);
127 VideoConfig secondary_config; 138 VideoConfig secondary_config;
128 if (configs.size() == 2) { 139 if (configs.size() == 2) {
129 DCHECK(configs[1].IsValidConfig()); 140 DCHECK(configs[1].IsValidConfig());
130 secondary_config = DecoderConfigAdapter::ToCastVideoConfig(kSecondary, 141 secondary_config = DecoderConfigAdapter::ToCastVideoConfig(kSecondary,
131 configs[1]); 142 configs[1]);
132 video_config.additional_config = &secondary_config; 143 video_config.additional_config = &secondary_config;
133 } 144 }
134 145
135 if (!video_device_->SetConfig(video_config) || 146 if (!video_decoder_->SetConfig(video_config)) {
136 !av_pipeline_impl_->Initialize()) {
137 status_cb.Run(::media::PIPELINE_ERROR_INITIALIZATION_FAILED); 147 status_cb.Run(::media::PIPELINE_ERROR_INITIALIZATION_FAILED);
138 return; 148 return;
139 } 149 }
140 av_pipeline_impl_->TransitionToState(AvPipelineImpl::kFlushed); 150 av_pipeline_impl_->TransitionToState(AvPipelineImpl::kFlushed);
141 status_cb.Run(::media::PIPELINE_OK); 151 status_cb.Run(::media::PIPELINE_OK);
142 } 152 }
143 153
144 void VideoPipelineImpl::OnUpdateConfig( 154 void VideoPipelineImpl::OnUpdateConfig(
145 StreamId id, 155 StreamId id,
146 const ::media::AudioDecoderConfig& audio_config, 156 const ::media::AudioDecoderConfig& audio_config,
147 const ::media::VideoDecoderConfig& video_config) { 157 const ::media::VideoDecoderConfig& video_config) {
148 if (video_config.IsValidConfig()) { 158 if (video_config.IsValidConfig()) {
149 CMALOG(kLogControl) << "VideoPipelineImpl::OnUpdateConfig id:" << id << " " 159 CMALOG(kLogControl) << __FUNCTION__ << " id:" << id << " "
150 << video_config.AsHumanReadableString(); 160 << video_config.AsHumanReadableString();
151 161
152 bool success = video_device_->SetConfig( 162 bool success = video_decoder_->SetConfig(
153 DecoderConfigAdapter::ToCastVideoConfig(id, video_config)); 163 DecoderConfigAdapter::ToCastVideoConfig(id, video_config));
154 if (!success && 164 if (!success &&
155 !video_client_.av_pipeline_client.playback_error_cb.is_null()) { 165 !video_client_.av_pipeline_client.playback_error_cb.is_null()) {
156 video_client_.av_pipeline_client.playback_error_cb.Run( 166 video_client_.av_pipeline_client.playback_error_cb.Run(
157 ::media::PIPELINE_ERROR_DECODE); 167 ::media::PIPELINE_ERROR_DECODE);
158 } 168 }
159 } 169 }
160 } 170 }
161 171
162 void VideoPipelineImpl::OnNaturalSizeChanged(const Size& size) { 172 void VideoPipelineImpl::OnNaturalSizeChanged(const Size& size) {
163 if (av_pipeline_impl_->GetState() != AvPipelineImpl::kPlaying) 173 if (av_pipeline_impl_->GetState() != AvPipelineImpl::kPlaying)
164 return; 174 return;
165 175
166 if (!video_client_.natural_size_changed_cb.is_null()) { 176 if (!video_client_.natural_size_changed_cb.is_null()) {
167 video_client_.natural_size_changed_cb.Run( 177 video_client_.natural_size_changed_cb.Run(
168 gfx::Size(size.width, size.height)); 178 gfx::Size(size.width, size.height));
169 } 179 }
170 } 180 }
171 181
172 void VideoPipelineImpl::UpdateStatistics() { 182 void VideoPipelineImpl::UpdateStatistics() {
173 if (video_client_.av_pipeline_client.statistics_cb.is_null()) 183 if (video_client_.av_pipeline_client.statistics_cb.is_null())
174 return; 184 return;
175 185
176 MediaComponentDevice::Statistics device_stats; 186 MediaPipelineBackend::Decoder::Statistics device_stats;
177 if (!video_device_->GetStatistics(&device_stats)) 187 video_decoder_->GetStatistics(&device_stats);
178 return;
179 188
180 ::media::PipelineStatistics current_stats; 189 ::media::PipelineStatistics current_stats;
181 current_stats.video_bytes_decoded = device_stats.decoded_bytes; 190 current_stats.video_bytes_decoded = device_stats.decoded_bytes;
182 current_stats.video_frames_decoded = device_stats.decoded_samples; 191 current_stats.video_frames_decoded = device_stats.decoded_samples;
183 current_stats.video_frames_dropped = device_stats.dropped_samples; 192 current_stats.video_frames_dropped = device_stats.dropped_samples;
184 193
185 ::media::PipelineStatistics delta_stats; 194 ::media::PipelineStatistics delta_stats;
186 delta_stats.video_bytes_decoded = 195 delta_stats.video_bytes_decoded =
187 current_stats.video_bytes_decoded - previous_stats_.video_bytes_decoded; 196 current_stats.video_bytes_decoded - previous_stats_.video_bytes_decoded;
188 delta_stats.video_frames_decoded = 197 delta_stats.video_frames_decoded =
189 current_stats.video_frames_decoded - previous_stats_.video_frames_decoded; 198 current_stats.video_frames_decoded - previous_stats_.video_frames_decoded;
190 delta_stats.video_frames_dropped = 199 delta_stats.video_frames_dropped =
191 current_stats.video_frames_dropped - previous_stats_.video_frames_dropped; 200 current_stats.video_frames_dropped - previous_stats_.video_frames_dropped;
192 201
193 previous_stats_ = current_stats; 202 previous_stats_ = current_stats;
194 203
195 video_client_.av_pipeline_client.statistics_cb.Run(delta_stats); 204 video_client_.av_pipeline_client.statistics_cb.Run(delta_stats);
196 } 205 }
197 206
198 } // namespace media 207 } // namespace media
199 } // namespace chromecast 208 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/media/cma/pipeline/video_pipeline_impl.h ('k') | chromecast/media/cma/test/cma_end_to_end_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698