diff options
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/colorspace-test.c | 2 | ||||
| -rw-r--r-- | libswscale/rgb2rgb.c | 18 | ||||
| -rw-r--r-- | libswscale/rgb2rgb.h | 2 | ||||
| -rw-r--r-- | libswscale/swscale_unscaled.c | 8 |
4 files changed, 30 insertions, 0 deletions
diff --git a/libswscale/colorspace-test.c b/libswscale/colorspace-test.c index 8614b2700c..6d16785b12 100644 --- a/libswscale/colorspace-test.c +++ b/libswscale/colorspace-test.c @@ -86,6 +86,8 @@ int main(int argc, char **argv) FUNC(4, 4, shuffle_bytes_2103), /* rgb32tobgr32 */ FUNC(6, 6, rgb48tobgr48_nobswap), FUNC(6, 6, rgb48tobgr48_bswap), + FUNC(8, 6, rgb64to48_nobswap), + FUNC(8, 6, rgb64to48_bswap), FUNC(8, 6, rgb64tobgr48_nobswap), FUNC(8, 6, rgb64tobgr48_bswap), FUNC(0, 0, NULL) diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c index 86e3113e42..70aaee47d8 100644 --- a/libswscale/rgb2rgb.c +++ b/libswscale/rgb2rgb.c @@ -369,3 +369,21 @@ void rgb64tobgr48_ ## need_bswap(const uint8_t *src, \ DEFINE_RGB64TOBGR48(nobswap, 0) DEFINE_RGB64TOBGR48(bswap, 1) + +#define DEFINE_RGB64TO48(need_bswap, swap) \ +void rgb64to48_ ## need_bswap(const uint8_t *src, \ + uint8_t *dst, int src_size) \ +{ \ + uint16_t *d = (uint16_t *)dst; \ + uint16_t *s = (uint16_t *)src; \ + int i, num_pixels = src_size >> 3; \ + \ + for (i = 0; i < num_pixels; i++) { \ + d[3 * i ] = swap ? av_bswap16(s[4 * i ]) : s[4 * i ]; \ + d[3 * i + 1] = swap ? av_bswap16(s[4 * i + 1]) : s[4 * i + 1]; \ + d[3 * i + 2] = swap ? av_bswap16(s[4 * i + 2]) : s[4 * i + 2]; \ + } \ +} + +DEFINE_RGB64TO48(nobswap, 0) +DEFINE_RGB64TO48(bswap, 1) diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h index d4fd56a336..e37f0fbbbe 100644 --- a/libswscale/rgb2rgb.h +++ b/libswscale/rgb2rgb.h @@ -56,6 +56,8 @@ void rgb64tobgr48_nobswap(const uint8_t *src, uint8_t *dst, int src_size); void rgb64tobgr48_bswap(const uint8_t *src, uint8_t *dst, int src_size); void rgb48tobgr48_nobswap(const uint8_t *src, uint8_t *dst, int src_size); void rgb48tobgr48_bswap(const uint8_t *src, uint8_t *dst, int src_size); +void rgb64to48_nobswap(const uint8_t *src, uint8_t *dst, int src_size); +void rgb64to48_bswap(const uint8_t *src, uint8_t *dst, int src_size); void rgb24to32(const uint8_t *src, uint8_t *dst, int src_size); void rgb32to24(const uint8_t *src, uint8_t *dst, int src_size); void rgb16tobgr32(const uint8_t *src, uint8_t *dst, int src_size); diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index a78a1d8f30..c391a07d51 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -582,6 +582,14 @@ static rgbConvFn findRgbConvFn(SwsContext *c) || CONV_IS(BGRA64LE, RGB48BE) || CONV_IS(RGBA64BE, BGR48LE) || CONV_IS(BGRA64BE, RGB48LE)) conv = rgb64tobgr48_bswap; + else if (CONV_IS(RGBA64LE, RGB48LE) + || CONV_IS(BGRA64LE, BGR48LE) + || CONV_IS(RGBA64BE, RGB48BE) + || CONV_IS(BGRA64BE, BGR48BE)) conv = rgb64to48_nobswap; + else if (CONV_IS(RGBA64LE, RGB48BE) + || CONV_IS(BGRA64LE, BGR48BE) + || CONV_IS(RGBA64BE, RGB48LE) + || CONV_IS(BGRA64BE, BGR48LE)) conv = rgb64to48_bswap; } else /* BGR -> BGR */ if ((isBGRinInt(srcFormat) && isBGRinInt(dstFormat)) || |