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

Unified Diff: media/base/video_decoder_config.h

Issue 11578046: Revert 174311 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/media_switches.cc ('k') | media/ffmpeg/ffmpeg_common.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/video_decoder_config.h
===================================================================
--- media/base/video_decoder_config.h (revision 174345)
+++ media/base/video_decoder_config.h (working copy)
@@ -27,13 +27,12 @@
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 = kCodecVP9 // Must equal the last "real" codec above.
+ kVideoCodecMax = kCodecVP8 // Must equal the last "real" codec above.
};
// Video stream profile. This *must* match PP_VideoDecoder_Profile.
@@ -59,10 +58,7 @@
VP8PROFILE_MIN = 11,
VP8PROFILE_MAIN = VP8PROFILE_MIN,
VP8PROFILE_MAX = VP8PROFILE_MAIN,
- VP9PROFILE_MIN = 12,
- VP9PROFILE_MAIN = VP9PROFILE_MIN,
- VP9PROFILE_MAX = VP9PROFILE_MAIN,
- VIDEO_CODEC_PROFILE_MAX = VP9PROFILE_MAX,
+ VIDEO_CODEC_PROFILE_MAX = VP8PROFILE_MAX,
};
class MEDIA_EXPORT VideoDecoderConfig {
« no previous file with comments | « media/base/media_switches.cc ('k') | media/ffmpeg/ffmpeg_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698