From 78d42d41d47f65f20cfd9ce984eebb9282ed96e4 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Sun, 8 Mar 2020 09:01:42 +0100 Subject: [PATCH] vdpau: remove bogus assert The assert introduced by 24f2b0a8560 triggers when an application requests a chroma_type that's different to the one from the PIPE_VIDEO_CAP_PREFERED_FORMAT (before this change the chroma_type was set but ignored). So restore this behavior and ignore the chroma_type. Reported-by: Ilia Mirkin Reviewed-by: Leo Liu Fixes: 24f2b0a8560 ("gallium/video: remove pipe_video_buffer.chroma_format") Tested-by: Marge Bot Part-of: --- src/gallium/state_trackers/vdpau/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/state_trackers/vdpau/surface.c b/src/gallium/state_trackers/vdpau/surface.c index 1f1b0b3ef68..4158e6bcfe6 100644 --- a/src/gallium/state_trackers/vdpau/surface.c +++ b/src/gallium/state_trackers/vdpau/surface.c @@ -82,6 +82,7 @@ vlVdpVideoSurfaceCreate(VdpDevice device, VdpChromaType chroma_type, mtx_lock(&dev->mutex); memset(&p_surf->templat, 0, sizeof(p_surf->templat)); + /* TODO: buffer_format should be selected to match chroma_type */ p_surf->templat.buffer_format = pipe->screen->get_video_param ( pipe->screen, @@ -89,7 +90,6 @@ vlVdpVideoSurfaceCreate(VdpDevice device, VdpChromaType chroma_type, PIPE_VIDEO_ENTRYPOINT_BITSTREAM, PIPE_VIDEO_CAP_PREFERED_FORMAT ); - assert(pipe_format_to_chroma_format(p_surf->templat.buffer_format) == ChromaToPipe(chroma_type)); p_surf->templat.width = width; p_surf->templat.height = height; p_surf->templat.interlaced = pipe->screen->get_video_param -- 2.30.2