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

Side by Side Diff: media/mp4/es_descriptor.h

Issue 11819013: Add support for accepting MPEG2 AAC-LC bitstreams. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and add MPEG2 AAC-LC test. Created 7 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/filters/chunk_demuxer.cc ('k') | media/mp4/mp4_stream_parser.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_MP4_ES_DESCRIPTOR_H_ 5 #ifndef MEDIA_MP4_ES_DESCRIPTOR_H_
6 #define MEDIA_MP4_ES_DESCRIPTOR_H_ 6 #define MEDIA_MP4_ES_DESCRIPTOR_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "media/base/media_export.h" 11 #include "media/base/media_export.h"
12 12
13 namespace media { 13 namespace media {
14 14
15 class BitReader; 15 class BitReader;
16 16
17 namespace mp4 { 17 namespace mp4 {
18 18
19 // The following values are extracted from ISO 14496 Part 1 Table 5 - 19 // The following values are extracted from ISO 14496 Part 1 Table 5 -
20 // objectTypeIndication Values. Only values currently in use are included. 20 // objectTypeIndication Values. Only values currently in use are included.
21 enum ObjectType { 21 enum ObjectType {
22 kForbidden = 0, 22 kForbidden = 0,
23 kISO_14496_3 = 0x40 // MPEG4 AAC 23 kISO_14496_3 = 0x40, // MPEG4 AAC
24 kISO_13818_7_AAC_LC = 0x67 // MPEG2 AAC-LC
24 }; 25 };
25 26
26 // This class parse object type and decoder specific information from an 27 // This class parse object type and decoder specific information from an
27 // elementary stream descriptor, which is usually contained in an esds box. 28 // elementary stream descriptor, which is usually contained in an esds box.
28 // Please refer to ISO 14496 Part 1 7.2.6.5 for more details. 29 // Please refer to ISO 14496 Part 1 7.2.6.5 for more details.
29 class MEDIA_EXPORT ESDescriptor { 30 class MEDIA_EXPORT ESDescriptor {
30 public: 31 public:
31 ESDescriptor(); 32 ESDescriptor();
32 ~ESDescriptor(); 33 ~ESDescriptor();
33 34
(...skipping 14 matching lines...) Expand all
48 49
49 uint8 object_type_; 50 uint8 object_type_;
50 std::vector<uint8> decoder_specific_info_; 51 std::vector<uint8> decoder_specific_info_;
51 }; 52 };
52 53
53 } // namespace mp4 54 } // namespace mp4
54 55
55 } // namespace media 56 } // namespace media
56 57
57 #endif // MEDIA_MP4_ES_DESCRIPTOR_H_ 58 #endif // MEDIA_MP4_ES_DESCRIPTOR_H_
OLDNEW
« no previous file with comments | « media/filters/chunk_demuxer.cc ('k') | media/mp4/mp4_stream_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698