diff options
| author | Paul B Mahol <onemda@gmail.com> | 2012-07-18 00:09:37 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2012-07-18 23:47:40 +0000 |
| commit | 9d8eac6899eac64ad595bfae1e5bb0ccd61d97a4 (patch) | |
| tree | 07365f70427497452a053f7e69b695010bf7eb83 /libswscale/rgb2rgb.c | |
| parent | 204c4e953d895e15ab0908d715fd46181bf32add (diff) | |
swscale: simplify unscaled rgb48<->bgr48
Using av_bswap16 should be enough.
Diffstat (limited to 'libswscale/rgb2rgb.c')
| -rw-r--r-- | libswscale/rgb2rgb.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c index afc8d1f3a1..58c5a750a0 100644 --- a/libswscale/rgb2rgb.c +++ b/libswscale/rgb2rgb.c @@ -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) |