generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

swscale: K&R formatting cosmetics (part I)

Browse Source
This commit is contained in:
Diego Biurrun 2012-02-21 20:09:31 +01:00
parent 72b95764d0
commit 89d94b2182
4 changed files with 973 additions and 890 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
libswscale/options.c
View File

@ -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 }
}; };

213
libswscale/rgb2rgb.c
View File

@ -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 (*rgb24tobgr32)(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 (*rgb32tobgr24)(const uint8_t *src, uint8_t *dst, int src_size); void (*rgb32tobgr24)(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 (*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 (*rgb24to15)(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 (*rgb32tobgr16)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb32tobgr15)(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 (*rgb24tobgr24)(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 (*rgb16tobgr24)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb15tobgr24)(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 (*rgb32to16)(const uint8_t *src, uint8_t *dst, int src_size);
void (*rgb32to15)(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 (*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 (*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,18 +153,19 @@ 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
} }
} }
@ -170,13 +180,13 @@ void rgb16tobgr32(const uint8_t *src, uint8_t *dst, int src_size)
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,9 +194,9 @@ 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 rgb, r, g, b;
uint16_t *d = (uint16_t *)dst; uint16_t *d = (uint16_t *)dst;
const uint16_t *s = (const uint16_t *)src; const uint16_t *s = (const uint16_t *)src;
uint16_t rgb, r, g, b;
const uint16_t *end = s + src_size / 2; const uint16_t *end = s + src_size / 2;
while (s < end) { while (s < end) {
@ -209,9 +219,9 @@ void rgb16to24(const uint8_t *src, uint8_t *dst, int src_size)
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,9 +239,9 @@ 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);
} }
} }
@ -245,13 +255,13 @@ void rgb15tobgr32(const uint8_t *src, uint8_t *dst, int src_size)
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
} }
@ -265,9 +275,9 @@ void rgb15to24(const uint8_t *src, uint8_t *dst, int src_size)
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,17 +295,17 @@ 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++) {
@ -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]; \

565
libswscale/rgb2rgb_template.c
View File

