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

Unified Diff: media/media.gyp

Issue 10780026: Add HE AAC support to ISO BMFF. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Remove aac.h. 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
« no previous file with comments | « media/base/bit_reader_unittest.cc ('k') | media/mp4/aac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index d8de37a0b0824030cf0762faf8c476da2a01568f..fdfc072ff3840a97fe311a654a1efa3db8684984 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -135,6 +135,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',
@@ -456,6 +458,8 @@
}],
['proprietary_codecs==1 or branding=="Chrome"', {
'sources': [
+ 'mp4/aac.cc',
+ 'mp4/aac.h',
'mp4/avc.cc',
'mp4/avc.h',
'mp4/box_definitions.cc',
@@ -464,6 +468,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',
@@ -669,6 +675,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',
@@ -771,8 +778,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',
'mp4/track_run_iterator_unittest.cc',
« no previous file with comments | « media/base/bit_reader_unittest.cc ('k') | media/mp4/aac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698