media/base/mime_util_internal.h - Issue 2362193003: Add FLAC audio codec support

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

Issue 2362193003: Add FLAC audio codec support (Closed)

Patch Set: Enabled the test in media_browsertest.cc on Chromium Created 4 years, 2 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:

OLD	NEW
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 16 matching lines...) Expand all Loading...
27	27

28 enum Codec {	28 enum Codec {

29 INVALID_CODEC,	29 INVALID_CODEC,

30 PCM,	30 PCM,

31 MP3,	31 MP3,

32 AC3,	32 AC3,

33 EAC3,	33 EAC3,

34 MPEG2_AAC,	34 MPEG2_AAC,

35 MPEG4_AAC,	35 MPEG4_AAC,

36 VORBIS,	36 VORBIS,

	37 FLAC,
	wolenetz 2016/10/24 22:20:14 aside: how was this position in the enum determine aside: how was this position in the enum determined? servolk 2016/10/24 22:26:05 Oh, this CL is about a month old now, I don't reme Show quoted text On 2016/10/24 22:20:14, wolenetz wrote: > aside: how was this position in the enum determined? Oh, this CL is about a month old now, I don't remember TBH. Perhaps I thought that Vorbis was the last video codec in this list and FLAC would be the first audio codec. But looking closer at the list now, the ordering here seems to be completely random. ddorwin 2016/11/16 17:44:47 It is audio then video. This should probably go af Show quoted text On 2016/10/24 22:26:05, servolk wrote: > On 2016/10/24 22:20:14, wolenetz wrote: > > aside: how was this position in the enum determined? > > Oh, this CL is about a month old now, I don't remember TBH. Perhaps I thought > that Vorbis was the last video codec in this list and FLAC would be the first > audio codec. But looking closer at the list now, the ordering here seems to be > completely random. It is audio then video. This should probably go after OPUS. DaleCurtis 2016/11/17 23:41:58 Doesn't matter, but done. Show quoted text On 2016/11/16 at 17:44:47, ddorwin wrote: > On 2016/10/24 22:26:05, servolk wrote: > > On 2016/10/24 22:20:14, wolenetz wrote: > > > aside: how was this position in the enum determined? > > > > Oh, this CL is about a month old now, I don't remember TBH. Perhaps I thought > > that Vorbis was the last video codec in this list and FLAC would be the first > > audio codec. But looking closer at the list now, the ordering here seems to be > > completely random. > > It is audio then video. This should probably go after OPUS. Doesn't matter, but done.
37 OPUS,	38 OPUS,

38 H264,	39 H264,

39 HEVC,	40 HEVC,

40 VP8,	41 VP8,

41 VP9,	42 VP9,

42 THEORA,	43 THEORA,

43 LAST_CODEC = THEORA	44 LAST_CODEC = THEORA

44 };	45 };

45	46

46 // Platform configuration structure. Controls which codecs are supported at	47 // Platform configuration structure. Controls which codecs are supported at

(...skipping 122 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
169 // Lookup table for string compare based string -> Codec mappings.	170 // Lookup table for string compare based string -> Codec mappings.

170 StringToCodecMappings string_to_codec_map_;	171 StringToCodecMappings string_to_codec_map_;

171	172

172 DISALLOW_COPY_AND_ASSIGN(MimeUtil);	173 DISALLOW_COPY_AND_ASSIGN(MimeUtil);

173 };	174 };

174	175

175 } // namespace internal	176 } // namespace internal

176 } // namespace media	177 } // namespace media

177	178

178 #endif // MEDIA_BASE_MIME_UTIL_INTERNAL_H_	179 #endif // MEDIA_BASE_MIME_UTIL_INTERNAL_H_

OLD	NEW

« no previous file with comments | « media/base/demuxer_perftest.cc ('k') | media/base/mime_util_internal.cc » ('j') | media/base/mime_util_internal.cc » ('J')