Code cleanup for vme/mfc initializing on SKL

It keeps i965_encoder.c simple

v2: rebased

Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
Reviewed-by: Zhao Yakui <yakui.zhao@intel.com>

1 files changed, 19 insertions, 6 deletions

diff --git a/src/gen9_mfc.c b/src/gen9_mfc.c
index b3d6e78c..ce038b1f 100644
--- a/src/gen9_mfc.c
+++ b/src/gen9_mfc.c
@@ -39,18 +39,31 @@
 #include "i965_drv_video.h"
 #include "i965_encoder.h"
 #include "gen6_mfc.h"
+#include "gen9_mfc.h"
+#include "gen9_vdenc.h"
+#include "gen9_vp9_encapi.h"
 
 Bool gen9_mfc_context_init(VADriverContextP ctx, struct intel_encoder_context *encoder_context)
 {
-    if ((encoder_context->codec == CODEC_H264) ||
-        (encoder_context->codec == CODEC_H264_MVC)) {
+    switch (encoder_context->codec) {
+    case CODEC_VP8:
+    case CODEC_MPEG2:
+    case CODEC_JPEG:
+        return gen8_mfc_context_init(ctx, encoder_context);
+
+    case CODEC_H264:
+    case CODEC_H264_MVC:
+        if (encoder_context->low_power_mode)
+            return gen9_vdenc_context_init(ctx, encoder_context);
+        else
             return gen8_mfc_context_init(ctx, encoder_context);
-    }
 
+    case CODEC_HEVC:
+        return gen9_hcpe_context_init(ctx, encoder_context);
 
-    if ((encoder_context->codec == CODEC_VP8) ||
-        (encoder_context->codec == CODEC_MPEG2))
-        return gen8_mfc_context_init(ctx, encoder_context);
+    case CODEC_VP9:
+        return gen9_vp9_pak_context_init(ctx, encoder_context);
+    }
 
     /* Other profile/entrypoint pairs never get here, see gen9_enc_hw_context_init() */
     assert(0);