Commit: 5482dc227671f5d64aa09f0af5c6001d6cab7678 - hardware-intel-intel-driver (git)

hardware/intel/intel-driver

Commit MetaInfo

• Revisión: 5482dc227671f5d64aa09f0af5c6001d6cab7678 (tree)
• Tiempo: 2014-12-14 01:42:17
• Autor: Xiang, Haihao <haihao.xiang@inte...>
• Commiter: Xiang, Haihao

Log Message

HEVC: update frame store index

Signed-off-by: Xiang, Haihao <[e-mail]>
(cherry picked from commit 6f3f9d024a5b000ae86b2b85d35b6e3679903f5d)

Cambiar Resumen

• modified: src/gen9_mfd.c
• modified: src/gen9_mfd.h
• modified: src/i965_decoder_utils.c
• modified: src/i965_decoder_utils.h
• modified: src/intel_media.h

Diferencia incremental

--- a/src/gen9_mfd.c
+++ b/src/gen9_mfd.c
@@ -77,6 +77,7 @@ gen9_hcpd_init_hevc_surface(VADriverContextP ctx,
 
     if (!gen9_hevc_surface) {
         gen9_hevc_surface = calloc(sizeof(GenHevcSurface), 1);
+        gen9_hevc_surface->base.frame_store_id = -1;
         obj_surface->private_data = gen9_hevc_surface;
     }
 
@@ -127,6 +128,11 @@ gen9_hcpd_hevc_decode_init(VADriverContextP ctx,
 
     assert(decode_state->pic_param && decode_state->pic_param->buffer);
     pic_param = (VAPictureParameterBufferHEVC *)decode_state->pic_param->buffer;
+    intel_update_hevc_frame_store_index(ctx,
+                                        decode_state,
+                                        pic_param,
+                                        gen9_hcpd_context->reference_surfaces,
+                                        &gen9_hcpd_context->fs_ctx);
 
     gen9_hcpd_context->picture_width_in_pixels = pic_param->pic_width_in_luma_samples;
     gen9_hcpd_context->picture_height_in_pixels = pic_param->pic_height_in_luma_samples;

--- a/src/gen9_mfd.h
+++ b/src/gen9_mfd.h
@@ -41,6 +41,8 @@ struct gen9_hcpd_context
 {
     struct hw_context base;
 
+    GenFrameStoreContext fs_ctx;
+
     GenFrameStore reference_surfaces[MAX_GEN_HCP_REFERENCE_FRAMES];
 
     VAIQMatrixBufferHEVC  iq_matrix_hevc;

--- a/src/i965_decoder_utils.c
+++ b/src/i965_decoder_utils.c
@@ -671,6 +671,23 @@ intel_update_avc_frame_store_index(
 }
 
 void
+intel_update_hevc_frame_store_index(
+    VADriverContextP              ctx,
+    struct decode_state          *decode_state,
+    VAPictureParameterBufferHEVC *pic_param,
+    GenFrameStore                 frame_store[MAX_GEN_HCP_REFERENCE_FRAMES],
+    GenFrameStoreContext         *fs_ctx
+    )
+{
+    intel_update_codec_frame_store_index(ctx,
+                                         decode_state,
+                                         pic_param->CurrPic.pic_order_cnt,
+                                         frame_store,
+                                         MAX_GEN_HCP_REFERENCE_FRAMES,
+                                         fs_ctx);
+}
+
+void
 gen75_update_avc_frame_store_index(
     VADriverContextP              ctx,
     struct decode_state          *decode_state,

--- a/src/i965_decoder_utils.h
+++ b/src/i965_decoder_utils.h
@@ -111,6 +111,15 @@ intel_update_avc_frame_store_index(
 );
 
 void
+intel_update_hevc_frame_store_index(
+    VADriverContextP              ctx,
+    struct decode_state          *decode_state,
+    VAPictureParameterBufferHEVC *pic_param,
+    GenFrameStore                 frame_store[MAX_GEN_HCP_REFERENCE_FRAMES],
+    GenFrameStoreContext         *fs_ctx
+);
+
+void
 gen75_update_avc_frame_store_index(
     VADriverContextP                    ctx,
     struct decode_state                *decode_state,

--- a/src/intel_media.h
+++ b/src/intel_media.h
@@ -55,6 +55,7 @@ extern int intel_format_convert(float src, int out_int_bits, int out_frac_bits,i
 typedef struct gen_hevc_surface GenHevcSurface;
 struct gen_hevc_surface
 {
+    GenCodecSurface base;
     dri_bo *motion_vector_temporal_bo;
 };