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

Unified Diff: media/media.gyp

Issue 691233002: Added aac bitstream converter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Figured it out 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:
View side-by-side diff with in-line comments
Download patch
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index b4ca2bcd0cad07b61b495ea8a2cc7cac188b2d69..8b2606a2d048d676b157bba96e9ba13119a6c250 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',
@@ -1333,6 +1339,7 @@
'filters/audio_decoder_unittest.cc',
'filters/audio_file_reader_unittest.cc',
'filters/blocking_url_protocol_unittest.cc',
+ 'filters/ffmpeg_aac_bitstream_converter_unittest.cc',
'filters/ffmpeg_demuxer_unittest.cc',
'filters/ffmpeg_glue_unittest.cc',
'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
@@ -1401,6 +1408,7 @@
}],
['proprietary_codecs==1', {
'sources': [
+ 'filters/ffmpeg_aac_bitstream_converter_unittest.cc',
'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
'filters/h264_to_annex_b_bitstream_converter_unittest.cc',
'formats/common/stream_parser_test_base.cc',

Powered by Google App Engine
This is Rietveld 408576698