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

Side by Side Diff: media/base/mime_util_internal.h

Issue 1769833003: Consolidate MPEG*_AAC_* MimeUtil::Codec enum values (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Consolidate comments about codec string variants. Created 4 years, 9 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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_BASE_MIME_UTIL_INTERNAL_H_ 5 #ifndef MEDIA_BASE_MIME_UTIL_INTERNAL_H_
6 #define MEDIA_BASE_MIME_UTIL_INTERNAL_H_ 6 #define MEDIA_BASE_MIME_UTIL_INTERNAL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 12 matching lines...) Expand all
23 public: 23 public:
24 MimeUtil(); 24 MimeUtil();
25 ~MimeUtil(); 25 ~MimeUtil();
26 26
27 enum Codec { 27 enum Codec {
28 INVALID_CODEC, 28 INVALID_CODEC,
29 PCM, 29 PCM,
30 MP3, 30 MP3,
31 AC3, 31 AC3,
32 EAC3, 32 EAC3,
33 MPEG2_AAC_LC, 33 MPEG2_AAC,
34 MPEG2_AAC_MAIN, 34 MPEG4_AAC,
35 MPEG2_AAC_SSR,
36 MPEG4_AAC_LC,
37 MPEG4_AAC_SBR_v1,
38 MPEG4_AAC_SBR_PS_v2,
39 VORBIS, 35 VORBIS,
40 OPUS, 36 OPUS,
41 H264, 37 H264,
42 HEVC_MAIN, 38 HEVC_MAIN,
43 VP8, 39 VP8,
44 VP9, 40 VP9,
45 THEORA, 41 THEORA,
46 LAST_CODEC = THEORA 42 LAST_CODEC = THEORA
47 }; 43 };
48 44
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 // Lookup table for string compare based string -> Codec mappings. 151 // Lookup table for string compare based string -> Codec mappings.
156 StringToCodecMappings string_to_codec_map_; 152 StringToCodecMappings string_to_codec_map_;
157 153
158 DISALLOW_COPY_AND_ASSIGN(MimeUtil); 154 DISALLOW_COPY_AND_ASSIGN(MimeUtil);
159 }; 155 };
160 156
161 } // namespace internal 157 } // namespace internal
162 } // namespace media 158 } // namespace media
163 159
164 #endif // MEDIA_BASE_MIME_UTIL_INTERNAL_H_ 160 #endif // MEDIA_BASE_MIME_UTIL_INTERNAL_H_
OLDNEW
« no previous file with comments | « content/browser/media/media_canplaytype_browsertest.cc ('k') | media/base/mime_util_internal.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698