Add support for H.264 levels 6, 6.1 and 6.2

Fixes #307.

Signed-off-by: Mark Thompson <sw@jkqxz.net>

diff --git a/src/i965_avc_encoder_common.c b/src/i965_avc_encoder_common.c
index 657732d..c3f69e3 100644 (file)
--- a/src/i965_avc_encoder_common.c
+++ b/src/i965_avc_encoder_common.c
@@ -54,6 +54,9 @@ static const struct avc_level_limits {
     { INTEL_AVC_LEVEL_5,    589824,  22080,  110400,  512, 16 },
     { INTEL_AVC_LEVEL_51,   983040,  36864,  184320,  512, 16 },
     { INTEL_AVC_LEVEL_52,  2073600,  36864,  184320,  512, 16 },
+    { INTEL_AVC_LEVEL_6,   4177920, 139264,  696320, 8192, 16 },
+    { INTEL_AVC_LEVEL_61,  8355840, 139264,  696320, 8192, 16 },
+    { INTEL_AVC_LEVEL_62, 16711680, 139264,  696320, 8192, 16 },
 };
 
 static const struct avc_level_limits*

diff --git a/src/i965_avc_encoder_common.h b/src/i965_avc_encoder_common.h
index a4f7062..c42a4a5 100644 (file)
--- a/src/i965_avc_encoder_common.h
+++ b/src/i965_avc_encoder_common.h
@@ -95,7 +95,10 @@ typedef enum {
     INTEL_AVC_LEVEL_42                   = 42,
     INTEL_AVC_LEVEL_5                    = 50,
     INTEL_AVC_LEVEL_51                   = 51,
-    INTEL_AVC_LEVEL_52                   = 52
+    INTEL_AVC_LEVEL_52                   = 52,
+    INTEL_AVC_LEVEL_6                    = 60,
+    INTEL_AVC_LEVEL_61                   = 61,
+    INTEL_AVC_LEVEL_62                   = 62,
 } INTEL_AVC_LEVEL_IDC;
 
 /*