コミット: 9170fed321780f394e8eae4a789c31120c4e957c - hardware-intel-intel-driver (git)

hardware/intel/intel-driver

コミットメタ情報

• リビジョン: 9170fed321780f394e8eae4a789c31120c4e957c (tree)
• 日時: 2015-09-06 13:32:31
• 作者: Xiang, Haihao <haihao.xiang@inte...>
• コミッター: Xiang, Haihao

ログメッセージ

encode/hevc: Check slice type first in case user passes wrong parameters to driver

Signed-off-by: Xiang, Haihao <[e-mail]>

変更サマリ

• modified: src/i965_encoder.c

差分

--- a/src/i965_encoder.c
+++ b/src/i965_encoder.c
@@ -497,6 +497,7 @@ intel_encoder_check_hevc_parameter(VADriverContextP ctx,
     struct object_surface *obj_surface;	
     struct object_buffer *obj_buffer;
     VAEncPictureParameterBufferHEVC *pic_param = (VAEncPictureParameterBufferHEVC *)encode_state->pic_param_ext->buffer;
+    VAEncSliceParameterBufferHEVC *slice_param;
     int i;
 
     assert(!(pic_param->decoded_curr_pic.flags & VA_PICTURE_HEVC_INVALID));
@@ -539,7 +540,18 @@ intel_encoder_check_hevc_parameter(VADriverContextP ctx,
 
     for ( ; i < 15; i++)
         encode_state->reference_objects[i] = NULL;
-    
+
+    for (i = 0; i < encode_state->num_slice_params_ext; i++) {
+        slice_param = (VAEncSliceParameterBufferHEVC *)encode_state->slice_params_ext[i]->buffer;
+
+        if (slice_param->slice_type != HEVC_SLICE_I &&
+            slice_param->slice_type != HEVC_SLICE_P &&
+            slice_param->slice_type != HEVC_SLICE_B)
+            goto error;
+
+        /* TODO: add more check here */
+    }
+
     return VA_STATUS_SUCCESS;
 
 error: