summaryrefslogtreecommitdiffstats
path: root/media/base/video_decoder_config.h
diff options
context:
space:
mode:
authortomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-21 01:38:59 +0000
committertomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-21 01:38:59 +0000
commitf0811ff16e139a5d7eaaf78cad55d0ed1926863b (patch)
tree098dd80ff9580cde77f959d694405134d5133c4d /media/base/video_decoder_config.h
parent3507cc7914911e274911141e37b2cee9cb31c58d (diff)
downloadchromium_src-f0811ff16e139a5d7eaaf78cad55d0ed1926863b.zip
chromium_src-f0811ff16e139a5d7eaaf78cad55d0ed1926863b.tar.gz
chromium_src-f0811ff16e139a5d7eaaf78cad55d0ed1926863b.tar.bz2
Add wrapper class to media for support of VP9 video, and add a command line flag to enable the support.
This initial version of the wrapper provides support for decoding VP9 video in WebM container files, and is disabled by default. New flag added: --enable-vp9-playback BUG=166094 TEST=VP9 video in WebM containers plays back in <video> elements when --enable-vp9-playback is specified on the command line. Review URL: https://chromiumcodereview.appspot.com/11468018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174311 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/video_decoder_config.h')
-rw-r--r--media/base/video_decoder_config.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/media/base/video_decoder_config.h b/media/base/video_decoder_config.h
index b5ac792..958192c 100644
--- a/media/base/video_decoder_config.h
+++ b/media/base/video_decoder_config.h
@@ -27,12 +27,13 @@ enum VideoCodec {
kCodecMPEG4,
kCodecTheora,
kCodecVP8,
+ kCodecVP9,
// 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 = kCodecVP8 // Must equal the last "real" codec above.
+ kVideoCodecMax = kCodecVP9 // Must equal the last "real" codec above.
};
// Video stream profile. This *must* match PP_VideoDecoder_Profile.
@@ -58,7 +59,10 @@ enum VideoCodecProfile {
VP8PROFILE_MIN = 11,
VP8PROFILE_MAIN = VP8PROFILE_MIN,
VP8PROFILE_MAX = VP8PROFILE_MAIN,
- VIDEO_CODEC_PROFILE_MAX = VP8PROFILE_MAX,
+ VP9PROFILE_MIN = 12,
+ VP9PROFILE_MAIN = VP9PROFILE_MIN,
+ VP9PROFILE_MAX = VP9PROFILE_MAIN,
+ VIDEO_CODEC_PROFILE_MAX = VP9PROFILE_MAX,
};
class MEDIA_EXPORT VideoDecoderConfig {