highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libavutil/hwcontext_opencl: Fix channel order in format support check

Browse Source 
The `opencl_get_plane_format` function was incorrectly determining the
value used to set the image channel order. This resulted in all RGB
pixel formats being set to the `CL_RGBA` pixel format, regardless of
whether or not they actually *were* RGBA.

This patch fixes the issue by using the `offset` and depth of components
rather than the loop index to determine the value of `order`.

Signed-off-by: Jarek Samic <cldfire3@gmail.com>
Signed-off-by: Mark Thompson <sw@jkqxz.net>
This commit is contained in:
Jarek Samic 2019-04-07 22:01:23 -04:00 committed by Mark Thompson
parent 1ec777dcdd
commit 1c50d61a5a
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavutil/hwcontext_opencl.c
View File

@ -1419,8 +1419,9 @@ static int opencl_get_plane_format(enum AVPixelFormat pixfmt,
// from the same component. // from the same component.
if (step && comp->step != step) if (step && comp->step != step)
return AVERROR(EINVAL); return AVERROR(EINVAL);
order = order * 10 + c + 1;
depth = comp->depth; depth = comp->depth;
order = order * 10 + comp->offset / ((depth + 7) / 8) + 1;
step = comp->step; step = comp->step;
alpha = (desc->flags & AV_PIX_FMT_FLAG_ALPHA && alpha = (desc->flags & AV_PIX_FMT_FLAG_ALPHA &&
c == desc->nb_components - 1); c == desc->nb_components - 1);
@ -1456,14 +1457,10 @@ static int opencl_get_plane_format(enum AVPixelFormat pixfmt,
case order: image_format->image_channel_order = type; break; case order: image_format->image_channel_order = type; break;
switch (order) { switch (order) {
CHANNEL_ORDER(1, CL_R); CHANNEL_ORDER(1, CL_R);
CHANNEL_ORDER(2, CL_R);
CHANNEL_ORDER(3, CL_R);
CHANNEL_ORDER(4, CL_R);
CHANNEL_ORDER(12, CL_RG); CHANNEL_ORDER(12, CL_RG);
CHANNEL_ORDER(23, CL_RG);
CHANNEL_ORDER(1234, CL_RGBA); CHANNEL_ORDER(1234, CL_RGBA);
CHANNEL_ORDER(2341, CL_ARGB);
CHANNEL_ORDER(3214, CL_BGRA); CHANNEL_ORDER(3214, CL_BGRA);
CHANNEL_ORDER(4123, CL_ARGB);
#ifdef CL_ABGR #ifdef CL_ABGR
CHANNEL_ORDER(4321, CL_ABGR); CHANNEL_ORDER(4321, CL_ABGR);
#endif #endif