diff options
| author | Pierre-Eric Pelloux-Prayer <[email protected]> | 2020-03-08 09:01:42 +0100 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-03-11 08:17:07 +0000 |
| commit | 78d42d41d47f65f20cfd9ce984eebb9282ed96e4 (patch) | |
| tree | 5daf4a466f44c3d3594d402a2944b77a7467a51c /src/gallium/state_trackers/vdpau | |
| parent | b6cebf64394858be8e896c73de7d896f2bb071f7 (diff) | |
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 <[email protected]>
Reviewed-by: Leo Liu <[email protected]>
Fixes: 24f2b0a8560 ("gallium/video: remove pipe_video_buffer.chroma_format")
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4104>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4104>
Diffstat (limited to 'src/gallium/state_trackers/vdpau')
| -rw-r--r-- | src/gallium/state_trackers/vdpau/surface.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |