From 7e474e7bf971adeb5cd16f0673ea13f90a30870d Mon Sep 17 00:00:00 2001 From: Pengfei Qu Date: Tue, 18 Apr 2017 11:12:23 +0800 Subject: [PATCH] Enc: support AVC MVC encoder on SKL/APL/KBL Fixes #143 Signed-off-by: Pengfei Qu (cherry picked from commit bd3b97795f23f037418e7f830150c3a4d420cbfb) Conflicts: src/i965_device_info.c --- src/gen9_avc_encoder.c | 2 ++ src/i965_device_info.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gen9_avc_encoder.c b/src/gen9_avc_encoder.c index bcf89fd..f1bf8ea 100644 --- a/src/gen9_avc_encoder.c +++ b/src/gen9_avc_encoder.c @@ -7699,6 +7699,8 @@ gen9_avc_pak_pipeline(VADriverContextP ctx, case VAProfileH264ConstrainedBaseline: case VAProfileH264Main: case VAProfileH264High: + case VAProfileH264MultiviewHigh: + case VAProfileH264StereoHigh: vaStatus = gen9_avc_encode_picture(ctx, profile, encode_state, encoder_context); break; diff --git a/src/i965_device_info.c b/src/i965_device_info.c index f11572c..b838017 100644 --- a/src/i965_device_info.c +++ b/src/i965_device_info.c @@ -359,7 +359,7 @@ static struct hw_codec_info skl_hw_codec_info = { .has_di_motion_compensated = 1, .has_vp8_decoding = 1, .has_vp8_encoding = 1, - .has_h264_mvc_encoding = 0, + .has_h264_mvc_encoding = 1, .has_hevc_decoding = 1, .has_hevc_encoding = 1, .has_lp_h264_encoding = 1, @@ -414,7 +414,7 @@ static struct hw_codec_info bxt_hw_codec_info = { .has_di_motion_compensated = 1, .has_vp8_decoding = 1, .has_vp8_encoding = 1, - .has_h264_mvc_encoding = 0, + .has_h264_mvc_encoding = 1, .has_hevc_decoding = 1, .has_hevc_encoding = 1, .has_hevc10_decoding = 1, @@ -475,7 +475,7 @@ static struct hw_codec_info kbl_hw_codec_info = { .has_di_motion_compensated = 1, .has_vp8_decoding = 1, .has_vp8_encoding = 1, - .has_h264_mvc_encoding = 0, + .has_h264_mvc_encoding = 1, .has_hevc_decoding = 1, .has_hevc_encoding = 1, .has_hevc10_encoding = 1, -- 2.11.0