Commit 32a453ea authored by Michael Niedermayer's avatar Michael Niedermayer

swscale/input: Fix GBRAP16 input

Fixes part of Ticket5264
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit df36257a)
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 6d36d0ad
...@@ -818,6 +818,19 @@ static av_always_inline void planar_rgb16_to_y(uint8_t *_dst, const uint8_t *_sr ...@@ -818,6 +818,19 @@ static av_always_inline void planar_rgb16_to_y(uint8_t *_dst, const uint8_t *_sr
} }
} }
static av_always_inline void planar_rgb16_to_a(uint8_t *_dst, const uint8_t *_src[4],
int width, int bpc, int is_be, int32_t *rgb2yuv)
{
int i;
const uint16_t **src = (const uint16_t **)_src;
uint16_t *dst = (uint16_t *)_dst;
int shift = bpc < 16 ? bpc : 14;
for (i = 0; i < width; i++) {
dst[i] = rdpx(src[3] + i) << (14 - shift);
}
}
static av_always_inline void planar_rgb16_to_uv(uint8_t *_dstU, uint8_t *_dstV, static av_always_inline void planar_rgb16_to_uv(uint8_t *_dstU, uint8_t *_dstV,
const uint8_t *_src[4], int width, const uint8_t *_src[4], int width,
int bpc, int is_be, int32_t *rgb2yuv) int bpc, int is_be, int32_t *rgb2yuv)
...@@ -846,6 +859,11 @@ static void planar_rgb##nbits##endian_name##_to_y(uint8_t *dst, const uint8_t *s ...@@ -846,6 +859,11 @@ static void planar_rgb##nbits##endian_name##_to_y(uint8_t *dst, const uint8_t *s
{ \ { \
planar_rgb16_to_y(dst, src, w, nbits, endian, rgb2yuv); \ planar_rgb16_to_y(dst, src, w, nbits, endian, rgb2yuv); \
} \ } \
static void planar_rgb##nbits##endian_name##_to_a(uint8_t *dst, const uint8_t *src[4], \
int w, int32_t *rgb2yuv) \
{ \
planar_rgb16_to_a(dst, src, w, nbits, endian, rgb2yuv); \
} \
static void planar_rgb##nbits##endian_name##_to_uv(uint8_t *dstU, uint8_t *dstV, \ static void planar_rgb##nbits##endian_name##_to_uv(uint8_t *dstU, uint8_t *dstV, \
const uint8_t *src[4], int w, int32_t *rgb2yuv) \ const uint8_t *src[4], int w, int32_t *rgb2yuv) \
{ \ { \
...@@ -1168,6 +1186,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) ...@@ -1168,6 +1186,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c)
c->readLumPlanar = planar_rgb14le_to_y; c->readLumPlanar = planar_rgb14le_to_y;
break; break;
case AV_PIX_FMT_GBRAP16LE: case AV_PIX_FMT_GBRAP16LE:
c->readAlpPlanar = planar_rgb16le_to_a;
case AV_PIX_FMT_GBRP16LE: case AV_PIX_FMT_GBRP16LE:
c->readLumPlanar = planar_rgb16le_to_y; c->readLumPlanar = planar_rgb16le_to_y;
break; break;
...@@ -1184,6 +1203,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) ...@@ -1184,6 +1203,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c)
c->readLumPlanar = planar_rgb14be_to_y; c->readLumPlanar = planar_rgb14be_to_y;
break; break;
case AV_PIX_FMT_GBRAP16BE: case AV_PIX_FMT_GBRAP16BE:
c->readAlpPlanar = planar_rgb16be_to_a;
case AV_PIX_FMT_GBRP16BE: case AV_PIX_FMT_GBRP16BE:
c->readLumPlanar = planar_rgb16be_to_y; c->readLumPlanar = planar_rgb16be_to_y;
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment