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

frontends/va: Fix parsing packed headers without emulation bytes

Browse source 
Don't try to handle emulation bytes and only parse first NAL unit
if the packed header has no emulation bytes.

This fixes parsing packed headers from gstreamer.

Reviewed-by: Ruijing Dong <ruijing.dong@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25565>
This commit is contained in:
David Rosca 2023-10-05 16:47:21 +02:00 • committed by Marge Bot
parent 081f972eba
commit 3c5d82142d
4 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/frontends/va/picture.c
View file

@ -742,6 +742,8 @@ handleVAEncPackedHeaderParameterBufferType(vlVaContext *context, vlVaBuffer *buf
VAStatus status = VA_STATUS_SUCCESS;
VAEncPackedHeaderParameterBuffer *param = buf->data;
context->packed_header_emulation_bytes = param->has_emulation_bytes;
switch (u_reduce_video_profile(context->templat.profile)) {
case PIPE_VIDEO_FORMAT_MPEG4_AVC:
if (param->type == VAEncPackedHeaderSequence)

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

@ -486,7 +486,7 @@ vlVaHandleVAEncPackedHeaderDataBufferTypeH264(vlVaContext *context, vlVaBuffer *
unsigned nal_unit_type = vl_vlc_get_uimsbf(&vlc, 5);
struct vl_rbsp rbsp;
vl_rbsp_init(&rbsp, &vlc, ~0, true);
vl_rbsp_init(&rbsp, &vlc, ~0, context->packed_header_emulation_bytes);
switch(nal_unit_type) {
case H264_NAL_SPS:
@ -496,6 +496,9 @@ vlVaHandleVAEncPackedHeaderDataBufferTypeH264(vlVaContext *context, vlVaBuffer *
default:
break;
}
if (!context->packed_header_emulation_bytes)
break;
}
return VA_STATUS_SUCCESS;

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

@ -465,7 +465,7 @@ vlVaHandleVAEncPackedHeaderDataBufferTypeHEVC(vlVaContext *context, vlVaBuffer *
vl_vlc_eatbits(&vlc, 3);
struct vl_rbsp rbsp;
vl_rbsp_init(&rbsp, &vlc, ~0, true);
vl_rbsp_init(&rbsp, &vlc, ~0, context->packed_header_emulation_bytes);
switch(nal_unit_type) {
case HEVC_NAL_SPS:
@ -476,6 +476,9 @@ vlVaHandleVAEncPackedHeaderDataBufferTypeHEVC(vlVaContext *context, vlVaBuffer *
default:
break;
}
if (!context->packed_header_emulation_bytes)
break;
}
return VA_STATUS_SUCCESS;

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

@ -373,6 +373,7 @@ typedef struct {
bool needs_begin_frame;
void *blit_cs;
int packed_header_type;
bool packed_header_emulation_bytes;
struct set *surfaces;
} vlVaContext;