@ -26,7 +26,8 @@
#include <stddef.h> #include <stddef.h>
static inline void rgb24tobgr32_c(const uint8_t *src, uint8_t *dst, int src_size) static inline void rgb24tobgr32_c(const uint8_t *src, uint8_t *dst,
int src_size)
{ {
uint8_t *dest = dst; uint8_t *dest = dst;
const uint8_t *s = src; const uint8_t *s = src;
@ -34,12 +35,12 @@ static inline void rgb24tobgr32_c(const uint8_t *src, uint8_t *dst, int src_size
while (s < end) { while (s < end) {
#if HAVE_BIGENDIAN #if HAVE_BIGENDIAN
/* RGB24 (= R,G,B) -> RGB32 (= A,B,G,R) */ /* RGB24 (= R, G, B) -> RGB32 (= A, B, G, R) */
*dest++ = 255; *dest++ = 255;
*dest++ = s[2]; *dest++ = s[2];
*dest++ = s[1]; *dest++ = s[1];
*dest++ = s[0]; *dest++ = s[0];
s+=3; s += 3;
#else #else
*dest++ = *s++; *dest++ = *s++;
*dest++ = *s++; *dest++ = *s++;
@ -49,7 +50,8 @@ static inline void rgb24tobgr32_c(const uint8_t *src, uint8_t *dst, int src_size
} }
} }
static inline void rgb32tobgr24_c(const uint8_t *src, uint8_t *dst, int src_size) static inline void rgb32tobgr24_c(const uint8_t *src, uint8_t *dst,
int src_size)
{ {
uint8_t *dest = dst; uint8_t *dest = dst;
const uint8_t *s = src; const uint8_t *s = src;
@ -57,7 +59,7 @@ static inline void rgb32tobgr24_c(const uint8_t *src, uint8_t *dst, int src_size
while (s < end) { while (s < end) {
#if HAVE_BIGENDIAN #if HAVE_BIGENDIAN
/* RGB32 (= A,B,G,R) -> RGB24 (= R,G,B) */ /* RGB32 (= A, B, G, R) -> RGB24 (= R, G, B) */
s++; s++;
dest[2] = *s++; dest[2] = *s++;
dest[1] = *s++; dest[1] = *s++;
@ -73,189 +75,207 @@ static inline void rgb32tobgr24_c(const uint8_t *src, uint8_t *dst, int src_size
} }
/* /*
original by Strepto/Astral * 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
*/ */
static inline void rgb15to16_c(const uint8_t *src, uint8_t *dst, int src_size) static inline void rgb15to16_c(const uint8_t *src, uint8_t *dst, int src_size)
{ {
register const uint8_t* s=src; register uint8_t *d = dst;
register uint8_t* d=dst; register const uint8_t *s = src;
register const uint8_t *end = s + src_size; register const uint8_t *end = s + src_size;
const uint8_t *mm_end = end - 3; const uint8_t *mm_end = end - 3;
while (s < mm_end) { while (s < mm_end) {
register unsigned x= *((const uint32_t *)s); register unsigned x = *((const uint32_t *)s);
*((uint32_t *)d) = (x&0x7FFF7FFF) + (x&0x7FE07FE0); *((uint32_t *)d) = (x & 0x7FFF7FFF) + (x & 0x7FE07FE0);
d+=4; d += 4;
s+=4; s += 4;
} }
if (s < end) { if (s < end) {
register unsigned short x= *((const uint16_t *)s); register unsigned short x = *((const uint16_t *)s);
*((uint16_t *)d) = (x&0x7FFF) + (x&0x7FE0); *((uint16_t *)d) = (x & 0x7FFF) + (x & 0x7FE0);
} }
} }
static inline void rgb16to15_c(const uint8_t *src, uint8_t *dst, int src_size) static inline void rgb16to15_c(const uint8_t *src, uint8_t *dst, int src_size)
{ {
register const uint8_t* s=src; register uint8_t *d = dst;
register uint8_t* d=dst; register const uint8_t *s = src;
register const uint8_t *end = s + src_size; register const uint8_t *end = s + src_size;
const uint8_t *mm_end = end - 3; const uint8_t *mm_end = end - 3;
while (s < mm_end) { while (s < mm_end) {
register uint32_t x= *((const uint32_t*)s); register uint32_t x = *((const uint32_t *)s);
*((uint32_t *)d) = ((x>>1)&0x7FE07FE0) | (x&0x001F001F); *((uint32_t *)d) = ((x >> 1) & 0x7FE07FE0) | (x & 0x001F001F);
s+=4; s += 4;
d+=4; d += 4;
} }
if (s < end) { if (s < end) {
register uint16_t x= *((const uint16_t*)s); register uint16_t x = *((const uint16_t *)s);
*((uint16_t *)d) = ((x>>1)&0x7FE0) | (x&0x001F); *((uint16_t *)d) = ((x >> 1) & 0x7FE0) | (x & 0x001F);
} }
} }
static inline void rgb32to16_c(const uint8_t *src, uint8_t *dst, int src_size) static inline void rgb32to16_c(const uint8_t *src, uint8_t *dst, int src_size)
{ {
const uint8_t *s = src;
uint16_t *d = (uint16_t *)dst; uint16_t *d = (uint16_t *)dst;
const uint8_t *s = src;
const uint8_t *end = s + src_size; const uint8_t *end = s + src_size;
while (s < end) { while (s < end) {
register int rgb = *(const uint32_t*)s; s += 4; register int rgb = *(const uint32_t *)s;
*d++ = ((rgb&0xFF)>>3) + ((rgb&0xFC00)>>5) + ((rgb&0xF80000)>>8); s += 4;
*d++ = ((rgb & 0xFF) >> 3) +
((rgb & 0xFC00) >> 5) +
((rgb & 0xF80000) >> 8);
} }
} }
static inline void rgb32tobgr16_c(const uint8_t *src, uint8_t *dst, int src_size) static inline void rgb32tobgr16_c(const uint8_t *src, uint8_t *dst,
int src_size)
{ {
const uint8_t *s = src;
uint16_t *d = (uint16_t *)dst; uint16_t *d = (uint16_t *)dst;
const uint8_t *s = src;
const uint8_t *end = s + src_size; const uint8_t *end = s + src_size;
while (s < end) { while (s < end) {
register int rgb = *(const uint32_t*)s; s += 4; register int rgb = *(const uint32_t *)s;
*d++ = ((rgb&0xF8)<<8) + ((rgb&0xFC00)>>5) + ((rgb&0xF80000)>>19); s += 4;
*d++ = ((rgb & 0xF8) << 8) +
((rgb & 0xFC00) >> 5) +
((rgb & 0xF80000) >> 19);
} }
} }
static inline void rgb32to15_c(const uint8_t *src, uint8_t *dst, int src_size) static inline void rgb32to15_c(const uint8_t *src, uint8_t *dst, int src_size)
{ {
const uint8_t *s = src;
uint16_t *d = (uint16_t *)dst; uint16_t *d = (uint16_t *)dst;
const uint8_t *s = src;
const uint8_t *end = s + src_size; const uint8_t *end = s + src_size;
while (s < end) { while (s < end) {
register int rgb = *(const uint32_t*)s; s += 4; register int rgb = *(const uint32_t *)s;
*d++ = ((rgb&0xFF)>>3) + ((rgb&0xF800)>>6) + ((rgb&0xF80000)>>9); s += 4;
*d++ = ((rgb & 0xFF) >> 3) +
((rgb & 0xF800) >> 6) +
((rgb & 0xF80000) >> 9);
} }
} }
static inline void rgb32tobgr15_c(const uint8_t *src, uint8_t *dst, int src_size) static inline void rgb32tobgr15_c(const uint8_t *src, uint8_t *dst,
int src_size)
{ {
const uint8_t *s = src;
uint16_t *d = (uint16_t *)dst; uint16_t *d = (uint16_t *)dst;
const uint8_t *s = src;
const uint8_t *end = s + src_size; const uint8_t *end = s + src_size;
while (s < end) { while (s < end) {
register int rgb = *(const uint32_t*)s; s += 4; register int rgb = *(const uint32_t *)s;
*d++ = ((rgb&0xF8)<<7) + ((rgb&0xF800)>>6) + ((rgb&0xF80000)>>19); s += 4;
*d++ = ((rgb & 0xF8) << 7) +
((rgb & 0xF800) >> 6) +
((rgb & 0xF80000) >> 19);
} }
} }
static inline void rgb24tobgr16_c(const uint8_t *src, uint8_t *dst, int src_size) static inline void rgb24tobgr16_c(const uint8_t *src, uint8_t *dst,
int src_size)
{ {
const uint8_t *s = src;
uint16_t *d = (uint16_t *)dst; uint16_t *d = (uint16_t *)dst;
const uint8_t *s = src;
const uint8_t *end = s + src_size; const uint8_t *end = s + src_size;
while (s < end) { while (s < end) {
const int b = *s++; const int b = *s++;
const int g = *s++; const int g = *s++;
const int r = *s++; const int r = *s++;
*d++ = (b>>3) | ((g&0xFC)<<3) | ((r&0xF8)<<8); *d++ = (b >> 3) | ((g & 0xFC) << 3) | ((r & 0xF8) << 8);
} }
} }
static inline void rgb24to16_c(const uint8_t *src, uint8_t *dst, int src_size) static inline void rgb24to16_c(const uint8_t *src, uint8_t *dst, int src_size)
{ {
const uint8_t *s = src;
uint16_t *d = (uint16_t *)dst; uint16_t *d = (uint16_t *)dst;
const uint8_t *s = src;
const uint8_t *end = s + src_size; const uint8_t *end = s + src_size;
while (s < end) { while (s < end) {
const int r = *s++; const int r = *s++;
const int g = *s++; const int g = *s++;
const int b = *s++; const int b = *s++;
*d++ = (b>>3) | ((g&0xFC)<<3) | ((r&0xF8)<<8); *d++ = (b >> 3) | ((g & 0xFC) << 3) | ((r & 0xF8) << 8);
} }
} }
static inline void rgb24tobgr15_c(const uint8_t *src, uint8_t *dst, int src_size) static inline void rgb24tobgr15_c(const uint8_t *src, uint8_t *dst,
int src_size)
{ {
const uint8_t *s = src;
uint16_t *d = (uint16_t *)dst; uint16_t *d = (uint16_t *)dst;
const uint8_t *s = src;
const uint8_t *end = s + src_size; const uint8_t *end = s + src_size;
while (s < end) { while (s < end) {
const int b = *s++; const int b = *s++;
const int g = *s++; const int g = *s++;
const int r = *s++; const int r = *s++;
*d++ = (b>>3) | ((g&0xF8)<<2) | ((r&0xF8)<<7); *d++ = (b >> 3) | ((g & 0xF8) << 2) | ((r & 0xF8) << 7);
} }
} }
static inline void rgb24to15_c(const uint8_t *src, uint8_t *dst, int src_size) static inline void rgb24to15_c(const uint8_t *src, uint8_t *dst, int src_size)
{ {
const uint8_t *s = src;
uint16_t *d = (uint16_t *)dst; uint16_t *d = (uint16_t *)dst;
const uint8_t *s = src;
const uint8_t *end = s + src_size; const uint8_t *end = s + src_size;
while (s < end) { while (s < end) {
const int r = *s++; const int r = *s++;
const int g = *s++; const int g = *s++;
const int b = *s++; const int b = *s++;
*d++ = (b>>3) | ((g&0xF8)<<2) | ((r&0xF8)<<7); *d++ = (b >> 3) | ((g & 0xF8) << 2) | ((r & 0xF8) << 7);
} }
} }
/* /*
I use less accurate approximation here by simply left-shifting the input * I use less accurate approximation here by simply left-shifting the input
value and filling the low order bits with zeroes. This method improves PNG * value and filling the low order bits with zeroes. This method improves PNG
compression but this scheme cannot reproduce white exactly, since it does * compression but this scheme cannot reproduce white exactly, since it does
not generate an all-ones maximum value; the net effect is to darken the * not generate an all-ones maximum value; the net effect is to darken the
image slightly. * image slightly.
*
The better method should be "left bit replication": * The better method should be "left bit replication":
*
4 3 2 1 0 * 4 3 2 1 0
--------- * ---------
1 1 0 1 1 * 1 1 0 1 1
*
7 6 5 4 3 2 1 0 * 7 6 5 4 3 2 1 0
---------------- * ----------------
1 1 0 1 1 1 1 0 * 1 1 0 1 1 1 1 0
|=======| |===| * |=======| |===|
| leftmost bits repeated to fill open bits * | leftmost bits repeated to fill open bits
| * |
original bits * original bits
*/ */
static inline void rgb15tobgr24_c(const uint8_t *src, uint8_t *dst, int src_size) static inline void rgb15tobgr24_c(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&0x1F)<<3; *d++ = (bgr & 0x1F) << 3;
*d++ = (bgr&0x3E0)>>2; *d++ = (bgr & 0x3E0) >> 2;
*d++ = (bgr&0x7C00)>>7; *d++ = (bgr & 0x7C00) >> 7;
} }
} }
static inline void rgb16tobgr24_c(const uint8_t *src, uint8_t *dst, int src_size) static inline void rgb16tobgr24_c(const uint8_t *src, uint8_t *dst,
int src_size)
{ {
uint8_t *d = (uint8_t *)dst; uint8_t *d = (uint8_t *)dst;
const uint16_t *s = (const uint16_t *)src; const uint16_t *s = (const uint16_t *)src;
@ -263,9 +283,9 @@ static inline void rgb16tobgr24_c(const uint8_t *src, uint8_t *dst, int src_size
while (s < end) { while (s < end) {
register uint16_t bgr = *s++; register uint16_t bgr = *s++;
*d++ = (bgr&0x1F)<<3; *d++ = (bgr & 0x1F) << 3;
*d++ = (bgr&0x7E0)>>3; *d++ = (bgr & 0x7E0) >> 3;
*d++ = (bgr&0xF800)>>8; *d++ = (bgr & 0xF800) >> 8;
} }
} }
@ -279,13 +299,13 @@ static inline void rgb15to32_c(const uint8_t *src, uint8_t *dst, int src_size)
register uint16_t bgr = *s++; register uint16_t bgr = *s++;
#if HAVE_BIGENDIAN #if HAVE_BIGENDIAN
*d++ = 255; *d++ = 255;
*d++ = (bgr&0x7C00)>>7; *d++ = (bgr & 0x7C00) >> 7;
*d++ = (bgr&0x3E0)>>2; *d++ = (bgr & 0x3E0) >> 2;
*d++ = (bgr&0x1F)<<3; *d++ = (bgr & 0x1F) << 3;
#else #else
*d++ = (bgr&0x1F)<<3; *d++ = (bgr & 0x1F) << 3;
*d++ = (bgr&0x3E0)>>2; *d++ = (bgr & 0x3E0) >> 2;
*d++ = (bgr&0x7C00)>>7; *d++ = (bgr & 0x7C00) >> 7;
*d++ = 255; *d++ = 255;
#endif #endif
} }
@ -294,41 +314,44 @@ static inline void rgb15to32_c(const uint8_t *src, uint8_t *dst, int src_size)
static inline void rgb16to32_c(const uint8_t *src, uint8_t *dst, int src_size) static inline void rgb16to32_c(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&0xF800)>>8; *d++ = (bgr & 0xF800) >> 8;
*d++ = (bgr&0x7E0)>>3; *d++ = (bgr & 0x7E0) >> 3;
*d++ = (bgr&0x1F)<<3; *d++ = (bgr & 0x1F) << 3;
#else #else
*d++ = (bgr&0x1F)<<3; *d++ = (bgr & 0x1F) << 3;
*d++ = (bgr&0x7E0)>>3; *d++ = (bgr & 0x7E0) >> 3;
*d++ = (bgr&0xF800)>>8; *d++ = (bgr & 0xF800) >> 8;
*d++ = 255; *d++ = 255;
#endif #endif
} }
} }
static inline void shuffle_bytes_2103_c(const uint8_t *src, uint8_t *dst, int src_size) static inline void shuffle_bytes_2103_c(const uint8_t *src, uint8_t *dst,
int src_size)
{ {
int idx = 15 - src_size; int idx = 15 - src_size;
const uint8_t *s = src-idx; const uint8_t *s = src - idx;
uint8_t *d = dst-idx; uint8_t *d = dst - idx;
for (; idx<15; idx+=4) {
for (; idx < 15; idx += 4) {
register int v = *(const uint32_t *)&s[idx], g = v & 0xff00ff00; register int v = *(const uint32_t *)&s[idx], g = v & 0xff00ff00;
v &= 0xff00ff; v &= 0xff00ff;
*(uint32_t *)&d[idx] = (v>>16) + g + (v<<16); *(uint32_t *)&d[idx] = (v >> 16) + g + (v << 16);
} }
} }
static inline void rgb24tobgr24_c(const uint8_t *src, uint8_t *dst, int src_size) static inline void rgb24tobgr24_c(const uint8_t *src, uint8_t *dst, int src_size)
{ {
unsigned i; unsigned i;
for (i=0; i<src_size; i+=3) {
for (i = 0; i < src_size; i += 3) {
register uint8_t x = src[i + 2]; register uint8_t x = src[i + 2];
dst[i + 1] = src[i + 1]; dst[i + 1] = src[i + 1];
dst[i + 2] = src[i + 0]; dst[i + 2] = src[i + 0];
@ -344,9 +367,10 @@ static inline void yuvPlanartoyuy2_c(const uint8_t *ysrc, const uint8_t *usrc,
{ {
int y, i; int y, i;
const int chromWidth = width >> 1; const int chromWidth = width >> 1;
for (y=0; y<height; y++) {
for (y = 0; y < height; y++) {
#if HAVE_FAST_64BIT #if HAVE_FAST_64BIT
uint64_t *ldst = (uint64_t *) dst; uint64_t *ldst = (uint64_t *)dst;
const uint8_t *yc = ysrc, *uc = usrc, *vc = vsrc; const uint8_t *yc = ysrc, *uc = usrc, *vc = vsrc;
for (i = 0; i < chromWidth; i += 2) { for (i = 0; i < chromWidth; i += 2) {
uint64_t k = yc[0] + (uc[0] << 8) + uint64_t k = yc[0] + (uc[0] << 8) +
@ -360,11 +384,12 @@ static inline void yuvPlanartoyuy2_c(const uint8_t *ysrc, const uint8_t *usrc,
} }
#else #else
int *idst = (int32_t *) dst; int *idst = (int32_t *)dst;
const uint8_t *yc = ysrc, *uc = usrc, *vc = vsrc; const uint8_t *yc = ysrc, *uc = usrc, *vc = vsrc;
for (i = 0; i < chromWidth; i++) { for (i = 0; i < chromWidth; i++) {
#if HAVE_BIGENDIAN #if HAVE_BIGENDIAN
*idst++ = (yc[0] << 24)+ (uc[0] << 16) + *idst++ = (yc[0] << 24) + (uc[0] << 16) +
(yc[1] << 8) + (vc[0] << 0); (yc[1] << 8) + (vc[0] << 0);
#else #else
*idst++ = yc[0] + (uc[0] << 8) + *idst++ = yc[0] + (uc[0] << 8) +
@ -375,7 +400,7 @@ static inline void yuvPlanartoyuy2_c(const uint8_t *ysrc, const uint8_t *usrc,
vc++; vc++;
} }
#endif #endif
if ((y&(vertLumPerChroma-1)) == vertLumPerChroma-1) { if ((y & (vertLumPerChroma - 1)) == vertLumPerChroma - 1) {
usrc += chromStride; usrc += chromStride;
vsrc += chromStride; vsrc += chromStride;
} }
@ -390,9 +415,8 @@ static inline void yuvPlanartoyuy2_c(const uint8_t *ysrc, const uint8_t *usrc,
*/ */
static inline void yv12toyuy2_c(const uint8_t *ysrc, const uint8_t *usrc, static inline void yv12toyuy2_c(const uint8_t *ysrc, const uint8_t *usrc,
const uint8_t *vsrc, uint8_t *dst, const uint8_t *vsrc, uint8_t *dst,
int width, int height, int width, int height, int lumStride,
int lumStride, int chromStride, int chromStride, int dstStride)
int dstStride)
{ {
//FIXME interpolate chroma //FIXME interpolate chroma
yuvPlanartoyuy2_c(ysrc, usrc, vsrc, dst, width, height, lumStride, yuvPlanartoyuy2_c(ysrc, usrc, vsrc, dst, width, height, lumStride,
@ -407,9 +431,10 @@ static inline void yuvPlanartouyvy_c(const uint8_t *ysrc, const uint8_t *usrc,
{ {
int y, i; int y, i;
const int chromWidth = width >> 1; const int chromWidth = width >> 1;
for (y=0; y<height; y++) {
for (y = 0; y < height; y++) {
#if HAVE_FAST_64BIT #if HAVE_FAST_64BIT
uint64_t *ldst = (uint64_t *) dst; uint64_t *ldst = (uint64_t *)dst;
const uint8_t *yc = ysrc, *uc = usrc, *vc = vsrc; const uint8_t *yc = ysrc, *uc = usrc, *vc = vsrc;
for (i = 0; i < chromWidth; i += 2) { for (i = 0; i < chromWidth; i += 2) {
uint64_t k = uc[0] + (yc[0] << 8) + uint64_t k = uc[0] + (yc[0] << 8) +
@ -423,11 +448,12 @@ static inline void yuvPlanartouyvy_c(const uint8_t *ysrc, const uint8_t *usrc,
} }
#else #else
int *idst = (int32_t *) dst; int *idst = (int32_t *)dst;
const uint8_t *yc = ysrc, *uc = usrc, *vc = vsrc; const uint8_t *yc = ysrc, *uc = usrc, *vc = vsrc;
for (i = 0; i < chromWidth; i++) { for (i = 0; i < chromWidth; i++) {
#if HAVE_BIGENDIAN #if HAVE_BIGENDIAN
*idst++ = (uc[0] << 24)+ (yc[0] << 16) + *idst++ = (uc[0] << 24) + (yc[0] << 16) +
(vc[0] << 8) + (yc[1] << 0); (vc[0] << 8) + (yc[1] << 0);
#else #else
*idst++ = uc[0] + (yc[0] << 8) + *idst++ = uc[0] + (yc[0] << 8) +
@ -438,7 +464,7 @@ static inline void yuvPlanartouyvy_c(const uint8_t *ysrc, const uint8_t *usrc,
vc++; vc++;
} }
#endif #endif
if ((y&(vertLumPerChroma-1)) == vertLumPerChroma-1) { if ((y & (vertLumPerChroma - 1)) == vertLumPerChroma - 1) {
usrc += chromStride; usrc += chromStride;
vsrc += chromStride; vsrc += chromStride;
} }
@ -453,9 +479,8 @@ static inline void yuvPlanartouyvy_c(const uint8_t *ysrc, const uint8_t *usrc,
*/ */
static inline void yv12touyvy_c(const uint8_t *ysrc, const uint8_t *usrc, static inline void yv12touyvy_c(const uint8_t *ysrc, const uint8_t *usrc,
const uint8_t *vsrc, uint8_t *dst, const uint8_t *vsrc, uint8_t *dst,
int width, int height, int width, int height, int lumStride,
int lumStride, int chromStride, int chromStride, int dstStride)
int dstStride)
{ {
//FIXME interpolate chroma //FIXME interpolate chroma
yuvPlanartouyvy_c(ysrc, usrc, vsrc, dst, width, height, lumStride, yuvPlanartouyvy_c(ysrc, usrc, vsrc, dst, width, height, lumStride,
@ -467,9 +492,8 @@ static inline void yv12touyvy_c(const uint8_t *ysrc, const uint8_t *usrc,
*/ */
static inline void yuv422ptouyvy_c(const uint8_t *ysrc, const uint8_t *usrc, static inline void yuv422ptouyvy_c(const uint8_t *ysrc, const uint8_t *usrc,
const uint8_t *vsrc, uint8_t *dst, const uint8_t *vsrc, uint8_t *dst,
int width, int height, int width, int height, int lumStride,
int lumStride, int chromStride, int chromStride, int dstStride)
int dstStride)
{ {
yuvPlanartouyvy_c(ysrc, usrc, vsrc, dst, width, height, lumStride, yuvPlanartouyvy_c(ysrc, usrc, vsrc, dst, width, height, lumStride,
chromStride, dstStride, 1); chromStride, dstStride, 1);
@ -480,9 +504,8 @@ static inline void yuv422ptouyvy_c(const uint8_t *ysrc, const uint8_t *usrc,
*/ */
static inline void yuv422ptoyuy2_c(const uint8_t *ysrc, const uint8_t *usrc, static inline void yuv422ptoyuy2_c(const uint8_t *ysrc, const uint8_t *usrc,
const uint8_t *vsrc, uint8_t *dst, const uint8_t *vsrc, uint8_t *dst,
int width, int height, int width, int height, int lumStride,
int lumStride, int chromStride, int chromStride, int dstStride)
int dstStride)
{ {
yuvPlanartoyuy2_c(ysrc, usrc, vsrc, dst, width, height, lumStride, yuvPlanartoyuy2_c(ysrc, usrc, vsrc, dst, width, height, lumStride,
chromStride, dstStride, 1); chromStride, dstStride, 1);
@ -494,26 +517,26 @@ static inline void yuv422ptoyuy2_c(const uint8_t *ysrc, const uint8_t *usrc,
*/ */
static inline void yuy2toyv12_c(const uint8_t *src, uint8_t *ydst, static inline void yuy2toyv12_c(const uint8_t *src, uint8_t *ydst,
uint8_t *udst, uint8_t *vdst, uint8_t *udst, uint8_t *vdst,
int width, int height, int width, int height, int lumStride,
int lumStride, int chromStride, int chromStride, int srcStride)
int srcStride)
{ {
int y; int y;
const int chromWidth = width >> 1; const int chromWidth = width >> 1;
for (y=0; y<height; y+=2) {
for (y = 0; y < height; y += 2) {
int i; int i;
for (i=0; i<chromWidth; i++) { for (i = 0; i < chromWidth; i++) {
ydst[2*i+0] = src[4*i+0]; ydst[2 * i + 0] = src[4 * i + 0];
udst[i] = src[4*i+1]; udst[i] = src[4 * i + 1];
ydst[2*i+1] = src[4*i+2]; ydst[2 * i + 1] = src[4 * i + 2];
vdst[i] = src[4*i+3]; vdst[i] = src[4 * i + 3];
} }
ydst += lumStride; ydst += lumStride;
src += srcStride; src += srcStride;
for (i=0; i<chromWidth; i++) { for (i = 0; i < chromWidth; i++) {
ydst[2*i+0] = src[4*i+0]; ydst[2 * i + 0] = src[4 * i + 0];
ydst[2*i+1] = src[4*i+2]; ydst[2 * i + 1] = src[4 * i + 2];
} }
udst += chromStride; udst += chromStride;
vdst += chromStride; vdst += chromStride;
@ -525,46 +548,46 @@ static inline void yuy2toyv12_c(const uint8_t *src, uint8_t *ydst,
static inline void planar2x_c(const uint8_t *src, uint8_t *dst, int srcWidth, static inline void planar2x_c(const uint8_t *src, uint8_t *dst, int srcWidth,
int srcHeight, int srcStride, int dstStride) int srcHeight, int srcStride, int dstStride)
{ {
int x,y; int x, y;
dst[0]= src[0]; dst[0] = src[0];
// first line // first line
for (x=0; x<srcWidth-1; x++) { for (x = 0; x < srcWidth - 1; x++) {
dst[2*x+1]= (3*src[x] + src[x+1])>>2; dst[2 * x + 1] = (3 * src[x] + src[x + 1]) >> 2;
dst[2*x+2]= ( src[x] + 3*src[x+1])>>2; dst[2 * x + 2] = (src[x] + 3 * src[x + 1]) >> 2;
} }
dst[2*srcWidth-1]= src[srcWidth-1]; dst[2 * srcWidth - 1] = src[srcWidth - 1];
dst+= dstStride; dst += dstStride;
for (y=1; y<srcHeight; y++) { for (y = 1; y < srcHeight; y++) {
const int mmxSize = 1; const int mmxSize = 1;
dst[0 ]= (3*src[0] + src[srcStride])>>2; dst[0] = (src[0] * 3 + src[srcStride]) >> 2;
dst[dstStride]= ( src[0] + 3*src[srcStride])>>2; dst[dstStride] = (src[0] + 3 * src[srcStride]) >> 2;
for (x=mmxSize-1; x<srcWidth-1; x++) { for (x = mmxSize - 1; x < srcWidth - 1; x++) {
dst[2*x +1]= (3*src[x+0] + src[x+srcStride+1])>>2; dst[2 * x + 1] = (src[x + 0] * 3 + src[x + srcStride + 1]) >> 2;
dst[2*x+dstStride+2]= ( src[x+0] + 3*src[x+srcStride+1])>>2; dst[2 * x + dstStride + 2] = (src[x + 0] + 3 * src[x + srcStride + 1]) >> 2;
dst[2*x+dstStride+1]= ( src[x+1] + 3*src[x+srcStride ])>>2; dst[2 * x + dstStride + 1] = (src[x + 1] + 3 * src[x + srcStride]) >> 2;
dst[2*x +2]= (3*src[x+1] + src[x+srcStride ])>>2; dst[2 * x + 2] = (src[x + 1] * 3 + src[x + srcStride]) >> 2;
} }
dst[srcWidth*2 -1 ]= (3*src[srcWidth-1] + src[srcWidth-1 + srcStride])>>2; dst[srcWidth * 2 - 1] = (src[srcWidth - 1] * 3 + src[srcWidth - 1 + srcStride]) >> 2;
dst[srcWidth*2 -1 + dstStride]= ( src[srcWidth-1] + 3*src[srcWidth-1 + srcStride])>>2; dst[srcWidth * 2 - 1 + dstStride] = (src[srcWidth - 1] + 3 * src[srcWidth - 1 + srcStride]) >> 2;
dst+=dstStride*2; dst += dstStride * 2;
src+=srcStride; src += srcStride;
} }
// last line // last line
dst[0]= src[0]; dst[0] = src[0];
for (x=0; x<srcWidth-1; x++) { for (x = 0; x < srcWidth - 1; x++) {
dst[2*x+1]= (3*src[x] + src[x+1])>>2; dst[2 * x + 1] = (src[x] * 3 + src[x + 1]) >> 2;
dst[2*x+2]= ( src[x] + 3*src[x+1])>>2; dst[2 * x + 2] = (src[x] + 3 * src[x + 1]) >> 2;
} }
dst[2*srcWidth-1]= src[srcWidth-1]; dst[2 * srcWidth - 1] = src[srcWidth - 1];
} }
/** /**
@ -575,26 +598,26 @@ static inline void planar2x_c(const uint8_t *src, uint8_t *dst, int srcWidth,
*/ */
static inline void uyvytoyv12_c(const uint8_t *src, uint8_t *ydst, static inline void uyvytoyv12_c(const uint8_t *src, uint8_t *ydst,
uint8_t *udst, uint8_t *vdst, uint8_t *udst, uint8_t *vdst,
int width, int height, int width, int height, int lumStride,
int lumStride, int chromStride, int chromStride, int srcStride)
int srcStride)
{ {
int y; int y;
const int chromWidth = width >> 1; const int chromWidth = width >> 1;
for (y=0; y<height; y+=2) {
for (y = 0; y < height; y += 2) {
int i; int i;
for (i=0; i<chromWidth; i++) { for (i = 0; i < chromWidth; i++) {
udst[i] = src[4*i+0]; udst[i] = src[4 * i + 0];
ydst[2*i+0] = src[4*i+1]; ydst[2 * i + 0] = src[4 * i + 1];
vdst[i] = src[4*i+2]; vdst[i] = src[4 * i + 2];
ydst[2*i+1] = src[4*i+3]; ydst[2 * i + 1] = src[4 * i + 3];
} }
ydst += lumStride; ydst += lumStride;
src += srcStride; src += srcStride;
for (i=0; i<chromWidth; i++) { for (i = 0; i < chromWidth; i++) {
ydst[2*i+0] = src[4*i+1]; ydst[2 * i + 0] = src[4 * i + 1];
ydst[2*i+1] = src[4*i+3]; ydst[2 * i + 1] = src[4 * i + 3];
} }
udst += chromStride; udst += chromStride;
vdst += chromStride; vdst += chromStride;
@ -619,44 +642,44 @@ void rgb24toyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst,
for (y = 0; y < height; y += 2) { for (y = 0; y < height; y += 2) {
int i; int i;
for (i=0; i<chromWidth; i++) { for (i = 0; i < chromWidth; i++) {
unsigned int b = src[6*i+0]; unsigned int b = src[6 * i + 0];
unsigned int g = src[6*i+1]; unsigned int g = src[6 * i + 1];
unsigned int r = src[6*i+2]; unsigned int r = src[6 * i + 2];
unsigned int Y = ((RY*r + GY*g + BY*b)>>RGB2YUV_SHIFT) + 16; unsigned int Y = ((RY * r + GY * g + BY * b) >> RGB2YUV_SHIFT) + 16;
unsigned int V = ((RV*r + GV*g + BV*b)>>RGB2YUV_SHIFT) + 128; unsigned int V = ((RV * r + GV * g + BV * b) >> RGB2YUV_SHIFT) + 128;
unsigned int U = ((RU*r + GU*g + BU*b)>>RGB2YUV_SHIFT) + 128; unsigned int U = ((RU * r + GU * g + BU * b) >> RGB2YUV_SHIFT) + 128;
udst[i] = U; udst[i] = U;
vdst[i] = V; vdst[i] = V;
ydst[2*i] = Y; ydst[2 * i] = Y;
b = src[6*i+3]; b = src[6 * i + 3];
g = src[6*i+4]; g = src[6 * i + 4];
r = src[6*i+5]; r = src[6 * i + 5];
Y = ((RY*r + GY*g + BY*b)>>RGB2YUV_SHIFT) + 16; Y = ((RY * r + GY * g + BY * b) >> RGB2YUV_SHIFT) + 16;
ydst[2*i+1] = Y; ydst[2 * i + 1] = Y;
} }
ydst += lumStride; ydst += lumStride;
src += srcStride; src += srcStride;
for (i=0; i<chromWidth; i++) { for (i = 0; i < chromWidth; i++) {
unsigned int b = src[6*i+0]; unsigned int b = src[6 * i + 0];
unsigned int g = src[6*i+1]; unsigned int g = src[6 * i + 1];
unsigned int r = src[6*i+2]; unsigned int r = src[6 * i + 2];
unsigned int Y = ((RY*r + GY*g + BY*b)>>RGB2YUV_SHIFT) + 16; unsigned int Y = ((RY * r + GY * g + BY * b) >> RGB2YUV_SHIFT) + 16;
ydst[2*i] = Y; ydst[2 * i] = Y;
b = src[6*i+3]; b = src[6 * i + 3];
g = src[6*i+4]; g = src[6 * i + 4];
r = src[6*i+5]; r = src[6 * i + 5];
Y = ((RY*r + GY*g + BY*b)>>RGB2YUV_SHIFT) + 16; Y = ((RY * r + GY * g + BY * b) >> RGB2YUV_SHIFT) + 16;
ydst[2*i+1] = Y; ydst[2 * i + 1] = Y;
} }
udst += chromStride; udst += chromStride;
vdst += chromStride; vdst += chromStride;
@ -666,17 +689,16 @@ void rgb24toyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst,
} }
static void interleaveBytes_c(const uint8_t *src1, const uint8_t *src2, static void interleaveBytes_c(const uint8_t *src1, const uint8_t *src2,
uint8_t *dest, int width, uint8_t *dest, int width, int height,
int height, int src1Stride, int src1Stride, int src2Stride, int dstStride)
int src2Stride, int dstStride)
{ {
int h; int h;
for (h=0; h < height; h++) { for (h = 0; h < height; h++) {
int w; int w;
for (w=0; w < width; w++) { for (w = 0; w < width; w++) {
dest[2*w+0] = src1[w]; dest[2 * w + 0] = src1[w];
dest[2*w+1] = src2[w]; dest[2 * w + 1] = src2[w];
} }
dest += dstStride; dest += dstStride;
src1 += src1Stride; src1 += src1Stride;
@ -694,15 +716,15 @@ static inline void vu9_to_vu12_c(const uint8_t *src1, const uint8_t *src2,
int w = width / 2; int w = width / 2;
int h = height / 2; int h = height / 2;
for (y=0;y<h;y++) { for (y = 0; y < h; y++) {
const uint8_t* s1=src1+srcStride1*(y>>1); const uint8_t *s1 = src1 + srcStride1 * (y >> 1);
uint8_t* d=dst1+dstStride1*y; uint8_t *d = dst1 + dstStride1 * y;
for (x = 0; x < w; x++) for (x = 0; x < w; x++)
d[2 * x] = d[2 * x + 1] = s1[x]; d[2 * x] = d[2 * x + 1] = s1[x];
} }
for (y=0;y<h;y++) { for (y = 0; y < h; y++) {
const uint8_t* s2=src2+srcStride2*(y>>1); const uint8_t *s2 = src2 + srcStride2 * (y >> 1);
uint8_t* d=dst2+dstStride2*y; uint8_t *d = dst2 + dstStride2 * y;
for (x = 0; x < w; x++) for (x = 0; x < w; x++)
d[2 * x] = d[2 * x + 1] = s2[x]; d[2 * x] = d[2 * x + 1] = s2[x];
} }
@ -718,21 +740,21 @@ static inline void yvu9_to_yuy2_c(const uint8_t *src1, const uint8_t *src2,
int w = width / 2; int w = width / 2;
int h = height; int h = height;
for (y=0;y<h;y++) { for (y = 0; y < h; y++) {
const uint8_t* yp=src1+srcStride1*y; const uint8_t *yp = src1 + srcStride1 * y;
const uint8_t* up=src2+srcStride2*(y>>2); const uint8_t *up = src2 + srcStride2 * (y >> 2);
const uint8_t* vp=src3+srcStride3*(y>>2); const uint8_t *vp = src3 + srcStride3 * (y >> 2);
uint8_t* d=dst+dstStride*y; uint8_t *d = dst + dstStride * y;
for (x = 0; x < w; x++) { for (x = 0; x < w; x++) {
const int x2 = x<<2; const int x2 = x << 2;
d[8*x+0] = yp[x2]; d[8 * x + 0] = yp[x2];
d[8*x+1] = up[x]; d[8 * x + 1] = up[x];
d[8*x+2] = yp[x2+1]; d[8 * x + 2] = yp[x2 + 1];
d[8*x+3] = vp[x]; d[8 * x + 3] = vp[x];
d[8*x+4] = yp[x2+2]; d[8 * x + 4] = yp[x2 + 2];
d[8*x+5] = up[x]; d[8 * x + 5] = up[x];
d[8*x+6] = yp[x2+3]; d[8 * x + 6] = yp[x2 + 3];
d[8*x+7] = vp[x]; d[8 * x + 7] = vp[x];
} }
} }
} }
@ -740,11 +762,10 @@ static inline void yvu9_to_yuy2_c(const uint8_t *src1, const uint8_t *src2,
static void extract_even_c(const uint8_t *src, uint8_t *dst, int count) static void extract_even_c(const uint8_t *src, uint8_t *dst, int count)
{ {
dst += count; dst += count;
src += 2*count; src += count * 2;
count= - count; count = -count;
while (count < 0) {
while(count<0) { dst[count] = src[2 * count];
dst[count]= src[2*count];
count++; count++;
} }
} }
@ -752,13 +773,13 @@ static void extract_even_c(const uint8_t *src, uint8_t *dst, int count)
static void extract_even2_c(const uint8_t *src, uint8_t *dst0, uint8_t *dst1, static void extract_even2_c(const uint8_t *src, uint8_t *dst0, uint8_t *dst1,
int count) int count)
{ {
dst0+= count; dst0 += count;
dst1+= count; dst1 += count;
src += 4*count; src += count * 4;
count= - count; count = -count;
while(count<0) { while (count < 0) {
dst0[count]= src[4*count+0]; dst0[count] = src[4 * count + 0];
dst1[count]= src[4*count+2]; dst1[count] = src[4 * count + 2];
count++; count++;
} }
} }
@ -768,12 +789,12 @@ static void extract_even2avg_c(const uint8_t *src0, const uint8_t *src1,
{ {
dst0 += count; dst0 += count;
dst1 += count; dst1 += count;
src0 += 4*count; src0 += count * 4;
src1 += 4*count; src1 += count * 4;
count= - count; count = -count;
while(count<0) { while (count < 0) {
dst0[count]= (src0[4*count+0]+src1[4*count+0])>>1; dst0[count] = (src0[4 * count + 0] + src1[4 * count + 0]) >> 1;
dst1[count]= (src0[4*count+2]+src1[4*count+2])>>1; dst1[count] = (src0[4 * count + 2] + src1[4 * count + 2]) >> 1;
count++; count++;
} }
} }
@ -781,14 +802,14 @@ static void extract_even2avg_c(const uint8_t *src0, const uint8_t *src1,
static void extract_odd2_c(const uint8_t *src, uint8_t *dst0, uint8_t *dst1, static void extract_odd2_c(const uint8_t *src, uint8_t *dst0, uint8_t *dst1,
int count) int count)
{ {
dst0+= count; dst0 += count;
dst1+= count; dst1 += count;
src += 4*count; src += count * 4;
count= - count; count = -count;
src++; src++;
while(count<0) { while (count < 0) {
dst0[count]= src[4*count+0]; dst0[count] = src[4 * count + 0];
dst1[count]= src[4*count+2]; dst1[count] = src[4 * count + 2];
count++; count++;
} }
} }
@ -798,14 +819,14 @@ static void extract_odd2avg_c(const uint8_t *src0, const uint8_t *src1,
{ {
dst0 += count; dst0 += count;
dst1 += count; dst1 += count;
src0 += 4*count; src0 += count * 4;
src1 += 4*count; src1 += count * 4;
count= - count; count = -count;
src0++; src0++;
src1++; src1++;
while(count<0) { while (count < 0) {
dst0[count]= (src0[4*count+0]+src1[4*count+0])>>1; dst0[count] = (src0[4 * count + 0] + src1[4 * count + 0]) >> 1;
dst1[count]= (src0[4*count+2]+src1[4*count+2])>>1; dst1[count] = (src0[4 * count + 2] + src1[4 * count + 2]) >> 1;
count++; count++;
} }
} }
@ -815,18 +836,18 @@ static void yuyvtoyuv420_c(uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
int lumStride, int chromStride, int srcStride) int lumStride, int chromStride, int srcStride)
{ {
int y; int y;
const int chromWidth= -((-width)>>1); const int chromWidth = -((-width) >> 1);
for (y=0; y<height; y++) { for (y = 0; y < height; y++) {
extract_even_c(src, ydst, width); extract_even_c(src, ydst, width);
if(y&1) { if (y & 1) {
extract_odd2avg_c(src - srcStride, src, udst, vdst, chromWidth); extract_odd2avg_c(src - srcStride, src, udst, vdst, chromWidth);
udst+= chromStride; udst += chromStride;
vdst+= chromStride; vdst += chromStride;
} }
src += srcStride; src += srcStride;
ydst+= lumStride; ydst += lumStride;
} }
} }
@ -835,16 +856,16 @@ static void yuyvtoyuv422_c(uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
int lumStride, int chromStride, int srcStride) int lumStride, int chromStride, int srcStride)
{ {
int y; int y;
const int chromWidth= -((-width)>>1); const int chromWidth = -((-width) >> 1);
for (y=0; y<height; y++) { for (y = 0; y < height; y++) {
extract_even_c(src, ydst, width); extract_even_c(src, ydst, width);
extract_odd2_c(src, udst, vdst, chromWidth); extract_odd2_c(src, udst, vdst, chromWidth);
src += srcStride; src += srcStride;
ydst+= lumStride; ydst += lumStride;
udst+= chromStride; udst += chromStride;
vdst+= chromStride; vdst += chromStride;
} }
} }
@ -853,18 +874,18 @@ static void uyvytoyuv420_c(uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
int lumStride, int chromStride, int srcStride) int lumStride, int chromStride, int srcStride)
{ {
int y; int y;
const int chromWidth= -((-width)>>1); const int chromWidth = -((-width) >> 1);
for (y=0; y<height; y++) { for (y = 0; y < height; y++) {
extract_even_c(src + 1, ydst, width); extract_even_c(src + 1, ydst, width);
if(y&1) { if (y & 1) {
extract_even2avg_c(src - srcStride, src, udst, vdst, chromWidth); extract_even2avg_c(src - srcStride, src, udst, vdst, chromWidth);
udst+= chromStride; udst += chromStride;
vdst+= chromStride; vdst += chromStride;
} }
src += srcStride; src += srcStride;
ydst+= lumStride; ydst += lumStride;
} }
} }
@ -873,16 +894,16 @@ static void uyvytoyuv422_c(uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
int lumStride, int chromStride, int srcStride) int lumStride, int chromStride, int srcStride)
{ {
int y; int y;
const int chromWidth= -((-width)>>1); const int chromWidth = -((-width) >> 1);
for (y=0; y<height; y++) { for (y = 0; y < height; y++) {
extract_even_c(src + 1, ydst, width); extract_even_c(src + 1, ydst, width);
extract_even2_c(src, udst, vdst, chromWidth); extract_even2_c(src, udst, vdst, chromWidth);
src += srcStride; src += srcStride;
ydst+= lumStride; ydst += lumStride;
udst+= chromStride; udst += chromStride;
vdst+= chromStride; vdst += chromStride;
} }
} }

795
libswscale/yuv2rgb.c
View File

File diff suppressed because it is too large Load Diff