media/filters/ffmpeg_demuxer.cc - Issue 2801803002: Android: enable H264&VP8 HW accelerator for MediaRecorder

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/filters/ffmpeg_demuxer.cc

Issue 2801803002: Android: enable H264&VP8 HW accelerator for MediaRecorder (Closed)

Patch Set: exclude H264 from alpha channel recording test cases. Created 3 years, 8 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:

Index: media/filters/ffmpeg_demuxer.cc

diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc

index 699b2f8f928d20d6bef343f7d9be7712f8becded..c960b750c5db4bfd3ab2ab2836a618e8dd7e8de8 100644

--- a/media/filters/ffmpeg_demuxer.cc

+++ b/media/filters/ffmpeg_demuxer.cc

@@ -662,7 +662,7 @@ void FFmpegDemuxerStream::Read(const ReadCB& read_cb) {

void FFmpegDemuxerStream::EnableBitstreamConverter() {

DCHECK(task_runner_->BelongsToCurrentThread());

-#if BUILDFLAG(USE_PROPRIETARY_CODECS)

+#if BUILDFLAG(USE_PROPRIETARY_CODECS) || defined(OS_ANDROID)

InitBitstreamConverter();

#else

NOTREACHED() << "Proprietary codecs not enabled.";