| Message ID | 20220905051430.218289-2-philipl@overt.org |
|---|---|
| State | New |
| Headers | show |
| Series | swscale/input: Add support for new VAAPI formats | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Sun, 2022-09-04 at 22:14 -0700, Philip Langdale wrote: > Signed-off-by: Philip Langdale <philipl@overt.org> > --- > libswscale/input.c | 25 +++++++++++++++++++++++++ > libswscale/utils.c | 1 + > 2 files changed, 26 insertions(+) > > diff --git a/libswscale/input.c b/libswscale/input.c > index 92681c9c53..8032360907 100644 > --- a/libswscale/input.c > +++ b/libswscale/input.c > @@ -685,6 +685,25 @@ static void read_vuya_A_c(uint8_t *dst, const uint8_t > *src, const uint8_t *unuse > dst[i] = src[i * 4 + 3]; > } > > +static void read_xv36le_Y_c(uint8_t *dst, const uint8_t *src, const uint8_t > *unused0, const uint8_t *unused1, int width, > + uint32_t *unused2, void *opq) > +{ > + int i; > + for (i = 0; i < width; i++) > + AV_WN16(dst + i * 2, AV_RL16(src + i * 8 + 2) >> 4); > +} > + > + > +static void read_xv36le_UV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t > *unused0, const uint8_t *src, > + const uint8_t *unused1, int width, uint32_t > *unused2, void *opq) > +{ > + int i; > + for (i = 0; i < width; i++) { > + AV_WN16(dstU + i * 2, AV_RL16(src + i * 8 + 0) >> 4); > + AV_WN16(dstV + i * 2, AV_RL16(src + i * 8 + 4) >> 4); > + } > +} > + > /* This is almost identical to the previous, end exists only because > * yuy2ToY/UV)(dst, src + 1, ...) would have 100% unaligned accesses. */ > static void uyvyToY_c(uint8_t *dst, const uint8_t *src, const uint8_t > *unused1, const uint8_t *unused2, int width, > @@ -1381,6 +1400,9 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) > case AV_PIX_FMT_AYUV64LE: > c->chrToYV12 = read_ayuv64le_UV_c; > break; > + case AV_PIX_FMT_XV36LE: > + c->chrToYV12 = read_xv36le_UV_c; > + break; > case AV_PIX_FMT_P010LE: > case AV_PIX_FMT_P210LE: > case AV_PIX_FMT_P410LE: > @@ -1759,6 +1781,9 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) > case AV_PIX_FMT_AYUV64LE: > c->lumToYV12 = read_ayuv64le_Y_c; > break; > + case AV_PIX_FMT_XV36LE: > + c->lumToYV12 = read_xv36le_Y_c; > + break; > case AV_PIX_FMT_YUYV422: > case AV_PIX_FMT_YVYU422: > case AV_PIX_FMT_YA8: > diff --git a/libswscale/utils.c b/libswscale/utils.c > index a621a35862..a67e07b612 100644 > --- a/libswscale/utils.c > +++ b/libswscale/utils.c > @@ -262,6 +262,7 @@ static const FormatEntry format_entries[] = { > [AV_PIX_FMT_VUYX] = { 1, 1 }, > [AV_PIX_FMT_RGBAF16BE] = { 1, 0 }, > [AV_PIX_FMT_RGBAF16LE] = { 1, 0 }, > + [AV_PIX_FMT_XV36LE] = { 1, 0 }, > }; > > int ff_shuffle_filter_coefficients(SwsContext *c, int *filterPos, Patchset LGTM. You have another patchset for output, right? Thanks Haihao
On Mon, 5 Sep 2022 08:40:28 +0000 "Xiang, Haihao" <haihao.xiang@intel.com> wrote: > On Sun, 2022-09-04 at 22:14 -0700, Philip Langdale wrote: > > Signed-off-by: Philip Langdale <philipl@overt.org> > > --- > > libswscale/input.c | 25 +++++++++++++++++++++++++ > > libswscale/utils.c | 1 + > > 2 files changed, 26 insertions(+) > > > > Patchset LGTM. You have another patchset for output, right? > > Thanks > Haihao > Eventually. I still need to write it. --phil
diff --git a/libswscale/input.c b/libswscale/input.c index 92681c9c53..8032360907 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -685,6 +685,25 @@ static void read_vuya_A_c(uint8_t *dst, const uint8_t *src, const uint8_t *unuse dst[i] = src[i * 4 + 3]; } +static void read_xv36le_Y_c(uint8_t *dst, const uint8_t *src, const uint8_t *unused0, const uint8_t *unused1, int width, + uint32_t *unused2, void *opq) +{ + int i; + for (i = 0; i < width; i++) + AV_WN16(dst + i * 2, AV_RL16(src + i * 8 + 2) >> 4); +} + + +static void read_xv36le_UV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *unused0, const uint8_t *src, + const uint8_t *unused1, int width, uint32_t *unused2, void *opq) +{ + int i; + for (i = 0; i < width; i++) { + AV_WN16(dstU + i * 2, AV_RL16(src + i * 8 + 0) >> 4); + AV_WN16(dstV + i * 2, AV_RL16(src + i * 8 + 4) >> 4); + } +} + /* This is almost identical to the previous, end exists only because * yuy2ToY/UV)(dst, src + 1, ...) would have 100% unaligned accesses. */ static void uyvyToY_c(uint8_t *dst, const uint8_t *src, const uint8_t *unused1, const uint8_t *unused2, int width, @@ -1381,6 +1400,9 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_AYUV64LE: c->chrToYV12 = read_ayuv64le_UV_c; break; + case AV_PIX_FMT_XV36LE: + c->chrToYV12 = read_xv36le_UV_c; + break; case AV_PIX_FMT_P010LE: case AV_PIX_FMT_P210LE: case AV_PIX_FMT_P410LE: @@ -1759,6 +1781,9 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_AYUV64LE: c->lumToYV12 = read_ayuv64le_Y_c; break; + case AV_PIX_FMT_XV36LE: + c->lumToYV12 = read_xv36le_Y_c; + break; case AV_PIX_FMT_YUYV422: case AV_PIX_FMT_YVYU422: case AV_PIX_FMT_YA8: diff --git a/libswscale/utils.c b/libswscale/utils.c index a621a35862..a67e07b612 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -262,6 +262,7 @@ static const FormatEntry format_entries[] = { [AV_PIX_FMT_VUYX] = { 1, 1 }, [AV_PIX_FMT_RGBAF16BE] = { 1, 0 }, [AV_PIX_FMT_RGBAF16LE] = { 1, 0 }, + [AV_PIX_FMT_XV36LE] = { 1, 0 }, }; int ff_shuffle_filter_coefficients(SwsContext *c, int *filterPos,
Signed-off-by: Philip Langdale <philipl@overt.org> --- libswscale/input.c | 25 +++++++++++++++++++++++++ libswscale/utils.c | 1 + 2 files changed, 26 insertions(+)