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

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

Issue 812643005: Re-add AC3/EAC3 audio demuxing support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Code cleanup Created 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_FORMATS_MP4_ES_DESCRIPTOR_H_ 5 #ifndef MEDIA_FORMATS_MP4_ES_DESCRIPTOR_H_
6 #define MEDIA_FORMATS_MP4_ES_DESCRIPTOR_H_ 6 #define MEDIA_FORMATS_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 kISO_13818_7_AAC_LC = 0x67, // MPEG2 AAC-LC
25 kAC3 = 0xa5, // AC3
26 kEAC3 = 0xa6 // EAC3 / Dolby Digital Plus
25 }; 27 };
26 28
27 // This class parse object type and decoder specific information from an 29 // This class parse object type and decoder specific information from an
28 // elementary stream descriptor, which is usually contained in an esds box. 30 // elementary stream descriptor, which is usually contained in an esds box.
29 // Please refer to ISO 14496 Part 1 7.2.6.5 for more details. 31 // Please refer to ISO 14496 Part 1 7.2.6.5 for more details.
30 class MEDIA_EXPORT ESDescriptor { 32 class MEDIA_EXPORT ESDescriptor {
31 public: 33 public:
32 // Utility function to check if the given object type is AAC. 34 // Utility function to check if the given object type is AAC.
33 static bool IsAAC(uint8 object_type); 35 static bool IsAAC(uint8 object_type);
34 36
(...skipping 17 matching lines...) Expand all
52 54
53 uint8 object_type_; 55 uint8 object_type_;
54 std::vector<uint8> decoder_specific_info_; 56 std::vector<uint8> decoder_specific_info_;
55 }; 57 };
56 58
57 } // namespace mp4 59 } // namespace mp4
58 60
59 } // namespace media 61 } // namespace media
60 62
61 #endif // MEDIA_FORMATS_MP4_ES_DESCRIPTOR_H_ 63 #endif // MEDIA_FORMATS_MP4_ES_DESCRIPTOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698