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

Unified Diff: media/media.gyp

Issue 10753005: Add HE AAC support to ISO BMFF. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 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/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 29300fe1b89fdc39c2c0654b9f200dcd3d00c143..c73c3142109ff0c40bf717898d680dffcee06bf5 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -133,6 +133,8 @@
'base/audio_renderer_mixer.h',
'base/audio_renderer_mixer_input.cc',
'base/audio_renderer_mixer_input.h',
+ 'base/bit_reader.cc',
+ 'base/bit_reader.h',
'base/bitstream_buffer.h',
'base/buffers.cc',
'base/buffers.h',
@@ -452,6 +454,8 @@
}],
['proprietary_codecs==1 or branding=="Chrome"', {
'sources': [
+ 'mp4/aac.cc',
+ 'mp4/aac.h',
'mp4/avc.cc',
'mp4/avc.h',
'mp4/box_definitions.cc',
@@ -460,6 +464,8 @@
'mp4/box_reader.h',
'mp4/cenc.cc',
'mp4/cenc.h',
+ 'mp4/es_descriptor.cc',
+ 'mp4/es_descriptor.h',
'mp4/mp4_stream_parser.cc',
'mp4/mp4_stream_parser.h',
'mp4/offset_byte_queue.cc',
@@ -665,6 +671,7 @@
'audio/win/audio_output_win_unittest.cc',
'base/audio_renderer_mixer_unittest.cc',
'base/audio_renderer_mixer_input_unittest.cc',
+ 'base/bit_reader_unittest.cc',
'base/buffers_unittest.cc',
'base/clock_unittest.cc',
'base/composite_filter_unittest.cc',
@@ -762,8 +769,10 @@
}],
['proprietary_codecs==1 or branding=="Chrome"', {
'sources': [
+ 'mp4/aac_unittest.cc',
'mp4/avc_unittest.cc',
'mp4/box_reader_unittest.cc',
+ 'mp4/es_descriptor_unittest.cc',
'mp4/mp4_stream_parser_unittest.cc',
'mp4/offset_byte_queue_unittest.cc',
],

Powered by Google App Engine
This is Rietveld 408576698