diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2011-12-16 19:38:53 +0100 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2011-12-17 19:35:16 +0100 |
| commit | ed46a3d8423b8697773bdd9f22125bc19c9f72b1 (patch) | |
| tree | 43e5d3e29f0eed182169e4e12982bc9c78bf9003 /libswscale | |
| parent | adb28c49bdf02dd0e45b904c6b36d2696430f41e (diff) | |
| download | ffmpeg-ed46a3d8423b8697773bdd9f22125bc19c9f72b1.tar.gz | |
swscale: add rgb565 endianess conversion
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/swscale_unscaled.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index ec8f1bb552..b42854ad9f 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -718,15 +718,6 @@ void ff_get_unscaled_swscale(SwsContext *c) if (srcFormat==PIX_FMT_BGR24 && (dstFormat==PIX_FMT_YUV420P || dstFormat==PIX_FMT_YUVA420P) && !(flags & SWS_ACCURATE_RND)) c->swScale= bgr24ToYv12Wrapper; - /* bswap 16 bits per component packed formats */ - if ((srcFormat == PIX_FMT_RGB48LE && dstFormat == PIX_FMT_RGB48BE) || - (srcFormat == PIX_FMT_RGB48BE && dstFormat == PIX_FMT_RGB48LE) || - (srcFormat == PIX_FMT_BGR48LE && dstFormat == PIX_FMT_BGR48BE) || - (srcFormat == PIX_FMT_BGR48BE && dstFormat == PIX_FMT_BGR48LE) || - (srcFormat == PIX_FMT_GRAY16LE && dstFormat == PIX_FMT_GRAY16BE) || - (srcFormat == PIX_FMT_GRAY16BE && dstFormat == PIX_FMT_GRAY16LE)) - c->swScale = packed_16bpc_bswap; - /* RGB/BGR -> RGB/BGR (no dither needed forms) */ if ( isAnyRGB(srcFormat) && isAnyRGB(dstFormat) @@ -745,6 +736,19 @@ void ff_get_unscaled_swscale(SwsContext *c) && (!needsDither || (c->flags&(SWS_FAST_BILINEAR|SWS_POINT)))) c->swScale= rgbToRgbWrapper; + /* bswap 16 bits per pixel/component packed formats */ + if ((srcFormat == PIX_FMT_RGB48LE && dstFormat == PIX_FMT_RGB48BE) || + (srcFormat == PIX_FMT_RGB48BE && dstFormat == PIX_FMT_RGB48LE) || + (srcFormat == PIX_FMT_BGR48LE && dstFormat == PIX_FMT_BGR48BE) || + (srcFormat == PIX_FMT_BGR48BE && dstFormat == PIX_FMT_BGR48LE) || + (srcFormat == PIX_FMT_GRAY16LE && dstFormat == PIX_FMT_GRAY16BE) || + (srcFormat == PIX_FMT_GRAY16BE && dstFormat == PIX_FMT_GRAY16LE) || + (srcFormat == PIX_FMT_RGB565LE && dstFormat == PIX_FMT_RGB565BE) || + (srcFormat == PIX_FMT_RGB565BE && dstFormat == PIX_FMT_RGB565LE) || + (srcFormat == PIX_FMT_BGR565BE && dstFormat == PIX_FMT_BGR565LE) || + (srcFormat == PIX_FMT_BGR565LE && dstFormat == PIX_FMT_BGR565BE)) + c->swScale = packed_16bpc_bswap; + if ((usePal(srcFormat) && ( dstFormat == PIX_FMT_RGB32 || dstFormat == PIX_FMT_RGB32_1 || |