[vlc-commits] qsv: use the SDK defines for unknown values and other hardcoded values

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at videolabs.io> | Fri Sep  1 08:18:45 2017 +0200| [200e2930eed68a69bb3c7f05c6bbe3e623a73b41] | committer: Steve Lhomme

qsv: use the SDK defines for unknown values and other hardcoded values

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=200e2930eed68a69bb3c7f05c6bbe3e623a73b41
---

 modules/codec/qsv.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/codec/qsv.c b/modules/codec/qsv.c
index 21706391ab..2b2528e990 100644
--- a/modules/codec/qsv.c
+++ b/modules/codec/qsv.c
@@ -154,31 +154,35 @@ static void     Close(vlc_object_t *);
      "MPEG2 needs at least 1 here.")
 
 static const int const profile_h264_list[] =
-      { 0, MFX_PROFILE_AVC_CONSTRAINED_BASELINE, MFX_PROFILE_AVC_MAIN,
+      { MFX_PROFILE_UNKNOWN, MFX_PROFILE_AVC_CONSTRAINED_BASELINE, MFX_PROFILE_AVC_MAIN,
       MFX_PROFILE_AVC_EXTENDED, MFX_PROFILE_AVC_HIGH };
 static const char *const profile_h264_text[] =
     { "decide", "baseline", "main", "extended", "high" };
 
 static const int const profile_mpeg2_list[] =
-    { 0, MFX_PROFILE_MPEG2_SIMPLE, MFX_PROFILE_MPEG2_MAIN,
+    { MFX_PROFILE_UNKNOWN, MFX_PROFILE_MPEG2_SIMPLE, MFX_PROFILE_MPEG2_MAIN,
       MFX_PROFILE_MPEG2_HIGH };
 static const char *const profile_mpeg2_text[] =
     { "decide", "simple", "main", "high" };
 
 static const int const level_h264_list[] =
-    { 0, 10, 9, 12, 13, 20, 21, 22, 30, 31, 32, 40, 41,   42,   50, 51, 52};
+    { MFX_LEVEL_UNKNOWN, MFX_LEVEL_AVC_1, MFX_LEVEL_AVC_1b, MFX_LEVEL_AVC_12,
+      MFX_LEVEL_AVC_13, MFX_LEVEL_AVC_2, MFX_LEVEL_AVC_21, MFX_LEVEL_AVC_22,
+      MFX_LEVEL_AVC_3, MFX_LEVEL_AVC_31, MFX_LEVEL_AVC_32, MFX_LEVEL_AVC_4,
+      MFX_LEVEL_AVC_41, MFX_LEVEL_AVC_42, MFX_LEVEL_AVC_5, MFX_LEVEL_AVC_51,
+      MFX_LEVEL_AVC_52};
 static const char *const level_h264_text[] =
     { "decide", "1", "1.1b", "1.2", "1.3", "2", "2.1", "2.2", "3", "3.1",
       "3.2", "4", "4.1",   "4.2",   "5", "5.1", "5.2" };
 
 static const int const level_mpeg2_list[] =
-    { 0, MFX_LEVEL_MPEG2_LOW, MFX_LEVEL_MPEG2_MAIN,
+    { MFX_LEVEL_UNKNOWN, MFX_LEVEL_MPEG2_LOW, MFX_LEVEL_MPEG2_MAIN,
       MFX_LEVEL_MPEG2_HIGH, MFX_LEVEL_MPEG2_HIGH1440 };
 static const char *const level_mpeg2_text[] =
     { "decide", "low", "main", "high", "high1440" };
 
 static const int const target_usage_list[] =
-    { 0, MFX_TARGETUSAGE_BEST_QUALITY, MFX_TARGETUSAGE_BALANCED,
+    { MFX_TARGETUSAGE_UNKNOWN, MFX_TARGETUSAGE_BEST_QUALITY, MFX_TARGETUSAGE_BALANCED,
       MFX_TARGETUSAGE_BEST_SPEED };
 static const char *const target_usage_text[] =
     { "decide", "quality", "balanced", "speed" };