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

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

Issue 1978973002: Moves video frame callbacks from VideoFrameCompositor to Renderer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addresses comments Created 4 years, 7 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/cast_renderer.h ('k') | chromecast/renderer/media/cma_renderer.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/cast_renderer.h" 5 #include "chromecast/browser/media/cast_renderer.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/single_thread_task_runner.h" 8 #include "base/single_thread_task_runner.h"
9 #include "chromecast/base/task_runner_impl.h" 9 #include "chromecast/base/task_runner_impl.h"
10 #include "chromecast/media/cma/base/balanced_media_task_runner_factory.h" 10 #include "chromecast/media/cma/base/balanced_media_task_runner_factory.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 return; 96 return;
97 } 97 }
98 audio_stream->EnableBitstreamConverter(); 98 audio_stream->EnableBitstreamConverter();
99 } 99 }
100 100
101 // Initialize video. 101 // Initialize video.
102 ::media::DemuxerStream* video_stream = 102 ::media::DemuxerStream* video_stream =
103 demuxer_stream_provider->GetStream(::media::DemuxerStream::VIDEO); 103 demuxer_stream_provider->GetStream(::media::DemuxerStream::VIDEO);
104 if (video_stream) { 104 if (video_stream) {
105 VideoPipelineClient video_client; 105 VideoPipelineClient video_client;
106 // TODO(alokp): Set VideoPipelineClient::natural_size_changed_cb.
107 video_client.av_pipeline_client.wait_for_key_cb = base::Bind( 106 video_client.av_pipeline_client.wait_for_key_cb = base::Bind(
108 &CastRenderer::OnWaitingForDecryptionKey, weak_factory_.GetWeakPtr()); 107 &CastRenderer::OnWaitingForDecryptionKey, weak_factory_.GetWeakPtr());
109 video_client.av_pipeline_client.eos_cb = base::Bind( 108 video_client.av_pipeline_client.eos_cb = base::Bind(
110 &CastRenderer::OnEnded, weak_factory_.GetWeakPtr(), STREAM_VIDEO); 109 &CastRenderer::OnEnded, weak_factory_.GetWeakPtr(), STREAM_VIDEO);
111 video_client.av_pipeline_client.playback_error_cb = 110 video_client.av_pipeline_client.playback_error_cb =
112 base::Bind(&CastRenderer::OnError, weak_factory_.GetWeakPtr()); 111 base::Bind(&CastRenderer::OnError, weak_factory_.GetWeakPtr());
113 video_client.av_pipeline_client.statistics_cb = base::Bind( 112 video_client.av_pipeline_client.statistics_cb = base::Bind(
114 &CastRenderer::OnStatisticsUpdate, weak_factory_.GetWeakPtr()); 113 &CastRenderer::OnStatisticsUpdate, weak_factory_.GetWeakPtr());
114 video_client.natural_size_changed_cb = base::Bind(
115 &CastRenderer::OnVideoNaturalSizeChange, weak_factory_.GetWeakPtr());
115 // TODO(alokp): Change MediaPipelineImpl API to accept a single config 116 // TODO(alokp): Change MediaPipelineImpl API to accept a single config
116 // after CmaRenderer is deprecated. 117 // after CmaRenderer is deprecated.
117 std::vector<::media::VideoDecoderConfig> video_configs; 118 std::vector<::media::VideoDecoderConfig> video_configs;
118 video_configs.push_back(video_stream->video_decoder_config()); 119 video_configs.push_back(video_stream->video_decoder_config());
119 std::unique_ptr<CodedFrameProvider> frame_provider(new DemuxerStreamAdapter( 120 std::unique_ptr<CodedFrameProvider> frame_provider(new DemuxerStreamAdapter(
120 task_runner_, media_task_runner_factory_, video_stream)); 121 task_runner_, media_task_runner_factory_, video_stream));
121 ::media::PipelineStatus status = pipeline_->InitializeVideo( 122 ::media::PipelineStatus status = pipeline_->InitializeVideo(
122 video_configs, video_client, std::move(frame_provider)); 123 video_configs, video_client, std::move(frame_provider));
123 if (status != ::media::PIPELINE_OK) { 124 if (status != ::media::PIPELINE_OK) {
124 init_cb.Run(status); 125 init_cb.Run(status);
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 void CastRenderer::OnBufferingStateChange(::media::BufferingState state) { 200 void CastRenderer::OnBufferingStateChange(::media::BufferingState state) {
200 DCHECK(task_runner_->BelongsToCurrentThread()); 201 DCHECK(task_runner_->BelongsToCurrentThread());
201 client_->OnBufferingStateChange(state); 202 client_->OnBufferingStateChange(state);
202 } 203 }
203 204
204 void CastRenderer::OnWaitingForDecryptionKey() { 205 void CastRenderer::OnWaitingForDecryptionKey() {
205 DCHECK(task_runner_->BelongsToCurrentThread()); 206 DCHECK(task_runner_->BelongsToCurrentThread());
206 client_->OnWaitingForDecryptionKey(); 207 client_->OnWaitingForDecryptionKey();
207 } 208 }
208 209
210 void CastRenderer::OnVideoNaturalSizeChange(const gfx::Size& size) {
211 DCHECK(task_runner_->BelongsToCurrentThread());
212 client_->OnVideoNaturalSizeChange(size);
213 }
214
215 void CastRenderer::OnVideoOpacityChange(bool opaque) {
216 DCHECK(task_runner_->BelongsToCurrentThread());
217 client_->OnVideoOpacityChange(opaque);
218 }
219
209 } // namespace media 220 } // namespace media
210 } // namespace chromecast 221 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/browser/media/cast_renderer.h ('k') | chromecast/renderer/media/cma_renderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698