Add support for VDEnc VP9 CQP mode on CNL

[android-x86/hardware-intel-common-vaapi.git] / src / gen9_mfc.c

diff --git a/src/gen9_mfc.c b/src/gen9_mfc.c
index ce038b1..8a5e090 100644 (file)
--- a/src/gen9_mfc.c
+++ b/src/gen9_mfc.c
@@ -42,11 +42,19 @@
 #include "gen9_mfc.h"
 #include "gen9_vdenc.h"
 #include "gen9_vp9_encapi.h"
+#include "i965_encoder_api.h"
+
+extern Bool i965_encoder_vp8_pak_context_init(VADriverContextP ctx, struct intel_encoder_context *encoder_context);
+extern Bool gen10_vdenc_vp9_context_init(VADriverContextP ctx, struct intel_encoder_context *encoder_context);
 
 Bool gen9_mfc_context_init(VADriverContextP ctx, struct intel_encoder_context *encoder_context)
 {
+    struct i965_driver_data *i965 = i965_driver_data(ctx);
+
     switch (encoder_context->codec) {
     case CODEC_VP8:
+        return i965_encoder_vp8_pak_context_init(ctx, encoder_context);
+
     case CODEC_MPEG2:
     case CODEC_JPEG:
         return gen8_mfc_context_init(ctx, encoder_context);
@@ -56,13 +64,20 @@ Bool gen9_mfc_context_init(VADriverContextP ctx, struct intel_encoder_context *e
         if (encoder_context->low_power_mode)
             return gen9_vdenc_context_init(ctx, encoder_context);
         else
-            return gen8_mfc_context_init(ctx, encoder_context);
+            return gen9_avc_pak_context_init(ctx, encoder_context);
 
     case CODEC_HEVC:
-        return gen9_hcpe_context_init(ctx, encoder_context);
+        if (IS_GEN10(i965->intel.device_info))
+            return gen10_hevc_pak_context_init(ctx, encoder_context);
+        else
+            return gen9_hevc_pak_context_init(ctx, encoder_context);
 
     case CODEC_VP9:
-        return gen9_vp9_pak_context_init(ctx, encoder_context);
+        if (encoder_context->low_power_mode) {
+            assert(IS_GEN10(i965->intel.device_info));
+            return gen10_vdenc_vp9_context_init(ctx, encoder_context);
+        } else
+            return gen9_vp9_pak_context_init(ctx, encoder_context);
     }
 
     /* Other profile/entrypoint pairs never get here, see gen9_enc_hw_context_init() */