swscale: K&R formatting cosmetics (part I)

pull/3/merge
Diego Biurrun 13 years ago
parent 72b95764d0
commit 89d94b2182
  1. 58
      libswscale/options.c
  2. 241
      libswscale/rgb2rgb.c
  3. 685
      libswscale/rgb2rgb_template.c
  4. 893
      libswscale/yuv2rgb.c

@ -19,12 +19,12 @@
*/ */
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#include "libavutil/pixfmt.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/pixfmt.h"
#include "swscale.h" #include "swscale.h"
#include "swscale_internal.h" #include "swscale_internal.h"
static const char * sws_context_to_name(void * ptr) static const char *sws_context_to_name(void *ptr)
{ {
return "swscaler"; return "swscaler";
} }
@ -34,34 +34,34 @@ static const char * sws_context_to_name(void * ptr)
#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
static const AVOption options[] = { static const AVOption options[] = {
{ "sws_flags", "scaler/cpu flags", OFFSET(flags), AV_OPT_TYPE_FLAGS, {.dbl = DEFAULT }, 0, UINT_MAX, VE, "sws_flags" }, { "sws_flags", "scaler/cpu flags", OFFSET(flags), AV_OPT_TYPE_FLAGS, { .dbl = DEFAULT }, 0, UINT_MAX, VE, "sws_flags" },
{ "fast_bilinear", "fast bilinear", 0, AV_OPT_TYPE_CONST, {.dbl = SWS_FAST_BILINEAR }, INT_MIN, INT_MAX, VE, "sws_flags" }, { "fast_bilinear", "fast bilinear", 0, AV_OPT_TYPE_CONST, { .dbl = SWS_FAST_BILINEAR }, INT_MIN, INT_MAX, VE, "sws_flags" },
{ "bilinear", "bilinear", 0, AV_OPT_TYPE_CONST, {.dbl = SWS_BILINEAR }, INT_MIN, INT_MAX, VE, "sws_flags" }, { "bilinear", "bilinear", 0, AV_OPT_TYPE_CONST, { .dbl = SWS_BILINEAR }, INT_MIN, INT_MAX, VE, "sws_flags" },
{ "bicubic", "bicubic", 0, AV_OPT_TYPE_CONST, {.dbl = SWS_BICUBIC }, INT_MIN, INT_MAX, VE, "sws_flags" }, { "bicubic", "bicubic", 0, AV_OPT_TYPE_CONST, { .dbl = SWS_BICUBIC }, INT_MIN, INT_MAX, VE, "sws_flags" },
{ "experimental", "experimental", 0, AV_OPT_TYPE_CONST, {.dbl = SWS_X }, INT_MIN, INT_MAX, VE, "sws_flags" }, { "experimental", "experimental", 0, AV_OPT_TYPE_CONST, { .dbl = SWS_X }, INT_MIN, INT_MAX, VE, "sws_flags" },
{ "neighbor", "nearest neighbor", 0, AV_OPT_TYPE_CONST, {.dbl = SWS_POINT }, INT_MIN, INT_MAX, VE, "sws_flags" }, { "neighbor", "nearest neighbor", 0, AV_OPT_TYPE_CONST, { .dbl = SWS_POINT }, INT_MIN, INT_MAX, VE, "sws_flags" },
{ "area", "averaging area", 0, AV_OPT_TYPE_CONST, {.dbl = SWS_AREA }, INT_MIN, INT_MAX, VE, "sws_flags" }, { "area", "averaging area", 0, AV_OPT_TYPE_CONST, { .dbl = SWS_AREA }, INT_MIN, INT_MAX, VE, "sws_flags" },
{ "bicublin", "luma bicubic, chroma bilinear", 0, AV_OPT_TYPE_CONST, {.dbl = SWS_BICUBLIN }, INT_MIN, INT_MAX, VE, "sws_flags" }, { "bicublin", "luma bicubic, chroma bilinear", 0, AV_OPT_TYPE_CONST, { .dbl = SWS_BICUBLIN }, INT_MIN, INT_MAX, VE, "sws_flags" },
{ "gauss", "gaussian", 0, AV_OPT_TYPE_CONST, {.dbl = SWS_GAUSS }, INT_MIN, INT_MAX, VE, "sws_flags" }, { "gauss", "gaussian", 0, AV_OPT_TYPE_CONST, { .dbl = SWS_GAUSS }, INT_MIN, INT_MAX, VE, "sws_flags" },
{ "sinc", "sinc", 0, AV_OPT_TYPE_CONST, {.dbl = SWS_SINC }, INT_MIN, INT_MAX, VE, "sws_flags" }, { "sinc", "sinc", 0, AV_OPT_TYPE_CONST, { .dbl = SWS_SINC }, INT_MIN, INT_MAX, VE, "sws_flags" },
{ "lanczos", "lanczos", 0, AV_OPT_TYPE_CONST, {.dbl = SWS_LANCZOS }, INT_MIN, INT_MAX, VE, "sws_flags" }, { "lanczos", "lanczos", 0, AV_OPT_TYPE_CONST, { .dbl = SWS_LANCZOS }, INT_MIN, INT_MAX, VE, "sws_flags" },
{ "spline", "natural bicubic spline", 0, AV_OPT_TYPE_CONST, {.dbl = SWS_SPLINE }, INT_MIN, INT_MAX, VE, "sws_flags" }, { "spline", "natural bicubic spline", 0, AV_OPT_TYPE_CONST, { .dbl = SWS_SPLINE }, INT_MIN, INT_MAX, VE, "sws_flags" },
{ "print_info", "print info", 0, AV_OPT_TYPE_CONST, {.dbl = SWS_PRINT_INFO }, INT_MIN, INT_MAX, VE, "sws_flags" }, { "print_info", "print info", 0, AV_OPT_TYPE_CONST, { .dbl = SWS_PRINT_INFO }, INT_MIN, INT_MAX, VE, "sws_flags" },
{ "accurate_rnd", "accurate rounding", 0, AV_OPT_TYPE_CONST, {.dbl = SWS_ACCURATE_RND }, INT_MIN, INT_MAX, VE, "sws_flags" }, { "accurate_rnd", "accurate rounding", 0, AV_OPT_TYPE_CONST, { .dbl = SWS_ACCURATE_RND }, INT_MIN, INT_MAX, VE, "sws_flags" },
{ "full_chroma_int", "full chroma interpolation", 0 , AV_OPT_TYPE_CONST, {.dbl = SWS_FULL_CHR_H_INT }, INT_MIN, INT_MAX, VE, "sws_flags" }, { "full_chroma_int", "full chroma interpolation", 0, AV_OPT_TYPE_CONST, { .dbl = SWS_FULL_CHR_H_INT }, INT_MIN, INT_MAX, VE, "sws_flags" },
{ "full_chroma_inp", "full chroma input", 0 , AV_OPT_TYPE_CONST, {.dbl = SWS_FULL_CHR_H_INP }, INT_MIN, INT_MAX, VE, "sws_flags" }, { "full_chroma_inp", "full chroma input", 0, AV_OPT_TYPE_CONST, { .dbl = SWS_FULL_CHR_H_INP }, INT_MIN, INT_MAX, VE, "sws_flags" },
{ "bitexact", "", 0 , AV_OPT_TYPE_CONST, {.dbl = SWS_BITEXACT }, INT_MIN, INT_MAX, VE, "sws_flags" }, { "bitexact", "", 0, AV_OPT_TYPE_CONST, { .dbl = SWS_BITEXACT }, INT_MIN, INT_MAX, VE, "sws_flags" },
{ "srcw", "source width" , OFFSET(srcW), AV_OPT_TYPE_INT, {.dbl = 16 }, 1, INT_MAX, VE }, { "srcw", "source width", OFFSET(srcW), AV_OPT_TYPE_INT, { .dbl = 16 }, 1, INT_MAX, VE },
{ "srch", "source height" , OFFSET(srcH), AV_OPT_TYPE_INT, {.dbl = 16 }, 1, INT_MAX, VE }, { "srch", "source height", OFFSET(srcH), AV_OPT_TYPE_INT, { .dbl = 16 }, 1, INT_MAX, VE },
{ "dstw", "destination width" , OFFSET(dstW), AV_OPT_TYPE_INT, {.dbl = 16 }, 1, INT_MAX, VE }, { "dstw", "destination width", OFFSET(dstW), AV_OPT_TYPE_INT, { .dbl = 16 }, 1, INT_MAX, VE },
{ "dsth", "destination height", OFFSET(dstH), AV_OPT_TYPE_INT, {.dbl = 16 }, 1, INT_MAX, VE }, { "dsth", "destination height", OFFSET(dstH), AV_OPT_TYPE_INT, { .dbl = 16 }, 1, INT_MAX, VE },
{ "src_format", "source format" , OFFSET(srcFormat), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, 0, PIX_FMT_NB-1, VE }, { "src_format", "source format", OFFSET(srcFormat), AV_OPT_TYPE_INT, { .dbl = DEFAULT }, 0, PIX_FMT_NB - 1, VE },
{ "dst_format", "destination format", OFFSET(dstFormat), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, 0, PIX_FMT_NB-1, VE }, { "dst_format", "destination format", OFFSET(dstFormat), AV_OPT_TYPE_INT, { .dbl = DEFAULT }, 0, PIX_FMT_NB - 1, VE },
{ "src_range" , "source range" , OFFSET(srcRange) , AV_OPT_TYPE_INT, {.dbl = DEFAULT }, 0, 1, VE }, { "src_range", "source range", OFFSET(srcRange), AV_OPT_TYPE_INT, { .dbl = DEFAULT }, 0, 1, VE },
{ "dst_range" , "destination range" , OFFSET(dstRange) , AV_OPT_TYPE_INT, {.dbl = DEFAULT }, 0, 1, VE }, { "dst_range", "destination range", OFFSET(dstRange), AV_OPT_TYPE_INT, { .dbl = DEFAULT }, 0, 1, VE },
{ "param0" , "scaler param 0" , OFFSET(param[0]) , AV_OPT_TYPE_DOUBLE, {.dbl = SWS_PARAM_DEFAULT}, INT_MIN, INT_MAX, VE }, { "param0", "scaler param 0", OFFSET(param[0]), AV_OPT_TYPE_DOUBLE, { .dbl = SWS_PARAM_DEFAULT }, INT_MIN, INT_MAX, VE },
{ "param1" , "scaler param 1" , OFFSET(param[1]) , AV_OPT_TYPE_DOUBLE, {.dbl = SWS_PARAM_DEFAULT}, INT_MIN, INT_MAX, VE }, { "param1", "scaler param 1", OFFSET(param[1]), AV_OPT_TYPE_DOUBLE, { .dbl = SWS_PARAM_DEFAULT }, INT_MIN, INT_MAX, VE },
{ NULL } { NULL }
}; };

