diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-17 00:08:40 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-17 00:08:40 +0000 |
| commit | 7ae09bee4a843369b1a5b8a459ddb2b556ae24fd (patch) | |
| tree | 7726f5e5f1fdfee15ae98817e7c255b5254943f9 /media/media.gyp | |
| parent | 17bcc311f6e378e7c47389a073de53a4d798c7e8 (diff) | |
| download | chromium_src-7ae09bee4a843369b1a5b8a459ddb2b556ae24fd.zip chromium_src-7ae09bee4a843369b1a5b8a459ddb2b556ae24fd.tar.gz chromium_src-7ae09bee4a843369b1a5b8a459ddb2b556ae24fd.tar.bz2 | |
Revert 145769 (broke test stream, removed needed HasMoreRBSPData, added extra ops) - Add HE AAC support to ISO BMFF.
Also abstract common code in H264BitReader into BitReader for reusing.
Was: https://chromiumcodereview.appspot.com/10710002/
In the submitted patch of the last issue, the media.gyp included a non-existing file. This error hadn't been caught by try but later got caught by the build process and reverted the commit. So I create this issue to submit the fixed patch.
BUG=134445
TEST=BitReaderTest, AACTest
Review URL: https://chromiumcodereview.appspot.com/10753005
TBR=xiaomings@google.com
Review URL: https://chromiumcodereview.appspot.com/10779025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146927 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/media/media.gyp b/media/media.gyp index 8d8a1e1..430da1d 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -135,8 +135,6 @@ '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', @@ -458,8 +456,6 @@ }], ['proprietary_codecs==1 or branding=="Chrome"', { 'sources': [ - 'mp4/aac.cc', - 'mp4/aac.h', 'mp4/avc.cc', 'mp4/avc.h', 'mp4/box_definitions.cc', @@ -468,8 +464,6 @@ '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', @@ -675,7 +669,6 @@ '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', @@ -778,10 +771,8 @@ }], ['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', ], |