Signed-off-by: Paul B Mahol <onemda@gmail.com>tags/n1.0
| @@ -86,6 +86,8 @@ int main(int argc, char **argv) | |||||
| FUNC(4, 4, shuffle_bytes_2103), /* rgb32tobgr32 */ | FUNC(4, 4, shuffle_bytes_2103), /* rgb32tobgr32 */ | ||||
| FUNC(6, 6, rgb48tobgr48_nobswap), | FUNC(6, 6, rgb48tobgr48_nobswap), | ||||
| FUNC(6, 6, rgb48tobgr48_bswap), | FUNC(6, 6, rgb48tobgr48_bswap), | ||||
| FUNC(8, 6, rgb64tobgr48_nobswap), | |||||
| FUNC(8, 6, rgb64tobgr48_bswap), | |||||
| FUNC(0, 0, NULL) | FUNC(0, 0, NULL) | ||||
| }; | }; | ||||
| int width; | int width; | ||||
| @@ -351,3 +351,21 @@ void rgb48tobgr48_ ## need_bswap(const uint8_t *src, \ | |||||
| DEFINE_RGB48TOBGR48(nobswap, 0) | DEFINE_RGB48TOBGR48(nobswap, 0) | ||||
| DEFINE_RGB48TOBGR48(bswap, 1) | DEFINE_RGB48TOBGR48(bswap, 1) | ||||
| #define DEFINE_RGB64TOBGR48(need_bswap, swap) \ | |||||
| void rgb64tobgr48_ ## 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 + 2]) : s[4 * i + 2]; \ | |||||
| 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 ]) : s[4 * i ]; \ | |||||
| } \ | |||||
| } | |||||
| DEFINE_RGB64TOBGR48(nobswap, 0) | |||||
| DEFINE_RGB64TOBGR48(bswap, 1) | |||||
| @@ -52,6 +52,8 @@ extern void (*rgb32tobgr15)(const uint8_t *src, uint8_t *dst, int src_size); | |||||
| extern void (*shuffle_bytes_2103)(const uint8_t *src, uint8_t *dst, int src_size); | extern void (*shuffle_bytes_2103)(const uint8_t *src, uint8_t *dst, int src_size); | ||||
| 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_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 rgb48tobgr48_bswap(const uint8_t *src, uint8_t *dst, int src_size); | ||||
| void rgb24to32(const uint8_t *src, uint8_t *dst, int src_size); | void rgb24to32(const uint8_t *src, uint8_t *dst, int src_size); | ||||
| @@ -521,6 +521,13 @@ static int planarRgbToRgbWrapper(SwsContext *c, const uint8_t *src[], | |||||
| || (x) == PIX_FMT_ABGR \ | || (x) == PIX_FMT_ABGR \ | ||||
| ) | ) | ||||
| #define isRGBA64(x) ( \ | |||||
| (x) == PIX_FMT_RGBA64LE \ | |||||
| || (x) == PIX_FMT_RGBA64BE \ | |||||
| || (x) == PIX_FMT_BGRA64LE \ | |||||
| || (x) == PIX_FMT_BGRA64BE \ | |||||
| ) | |||||
| #define isRGB48(x) ( \ | #define isRGB48(x) ( \ | ||||
| (x) == PIX_FMT_RGB48LE \ | (x) == PIX_FMT_RGB48LE \ | ||||
| || (x) == PIX_FMT_RGB48BE \ | || (x) == PIX_FMT_RGB48BE \ | ||||
| @@ -566,6 +573,15 @@ static rgbConvFn findRgbConvFn(SwsContext *c) | |||||
| || CONV_IS(BGR48LE, RGB48BE) | || CONV_IS(BGR48LE, RGB48BE) | ||||
| || CONV_IS(RGB48BE, BGR48LE) | || CONV_IS(RGB48BE, BGR48LE) | ||||
| || CONV_IS(BGR48BE, RGB48LE)) conv = rgb48tobgr48_bswap; | || CONV_IS(BGR48BE, RGB48LE)) conv = rgb48tobgr48_bswap; | ||||
| } else if (isRGBA64(srcFormat) && isRGB48(dstFormat)) { | |||||
| if (CONV_IS(RGBA64LE, BGR48LE) | |||||
| || CONV_IS(BGRA64LE, RGB48LE) | |||||
| || CONV_IS(RGBA64BE, BGR48BE) | |||||
| || CONV_IS(BGRA64BE, RGB48BE)) conv = rgb64tobgr48_nobswap; | |||||
| else if (CONV_IS(RGBA64LE, BGR48BE) | |||||
| || CONV_IS(BGRA64LE, RGB48BE) | |||||
| || CONV_IS(RGBA64BE, BGR48LE) | |||||
| || CONV_IS(BGRA64BE, RGB48LE)) conv = rgb64tobgr48_bswap; | |||||
| } else | } else | ||||
| /* BGR -> BGR */ | /* BGR -> BGR */ | ||||
| if ((isBGRinInt(srcFormat) && isBGRinInt(dstFormat)) || | if ((isBGRinInt(srcFormat) && isBGRinInt(dstFormat)) || | ||||