fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 17:30:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vulkan/video: set HEVC nuh_temporal_id_plus1 and nal_unit_type correctly

Browse source 
This is only relevant for hierarchical coding using sub-layers.

Fixes: 72f52329cd ("vulkan/video: add a nal_unit lookup for hevc")

Reviewed-by: Hyunjun Ko <zzoon@igalia.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Colin Marc <hi@colinmarc.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31303>
This commit is contained in:
Colin Marc 2024-09-22 11:12:49 +02:00 • committed by Marge Bot
parent 101a803858
commit 2cf5ef37ba
1 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/vulkan/runtime/vk_video.c
View file

@ -1494,13 +1494,27 @@ vk_video_get_h265_nal_unit(const StdVideoEncodeH265PictureInfo *pic_info)
case STD_VIDEO_H265_PICTURE_TYPE_I:
return HEVC_NAL_CRA_NUT;
case STD_VIDEO_H265_PICTURE_TYPE_P:
return HEVC_NAL_TRAIL_R;
if (pic_info->TemporalId > 0)
if (pic_info->flags.is_reference)
return HEVC_NAL_TSA_R;
else
return HEVC_NAL_TSA_N;
else
if (pic_info->flags.is_reference)
return HEVC_NAL_TRAIL_R;
else
return HEVC_NAL_TRAIL_N;
case STD_VIDEO_H265_PICTURE_TYPE_B:
if (pic_info->flags.IrapPicFlag)
if (pic_info->flags.is_reference)
return HEVC_NAL_RASL_R;
else
return HEVC_NAL_RASL_N;
else if (pic_info->TemporalId > 0)
if (pic_info->flags.is_reference)
return HEVC_NAL_TSA_R;
else
return HEVC_NAL_TSA_N;
else
if (pic_info->flags.is_reference)
return HEVC_NAL_TRAIL_R;
@ -1724,16 +1738,16 @@ vk_video_encode_h264_pps(const StdVideoH264PictureParameterSet *pps,
static void
emit_nalu_h265_header(struct vl_bitstream_encoder *enc,
int nal_unit_type)
int nal_unit_type, int temporal_id)
{
enc->prevent_start_code = false;
vl_bitstream_put_bits(enc, 24, 0);
vl_bitstream_put_bits(enc, 8, 1);
vl_bitstream_put_bits(enc, 1, 0);
vl_bitstream_put_bits(enc, 6, nal_unit_type); /* SPS NAL REF */
vl_bitstream_put_bits(enc, 6, 0);//nuh_layer_id
vl_bitstream_put_bits(enc, 3, 1);//nuh_temporal_id_plus1;
vl_bitstream_put_bits(enc, 6, nal_unit_type); /* SPS NAL REF */
vl_bitstream_put_bits(enc, 6, 0); /* nuh_layer_id */
vl_bitstream_put_bits(enc, 3, temporal_id + 1); /* nuh_temporal_id_plus1 */
vl_bitstream_flush(enc);
enc->prevent_start_code = true;
@ -1776,7 +1790,7 @@ vk_video_encode_h265_vps(const StdVideoH265VideoParameterSet *vps,
vl_bitstream_encoder_clear(&enc, data_ptr, data_size, size_limit);
emit_nalu_h265_header(&enc, HEVC_NAL_VPS_NUT);
emit_nalu_h265_header(&enc, HEVC_NAL_VPS_NUT, 0);
vl_bitstream_put_bits(&enc, 4, vps->vps_video_parameter_set_id);
vl_bitstream_put_bits(&enc, 2, 3);
@ -1866,7 +1880,7 @@ vk_video_encode_h265_sps(const StdVideoH265SequenceParameterSet *sps,
vl_bitstream_encoder_clear(&enc, data_ptr, data_size, size_limit);
emit_nalu_h265_header(&enc, HEVC_NAL_SPS_NUT);
emit_nalu_h265_header(&enc, HEVC_NAL_SPS_NUT, 0);
vl_bitstream_put_bits(&enc, 4, sps->sps_video_parameter_set_id);
vl_bitstream_put_bits(&enc, 3, sps->sps_max_sub_layers_minus1);
@ -2024,7 +2038,7 @@ vk_video_encode_h265_pps(const StdVideoH265PictureParameterSet *pps,
vl_bitstream_encoder_clear(&enc, data_ptr, data_size, size_limit);
emit_nalu_h265_header(&enc, HEVC_NAL_PPS_NUT);
emit_nalu_h265_header(&enc, HEVC_NAL_PPS_NUT, 0);
vl_bitstream_exp_golomb_ue(&enc, pps->pps_pic_parameter_set_id);
vl_bitstream_exp_golomb_ue(&enc, pps->pps_seq_parameter_set_id);
@ -2265,7 +2279,7 @@ vk_video_encode_h265_slice_header(const StdVideoEncodeH265PictureInfo *pic_info,
uint32_t data_size = *data_size_ptr;
vl_bitstream_encoder_clear(&enc, data_ptr, data_size, VL_BITSTREAM_MAX_BUFFER);
emit_nalu_h265_header(&enc, vk_video_get_h265_nal_unit(pic_info));
emit_nalu_h265_header(&enc, vk_video_get_h265_nal_unit(pic_info), pic_info->TemporalId);
vl_bitstream_put_bits(&enc, 1, slice_header->flags.first_slice_segment_in_pic_flag);
if (pic_info->flags.IrapPicFlag) {