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

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

Issue 2723833002: WebM support for new multipart VP9 string. (Closed)
Patch Set: Rebase Created 3 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
« no previous file with comments | « media/base/mime_util_unittest.cc ('k') | media/base/video_codecs.cc » ('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 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_VIDEO_CODECS_H_ 5 #ifndef MEDIA_BASE_VIDEO_CODECS_H_
6 #define MEDIA_BASE_VIDEO_CODECS_H_ 6 #define MEDIA_BASE_VIDEO_CODECS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <string> 9 #include <string>
10 #include "media/base/media_export.h" 10 #include "media/base/media_export.h"
11 #include "media/media_features.h" 11 #include "media/media_features.h"
12 #include "ui/gfx/color_space.h"
12 13
13 namespace media { 14 namespace media {
14 15
15 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.media 16 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.media
16 enum VideoCodec { 17 enum VideoCodec {
17 // These values are histogrammed over time; do not change their ordinal 18 // These values are histogrammed over time; do not change their ordinal
18 // values. When deleting a codec replace it with a dummy value; when adding a 19 // values. When deleting a codec replace it with a dummy value; when adding a
19 // codec, do so at the bottom (and update kVideoCodecMax). 20 // codec, do so at the bottom (and update kVideoCodecMax).
20 kUnknownVideoCodec = 0, 21 kUnknownVideoCodec = 0,
21 kCodecH264, 22 kCodecH264,
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 std::string MEDIA_EXPORT GetProfileName(VideoCodecProfile profile); 96 std::string MEDIA_EXPORT GetProfileName(VideoCodecProfile profile);
96 97
97 // ParseNewStyleVp9CodecID handles parsing of new style vp9 codec IDs per 98 // ParseNewStyleVp9CodecID handles parsing of new style vp9 codec IDs per
98 // proposed VP Codec ISO Media File Format Binding specification: 99 // proposed VP Codec ISO Media File Format Binding specification:
99 // https://storage.googleapis.com/downloads.webmproject.org/docs/vp9/vp-codec-is o-media-file-format-binding-20160516-draft.pdf 100 // https://storage.googleapis.com/downloads.webmproject.org/docs/vp9/vp-codec-is o-media-file-format-binding-20160516-draft.pdf
100 // ParseLegacyVp9CodecID handles parsing of legacy VP9 codec strings defined 101 // ParseLegacyVp9CodecID handles parsing of legacy VP9 codec strings defined
101 // for WebM. 102 // for WebM.
102 // TODO(kqyang): Consolidate the two functions once we address crbug.com/667834 103 // TODO(kqyang): Consolidate the two functions once we address crbug.com/667834
103 MEDIA_EXPORT bool ParseNewStyleVp9CodecID(const std::string& codec_id, 104 MEDIA_EXPORT bool ParseNewStyleVp9CodecID(const std::string& codec_id,
104 VideoCodecProfile* profile, 105 VideoCodecProfile* profile,
105 uint8_t* level_idc); 106 uint8_t* level_idc,
107 gfx::ColorSpace::TransferID* eotf);
108
106 MEDIA_EXPORT bool ParseLegacyVp9CodecID(const std::string& codec_id, 109 MEDIA_EXPORT bool ParseLegacyVp9CodecID(const std::string& codec_id,
107 VideoCodecProfile* profile, 110 VideoCodecProfile* profile,
108 uint8_t* level_idc); 111 uint8_t* level_idc);
109 112
110 // Handle parsing AVC/H.264 codec ids as outlined in RFC 6381 and ISO-14496-10. 113 // Handle parsing AVC/H.264 codec ids as outlined in RFC 6381 and ISO-14496-10.
111 MEDIA_EXPORT bool ParseAVCCodecId(const std::string& codec_id, 114 MEDIA_EXPORT bool ParseAVCCodecId(const std::string& codec_id,
112 VideoCodecProfile* profile, 115 VideoCodecProfile* profile,
113 uint8_t* level_idc); 116 uint8_t* level_idc);
114 117
115 #if BUILDFLAG(ENABLE_HEVC_DEMUXING) 118 #if BUILDFLAG(ENABLE_HEVC_DEMUXING)
(...skipping 13 matching lines...) Expand all
129 #if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER) 132 #if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
130 // Translate legacy avc1 codec ids (like avc1.66.30 or avc1.77.31) into a new 133 // Translate legacy avc1 codec ids (like avc1.66.30 or avc1.77.31) into a new
131 // style standard avc1 codec ids like avc1.4D002F. If the input codec is not 134 // style standard avc1 codec ids like avc1.4D002F. If the input codec is not
132 // recognized as a legacy codec id, then returns the input string unchanged. 135 // recognized as a legacy codec id, then returns the input string unchanged.
133 std::string TranslateLegacyAvc1CodecIds(const std::string& codec_id); 136 std::string TranslateLegacyAvc1CodecIds(const std::string& codec_id);
134 #endif 137 #endif
135 138
136 } // namespace media 139 } // namespace media
137 140
138 #endif // MEDIA_BASE_VIDEO_CODECS_H_ 141 #endif // MEDIA_BASE_VIDEO_CODECS_H_
OLDNEW
« no previous file with comments | « media/base/mime_util_unittest.cc ('k') | media/base/video_codecs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698