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

Unified Diff: media/renderers/default_renderer_factory.cc

Issue 1800953002: Add MojoVideoDecoder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments. Created 4 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/mojo/services/mojo_video_decoder.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/renderers/default_renderer_factory.cc
diff --git a/media/renderers/default_renderer_factory.cc b/media/renderers/default_renderer_factory.cc
index 88fd15789c27ab84cfe9c350a09bca74753072ef..f1530d640cf512ac88153724aa625bcb1aa0f16e 100644
--- a/media/renderers/default_renderer_factory.cc
+++ b/media/renderers/default_renderer_factory.cc
@@ -56,6 +56,8 @@ ScopedVector<AudioDecoder> DefaultRendererFactory::CreateAudioDecoders(
audio_decoders.push_back(new OpusAudioDecoder(media_task_runner));
+ // Use an external decoder only if we cannot otherwise decode in the
+ // renderer.
if (decoder_factory_)
decoder_factory_->CreateAudioDecoders(&audio_decoders);
@@ -69,6 +71,11 @@ ScopedVector<VideoDecoder> DefaultRendererFactory::CreateVideoDecoders(
// Create our video decoders and renderer.
ScopedVector<VideoDecoder> video_decoders;
+ // Prefer an external decoder since one will only exist if it is hardware
+ // accelerated.
+ if (decoder_factory_)
+ decoder_factory_->CreateVideoDecoders(&video_decoders);
+
// |gpu_factories_| requires that its entry points be called on its
// |GetTaskRunner()|. Since |pipeline_| will own decoders created from the
// factories, require that their message loops are identical.
@@ -87,9 +94,6 @@ ScopedVector<VideoDecoder> DefaultRendererFactory::CreateVideoDecoders(
video_decoders.push_back(new FFmpegVideoDecoder());
#endif
- if (decoder_factory_)
- decoder_factory_->CreateVideoDecoders(&video_decoders);
-
return video_decoders;
}
« no previous file with comments | « media/mojo/services/mojo_video_decoder.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698