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

Side by Side Diff: content/renderer/media/webmediaplayer_impl.cc

Issue 418143005: media: Introduce Renderer interface and RendererImpl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments addressed Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « content/renderer/media/webmediaplayer_impl.h ('k') | media/BUILD.gn » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/renderer/media/webmediaplayer_impl.h" 5 #include "content/renderer/media/webmediaplayer_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #include "media/base/text_renderer.h" 51 #include "media/base/text_renderer.h"
52 #include "media/base/video_frame.h" 52 #include "media/base/video_frame.h"
53 #include "media/filters/audio_renderer_impl.h" 53 #include "media/filters/audio_renderer_impl.h"
54 #include "media/filters/chunk_demuxer.h" 54 #include "media/filters/chunk_demuxer.h"
55 #include "media/filters/ffmpeg_audio_decoder.h" 55 #include "media/filters/ffmpeg_audio_decoder.h"
56 #include "media/filters/ffmpeg_demuxer.h" 56 #include "media/filters/ffmpeg_demuxer.h"
57 #include "media/filters/ffmpeg_video_decoder.h" 57 #include "media/filters/ffmpeg_video_decoder.h"
58 #include "media/filters/gpu_video_accelerator_factories.h" 58 #include "media/filters/gpu_video_accelerator_factories.h"
59 #include "media/filters/gpu_video_decoder.h" 59 #include "media/filters/gpu_video_decoder.h"
60 #include "media/filters/opus_audio_decoder.h" 60 #include "media/filters/opus_audio_decoder.h"
61 #include "media/filters/renderer_impl.h"
61 #include "media/filters/video_renderer_impl.h" 62 #include "media/filters/video_renderer_impl.h"
62 #include "media/filters/vpx_video_decoder.h" 63 #include "media/filters/vpx_video_decoder.h"
63 #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h" 64 #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h"
64 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h" 65 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h"
65 #include "third_party/WebKit/public/platform/WebMediaSource.h" 66 #include "third_party/WebKit/public/platform/WebMediaSource.h"
66 #include "third_party/WebKit/public/platform/WebRect.h" 67 #include "third_party/WebKit/public/platform/WebRect.h"
67 #include "third_party/WebKit/public/platform/WebSize.h" 68 #include "third_party/WebKit/public/platform/WebSize.h"
68 #include "third_party/WebKit/public/platform/WebString.h" 69 #include "third_party/WebKit/public/platform/WebString.h"
69 #include "third_party/WebKit/public/platform/WebURL.h" 70 #include "third_party/WebKit/public/platform/WebURL.h"
70 #include "third_party/WebKit/public/web/WebDocument.h" 71 #include "third_party/WebKit/public/web/WebDocument.h"
(...skipping 1090 matching lines...) Expand 10 before | Expand all | Expand 10 after
1161 if (!is_downloading && network_state_ == WebMediaPlayer::NetworkStateLoading) 1162 if (!is_downloading && network_state_ == WebMediaPlayer::NetworkStateLoading)
1162 SetNetworkState(WebMediaPlayer::NetworkStateIdle); 1163 SetNetworkState(WebMediaPlayer::NetworkStateIdle);
1163 else if (is_downloading && network_state_ == WebMediaPlayer::NetworkStateIdle) 1164 else if (is_downloading && network_state_ == WebMediaPlayer::NetworkStateIdle)
1164 SetNetworkState(WebMediaPlayer::NetworkStateLoading); 1165 SetNetworkState(WebMediaPlayer::NetworkStateLoading);
1165 media_log_->AddEvent( 1166 media_log_->AddEvent(
1166 media_log_->CreateBooleanEvent( 1167 media_log_->CreateBooleanEvent(
1167 media::MediaLogEvent::NETWORK_ACTIVITY_SET, 1168 media::MediaLogEvent::NETWORK_ACTIVITY_SET,
1168 "is_downloading_data", is_downloading)); 1169 "is_downloading_data", is_downloading));
1169 } 1170 }
1170 1171
1172 // TODO(xhwang): Move this to a factory class so that we can create different
gunsch 2014/08/22 22:55:26 qq: what's the plan for this? Is this expected to
gunsch 2014/08/22 22:56:35 Ah, I just saw your reply to Damien earlier this C
xhwang 2014/08/22 23:00:55 The current plan is that we'll create different Re
1173 // renderers.
1174 scoped_ptr<media::Renderer> WebMediaPlayerImpl::CreateRenderer() {
1175 media::SetDecryptorReadyCB set_decryptor_ready_cb =
1176 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetDecryptorReadyCB);
1177
1178 // Create our audio decoders and renderer.
1179 ScopedVector<media::AudioDecoder> audio_decoders;
1180
1181 media::LogCB log_cb = base::Bind(&LogMediaSourceError, media_log_);
1182 audio_decoders.push_back(new media::FFmpegAudioDecoder(media_loop_, log_cb));
1183 audio_decoders.push_back(new media::OpusAudioDecoder(media_loop_));
1184
1185 scoped_ptr<media::AudioRenderer> audio_renderer(new media::AudioRendererImpl(
1186 media_loop_,
1187 audio_source_provider_.get(),
1188 audio_decoders.Pass(),
1189 set_decryptor_ready_cb,
1190 RenderThreadImpl::current()->GetAudioHardwareConfig()));
1191
1192 // Create our video decoders and renderer.
1193 ScopedVector<media::VideoDecoder> video_decoders;
1194
1195 if (gpu_factories_.get()) {
1196 video_decoders.push_back(
1197 new media::GpuVideoDecoder(gpu_factories_, media_log_));
1198 }
1199
1200 #if !defined(MEDIA_DISABLE_LIBVPX)
1201 video_decoders.push_back(new media::VpxVideoDecoder(media_loop_));
1202 #endif // !defined(MEDIA_DISABLE_LIBVPX)
1203
1204 video_decoders.push_back(new media::FFmpegVideoDecoder(media_loop_));
1205
1206 scoped_ptr<media::VideoRenderer> video_renderer(
1207 new media::VideoRendererImpl(
1208 media_loop_,
1209 video_decoders.Pass(),
1210 set_decryptor_ready_cb,
1211 base::Bind(&WebMediaPlayerImpl::FrameReady, base::Unretained(this)),
1212 true));
1213
1214 // Create renderer.
1215 return scoped_ptr<media::Renderer>(new media::RendererImpl(
1216 media_loop_,
1217 demuxer_.get(),
1218 audio_renderer.Pass(),
1219 video_renderer.Pass()));
1220 }
1221
1171 void WebMediaPlayerImpl::StartPipeline() { 1222 void WebMediaPlayerImpl::StartPipeline() {
1172 DCHECK(main_loop_->BelongsToCurrentThread()); 1223 DCHECK(main_loop_->BelongsToCurrentThread());
1173 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); 1224 const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
1174 1225
1175 // Keep track if this is a MSE or non-MSE playback. 1226 // Keep track if this is a MSE or non-MSE playback.
1176 UMA_HISTOGRAM_BOOLEAN("Media.MSE.Playback", 1227 UMA_HISTOGRAM_BOOLEAN("Media.MSE.Playback",
1177 (load_type_ == LoadTypeMediaSource)); 1228 (load_type_ == LoadTypeMediaSource));
1178 1229
1179 media::LogCB mse_log_cb; 1230 media::LogCB mse_log_cb;
1180 1231
(...skipping 16 matching lines...) Expand all
1197 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDemuxerOpened), 1248 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDemuxerOpened),
1198 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNeedKey), 1249 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNeedKey),
1199 mse_log_cb, 1250 mse_log_cb,
1200 true); 1251 true);
1201 demuxer_.reset(chunk_demuxer_); 1252 demuxer_.reset(chunk_demuxer_);
1202 } 1253 }
1203 1254
1204 scoped_ptr<media::FilterCollection> filter_collection( 1255 scoped_ptr<media::FilterCollection> filter_collection(
1205 new media::FilterCollection()); 1256 new media::FilterCollection());
1206 filter_collection->SetDemuxer(demuxer_.get()); 1257 filter_collection->SetDemuxer(demuxer_.get());
1207 1258 filter_collection->SetRenderer(CreateRenderer());
1208 media::SetDecryptorReadyCB set_decryptor_ready_cb =
1209 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetDecryptorReadyCB);
1210
1211 // Create our audio decoders and renderer.
1212 ScopedVector<media::AudioDecoder> audio_decoders;
1213 audio_decoders.push_back(new media::FFmpegAudioDecoder(media_loop_,
1214 mse_log_cb));
1215 audio_decoders.push_back(new media::OpusAudioDecoder(media_loop_));
1216
1217 scoped_ptr<media::AudioRenderer> audio_renderer(new media::AudioRendererImpl(
1218 media_loop_,
1219 audio_source_provider_.get(),
1220 audio_decoders.Pass(),
1221 set_decryptor_ready_cb,
1222 RenderThreadImpl::current()->GetAudioHardwareConfig()));
1223 filter_collection->SetAudioRenderer(audio_renderer.Pass());
1224
1225 // Create our video decoders and renderer.
1226 ScopedVector<media::VideoDecoder> video_decoders;
1227
1228 if (gpu_factories_.get()) {
1229 video_decoders.push_back(
1230 new media::GpuVideoDecoder(gpu_factories_, media_log_));
1231 }
1232
1233 #if !defined(MEDIA_DISABLE_LIBVPX)
1234 video_decoders.push_back(new media::VpxVideoDecoder(media_loop_));
1235 #endif // !defined(MEDIA_DISABLE_LIBVPX)
1236
1237 video_decoders.push_back(new media::FFmpegVideoDecoder(media_loop_));
1238
1239 scoped_ptr<media::VideoRenderer> video_renderer(
1240 new media::VideoRendererImpl(
1241 media_loop_,
1242 video_decoders.Pass(),
1243 set_decryptor_ready_cb,
1244 base::Bind(&WebMediaPlayerImpl::FrameReady, base::Unretained(this)),
1245 true));
1246 filter_collection->SetVideoRenderer(video_renderer.Pass());
1247 1259
1248 if (cmd_line->HasSwitch(switches::kEnableInbandTextTracks)) { 1260 if (cmd_line->HasSwitch(switches::kEnableInbandTextTracks)) {
1249 scoped_ptr<media::TextRenderer> text_renderer( 1261 scoped_ptr<media::TextRenderer> text_renderer(
1250 new media::TextRenderer( 1262 new media::TextRenderer(
1251 media_loop_, 1263 media_loop_,
1252 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnAddTextTrack))); 1264 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnAddTextTrack)));
1253 1265
1254 filter_collection->SetTextRenderer(text_renderer.Pass()); 1266 filter_collection->SetTextRenderer(text_renderer.Pass());
1255 } 1267 }
1256 1268
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
1406 compositor_task_runner_->PostTask(FROM_HERE, 1418 compositor_task_runner_->PostTask(FROM_HERE,
1407 base::Bind(&GetCurrentFrameAndSignal, 1419 base::Bind(&GetCurrentFrameAndSignal,
1408 base::Unretained(compositor_), 1420 base::Unretained(compositor_),
1409 &video_frame, 1421 &video_frame,
1410 &event)); 1422 &event));
1411 event.Wait(); 1423 event.Wait();
1412 return video_frame; 1424 return video_frame;
1413 } 1425 }
1414 1426
1415 } // namespace content 1427 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/webmediaplayer_impl.h ('k') | media/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698