media/renderers/default_renderer_factory.cc - Issue 1230793009: Initial support for the desktop media pipeline on Android.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/renderers/default_renderer_factory.cc

Issue 1230793009: Initial support for the desktop media pipeline on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: I forgot what year it is Created 5 years, 5 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

Index: media/renderers/default_renderer_factory.cc

diff --git a/media/renderers/default_renderer_factory.cc b/media/renderers/default_renderer_factory.cc

index a2a91d5b16491407ab11c48507c4d7c834f9c9ca..92dc5ad840785ca2c5f20ae5f4bef2c7dac429a5 100644

--- a/media/renderers/default_renderer_factory.cc

+++ b/media/renderers/default_renderer_factory.cc

@@ -9,8 +9,10 @@

#if !defined(MEDIA_DISABLE_FFMPEG)

#include "media/base/media_log.h"

#include "media/filters/ffmpeg_audio_decoder.h"

+#if !defined(DISABLE_FFMPEG_VIDEO_DECODERS)

#include "media/filters/ffmpeg_video_decoder.h"

#endif

+#endif

#include "media/filters/gpu_video_decoder.h"

#include "media/filters/opus_audio_decoder.h"

#include "media/renderers/audio_renderer_impl.h"

@@ -72,7 +74,7 @@ scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer(

video_decoders.push_back(new VpxVideoDecoder(media_task_runner));

#endif

-#if !defined(MEDIA_DISABLE_FFMPEG)

+#if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS)

video_decoders.push_back(new FFmpegVideoDecoder(media_task_runner));

#endif

« media/media_cdm.gypi ('K') | « media/media_variables.gypi ('k') | third_party/opus/opus.gyp » ('j') | no next file with comments »