Index: gpu/config/gpu_info.h |
diff --git a/gpu/config/gpu_info.h b/gpu/config/gpu_info.h |
index 8003c930b6930b98e890339d3a2c0339b14501e2..e5e5400fa1aac7c3997d2ea7833d391596561f1a 100644 |
--- a/gpu/config/gpu_info.h |
+++ b/gpu/config/gpu_info.h |
@@ -40,19 +40,23 @@ enum VideoCodecProfile { |
VIDEO_CODEC_PROFILE_UNKNOWN = -1, |
VIDEO_CODEC_PROFILE_MIN = VIDEO_CODEC_PROFILE_UNKNOWN, |
H264PROFILE_BASELINE = 0, |
- 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, |
- VP8PROFILE_ANY = 11, |
- VP9PROFILE_ANY = 12, |
- VIDEO_CODEC_PROFILE_MAX = VP9PROFILE_ANY, |
+ H264PROFILE_MAIN, |
+ H264PROFILE_EXTENDED, |
+ H264PROFILE_HIGH, |
+ H264PROFILE_HIGH10PROFILE, |
+ H264PROFILE_HIGH422PROFILE, |
+ H264PROFILE_HIGH444PREDICTIVEPROFILE, |
+ H264PROFILE_SCALABLEBASELINE, |
+ H264PROFILE_SCALABLEHIGH, |
+ H264PROFILE_STEREOHIGH, |
+ H264PROFILE_MULTIVIEWHIGH, |
+ VP8PROFILE_ANY, |
+ VP9PROFILE_ANY, |
+ // 4 profile values are reserved for VP9 profiles. |
+ HEVCPROFILE_MAIN = VP9PROFILE_ANY + 4, //=16 |
ddorwin
2016/03/02 01:36:38
Just remove the 16 entirely. It could rot (althoug
servolk
2016/03/02 01:47:45
I'm starting to think that maybe it would be best
ddorwin
2016/03/03 22:00:21
I'm hesitant to define things we don't use, though
DaleCurtis
2016/03/03 22:05:32
Sergey, you say "the 4 VP9 profiles" above. Do we
DaleCurtis
2016/03/03 22:17:20
Thanks for the link. Lets just include those here
ddorwin
2016/03/03 22:21:17
VP9PROFILE_ANY appears 23 times [1]. We should pro
|
+ HEVCPROFILE_MAIN10, |
+ HEVCPROFILE_MAIN_STILL_PICTURE, |
+ VIDEO_CODEC_PROFILE_MAX = HEVCPROFILE_MAIN_STILL_PICTURE, |
}; |
// Specification of a decoding profile supported by a hardware decoder. |