[FFmpeg-cvslog] swscale: unscaled rgba64->rgb48

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Wed Jul 18 01:49:52 2012 +0000| [6b7849e6da54d57d04c4816b1a0717c1527afc19] | committer: Paul B Mahol

swscale: unscaled rgba64->rgb48

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6b7849e6da54d57d04c4816b1a0717c1527afc19
---

 libswscale/colorspace-test.c  |    2 ++
 libswscale/rgb2rgb.c          |   18 ++++++++++++++++++
 libswscale/rgb2rgb.h          |    2 ++
 libswscale/swscale_unscaled.c |    8 ++++++++
 4 files changed, 30 insertions(+)

diff --git a/libswscale/colorspace-test.c b/libswscale/colorspace-test.c
index 8614b27..6d16785 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 86e3113..70aaee4 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 d4fd56a..e37f0fb 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 a78a1d8..c391a07 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)) ||