fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-02 16:00:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

frontends/va: Remove fallback if app doesn't enable packed headers

Browse source 
This was only a best effort fallback and it doesn't always work.
Driver is expected to only output slice NALs when packed headers
are not enabled, so let's just do that.

Reviewed-by: Ruijing Dong <ruijing.dong@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31126>
This commit is contained in:
David Rosca 2024-09-11 09:39:07 +02:00 • committed by Marge Bot
parent d3429a7e00
commit e27eeff95d
6 changed files with 0 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gallium/frontends/va/config.c
View file

@ -745,7 +745,6 @@ vlVaCreateConfig(VADriverContextP ctx, VAProfile profile, VAEntrypoint entrypoin
FREE(config);
return VA_STATUS_ERROR_INVALID_VALUE;
}
config->packed_headers = attrib_value;
}
}

1
src/gallium/frontends/va/context.c
View file

@ -424,7 +424,6 @@ vlVaCreateContext(VADriverContextP ctx, VAConfigID config_id, int picture_width,
default:
break;
}
context->desc.base.packed_headers = config->packed_headers;
mtx_lock(&drv->mutex);
context->decoder = drv->pipe->create_video_codec(drv->pipe, &context->templat);

15
src/gallium/frontends/va/picture_h264_enc.c
View file

@ -133,12 +133,6 @@ vlVaHandleVAEncPictureParameterBufferTypeH264(vlVaDriver *drv, vlVaContext *cont
context->desc.h264enc.pic_ctrl.transform_8x8_mode_flag =
h264->pic_fields.bits.transform_8x8_mode_flag;
if (!(context->desc.base.packed_headers & VA_ENC_PACKED_HEADER_SLICE)) {
unsigned max_poc = 1 << (context->desc.h264enc.seq.log2_max_pic_order_cnt_lsb_minus4 + 4);
context->desc.h264enc.slice.frame_num = h264->frame_num;
context->desc.h264enc.slice.pic_order_cnt_lsb = h264->CurrPic.TopFieldOrderCnt % max_poc;
}
return VA_STATUS_SUCCESS;
}
@ -299,15 +293,6 @@ vlVaHandleVAEncSequenceParameterBufferTypeH264(vlVaDriver *drv, vlVaContext *con
context->desc.h264enc.seq.enc_frame_crop_bottom_offset = h264->frame_crop_bottom_offset;
}
if (!(context->desc.base.packed_headers & VA_ENC_PACKED_HEADER_SEQUENCE)) {
util_dynarray_append(&context->desc.h264enc.raw_headers,
struct pipe_enc_raw_header,
(struct pipe_enc_raw_header){.type = PIPE_H264_NAL_SPS});
util_dynarray_append(&context->desc.h264enc.raw_headers,
struct pipe_enc_raw_header,
(struct pipe_enc_raw_header){.type = PIPE_H264_NAL_PPS});
}
return VA_STATUS_SUCCESS;
}

31
src/gallium/frontends/va/picture_hevc_enc.c
View file

@ -130,15 +130,6 @@ vlVaHandleVAEncPictureParameterBufferTypeHEVC(vlVaDriver *drv, vlVaContext *cont
context->desc.h265enc.num_ref_idx_l0_active_minus1 = h265->num_ref_idx_l0_default_active_minus1;
context->desc.h265enc.num_ref_idx_l1_active_minus1 = h265->num_ref_idx_l1_default_active_minus1;
if (!(context->desc.base.packed_headers & VA_ENC_PACKED_HEADER_SLICE)) {
unsigned max_poc = 1 << (context->desc.h265enc.seq.log2_max_pic_order_cnt_lsb_minus4 + 4);
context->desc.h265enc.slice.slice_pic_order_cnt_lsb = h265->decoded_curr_pic.pic_order_cnt % max_poc;
if (context->desc.h265enc.picture_type == PIPE_H2645_ENC_PICTURE_TYPE_P) {
context->desc.h265enc.slice.st_ref_pic_set.num_negative_pics = 1;
context->desc.h265enc.slice.st_ref_pic_set.used_by_curr_pic_s0_flag[0] = 1;
}
}
return VA_STATUS_SUCCESS;
}
@ -314,28 +305,6 @@ vlVaHandleVAEncSequenceParameterBufferTypeHEVC(vlVaDriver *drv, vlVaContext *con
context->desc.h265enc.rc[0].frame_rate_num = time_scale;
context->desc.h265enc.rc[0].frame_rate_den = num_units_in_tick;
if (!(context->desc.base.packed_headers & VA_ENC_PACKED_HEADER_SEQUENCE)) {
struct pipe_h265_profile_tier_level *ptl =
&context->desc.h265enc.vid.profile_tier_level;
util_dynarray_append(&context->desc.h264enc.raw_headers,
struct pipe_enc_raw_header,
(struct pipe_enc_raw_header){.type = PIPE_H265_NAL_VPS});
util_dynarray_append(&context->desc.h264enc.raw_headers,
struct pipe_enc_raw_header,
(struct pipe_enc_raw_header){.type = PIPE_H265_NAL_SPS});
util_dynarray_append(&context->desc.h264enc.raw_headers,
struct pipe_enc_raw_header,
(struct pipe_enc_raw_header){.type = PIPE_H265_NAL_PPS});
context->desc.h265enc.vid.vps_base_layer_internal_flag = 1;
context->desc.h265enc.vid.vps_base_layer_available_flag = 1;
ptl->profile_tier.general_tier_flag = h265->general_tier_flag;
ptl->profile_tier.general_profile_idc = h265->general_profile_idc;
ptl->profile_tier.general_progressive_source_flag = 1;
ptl->profile_tier.general_frame_only_constraint_flag = 1;
ptl->general_level_idc = h265->general_level_idc;
context->desc.h265enc.seq.profile_tier_level = *ptl;
}
return VA_STATUS_SUCCESS;
}

1
src/gallium/frontends/va/va_private.h
View file

@ -432,7 +432,6 @@ typedef struct {
enum pipe_video_entrypoint entrypoint;
enum pipe_h2645_enc_rate_control_method rc;
unsigned int rt_format;
unsigned int packed_headers;
} vlVaConfig;
typedef struct vlVaSurface {

1
src/gallium/include/pipe/p_video_state.h
View file

@ -235,7 +235,6 @@ struct pipe_picture_desc
unsigned flush_flags;
/* A fence for pipe_video_codec::end_frame to signal job completion */
struct pipe_fence_handle **fence;
unsigned packed_headers;
};
struct pipe_quant_matrix