AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vulkan/video: start deep copying the parameters structures

Browse Source 
Joshua Ashton pointed out we aren't copying these deeply,
and we really should be.

This introduces deep copies of all the h264/h265 parameter sets.

Reviewed-by: Hyunjun Ko <zzoon@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27066>
This commit is contained in:
Dave Airlie
2024-01-15 15:20:55 +10:00
committed by Marge Bot
parent b4a6a876be
commit 34e72579cd
2 changed files with 164 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vulkan/runtime/vk_video.c
+142 -5
View File
@@ -93,11 +93,147 @@ vk_video_session_init(struct vk_device *device,
return VK_SUCCESS;
}
static void
vk_video_deep_copy_h264_sps(struct vk_video_h264_sps *dst,
const StdVideoH264SequenceParameterSet *src)
{
memcpy(&dst->base, src, sizeof(StdVideoH264SequenceParameterSet));
if (src->num_ref_frames_in_pic_order_cnt_cycle && src->pOffsetForRefFrame) {
memcpy(dst->offsets_for_ref_frame, src->pOffsetForRefFrame, sizeof(int32_t) * src->num_ref_frames_in_pic_order_cnt_cycle);
dst->base.pOffsetForRefFrame = dst->offsets_for_ref_frame;
}
if (src->flags.seq_scaling_matrix_present_flag && src->pScalingLists) {
memcpy(&dst->scaling_lists, src->pScalingLists, sizeof(StdVideoH264ScalingLists));
dst->base.pScalingLists = &dst->scaling_lists;
}
if (src->flags.vui_parameters_present_flag && src->pSequenceParameterSetVui) {
memcpy(&dst->vui, src->pSequenceParameterSetVui, sizeof(StdVideoH264SequenceParameterSetVui));
dst->base.pSequenceParameterSetVui = &dst->vui;
if (src->pSequenceParameterSetVui->pHrdParameters) {
memcpy(&dst->vui_hrd_parameters, src->pSequenceParameterSetVui->pHrdParameters,
sizeof(StdVideoH264HrdParameters));
dst->vui.pHrdParameters = &dst->vui_hrd_parameters;
}
}
}
static void
vk_video_deep_copy_h264_pps(struct vk_video_h264_pps *dst,
const StdVideoH264PictureParameterSet *src)
{
memcpy(&dst->base, src, sizeof(StdVideoH264PictureParameterSet));
if (src->flags.pic_scaling_matrix_present_flag && src->pScalingLists) {
memcpy(&dst->scaling_lists, src->pScalingLists, sizeof(StdVideoH264ScalingLists));
dst->base.pScalingLists = &dst->scaling_lists;
}
}
static void
vk_video_deep_copy_h265_vps(struct vk_video_h265_vps *dst,
const StdVideoH265VideoParameterSet *src)
{
memcpy(&dst->base, src, sizeof(StdVideoH265VideoParameterSet));
if (src->pDecPicBufMgr) {
memcpy(&dst->dec_pic_buf_mgr, src->pDecPicBufMgr, sizeof(StdVideoH265DecPicBufMgr));
dst->base.pDecPicBufMgr = &dst->dec_pic_buf_mgr;
}
if (src->pHrdParameters) {
memcpy(&dst->hrd_parameters, src->pHrdParameters, sizeof(StdVideoH265HrdParameters));
dst->base.pHrdParameters = &dst->hrd_parameters;
if (src->pHrdParameters->pSubLayerHrdParametersNal) {
memcpy(&dst->hrd_parameters_nal, src->pHrdParameters->pSubLayerHrdParametersNal,
sizeof(StdVideoH265SubLayerHrdParameters));
dst->hrd_parameters.pSubLayerHrdParametersNal = &dst->hrd_parameters_nal;
}
if (src->pHrdParameters->pSubLayerHrdParametersVcl) {
memcpy(&dst->hrd_parameters_vcl, src->pHrdParameters->pSubLayerHrdParametersVcl,
sizeof(StdVideoH265SubLayerHrdParameters));
dst->hrd_parameters.pSubLayerHrdParametersVcl = &dst->hrd_parameters_vcl;
}
}
if (src->pProfileTierLevel) {
memcpy(&dst->tier_level, src->pProfileTierLevel, sizeof(StdVideoH265ProfileTierLevel));
dst->base.pProfileTierLevel = &dst->tier_level;
}
}
static void
vk_video_deep_copy_h265_sps(struct vk_video_h265_sps *dst,
const StdVideoH265SequenceParameterSet *src)
{
memcpy(&dst->base, src, sizeof(StdVideoH265SequenceParameterSet));
if (src->pProfileTierLevel) {
memcpy(&dst->tier_level, src->pProfileTierLevel, sizeof(StdVideoH265ProfileTierLevel));
dst->base.pProfileTierLevel = &dst->tier_level;
}
if (src->pDecPicBufMgr) {
memcpy(&dst->dec_pic_buf_mgr, src->pDecPicBufMgr, sizeof(StdVideoH265DecPicBufMgr));
dst->base.pDecPicBufMgr = &dst->dec_pic_buf_mgr;
}
if (src->flags.sps_scaling_list_data_present_flag && src->pScalingLists) {
memcpy(&dst->scaling_lists, src->pScalingLists, sizeof(StdVideoH265ScalingLists));
dst->base.pScalingLists = &dst->scaling_lists;
}
if (src->pShortTermRefPicSet) {
memcpy(&dst->short_term_ref_pic_set, src->pShortTermRefPicSet, sizeof(StdVideoH265ShortTermRefPicSet));
dst->base.pShortTermRefPicSet = &dst->short_term_ref_pic_set;
}
if (src->pLongTermRefPicsSps) {
memcpy(&dst->long_term_ref_pics_sps, src->pLongTermRefPicsSps, sizeof(StdVideoH265LongTermRefPicsSps));
dst->base.pLongTermRefPicsSps = &dst->long_term_ref_pics_sps;
}
if (src->pSequenceParameterSetVui) {
memcpy(&dst->vui, src->pSequenceParameterSetVui, sizeof(StdVideoH265SequenceParameterSetVui));
dst->base.pSequenceParameterSetVui = &dst->vui;
if (src->pSequenceParameterSetVui->pHrdParameters) {
memcpy(&dst->hrd_parameters, src->pSequenceParameterSetVui->pHrdParameters, sizeof(StdVideoH265HrdParameters));
dst->vui.pHrdParameters = &dst->hrd_parameters;
if (src->pSequenceParameterSetVui->pHrdParameters->pSubLayerHrdParametersNal) {
memcpy(&dst->hrd_parameters_nal, src->pSequenceParameterSetVui->pHrdParameters->pSubLayerHrdParametersNal,
sizeof(StdVideoH265SubLayerHrdParameters));
dst->hrd_parameters.pSubLayerHrdParametersNal = &dst->hrd_parameters_nal;
}
if (src->pSequenceParameterSetVui->pHrdParameters->pSubLayerHrdParametersVcl) {
memcpy(&dst->hrd_parameters_vcl, src->pSequenceParameterSetVui->pHrdParameters->pSubLayerHrdParametersVcl,
sizeof(StdVideoH265SubLayerHrdParameters));
dst->hrd_parameters.pSubLayerHrdParametersVcl = &dst->hrd_parameters_vcl;
}
}
}
if (src->flags.sps_palette_predictor_initializers_present_flag && src->pPredictorPaletteEntries) {
memcpy(&dst->palette_entries, src->pPredictorPaletteEntries, sizeof(StdVideoH265PredictorPaletteEntries));
dst->base.pPredictorPaletteEntries = &dst->palette_entries;
}
}
static void
vk_video_deep_copy_h265_pps(struct vk_video_h265_pps *dst,
const StdVideoH265PictureParameterSet *src)
{
memcpy(&dst->base, src, sizeof(StdVideoH265PictureParameterSet));
if (src->flags.pps_scaling_list_data_present_flag && src->pScalingLists) {
memcpy(&dst->scaling_lists, src->pScalingLists, sizeof(StdVideoH265ScalingLists));
dst->base.pScalingLists = &dst->scaling_lists;
}
if (src->flags.pps_palette_predictor_initializers_present_flag && src->pPredictorPaletteEntries) {
memcpy(&dst->palette_entries, src->pPredictorPaletteEntries, sizeof(StdVideoH265PredictorPaletteEntries));
dst->base.pPredictorPaletteEntries = &dst->palette_entries;
}
}
#define FIND(PARAMSET, SS, SET, ID) \
static struct vk_video_##SET *find_##SS##_##SET(const struct vk_video_session_parameters *params, uint32_t id) { \
for (unsigned i = 0; i < params->SS.SET##_count; i++) { \
if (params->SS.SET[i].base.ID == id) \
return &params->SS.SET[i]; \
return &params->SS.SET[i]; \
} \
return NULL; \
} \
@@ -106,18 +242,19 @@ vk_video_session_init(struct vk_device *device,
const PARAMSET *new_set, bool noreplace) { \
struct vk_video_##SET *set = find_##SS##_##SET(params, new_set->ID); \
if (set) { \
if (noreplace) \
if (noreplace) \
return; \
set->base = *new_set; \
vk_video_deep_copy_##SET(set, new_set); \
} else \
params->SS.SET[params->SS.SET##_count++].base = *new_set; \
vk_video_deep_copy_##SET(&params->SS.SET[params->SS.SET##_count++], new_set); \
} \
\
static VkResult update_##SS##_##SET(struct vk_video_session_parameters *params, \
uint32_t count, const PARAMSET *updates) { \
if (params->SS.SET##_count + count >= params->SS.max_##SET##_count) \
return VK_ERROR_TOO_MANY_OBJECTS; \
typed_memcpy(&params->SS.SET[params->SS.SET##_count].base, updates, count); \
for (unsigned _c = 0; _c < count; _c++) \
vk_video_deep_copy_##SET(&params->SS.SET[params->SS.SET##_count + _c], &updates[_c]); \
params->SS.SET##_count += count; \
return VK_SUCCESS; \
}
src/vulkan/runtime/vk_video.h
+22
View File
@@ -31,22 +31,44 @@ extern "C" {
struct vk_video_h264_sps {
StdVideoH264SequenceParameterSet base;
int32_t offsets_for_ref_frame[256];
StdVideoH264ScalingLists scaling_lists;
StdVideoH264SequenceParameterSetVui vui;
StdVideoH264HrdParameters vui_hrd_parameters;
};
struct vk_video_h264_pps {
StdVideoH264PictureParameterSet base;
StdVideoH264ScalingLists scaling_lists;
};
struct vk_video_h265_vps {
StdVideoH265VideoParameterSet base;
StdVideoH265DecPicBufMgr dec_pic_buf_mgr;
StdVideoH265SubLayerHrdParameters hrd_parameters_nal;
StdVideoH265SubLayerHrdParameters hrd_parameters_vcl;
StdVideoH265HrdParameters hrd_parameters;
StdVideoH265ProfileTierLevel tier_level;
};
struct vk_video_h265_sps {
StdVideoH265SequenceParameterSet base;
StdVideoH265ProfileTierLevel tier_level;
StdVideoH265DecPicBufMgr dec_pic_buf_mgr;
StdVideoH265ScalingLists scaling_lists;
StdVideoH265ShortTermRefPicSet short_term_ref_pic_set;
StdVideoH265LongTermRefPicsSps long_term_ref_pics_sps;
StdVideoH265SubLayerHrdParameters hrd_parameters_nal;
StdVideoH265SubLayerHrdParameters hrd_parameters_vcl;
StdVideoH265HrdParameters hrd_parameters;
StdVideoH265SequenceParameterSetVui vui;
StdVideoH265PredictorPaletteEntries palette_entries;
};
struct vk_video_h265_pps {
StdVideoH265PictureParameterSet base;
StdVideoH265ScalingLists scaling_lists;
StdVideoH265PredictorPaletteEntries palette_entries;
};
struct vk_video_session {