fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 22:49:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

frontends/va: Move mjpeg sampling_factor to pipe_mjpeg_picture_desc

Browse source 
Reviewed-by: David (Ming Qiang) Wu <David.Wu3@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32504>
This commit is contained in:
David Rosca 2024-11-26 19:34:39 +01:00 • committed by Marge Bot
parent 7a9f14d3c2
commit 5f3a93dacf
4 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -129,7 +129,6 @@ vlVaBeginPicture(VADriverContextP ctx, VAContextID context_id, VASurfaceID rende
context->target_id = render_target;
context->target = surf->buffer;
context->mjpeg.sampling_factor = 0;
if (context->templat.entrypoint != PIPE_VIDEO_ENTRYPOINT_ENCODE)
context->needs_begin_frame = true;

7
src/gallium/frontends/va/picture_mjpeg.c
View file

@ -40,6 +40,9 @@ void vlVaHandlePictureParameterBufferMJPEG(vlVaDriver *drv, vlVaContext *context
STATIC_ASSERT(sizeof(mjpeg->components) ==
sizeof(context->desc.mjpeg.picture_parameter.components));
context->desc.mjpeg.picture_parameter.sampling_factor = 0;
for (i = 0; i < MIN2(mjpeg->num_components, ARRAY_SIZE(mjpeg->components)); ++i) {
context->desc.mjpeg.picture_parameter.components[i].component_id =
mjpeg->components[i].component_id;
@ -51,8 +54,8 @@ void vlVaHandlePictureParameterBufferMJPEG(vlVaDriver *drv, vlVaContext *context
mjpeg->components[i].quantiser_table_selector;
sf = mjpeg->components[i].h_sampling_factor << 4 | mjpeg->components[i].v_sampling_factor;
context->mjpeg.sampling_factor <<= 8;
context->mjpeg.sampling_factor |= sf;
context->desc.mjpeg.picture_parameter.sampling_factor <<= 8;
context->desc.mjpeg.picture_parameter.sampling_factor |= sf;
}
context->desc.mjpeg.picture_parameter.num_components = mjpeg->num_components;

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

@ -412,12 +412,6 @@ typedef struct vlVaContext {
} mpeg4;
struct {
unsigned sampling_factor;
#define MJPEG_SAMPLING_FACTOR_NV12 (0x221111)
#define MJPEG_SAMPLING_FACTOR_YUY2 (0x221212)
#define MJPEG_SAMPLING_FACTOR_YUV422 (0x211111)
#define MJPEG_SAMPLING_FACTOR_YUV444 (0x111111)
#define MJPEG_SAMPLING_FACTOR_YUV400 (0x11)
uint8_t slice_header[MAX_MJPEG_SLICE_HEADER_SIZE];
unsigned int slice_header_size;
} mjpeg;

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

@ -1626,6 +1626,7 @@ struct pipe_mjpeg_picture_desc
uint16_t crop_y;
uint16_t crop_width;
uint16_t crop_height;
uint32_t sampling_factor;
} picture_parameter;
struct