From b1b36a44a4b761a81b59f6109fc5272f33b2600c Mon Sep 17 00:00:00 2001
From: Matteo Valdina <matteo.valdina@gmail.com>
Date: Mon, 24 Sep 2018 16:54:29 -0500
Subject: [PATCH] libs: h264: Update level table to "Recommendation H.264
 (04/17)".
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added level 6, 6.1 and 6.2. Reference Table A-1 – Level limits
from T-REC-H.264-201704.

https://bugzilla.gnome.org/show_bug.cgi?id=797202
---
 gst-libs/gst/vaapi/gstvaapiutils_h264.c | 10 ++++++++--
 gst-libs/gst/vaapi/gstvaapiutils_h264.h |  6 ++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/gst-libs/gst/vaapi/gstvaapiutils_h264.c b/gst-libs/gst/vaapi/gstvaapiutils_h264.c
index 19bfae95be..fa09ef4714 100644
--- a/gst-libs/gst/vaapi/gstvaapiutils_h264.c
+++ b/gst-libs/gst/vaapi/gstvaapiutils_h264.c
@@ -70,6 +70,9 @@ static const struct map gst_vaapi_h264_level_map[] = {
   { GST_VAAPI_LEVEL_H264_L5,    "5"     },
   { GST_VAAPI_LEVEL_H264_L5_1,  "5.1"   },
   { GST_VAAPI_LEVEL_H264_L5_2,  "5.2"   },
+  { GST_VAAPI_LEVEL_H264_L6,    "6"     },
+  { GST_VAAPI_LEVEL_H264_L6_1,  "6.1"   },
+  { GST_VAAPI_LEVEL_H264_L6_2,  "6.2"   },
   { 0, NULL }
 /* *INDENT-ON* */
 };
@@ -95,6 +98,9 @@ static const GstVaapiH264LevelLimits gst_vaapi_h264_level_limits[] = {
   { GST_VAAPI_LEVEL_H264_L5,    50,   589824,  22080, 110400, 135000, 135000, 2 },
   { GST_VAAPI_LEVEL_H264_L5_1,  51,   983040,  36864, 184320, 240000, 240000, 2 },
   { GST_VAAPI_LEVEL_H264_L5_2,  52,  2073600,  36864, 184320, 240000, 240000, 2 },
+  { GST_VAAPI_LEVEL_H264_L6,    60,  4177920, 139264, 696320, 240000, 240000, 2 },
+  { GST_VAAPI_LEVEL_H264_L6_1,  61,  8355840, 139264, 696320, 480000, 480000, 2 },
+  { GST_VAAPI_LEVEL_H264_L6_2,  62, 16711680, 139264, 696320, 800000, 800000, 2 },
   { 0, }
 };
 /* *INDENT-ON* */
@@ -322,7 +328,7 @@ not_found:
 const gchar *
 gst_vaapi_utils_h264_get_level_string (GstVaapiLevelH264 level)
 {
-  if (level < GST_VAAPI_LEVEL_H264_L1 || level > GST_VAAPI_LEVEL_H264_L5_2)
+  if (level < GST_VAAPI_LEVEL_H264_L1 || level > GST_VAAPI_LEVEL_H264_L6_2)
     return NULL;
   return gst_vaapi_h264_level_map[level - GST_VAAPI_LEVEL_H264_L1].name;
 }
@@ -331,7 +337,7 @@ gst_vaapi_utils_h264_get_level_string (GstVaapiLevelH264 level)
 const GstVaapiH264LevelLimits *
 gst_vaapi_utils_h264_get_level_limits (GstVaapiLevelH264 level)
 {
-  if (level < GST_VAAPI_LEVEL_H264_L1 || level > GST_VAAPI_LEVEL_H264_L5_2)
+  if (level < GST_VAAPI_LEVEL_H264_L1 || level > GST_VAAPI_LEVEL_H264_L6_2)
     return NULL;
   return &gst_vaapi_h264_level_limits[level - GST_VAAPI_LEVEL_H264_L1];
 }
diff --git a/gst-libs/gst/vaapi/gstvaapiutils_h264.h b/gst-libs/gst/vaapi/gstvaapiutils_h264.h
index 057705033d..38d1341957 100644
--- a/gst-libs/gst/vaapi/gstvaapiutils_h264.h
+++ b/gst-libs/gst/vaapi/gstvaapiutils_h264.h
@@ -45,6 +45,9 @@ G_BEGIN_DECLS
  * @GST_VAAPI_LEVEL_H264_L5: H.264 level 5.
  * @GST_VAAPI_LEVEL_H264_L5_1: H.264 level 5.1.
  * @GST_VAAPI_LEVEL_H264_L5_2: H.264 level 5.2.
+ * @GST_VAAPI_LEVEL_H264_L6: H.264 level 6.
+ * @GST_VAAPI_LEVEL_H264_L6_1: H.264 level 6.1.
+ * @GST_VAAPI_LEVEL_H264_L6_2: H.264 level 6.2.
  *
  * The set of all levels for #GstVaapiLevelH264.
  */
@@ -66,6 +69,9 @@ typedef enum {
   GST_VAAPI_LEVEL_H264_L5,
   GST_VAAPI_LEVEL_H264_L5_1,
   GST_VAAPI_LEVEL_H264_L5_2,
+  GST_VAAPI_LEVEL_H264_L6,
+  GST_VAAPI_LEVEL_H264_L6_1,
+  GST_VAAPI_LEVEL_H264_L6_2,
 } GstVaapiLevelH264;
 
 /* Returns a relative score for the supplied GstVaapiProfile */