Module: Mesa Branch: main Commit: 114c35cb0cc2613586ddf71764e68f4bb9e9ef9c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=114c35cb0cc2613586ddf71764e68f4bb9e9ef9c
Author: Sil Vilerino <[email protected]> Date: Mon Apr 17 12:56:01 2023 -0400 frontend/va: Add H264 decode slice data Reviewed-by: Giancarlo Devich <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22541> --- src/gallium/frontends/va/picture_h264.c | 34 +++++++++++++++++++++++++++++++- src/gallium/include/pipe/p_video_state.h | 9 +++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/src/gallium/frontends/va/picture_h264.c b/src/gallium/frontends/va/picture_h264.c index 04241a4c346..8f334d30f90 100644 --- a/src/gallium/frontends/va/picture_h264.c +++ b/src/gallium/frontends/va/picture_h264.c @@ -174,6 +174,12 @@ void vlVaHandlePictureParameterBufferH264(vlVaDriver *drv, vlVaContext *context, /* Make sure remaining elements are clean */ for (; i < 16; ++i) resetReferencePictureDesc(&context->desc.h264, i); + + context->desc.h264.slice_parameter.slice_info_present = false; + memset(context->desc.h264.slice_parameter.slice_data_flag, 0, sizeof(context->desc.h264.slice_parameter.slice_data_flag)); + memset(context->desc.h264.slice_parameter.slice_data_offset, 0, sizeof(context->desc.h264.slice_parameter.slice_data_offset)); + memset(context->desc.h264.slice_parameter.slice_data_size, 0, sizeof(context->desc.h264.slice_parameter.slice_data_size)); + } void vlVaHandleIQMatrixBufferH264(vlVaContext *context, vlVaBuffer *buf) @@ -190,9 +196,35 @@ void vlVaHandleSliceParameterBufferH264(vlVaContext *context, vlVaBuffer *buf) VASliceParameterBufferH264 *h264 = buf->data; assert(buf->size >= sizeof(VASliceParameterBufferH264) && buf->num_elements == 1); - context->desc.h264.slice_count += buf->num_elements; context->desc.h264.num_ref_idx_l0_active_minus1 = h264->num_ref_idx_l0_active_minus1; context->desc.h264.num_ref_idx_l1_active_minus1 = h264->num_ref_idx_l1_active_minus1; + + ASSERTED const size_t max_pipe_h264_slices = ARRAY_SIZE(context->desc.h264.slice_parameter.slice_data_offset); + assert(context->desc.h264.slice_count < max_pipe_h264_slices); + + context->desc.h264.slice_parameter.slice_info_present = true; + context->desc.h264.slice_parameter.slice_data_size[context->desc.h264.slice_count] = h264->slice_data_size; + context->desc.h264.slice_parameter.slice_data_offset[context->desc.h264.slice_count] = h264->slice_data_offset; + + switch (h264->slice_data_flag) { + case VA_SLICE_DATA_FLAG_ALL: + context->desc.h264.slice_parameter.slice_data_flag[context->desc.h264.slice_count] = PIPE_SLICE_BUFFER_PLACEMENT_TYPE_WHOLE; + break; + case VA_SLICE_DATA_FLAG_BEGIN: + context->desc.h264.slice_parameter.slice_data_flag[context->desc.h264.slice_count] = PIPE_SLICE_BUFFER_PLACEMENT_TYPE_BEGIN; + break; + case VA_SLICE_DATA_FLAG_MIDDLE: + context->desc.h264.slice_parameter.slice_data_flag[context->desc.h264.slice_count] = PIPE_SLICE_BUFFER_PLACEMENT_TYPE_MIDDLE; + break; + case VA_SLICE_DATA_FLAG_END: + context->desc.h264.slice_parameter.slice_data_flag[context->desc.h264.slice_count] = PIPE_SLICE_BUFFER_PLACEMENT_TYPE_END; + break; + default: + break; + } + + /* assert(buf->num_elements == 1) above; */ + context->desc.h264.slice_count += buf->num_elements; } diff --git a/src/gallium/include/pipe/p_video_state.h b/src/gallium/include/pipe/p_video_state.h index fe5ea62d57d..2bce17b8e7e 100644 --- a/src/gallium/include/pipe/p_video_state.h +++ b/src/gallium/include/pipe/p_video_state.h @@ -390,6 +390,15 @@ struct pipe_h264_picture_desc /* using private as a parameter name conflicts with C++ keywords */ void *priv; + + struct + { + bool slice_info_present; + uint32_t slice_count; + uint32_t slice_data_size[128]; + uint32_t slice_data_offset[128]; + enum pipe_slice_buffer_placement_type slice_data_flag[128]; + } slice_parameter; }; struct pipe_enc_quality_modes
