media/media.gyp - Issue 691233002: Added aac bitstream converter

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/media.gyp

Issue 691233002: Added aac bitstream converter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 1 month 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/media.gyp

diff --git a/media/media.gyp b/media/media.gyp

index 1547bae6ce4a7bd85777782f529c35b6c9d8e3af..c5f7aa4741f5ac1f86ef78e412a0c4f2df9d6ceb 100644

--- a/media/media.gyp

+++ b/media/media.gyp

@@ -409,6 +409,7 @@

'filters/decrypting_video_decoder.h',

'filters/ffmpeg_audio_decoder.cc',

'filters/ffmpeg_audio_decoder.h',

+ 'filters/ffmpeg_bitstream_converter.h',

'filters/ffmpeg_demuxer.cc',

'filters/ffmpeg_demuxer.h',

'filters/ffmpeg_glue.cc',

@@ -604,8 +605,11 @@

'filters/audio_file_reader.h',

'filters/blocking_url_protocol.cc',

'filters/blocking_url_protocol.h',

+ 'filters/ffmpeg_aac_bitstream_converter.cc',

+ 'filters/ffmpeg_aac_bitstream_converter.h',

'filters/ffmpeg_audio_decoder.cc',

'filters/ffmpeg_audio_decoder.h',

+ 'filters/ffmpeg_bitstream_converter.h',

'filters/ffmpeg_demuxer.cc',

'filters/ffmpeg_demuxer.h',

'filters/ffmpeg_glue.cc',

@@ -936,6 +940,8 @@

}],

['proprietary_codecs==1', {

'sources': [

+ 'filters/ffmpeg_aac_bitstream_converter.cc',

+ 'filters/ffmpeg_aac_bitstream_converter.h',

'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc',

'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h',

'filters/h264_to_annex_b_bitstream_converter.cc',