diff options
author | servolk <servolk@chromium.org> | 2015-09-09 11:26:06 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-09-09 18:27:26 +0000 |
commit | b103e37028d2d83982b77b84aecef93350a98e91 (patch) | |
tree | 1f4d050a5e14772e724656c19e4c59da09cbab0b /media/base/video_decoder_config.h | |
parent | 9daeacae81c70fe055af8d8a333691ca9a9fd181 (diff) | |
download | chromium_src-b103e37028d2d83982b77b84aecef93350a98e91.zip chromium_src-b103e37028d2d83982b77b84aecef93350a98e91.tar.gz chromium_src-b103e37028d2d83982b77b84aecef93350a98e91.tar.bz2 |
Move VideoCodec/VideoCodecProfile enums into video_codecs.h
As discussed on HEVC CL https://codereview.chromium.org/816353010/
we could move VideoCodec/VideoCodecProfile enums into a separate
header video_codecs.h, since we don't always need the full
VideoDecoderConfig.
BUG=none
Review URL: https://codereview.chromium.org/1333573003
Cr-Commit-Position: refs/heads/master@{#347961}
Diffstat (limited to 'media/base/video_decoder_config.h')
-rw-r--r-- | media/base/video_decoder_config.h | 53 |
1 files changed, 1 insertions, 52 deletions
diff --git a/media/base/video_decoder_config.h b/media/base/video_decoder_config.h index abc1de8..0dae77c8 100644 --- a/media/base/video_decoder_config.h +++ b/media/base/video_decoder_config.h @@ -10,64 +10,13 @@ #include "base/basictypes.h" #include "media/base/media_export.h" +#include "media/base/video_codecs.h" #include "media/base/video_types.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h" namespace media { -enum VideoCodec { - // These values are histogrammed over time; do not change their ordinal - // values. When deleting a codec replace it with a dummy value; when adding a - // codec, do so at the bottom (and update kVideoCodecMax). - kUnknownVideoCodec = 0, - kCodecH264, - kCodecVC1, - kCodecMPEG2, - kCodecMPEG4, - kCodecTheora, - kCodecVP8, - kCodecVP9, - kCodecHEVC, - // DO NOT ADD RANDOM VIDEO CODECS! - // - // The only acceptable time to add a new codec is if there is production code - // that uses said codec in the same CL. - - kVideoCodecMax = kCodecHEVC // Must equal the last "real" codec above. -}; - -// Video stream profile. This *must* match PP_VideoDecoder_Profile. -// (enforced in webkit/plugins/ppapi/ppb_video_decoder_impl.cc) and -// gpu::VideoCodecProfile. -enum VideoCodecProfile { - // Keep the values in this enum unique, as they imply format (h.264 vs. VP8, - // for example), and keep the values for a particular format grouped - // together for clarity. - VIDEO_CODEC_PROFILE_UNKNOWN = -1, - VIDEO_CODEC_PROFILE_MIN = VIDEO_CODEC_PROFILE_UNKNOWN, - H264PROFILE_MIN = 0, - H264PROFILE_BASELINE = H264PROFILE_MIN, - H264PROFILE_MAIN = 1, - H264PROFILE_EXTENDED = 2, - H264PROFILE_HIGH = 3, - H264PROFILE_HIGH10PROFILE = 4, - H264PROFILE_HIGH422PROFILE = 5, - H264PROFILE_HIGH444PREDICTIVEPROFILE = 6, - H264PROFILE_SCALABLEBASELINE = 7, - H264PROFILE_SCALABLEHIGH = 8, - H264PROFILE_STEREOHIGH = 9, - H264PROFILE_MULTIVIEWHIGH = 10, - H264PROFILE_MAX = H264PROFILE_MULTIVIEWHIGH, - VP8PROFILE_MIN = 11, - VP8PROFILE_ANY = VP8PROFILE_MIN, - VP8PROFILE_MAX = VP8PROFILE_ANY, - VP9PROFILE_MIN = 12, - VP9PROFILE_ANY = VP9PROFILE_MIN, - VP9PROFILE_MAX = VP9PROFILE_ANY, - VIDEO_CODEC_PROFILE_MAX = VP9PROFILE_MAX, -}; - MEDIA_EXPORT VideoCodec VideoCodecProfileToVideoCodec(VideoCodecProfile profile); |