Chromium Code Reviews| Index: media/base/video_decoder_config.h |
| diff --git a/media/base/video_decoder_config.h b/media/base/video_decoder_config.h |
| index b5ac79210c6076f034f67b758824f633bb32a1e2..958192c06feccbd8b0fc66de783716d707a65c85 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, |
|
scherkus (not reviewing)
2012/12/14 21:32:41
do you have to update webkit/plugins/ppapi/ppb_vid
Tom Finegan
2012/12/15 06:13:30
Not for M25.
|
| + VP9PROFILE_MAIN = VP9PROFILE_MIN, |
| + VP9PROFILE_MAX = VP9PROFILE_MAIN, |
| + VIDEO_CODEC_PROFILE_MAX = VP9PROFILE_MAX, |
| }; |
| class MEDIA_EXPORT VideoDecoderConfig { |