videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-09 01:07:01 +02:00
Code Releases Activity

swscale: simplify unscaled rgb48<->bgr48

Browse Source 
Using av_bswap16 should be enough.
This commit is contained in:
Paul B Mahol 2012-07-18 00:09:37 +00:00
parent 204c4e953d
commit 9d8eac6899
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libswscale/colorspace-test.c
View File

@ -84,8 +84,8 @@ int main(int argc, char **argv)
FUNC(4, 2, rgb32tobgr16),
FUNC(4, 3, rgb32tobgr24),
FUNC(4, 4, shuffle_bytes_2103), /* rgb32tobgr32 */
FUNC(6, 6, rgb48tobgr48_LL),
FUNC(6, 6, rgb48tobgr48_LB),
FUNC(6, 6, rgb48tobgr48_nobswap),
FUNC(6, 6, rgb48tobgr48_bswap),
FUNC(0, 0, NULL)
};
int width;

17
libswscale/rgb2rgb.c
View File

@ -26,7 +26,6 @@
#include <inttypes.h>
#include "libavutil/bswap.h"
#include "libavutil/intreadwrite.h"
#include "config.h"
#include "rgb2rgb.h"
#include "swscale.h"
@ -335,20 +334,20 @@ DEFINE_SHUFFLE_BYTES(1, 2, 3, 0)
DEFINE_SHUFFLE_BYTES(3, 0, 1, 2)
DEFINE_SHUFFLE_BYTES(3, 2, 1, 0)
#define DEFINE_RGB48TOBGR48(ie, oe) \
void rgb48tobgr48_ ## ie ## oe(const uint8_t *src, \
uint8_t *dst, int src_size) \
#define DEFINE_RGB48TOBGR48(need_bswap, swap) \
void rgb48tobgr48_ ## 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 >> 1; \
\
for (i = 0; i < num_pixels; i += 3) { \
AV_W ## oe ## 16(&d[i ], AV_R ## ie ## 16(&s[i + 2])); \
AV_W ## oe ## 16(&d[i + 1], AV_R ## ie ## 16(&s[i + 1])); \
AV_W ## oe ## 16(&d[i + 2], AV_R ## ie ## 16(&s[i ])); \
d[i ] = swap ? av_bswap16(s[i + 2]) : s[i + 2]; \
d[i + 1] = swap ? av_bswap16(s[i + 1]) : s[i + 1]; \
d[i + 2] = swap ? av_bswap16(s[i ]) : s[i ]; \
} \
}
DEFINE_RGB48TOBGR48(L, L)
DEFINE_RGB48TOBGR48(L, B)
DEFINE_RGB48TOBGR48(nobswap, 0)
DEFINE_RGB48TOBGR48(bswap, 1)

4
libswscale/rgb2rgb.h
View File

@ -52,8 +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);
void rgb48tobgr48_LL(const uint8_t *src, uint8_t *dst, int src_size);
void rgb48tobgr48_LB(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 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);

4
libswscale/swscale_unscaled.c
View File

@ -561,11 +561,11 @@ static rgbConvFn findRgbConvFn(SwsContext *c)
if (CONV_IS(RGB48LE, BGR48LE)
|| CONV_IS(BGR48LE, RGB48LE)
|| CONV_IS(RGB48BE, BGR48BE)
|| CONV_IS(BGR48BE, RGB48BE)) conv = rgb48tobgr48_LL;
|| CONV_IS(BGR48BE, RGB48BE)) conv = rgb48tobgr48_nobswap;
else if (CONV_IS(RGB48LE, BGR48BE)
|| CONV_IS(BGR48LE, RGB48BE)
|| CONV_IS(RGB48BE, BGR48LE)
|| CONV_IS(BGR48BE, RGB48LE)) conv = rgb48tobgr48_LB;
|| CONV_IS(BGR48BE, RGB48LE)) conv = rgb48tobgr48_bswap;
} else
/* BGR -> BGR */
if ((isBGRinInt(srcFormat) && isBGRinInt(dstFormat)) ||