@ -22,48 +22,58 @@
* License along with Libav; if not, write to the Free Software * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <inttypes.h> #include <inttypes.h>
#include "config.h"
#include "libavutil/bswap.h" #include "libavutil/bswap.h"
#include "config.h"
#include "rgb2rgb.h" #include "rgb2rgb.h"
#include "swscale.h" #include "swscale.h"
#include "swscale_internal.h" #include "swscale_internal.h"
void (*rgb32tobgr24)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb32tobgr16)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb32tobgr15)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb24tobgr32)(const uint8_t *src, uint8_t *dst, int src_size); void (*rgb24tobgr32)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb24tobgr24)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb24tobgr16)(const uint8_t *src, uint8_t *dst, int src_size); void (*rgb24tobgr16)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb24tobgr15)(const uint8_t *src, uint8_t *dst, int src_size); void (*rgb24tobgr15)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb32tobgr24)(const uint8_t *src, uint8_t *dst, int src_size); void (*rgb16tobgr24)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb15tobgr24)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb32to16)(const uint8_t *src, uint8_t *dst, int src_size); void (*rgb32to16)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb32to15)(const uint8_t *src, uint8_t *dst, int src_size); void (*rgb32to15)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb15to16)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb15tobgr24)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb15to32)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb16to15)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb16tobgr24)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb16to32)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb24tobgr24)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb24to16)(const uint8_t *src, uint8_t *dst, int src_size); void (*rgb24to16)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb24to15)(const uint8_t *src, uint8_t *dst, int src_size); void (*rgb24to15)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb16to32)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb16to15)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb15to16)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb15to32)(const uint8_t *src, uint8_t *dst, int src_size);
void (*shuffle_bytes_2103)(const uint8_t *src, uint8_t *dst, int src_size); void (*shuffle_bytes_2103)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb32tobgr16)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb32tobgr15)(const uint8_t *src, uint8_t *dst, int src_size);
void (*yv12toyuy2)(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst, void (*yv12toyuy2)(const uint8_t *ysrc, const uint8_t *usrc,
const uint8_t *vsrc, uint8_t *dst,
int width, int height, int width, int height,
int lumStride, int chromStride, int dstStride); int lumStride, int chromStride, int dstStride);
void (*yv12touyvy)(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst, void (*yv12touyvy)(const uint8_t *ysrc, const uint8_t *usrc,
const uint8_t *vsrc, uint8_t *dst,
int width, int height, int width, int height,
int lumStride, int chromStride, int dstStride); int lumStride, int chromStride, int dstStride);
void (*yuv422ptoyuy2)(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst, void (*yuv422ptoyuy2)(const uint8_t *ysrc, const uint8_t *usrc,
const uint8_t *vsrc, uint8_t *dst,
int width, int height, int width, int height,
int lumStride, int chromStride, int dstStride); int lumStride, int chromStride, int dstStride);
void (*yuv422ptouyvy)(const uint8_t *ysrc, const uint8_t *usrc, const uint8_t *vsrc, uint8_t *dst, void (*yuv422ptouyvy)(const uint8_t *ysrc, const uint8_t *usrc,
const uint8_t *vsrc, uint8_t *dst,
int width, int height, int width, int height,
int lumStride, int chromStride, int dstStride); int lumStride, int chromStride, int dstStride);
void (*yuy2toyv12)(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, void (*yuy2toyv12)(const uint8_t *src, uint8_t *ydst,
uint8_t *udst, uint8_t *vdst,
int width, int height, int width, int height,
int lumStride, int chromStride, int srcStride); int lumStride, int chromStride, int srcStride);
void (*rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, void (*rgb24toyv12)(const uint8_t *src, uint8_t *ydst,
uint8_t *udst, uint8_t *vdst,
int width, int height, int width, int height,
int lumStride, int chromStride, int srcStride); int lumStride, int chromStride, int srcStride);
void (*planar2x)(const uint8_t *src, uint8_t *dst, int width, int height, void (*planar2x)(const uint8_t *src, uint8_t *dst, int width, int height,
@ -76,45 +86,44 @@ void (*vu9_to_vu12)(const uint8_t *src1, const uint8_t *src2,
int width, int height, int width, int height,
int srcStride1, int srcStride2, int srcStride1, int srcStride2,
int dstStride1, int dstStride2); int dstStride1, int dstStride2);
void (*yvu9_to_yuy2)(const uint8_t *src1, const uint8_t *src2, const uint8_t *src3, void (*yvu9_to_yuy2)(const uint8_t *src1, const uint8_t *src2,
uint8_t *dst, const uint8_t *src3, uint8_t *dst,
int width, int height, int width, int height,
int srcStride1, int srcStride2, int srcStride1, int srcStride2,
int srcStride3, int dstStride); int srcStride3, int dstStride);
void (*uyvytoyuv420)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, const uint8_t *src, void (*uyvytoyuv420)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
int width, int height, const uint8_t *src, int width, int height,
int lumStride, int chromStride, int srcStride); int lumStride, int chromStride, int srcStride);
void (*uyvytoyuv422)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, const uint8_t *src, void (*uyvytoyuv422)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
int width, int height, const uint8_t *src, int width, int height,
int lumStride, int chromStride, int srcStride); int lumStride, int chromStride, int srcStride);
void (*yuyvtoyuv420)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, const uint8_t *src, void (*yuyvtoyuv420)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
int width, int height, const uint8_t *src, int width, int height,
int lumStride, int chromStride, int srcStride); int lumStride, int chromStride, int srcStride);
void (*yuyvtoyuv422)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, const uint8_t *src, void (*yuyvtoyuv422)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
int width, int height, const uint8_t *src, int width, int height,
int lumStride, int chromStride, int srcStride); int lumStride, int chromStride, int srcStride);
#define RGB2YUV_SHIFT 8 #define RGB2YUV_SHIFT 8
#define BY ((int)( 0.098*(1<<RGB2YUV_SHIFT)+0.5)) #define BY ((int)( 0.098 * (1 << RGB2YUV_SHIFT) + 0.5))
#define BV ((int)(-0.071*(1<<RGB2YUV_SHIFT)+0.5)) #define BV ((int)(-0.071 * (1 << RGB2YUV_SHIFT) + 0.5))
#define BU ((int)( 0.439*(1<<RGB2YUV_SHIFT)+0.5)) #define BU ((int)( 0.439 * (1 << RGB2YUV_SHIFT) + 0.5))
#define GY ((int)( 0.504*(1<<RGB2YUV_SHIFT)+0.5)) #define GY ((int)( 0.504 * (1 << RGB2YUV_SHIFT) + 0.5))
#define GV ((int)(-0.368*(1<<RGB2YUV_SHIFT)+0.5)) #define GV ((int)(-0.368 * (1 << RGB2YUV_SHIFT) + 0.5))
#define GU ((int)(-0.291*(1<<RGB2YUV_SHIFT)+0.5)) #define GU ((int)(-0.291 * (1 << RGB2YUV_SHIFT) + 0.5))
#define RY ((int)( 0.257*(1<<RGB2YUV_SHIFT)+0.5)) #define RY ((int)( 0.257 * (1 << RGB2YUV_SHIFT) + 0.5))
#define RV ((int)( 0.439*(1<<RGB2YUV_SHIFT)+0.5)) #define RV ((int)( 0.439 * (1 << RGB2YUV_SHIFT) + 0.5))
#define RU ((int)(-0.148*(1<<RGB2YUV_SHIFT)+0.5)) #define RU ((int)(-0.148 * (1 << RGB2YUV_SHIFT) + 0.5))
//plain C versions //plain C versions
#include "rgb2rgb_template.c" #include "rgb2rgb_template.c"
/* /*
RGB15->RGB16 original by Strepto/Astral * RGB15->RGB16 original by Strepto/Astral
ported to gcc & bugfixed : A'rpi * ported to gcc & bugfixed : A'rpi
MMX2, 3DNOW optimization by Nick Kurshev * MMX2, 3DNOW optimization by Nick Kurshev
32-bit C version, and and&add trick by Michael Niedermayer * 32-bit C version, and and&add trick by Michael Niedermayer
*/ */
void sws_rgb2rgb_init(void) void sws_rgb2rgb_init(void)
{ {
@ -127,16 +136,16 @@ void rgb32to24(const uint8_t *src, uint8_t *dst, int src_size)
{ {
int i, num_pixels = src_size >> 2; int i, num_pixels = src_size >> 2;
for (i=0; i<num_pixels; i++) { for (i = 0; i < num_pixels; i++) {
#if HAVE_BIGENDIAN #if HAVE_BIGENDIAN
/* RGB32 (= A,B,G,R) -> BGR24 (= B,G,R) */ /* RGB32 (= A,B,G,R) -> BGR24 (= B,G,R) */
dst[3*i + 0] = src[4*i + 1]; dst[3 * i + 0] = src[4 * i + 1];
dst[3*i + 1] = src[4*i + 2]; dst[3 * i + 1] = src[4 * i + 2];
dst[3*i + 2] = src[4*i + 3]; dst[3 * i + 2] = src[4 * i + 3];
#else #else
dst[3*i + 0] = src[4*i + 2]; dst[3 * i + 0] = src[4 * i + 2];
dst[3*i + 1] = src[4*i + 1]; dst[3 * i + 1] = src[4 * i + 1];
dst[3*i + 2] = src[4*i + 0]; dst[3 * i + 2] = src[4 * i + 0];
#endif #endif
} }
} }
@ -144,39 +153,40 @@ void rgb32to24(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)
{ {
int i; int i;
for (i=0; 3*i<src_size; i++) {
for (i = 0; 3 * i < src_size; i++) {
#if HAVE_BIGENDIAN #if HAVE_BIGENDIAN
/* RGB24 (= R,G,B) -> BGR32 (= A,R,G,B) */ /* RGB24 (= R, G, B) -> BGR32 (= A, R, G, B) */
dst[4*i + 0] = 255; dst[4 * i + 0] = 255;
dst[4*i + 1] = src[3*i + 0]; dst[4 * i + 1] = src[3 * i + 0];
dst[4*i + 2] = src[3*i + 1]; dst[4 * i + 2] = src[3 * i + 1];
dst[4*i + 3] = src[3*i + 2]; dst[4 * i + 3] = src[3 * i + 2];
#else #else
dst[4*i + 0] = src[3*i + 2]; dst[4 * i + 0] = src[3 * i + 2];
dst[4*i + 1] = src[3*i + 1]; dst[4 * i + 1] = src[3 * i + 1];
dst[4*i + 2] = src[3*i + 0]; dst[4 * i + 2] = src[3 * i + 0];
dst[4*i + 3] = 255; dst[4 * i + 3] = 255;
#endif #endif
} }
} }
void rgb16tobgr32(const uint8_t *src, uint8_t *dst, int src_size) void rgb16tobgr32(const uint8_t *src, uint8_t *dst, int src_size)
{ {
uint8_t *d = dst; uint8_t *d = dst;
const uint16_t *s = (const uint16_t *)src; const uint16_t *s = (const uint16_t *)src;
const uint16_t *end = s + src_size / 2; const uint16_t *end = s + src_size / 2;
while (s < end) { while (s < end) {
register uint16_t bgr = *s++; register uint16_t bgr = *s++;
#if HAVE_BIGENDIAN #if HAVE_BIGENDIAN
*d++ = 255; *d++ = 255;
*d++ = (bgr&0x1F)<<3; *d++ = (bgr & 0x1F) << 3;
*d++ = (bgr&0x7E0)>>3; *d++ = (bgr & 0x7E0) >> 3;
*d++ = (bgr&0xF800)>>8; *d++ = (bgr & 0xF800) >> 8;
#else #else
*d++ = (bgr&0xF800)>>8; *d++ = (bgr & 0xF800) >> 8;
*d++ = (bgr&0x7E0)>>3; *d++ = (bgr & 0x7E0) >> 3;
*d++ = (bgr&0x1F)<<3; *d++ = (bgr & 0x1F) << 3;
*d++ = 255; *d++ = 255;
#endif #endif
} }
@ -184,34 +194,34 @@ void rgb16tobgr32(const uint8_t *src, uint8_t *dst, int src_size)
void rgb12to15(const uint8_t *src, uint8_t *dst, int src_size) void rgb12to15(const uint8_t *src, uint8_t *dst, int src_size)
{ {
uint16_t *d = (uint16_t *)dst;
const uint16_t *s = (const uint16_t *)src;
uint16_t rgb, r, g, b; uint16_t rgb, r, g, b;
uint16_t *d = (uint16_t *)dst;
const uint16_t *s = (const uint16_t *)src;
const uint16_t *end = s + src_size / 2; const uint16_t *end = s + src_size / 2;
while (s < end) { while (s < end) {
rgb = *s++; rgb = *s++;
r = rgb & 0xF00; r = rgb & 0xF00;
g = rgb & 0x0F0; g = rgb & 0x0F0;
b = rgb & 0x00F; b = rgb & 0x00F;
r = (r << 3) | ((r & 0x800) >> 1); r = (r << 3) | ((r & 0x800) >> 1);
g = (g << 2) | ((g & 0x080) >> 2); g = (g << 2) | ((g & 0x080) >> 2);
b = (b << 1) | ( b >> 3); b = (b << 1) | ( b >> 3);
*d++ = r | g | b; *d++ = r | g | b;
} }
} }
void rgb16to24(const uint8_t *src, uint8_t *dst, int src_size) void rgb16to24(const uint8_t *src, uint8_t *dst, int src_size)
{ {
uint8_t *d = dst; uint8_t *d = dst;
const uint16_t *s = (const uint16_t *)src; const uint16_t *s = (const uint16_t *)src;
const uint16_t *end = s + src_size / 2; const uint16_t *end = s + src_size / 2;
while (s < end) { while (s < end) {
register uint16_t bgr = *s++; register uint16_t bgr = *s++;
*d++ = (bgr&0xF800)>>8; *d++ = (bgr & 0xF800) >> 8;
*d++ = (bgr&0x7E0)>>3; *d++ = (bgr & 0x7E0) >> 3;
*d++ = (bgr&0x1F)<<3; *d++ = (bgr & 0x1F) << 3;
} }
} }
@ -219,9 +229,9 @@ void rgb16tobgr16(const uint8_t *src, uint8_t *dst, int src_size)
{ {
int i, num_pixels = src_size >> 1; int i, num_pixels = src_size >> 1;
for (i=0; i<num_pixels; i++) { for (i = 0; i < num_pixels; i++) {
unsigned rgb = ((const uint16_t*)src)[i]; unsigned rgb = ((const uint16_t *)src)[i];
((uint16_t*)dst)[i] = (rgb>>11) | (rgb&0x7E0) | (rgb<<11); ((uint16_t *)dst)[i] = (rgb >> 11) | (rgb & 0x7E0) | (rgb << 11);
} }
} }
@ -229,29 +239,29 @@ void rgb16tobgr15(const uint8_t *src, uint8_t *dst, int src_size)
{ {
int i, num_pixels = src_size >> 1; int i, num_pixels = src_size >> 1;
for (i=0; i<num_pixels; i++) { for (i = 0; i < num_pixels; i++) {
unsigned rgb = ((const uint16_t*)src)[i]; unsigned rgb = ((const uint16_t *)src)[i];
((uint16_t*)dst)[i] = (rgb>>11) | ((rgb&0x7C0)>>1) | ((rgb&0x1F)<<10); ((uint16_t *)dst)[i] = (rgb >> 11) | ((rgb & 0x7C0) >> 1) | ((rgb & 0x1F) << 10);
} }
} }
void rgb15tobgr32(const uint8_t *src, uint8_t *dst, int src_size) void rgb15tobgr32(const uint8_t *src, uint8_t *dst, int src_size)
{ {
uint8_t *d = dst; uint8_t *d = dst;
const uint16_t *s = (const uint16_t *)src; const uint16_t *s = (const uint16_t *)src;
const uint16_t *end = s + src_size / 2; const uint16_t *end = s + src_size / 2;
while (s < end) { while (s < end) {
register uint16_t bgr = *s++; register uint16_t bgr = *s++;
#if HAVE_BIGENDIAN #if HAVE_BIGENDIAN
*d++ = 255; *d++ = 255;
*d++ = (bgr&0x1F)<<3; *d++ = (bgr & 0x1F) << 3;
*d++ = (bgr&0x3E0)>>2; *d++ = (bgr & 0x3E0) >> 2;
*d++ = (bgr&0x7C00)>>7; *d++ = (bgr & 0x7C00) >> 7;
#else #else
*d++ = (bgr&0x7C00)>>7; *d++ = (bgr & 0x7C00) >> 7;
*d++ = (bgr&0x3E0)>>2; *d++ = (bgr & 0x3E0) >> 2;
*d++ = (bgr&0x1F)<<3; *d++ = (bgr & 0x1F) << 3;
*d++ = 255; *d++ = 255;
#endif #endif
} }
@ -259,15 +269,15 @@ void rgb15tobgr32(const uint8_t *src, uint8_t *dst, int src_size)
void rgb15to24(const uint8_t *src, uint8_t *dst, int src_size) void rgb15to24(const uint8_t *src, uint8_t *dst, int src_size)
{ {
uint8_t *d = dst; uint8_t *d = dst;
const uint16_t *s = (const uint16_t *)src; const uint16_t *s = (const uint16_t *)src;
const uint16_t *end = s + src_size / 2; const uint16_t *end = s + src_size / 2;
while (s < end) { while (s < end) {
register uint16_t bgr = *s++; register uint16_t bgr = *s++;
*d++ = (bgr&0x7C00)>>7; *d++ = (bgr & 0x7C00) >> 7;
*d++ = (bgr&0x3E0)>>2; *d++ = (bgr & 0x3E0) >> 2;
*d++ = (bgr&0x1F)<<3; *d++ = (bgr & 0x1F) << 3;
} }
} }
@ -275,9 +285,9 @@ void rgb15tobgr16(const uint8_t *src, uint8_t *dst, int src_size)
{ {
int i, num_pixels = src_size >> 1; int i, num_pixels = src_size >> 1;
for (i=0; i<num_pixels; i++) { for (i = 0; i < num_pixels; i++) {
unsigned rgb = ((const uint16_t*)src)[i]; unsigned rgb = ((const uint16_t *)src)[i];
((uint16_t*)dst)[i] = ((rgb&0x7C00)>>10) | ((rgb&0x3E0)<<1) | (rgb<<11); ((uint16_t *)dst)[i] = ((rgb & 0x7C00) >> 10) | ((rgb & 0x3E0) << 1) | (rgb << 11);
} }
} }
@ -285,22 +295,22 @@ void rgb15tobgr15(const uint8_t *src, uint8_t *dst, int src_size)
{ {
int i, num_pixels = src_size >> 1; int i, num_pixels = src_size >> 1;
for (i=0; i<num_pixels; i++) { for (i = 0; i < num_pixels; i++) {
unsigned rgb = ((const uint16_t*)src)[i]; unsigned rgb = ((const uint16_t *)src)[i];
unsigned br = rgb & 0x7C1F; unsigned br = rgb & 0x7C1F;
((uint16_t*)dst)[i] = (br>>10) | (rgb&0x3E0) | (br<<10); ((uint16_t *)dst)[i] = (br >> 10) | (rgb & 0x3E0) | (br << 10);
} }
} }
void rgb12tobgr12(const uint8_t *src, uint8_t *dst, int src_size) void rgb12tobgr12(const uint8_t *src, uint8_t *dst, int src_size)
{ {
uint16_t *d = (uint16_t*)dst; uint16_t *d = (uint16_t *)dst;
uint16_t *s = (uint16_t*)src; uint16_t *s = (uint16_t *)src;
int i, num_pixels = src_size >> 1; int i, num_pixels = src_size >> 1;
for (i = 0; i < num_pixels; i++) { for (i = 0; i < num_pixels; i++) {
unsigned rgb = s[i]; unsigned rgb = s[i];
d[i] = (rgb << 8 | rgb & 0xF0 | rgb >> 8) & 0xFFF; d[i] = (rgb << 8 | rgb & 0xF0 | rgb >> 8) & 0xFFF;
} }
} }
@ -308,21 +318,22 @@ void bgr8torgb8(const uint8_t *src, uint8_t *dst, int src_size)
{ {
int i, num_pixels = src_size; int i, num_pixels = src_size;
for (i=0; i<num_pixels; i++) { for (i = 0; i < num_pixels; i++) {
register uint8_t rgb = src[i]; register uint8_t rgb = src[i];
unsigned r = (rgb & 0x07); unsigned r = (rgb & 0x07);
unsigned g = (rgb & 0x38) >> 3; unsigned g = (rgb & 0x38) >> 3;
unsigned b = (rgb & 0xC0) >> 6; unsigned b = (rgb & 0xC0) >> 6;
dst[i] = ((b<<1)&0x07) | ((g&0x07)<<3) | ((r&0x03)<<6); dst[i] = ((b << 1) & 0x07) | ((g & 0x07) << 3) | ((r & 0x03) << 6);
} }
} }
#define DEFINE_SHUFFLE_BYTES(a, b, c, d) \ #define DEFINE_SHUFFLE_BYTES(a, b, c, d) \
void shuffle_bytes_##a##b##c##d(const uint8_t *src, uint8_t *dst, int src_size) \ void shuffle_bytes_ ## a ## b ## c ## d(const uint8_t *src, \
uint8_t *dst, int src_size) \
{ \ { \
int i; \ int i; \
\ \
for (i = 0; i < src_size; i+=4) { \ for (i = 0; i < src_size; i += 4) { \
dst[i + 0] = src[i + a]; \ dst[i + 0] = src[i + a]; \
dst[i + 1] = src[i + b]; \ dst[i + 1] = src[i + b]; \
dst[i + 2] = src[i + c]; \ dst[i + 2] = src[i + c]; \

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save