*/
/*
- supported Input formats: YV12 (grayscale soon too)
- supported output formats: YV12, BGR15, BGR16, BGR24, BGR32 (grayscale soon too)
+ supported Input formats: YV12, I420/IYUV, YUY2, BGR32, BGR24, BGR16, BGR15, RGB32, RGB24, Y8/Y800, YVU9/IF09
+ supported output formats: YV12, I420/IYUV, {BGR,RGB}{1,4,8,15,16,24,32}, Y8/Y800, YVU9/IF09
+ {BGR,RGB}{1,4,8,15,16} support dithering
+
+ unscaled special converters (YV12=I420=IYUV, Y800=Y8)
+ YV12 -> {BGR,RGB}{1,4,8,15,16,24,32}
+ x -> x
+ YUV9 -> YV12
+ YUV9/YV12 -> Y800
+ Y800 -> YUV9/YV12
+ BGR24 -> BGR32 & RGB24 -> RGB32
+ BGR32 -> BGR24 & RGB32 -> RGB24
+ BGR15 -> BGR16
+*/
+
+/*
+tested special converters (most are tested actually but i didnt write it down ...)
+ YV12 -> BGR16
+ YV12 -> YV12
+ BGR15 -> BGR16
+ BGR16 -> BGR16
+ YVU9 -> YV12
+
+untested special converters
+ YV12/I420 -> BGR15/BGR24/BGR32 (its the yuv2rgb stuff, so it should be ok)
+ YV12/I420 -> YV12/I420
+ YUY2/BGR15/BGR24/BGR32/RGB24/RGB32 -> same format
+ BGR24 -> BGR32 & RGB24 -> RGB32
+ BGR32 -> BGR24 & RGB32 -> RGB24
+ BGR24 -> YV12
*/
#include <inttypes.h>
#include <stdio.h>
#include "../config.h"
#include "../mangle.h"
+#include <assert.h>
#ifdef HAVE_MALLOC_H
#include <malloc.h>
+#else
+#include <stdlib.h>
#endif
#include "swscale.h"
#include "../cpudetect.h"
+#include "../bswap.h"
#include "../libvo/img_format.h"
+#include "rgb2rgb.h"
+#include "../libvo/fastmemcpy.h"
+#include "../mp_msg.h"
+
+#define MSG_WARN(args...) mp_msg(MSGT_SWS,MSGL_WARN, ##args )
+#define MSG_FATAL(args...) mp_msg(MSGT_SWS,MSGL_FATAL, ##args )
+#define MSG_ERR(args...) mp_msg(MSGT_SWS,MSGL_ERR, ##args )
+#define MSG_V(args...) mp_msg(MSGT_SWS,MSGL_V, ##args )
+#define MSG_DBG2(args...) mp_msg(MSGT_SWS,MSGL_DBG2, ##args )
+#define MSG_INFO(args...) mp_msg(MSGT_SWS,MSGL_INFO, ##args )
+
#undef MOVNTQ
#undef PAVGB
//#define HAVE_3DNOW
//#undef HAVE_MMX
//#undef ARCH_X86
+//#define WORDS_BIGENDIAN
#define DITHER1XBPP
-#define RET 0xC3 //near return opcode
+#define FAST_BGR2YV12 // use 7 bit coeffs instead of 15bit
+
+#define RET 0xC3 //near return opcode for X86
#ifdef MP_DEBUG
-#define ASSERT(x) if(!(x)) { printf("ASSERT " #x " failed\n"); *((int*)0)=0; }
+#define ASSERT(x) assert(x);
#else
#define ASSERT(x) ;
#endif
#define PI 3.14159265358979323846
#endif
+//FIXME replace this with something faster
+#define isPlanarYUV(x) ((x)==IMGFMT_YV12 || (x)==IMGFMT_I420 || (x)==IMGFMT_YVU9)
+#define isYUV(x) ((x)==IMGFMT_YUY2 || isPlanarYUV(x))
+#define isGray(x) ((x)==IMGFMT_Y800)
+#define isRGB(x) (((x)&IMGFMT_RGB_MASK)==IMGFMT_RGB)
+#define isBGR(x) (((x)&IMGFMT_BGR_MASK)==IMGFMT_BGR)
+#define isSupportedIn(x) ((x)==IMGFMT_YV12 || (x)==IMGFMT_I420 || (x)==IMGFMT_YUY2 \
+ || (x)==IMGFMT_BGR32|| (x)==IMGFMT_BGR24|| (x)==IMGFMT_BGR16|| (x)==IMGFMT_BGR15\
+ || (x)==IMGFMT_RGB32|| (x)==IMGFMT_RGB24\
+ || (x)==IMGFMT_Y800 || (x)==IMGFMT_YVU9)
+#define isSupportedOut(x) ((x)==IMGFMT_YV12 || (x)==IMGFMT_I420 \
+ || isRGB(x) || isBGR(x)\
+ || (x)==IMGFMT_Y800 || (x)==IMGFMT_YVU9)
+#define isPacked(x) ((x)==IMGFMT_YUY2 || isRGB(x) || isBGR(x))
+
+#define RGB2YUV_SHIFT 16
+#define BY ((int)( 0.098*(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 GY ((int)( 0.504*(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 RY ((int)( 0.257*(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))
+
extern int verbose; // defined in mplayer.c
/*
NOTES
-
-known BUGS with known cause (no bugreports please!, but patches are welcome :) )
-horizontal fast_bilinear MMX2 scaler reads 1-7 samples too much (might cause a sig11)
-
-Supported output formats BGR15 BGR16 BGR24 BGR32 YV12
-BGR15 & BGR16 MMX verions support dithering
Special versions: fast Y 1:1 scaling (no interpolation in y direction)
TODO
more intelligent missalignment avoidance for the horizontal scaler
-dither in C
-change the distance of the u & v buffer
write special vertical cubic upscale version
Optimize C code (yv12 / minmax)
+add support for packed pixel yuv input & output
+add support for Y8 output
+optimize bgr24 & bgr32
+add BGR4 output support
+write special BGR->BGR scaler
+deglobalize yuv2rgb*.c
*/
#define ABS(a) ((a) > 0 ? (a) : (-(a)))
static uint64_t __attribute__((aligned(8))) bm00001111=0x00000000FFFFFFFFLL;
static uint64_t __attribute__((aligned(8))) bm00000111=0x0000000000FFFFFFLL;
static uint64_t __attribute__((aligned(8))) bm11111000=0xFFFFFFFFFF000000LL;
+static uint64_t __attribute__((aligned(8))) bm01010101=0x00FF00FF00FF00FFLL;
static volatile uint64_t __attribute__((aligned(8))) b5Dither;
static volatile uint64_t __attribute__((aligned(8))) g5Dither;
static uint64_t __attribute__((aligned(8))) M24B= 0xFF0000FF0000FF00LL;
static uint64_t __attribute__((aligned(8))) M24C= 0x0000FF0000FF0000LL;
-// FIXME remove
-static uint64_t __attribute__((aligned(8))) asm_yalpha1;
-static uint64_t __attribute__((aligned(8))) asm_uvalpha1;
+#ifdef FAST_BGR2YV12
+static const uint64_t bgr2YCoeff __attribute__((aligned(8))) = 0x000000210041000DULL;
+static const uint64_t bgr2UCoeff __attribute__((aligned(8))) = 0x0000FFEEFFDC0038ULL;
+static const uint64_t bgr2VCoeff __attribute__((aligned(8))) = 0x00000038FFD2FFF8ULL;
+#else
+static const uint64_t bgr2YCoeff __attribute__((aligned(8))) = 0x000020E540830C8BULL;
+static const uint64_t bgr2UCoeff __attribute__((aligned(8))) = 0x0000ED0FDAC23831ULL;
+static const uint64_t bgr2VCoeff __attribute__((aligned(8))) = 0x00003831D0E6F6EAULL;
+#endif
+static const uint64_t bgr2YOffset __attribute__((aligned(8))) = 0x1010101010101010ULL;
+static const uint64_t bgr2UVOffset __attribute__((aligned(8)))= 0x8080808080808080ULL;
+static const uint64_t w1111 __attribute__((aligned(8))) = 0x0001000100010001ULL;
#endif
// clipping helper table for C implementations:
static unsigned char clip_table[768];
-static unsigned short clip_table16b[768];
-static unsigned short clip_table16g[768];
-static unsigned short clip_table16r[768];
-static unsigned short clip_table15b[768];
-static unsigned short clip_table15g[768];
-static unsigned short clip_table15r[768];
-
-// yuv->rgb conversion tables:
-static int yuvtab_2568[256];
-static int yuvtab_3343[256];
-static int yuvtab_0c92[256];
-static int yuvtab_1a1e[256];
-static int yuvtab_40cf[256];
-// Needed for cubic scaler to catch overflows
-static int clip_yuvtab_2568[768];
-static int clip_yuvtab_3343[768];
-static int clip_yuvtab_0c92[768];
-static int clip_yuvtab_1a1e[768];
-static int clip_yuvtab_40cf[768];
-
//global sws_flags from the command line
-int sws_flags=0;
+int sws_flags=2;
//global srcFilter
SwsFilter src_filter= {NULL, NULL, NULL, NULL};
float sws_chr_gblur= 0.0;
int sws_chr_vshift= 0;
int sws_chr_hshift= 0;
+float sws_chr_sharpen= 0.0;
+float sws_lum_sharpen= 0.0;
/* cpuCaps combined from cpudetect and whats actually compiled in
(if there is no support for something compiled in it wont appear here) */
int srcSliceH, uint8_t* dst[], int dstStride[])=NULL;
static SwsVector *getConvVec(SwsVector *a, SwsVector *b);
+static inline void orderYUV(int format, uint8_t * sortedP[], int sortedStride[], uint8_t * p[], int stride[]);
+void *yuv2rgb_c_init (unsigned bpp, int mode, void *table_rV[256], void *table_gU[256], int table_gV[256], void *table_bU[256]);
+
+extern const uint8_t dither_2x2_4[2][8];
+extern const uint8_t dither_2x2_8[2][8];
+extern const uint8_t dither_8x8_32[8][8];
+extern const uint8_t dither_8x8_73[8][8];
+extern const uint8_t dither_8x8_220[8][8];
#ifdef CAN_COMPILE_X86_ASM
void in_asm_used_var_warning_killer()
{
volatile int i= yCoeff+vrCoeff+ubCoeff+vgCoeff+ugCoeff+bF8+bFC+w400+w80+w10+
- bm00001111+bm00000111+bm11111000+b16Mask+g16Mask+r16Mask+b15Mask+g15Mask+r15Mask+asm_yalpha1+ asm_uvalpha1+
- M24A+M24B+M24C+w02 + b5Dither+g5Dither+r5Dither+g6Dither+dither4[0]+dither8[0];
+ bm00001111+bm00000111+bm11111000+b16Mask+g16Mask+r16Mask+b15Mask+g15Mask+r15Mask+
+ M24A+M24B+M24C+w02 + b5Dither+g5Dither+r5Dither+g6Dither+dither4[0]+dither8[0]+bm01010101;
if(i) i=0;
}
#endif
+static int testFormat[]={
+IMGFMT_YVU9,
+IMGFMT_YV12,
+//IMGFMT_IYUV,
+IMGFMT_I420,
+IMGFMT_BGR15,
+IMGFMT_BGR16,
+IMGFMT_BGR24,
+IMGFMT_BGR32,
+IMGFMT_RGB24,
+IMGFMT_RGB32,
+//IMGFMT_Y8,
+IMGFMT_Y800,
+//IMGFMT_YUY2,
+0
+};
+
+static uint64_t getSSD(uint8_t *src1, uint8_t *src2, int stride1, int stride2, int w, int h){
+ int x,y;
+ uint64_t ssd=0;
+
+ for(y=0; y<h; y++){
+ for(x=0; x<w; x++){
+ int d= src1[x + y*stride1] - src2[x + y*stride2];
+ ssd+= d*d;
+ }
+ }
+ return ssd;
+}
+
+// test by ref -> src -> dst -> out & compare out against ref
+// ref & out are YV12
+static void doTest(uint8_t *ref[3], int refStride[3], int w, int h, int srcFormat, int dstFormat,
+ int srcW, int srcH, int dstW, int dstH, int flags){
+ uint8_t *src[3];
+ uint8_t *dst[3];
+ uint8_t *out[3];
+ int srcStride[3], dstStride[3];
+ int i;
+ uint64_t ssdY, ssdU, ssdV;
+ SwsContext *srcContext, *dstContext, *outContext;
+
+ for(i=0; i<3; i++){
+ // avoid stride % bpp != 0
+ if(srcFormat==IMGFMT_RGB24 || srcFormat==IMGFMT_BGR24)
+ srcStride[i]= srcW*3;
+ else
+ srcStride[i]= srcW*4;
+
+ if(dstFormat==IMGFMT_RGB24 || dstFormat==IMGFMT_BGR24)
+ dstStride[i]= dstW*3;
+ else
+ dstStride[i]= dstW*4;
+
+ src[i]= malloc(srcStride[i]*srcH);
+ dst[i]= malloc(dstStride[i]*dstH);
+ out[i]= malloc(refStride[i]*h);
+ }
+
+ srcContext= getSwsContext(w, h, IMGFMT_YV12, srcW, srcH, srcFormat, flags, NULL, NULL);
+ dstContext= getSwsContext(srcW, srcH, srcFormat, dstW, dstH, dstFormat, flags, NULL, NULL);
+ outContext= getSwsContext(dstW, dstH, dstFormat, w, h, IMGFMT_YV12, flags, NULL, NULL);
+ if(srcContext==NULL ||dstContext==NULL ||outContext==NULL){
+ printf("Failed allocating swsContext\n");
+ goto end;
+ }
+// printf("test %X %X %X -> %X %X %X\n", (int)ref[0], (int)ref[1], (int)ref[2],
+// (int)src[0], (int)src[1], (int)src[2]);
+
+ srcContext->swScale(srcContext, ref, refStride, 0, h , src, srcStride);
+ dstContext->swScale(dstContext, src, srcStride, 0, srcH, dst, dstStride);
+ outContext->swScale(outContext, dst, dstStride, 0, dstH, out, refStride);
+
+ ssdY= getSSD(ref[0], out[0], refStride[0], refStride[0], w, h);
+ ssdU= getSSD(ref[1], out[1], refStride[1], refStride[1], (w+1)>>1, (h+1)>>1);
+ ssdV= getSSD(ref[2], out[2], refStride[2], refStride[2], (w+1)>>1, (h+1)>>1);
+
+ if(isGray(srcFormat) || isGray(dstFormat)) ssdU=ssdV=0; //FIXME check that output is really gray
+
+ ssdY/= w*h;
+ ssdU/= w*h/4;
+ ssdV/= w*h/4;
+
+ if(ssdY>100 || ssdU>50 || ssdV>50){
+ printf(" %s %dx%d -> %s %4dx%4d flags=%2d SSD=%5lld,%5lld,%5lld\n",
+ vo_format_name(srcFormat), srcW, srcH,
+ vo_format_name(dstFormat), dstW, dstH,
+ flags,
+ ssdY, ssdU, ssdV);
+ }
+
+ end:
+
+ freeSwsContext(srcContext);
+ freeSwsContext(dstContext);
+ freeSwsContext(outContext);
+
+ for(i=0; i<3; i++){
+ free(src[i]);
+ free(dst[i]);
+ free(out[i]);
+ }
+}
+
+static void selfTest(uint8_t *src[3], int stride[3], int w, int h){
+ int srcFormat, dstFormat, srcFormatIndex, dstFormatIndex;
+ int srcW, srcH, dstW, dstH;
+ int flags;
+
+ for(srcFormatIndex=0; ;srcFormatIndex++){
+ srcFormat= testFormat[srcFormatIndex];
+ if(!srcFormat) break;
+ for(dstFormatIndex=0; ;dstFormatIndex++){
+ dstFormat= testFormat[dstFormatIndex];
+ if(!dstFormat) break;
+ if(!isSupportedOut(dstFormat)) continue;
+printf("%s -> %s\n",
+ vo_format_name(srcFormat),
+ vo_format_name(dstFormat));
+
+ srcW= w+w/3;
+ srcH= h+h/3;
+ for(dstW=w; dstW<w*2; dstW+= dstW/3){
+ for(dstH=h; dstH<h*2; dstH+= dstH/3){
+ for(flags=1; flags<33; flags*=2)
+ doTest(src, stride, w, h, srcFormat, dstFormat,
+ srcW, srcH, dstW, dstH, flags);
+ }
+ }
+ }
+ }
+}
+
static inline void yuv2yuvXinC(int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize,
int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize,
- uint8_t *dest, uint8_t *uDest, uint8_t *vDest, int dstW)
+ uint8_t *dest, uint8_t *uDest, uint8_t *vDest, int dstW, int chrDstW)
{
//FIXME Optimize (just quickly writen not opti..)
int i;
}
if(uDest != NULL)
- for(i=0; i<(dstW>>1); i++)
+ for(i=0; i<chrDstW; i++)
{
int u=0;
int v=0;
}
}
-static inline void yuv2rgbXinC(int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize,
+#define YSCALE_YUV_2_RGBX_C(type) \
+ for(i=0; i<(dstW>>1); i++){\
+ int j;\
+ int Y1=0;\
+ int Y2=0;\
+ int U=0;\
+ int V=0;\
+ type *r, *b, *g;\
+ const int i2= 2*i;\
+ \
+ for(j=0; j<lumFilterSize; j++)\
+ {\
+ Y1 += lumSrc[j][i2] * lumFilter[j];\
+ Y2 += lumSrc[j][i2+1] * lumFilter[j];\
+ }\
+ for(j=0; j<chrFilterSize; j++)\
+ {\
+ U += chrSrc[j][i] * chrFilter[j];\
+ V += chrSrc[j][i+2048] * chrFilter[j];\
+ }\
+ Y1>>=19;\
+ Y2>>=19;\
+ U >>=19;\
+ V >>=19;\
+ if((Y1|Y2|U|V)&256)\
+ {\
+ if(Y1>255) Y1=255;\
+ else if(Y1<0)Y1=0;\
+ if(Y2>255) Y2=255;\
+ else if(Y2<0)Y2=0;\
+ if(U>255) U=255;\
+ else if(U<0) U=0;\
+ if(V>255) V=255;\
+ else if(V<0) V=0;\
+ }\
+ r = c->table_rV[V];\
+ g = c->table_gU[U] + c->table_gV[V];\
+ b = c->table_bU[U];\
+
+#define YSCALE_YUV_2_RGB2_C(type) \
+ for(i=0; i<(dstW>>1); i++){\
+ const int i2= 2*i;\
+ int Y1= (buf0[i2 ]*yalpha1+buf1[i2 ]*yalpha)>>19;\
+ int Y2= (buf0[i2+1]*yalpha1+buf1[i2+1]*yalpha)>>19;\
+ int U= (uvbuf0[i ]*uvalpha1+uvbuf1[i ]*uvalpha)>>19;\
+ int V= (uvbuf0[i+2048]*uvalpha1+uvbuf1[i+2048]*uvalpha)>>19;\
+ type *r, *b, *g;\
+ r = c->table_rV[V];\
+ g = c->table_gU[U] + c->table_gV[V];\
+ b = c->table_bU[U];\
+
+#define YSCALE_YUV_2_RGB1_C(type) \
+ for(i=0; i<(dstW>>1); i++){\
+ const int i2= 2*i;\
+ int Y1= buf0[i2 ]>>7;\
+ int Y2= buf0[i2+1]>>7;\
+ int U= (uvbuf1[i ])>>7;\
+ int V= (uvbuf1[i+2048])>>7;\
+ type *r, *b, *g;\
+ r = c->table_rV[V];\
+ g = c->table_gU[U] + c->table_gV[V];\
+ b = c->table_bU[U];\
+
+#define YSCALE_YUV_2_RGB1B_C(type) \
+ for(i=0; i<(dstW>>1); i++){\
+ const int i2= 2*i;\
+ int Y1= buf0[i2 ]>>7;\
+ int Y2= buf0[i2+1]>>7;\
+ int U= (uvbuf0[i ] + uvbuf1[i ])>>8;\
+ int V= (uvbuf0[i+2048] + uvbuf1[i+2048])>>8;\
+ type *r, *b, *g;\
+ r = c->table_rV[V];\
+ g = c->table_gU[U] + c->table_gV[V];\
+ b = c->table_bU[U];\
+
+#define YSCALE_YUV_2_ANYRGB_C(func)\
+ switch(c->dstFormat)\
+ {\
+ case IMGFMT_BGR32:\
+ case IMGFMT_RGB32:\
+ func(uint32_t)\
+ ((uint32_t*)dest)[i2+0]= r[Y1] + g[Y1] + b[Y1];\
+ ((uint32_t*)dest)[i2+1]= r[Y2] + g[Y2] + b[Y2];\
+ } \
+ break;\
+ case IMGFMT_RGB24:\
+ func(uint8_t)\
+ ((uint8_t*)dest)[0]= r[Y1];\
+ ((uint8_t*)dest)[1]= g[Y1];\
+ ((uint8_t*)dest)[2]= b[Y1];\
+ ((uint8_t*)dest)[3]= r[Y2];\
+ ((uint8_t*)dest)[4]= g[Y2];\
+ ((uint8_t*)dest)[5]= b[Y2];\
+ ((uint8_t*)dest)+=6;\
+ }\
+ break;\
+ case IMGFMT_BGR24:\
+ func(uint8_t)\
+ ((uint8_t*)dest)[0]= b[Y1];\
+ ((uint8_t*)dest)[1]= g[Y1];\
+ ((uint8_t*)dest)[2]= r[Y1];\
+ ((uint8_t*)dest)[3]= b[Y2];\
+ ((uint8_t*)dest)[4]= g[Y2];\
+ ((uint8_t*)dest)[5]= r[Y2];\
+ ((uint8_t*)dest)+=6;\
+ }\
+ break;\
+ case IMGFMT_RGB16:\
+ case IMGFMT_BGR16:\
+ {\
+ const int dr1= dither_2x2_8[y&1 ][0];\
+ const int dg1= dither_2x2_4[y&1 ][0];\
+ const int db1= dither_2x2_8[(y&1)^1][0];\
+ const int dr2= dither_2x2_8[y&1 ][1];\
+ const int dg2= dither_2x2_4[y&1 ][1];\
+ const int db2= dither_2x2_8[(y&1)^1][1];\
+ func(uint16_t)\
+ ((uint16_t*)dest)[i2+0]= r[Y1+dr1] + g[Y1+dg1] + b[Y1+db1];\
+ ((uint16_t*)dest)[i2+1]= r[Y2+dr2] + g[Y2+dg2] + b[Y2+db2];\
+ }\
+ }\
+ break;\
+ case IMGFMT_RGB15:\
+ case IMGFMT_BGR15:\
+ {\
+ const int dr1= dither_2x2_8[y&1 ][0];\
+ const int dg1= dither_2x2_8[y&1 ][1];\
+ const int db1= dither_2x2_8[(y&1)^1][0];\
+ const int dr2= dither_2x2_8[y&1 ][1];\
+ const int dg2= dither_2x2_8[y&1 ][0];\
+ const int db2= dither_2x2_8[(y&1)^1][1];\
+ func(uint16_t)\
+ ((uint16_t*)dest)[i2+0]= r[Y1+dr1] + g[Y1+dg1] + b[Y1+db1];\
+ ((uint16_t*)dest)[i2+1]= r[Y2+dr2] + g[Y2+dg2] + b[Y2+db2];\
+ }\
+ }\
+ break;\
+ case IMGFMT_RGB8:\
+ case IMGFMT_BGR8:\
+ {\
+ const uint8_t * const d64= dither_8x8_73[y&7];\
+ const uint8_t * const d32= dither_8x8_32[y&7];\
+ func(uint8_t)\
+ ((uint8_t*)dest)[i2+0]= r[Y1+d32[(i2+0)&7]] + g[Y1+d32[(i2+0)&7]] + b[Y1+d64[(i2+0)&7]];\
+ ((uint8_t*)dest)[i2+1]= r[Y2+d32[(i2+1)&7]] + g[Y2+d32[(i2+1)&7]] + b[Y2+d64[(i2+1)&7]];\
+ }\
+ }\
+ break;\
+ case IMGFMT_RGB4:\
+ case IMGFMT_BGR4:\
+ {\
+ const uint8_t * const d64= dither_8x8_73 [y&7];\
+ const uint8_t * const d128=dither_8x8_220[y&7];\
+ func(uint8_t)\
+ ((uint8_t*)dest)[i2+0]= r[Y1+d128[(i2+0)&7]] + g[Y1+d64[(i2+0)&7]] + b[Y1+d128[(i2+0)&7]];\
+ ((uint8_t*)dest)[i2+1]= r[Y2+d128[(i2+1)&7]] + g[Y2+d64[(i2+1)&7]] + b[Y2+d128[(i2+1)&7]];\
+ }\
+ }\
+ break;\
+ case IMGFMT_RGB1:\
+ case IMGFMT_BGR1:\
+ {\
+ const uint8_t * const d128=dither_8x8_220[y&7];\
+ uint8_t *g= c->table_gU[128] + c->table_gV[128];\
+ for(i=0; i<dstW-7; i+=8){\
+ int acc;\
+ acc = g[((buf0[i ]*yalpha1+buf1[i ]*yalpha)>>19) + d128[0]];\
+ acc+= acc + g[((buf0[i+1]*yalpha1+buf1[i+1]*yalpha)>>19) + d128[1]];\
+ acc+= acc + g[((buf0[i+2]*yalpha1+buf1[i+2]*yalpha)>>19) + d128[2]];\
+ acc+= acc + g[((buf0[i+3]*yalpha1+buf1[i+3]*yalpha)>>19) + d128[3]];\
+ acc+= acc + g[((buf0[i+4]*yalpha1+buf1[i+4]*yalpha)>>19) + d128[4]];\
+ acc+= acc + g[((buf0[i+5]*yalpha1+buf1[i+5]*yalpha)>>19) + d128[5]];\
+ acc+= acc + g[((buf0[i+6]*yalpha1+buf1[i+6]*yalpha)>>19) + d128[6]];\
+ acc+= acc + g[((buf0[i+7]*yalpha1+buf1[i+7]*yalpha)>>19) + d128[7]];\
+ ((uint8_t*)dest)[0]= acc;\
+ ((uint8_t*)dest)++;\
+ }\
+\
+/*\
+((uint8_t*)dest)-= dstW>>4;\
+{\
+ int acc=0;\
+ int left=0;\
+ static int top[1024];\
+ static int last_new[1024][1024];\
+ static int last_in3[1024][1024];\
+ static int drift[1024][1024];\
+ int topLeft=0;\
+ int shift=0;\
+ int count=0;\
+ const uint8_t * const d128=dither_8x8_220[y&7];\
+ int error_new=0;\
+ int error_in3=0;\
+ int f=0;\
+ \
+ for(i=dstW>>1; i<dstW; i++){\
+ int in= ((buf0[i ]*yalpha1+buf1[i ]*yalpha)>>19);\
+ int in2 = (76309 * (in - 16) + 32768) >> 16;\
+ int in3 = (in2 < 0) ? 0 : ((in2 > 255) ? 255 : in2);\
+ int old= (left*7 + topLeft + top[i]*5 + top[i+1]*3)/20 + in3\
+ + (last_new[y][i] - in3)*f/256;\
+ int new= old> 128 ? 255 : 0;\
+\
+ error_new+= ABS(last_new[y][i] - new);\
+ error_in3+= ABS(last_in3[y][i] - in3);\
+ f= error_new - error_in3*4;\
+ if(f<0) f=0;\
+ if(f>256) f=256;\
+\
+ topLeft= top[i];\
+ left= top[i]= old - new;\
+ last_new[y][i]= new;\
+ last_in3[y][i]= in3;\
+\
+ acc+= acc + (new&1);\
+ if((i&7)==6){\
+ ((uint8_t*)dest)[0]= acc;\
+ ((uint8_t*)dest)++;\
+ }\
+ }\
+}\
+*/\
+ }\
+ break;\
+ }\
+
+
+static inline void yuv2rgbXinC(SwsContext *c, int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize,
int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize,
- uint8_t *dest, int dstW, int dstFormat)
+ uint8_t *dest, int dstW, int y)
{
- if(dstFormat==IMGFMT_BGR32)
+ int i;
+ switch(c->dstFormat)
{
- int i;
- for(i=0; i<(dstW>>1); i++){
- int j;
- int Y1=0;
- int Y2=0;
- int U=0;
- int V=0;
- int Cb, Cr, Cg;
- for(j=0; j<lumFilterSize; j++)
- {
- Y1 += lumSrc[j][2*i] * lumFilter[j];
- Y2 += lumSrc[j][2*i+1] * lumFilter[j];
- }
- for(j=0; j<chrFilterSize; j++)
- {
- U += chrSrc[j][i] * chrFilter[j];
- V += chrSrc[j][i+2048] * chrFilter[j];
- }
- Y1= clip_yuvtab_2568[ (Y1>>19) + 256 ];
- Y2= clip_yuvtab_2568[ (Y2>>19) + 256 ];
- U >>= 19;
- V >>= 19;
-
- Cb= clip_yuvtab_40cf[U+ 256];
- Cg= clip_yuvtab_1a1e[V+ 256] + yuvtab_0c92[U+ 256];
- Cr= clip_yuvtab_3343[V+ 256];
-
- dest[8*i+0]=clip_table[((Y1 + Cb) >>13)];
- dest[8*i+1]=clip_table[((Y1 + Cg) >>13)];
- dest[8*i+2]=clip_table[((Y1 + Cr) >>13)];
-
- dest[8*i+4]=clip_table[((Y2 + Cb) >>13)];
- dest[8*i+5]=clip_table[((Y2 + Cg) >>13)];
- dest[8*i+6]=clip_table[((Y2 + Cr) >>13)];
+ case IMGFMT_RGB32:
+ case IMGFMT_BGR32:
+ YSCALE_YUV_2_RGBX_C(uint32_t)
+ ((uint32_t*)dest)[i2+0]= r[Y1] + g[Y1] + b[Y1];
+ ((uint32_t*)dest)[i2+1]= r[Y2] + g[Y2] + b[Y2];
}
- }
- else if(dstFormat==IMGFMT_BGR24)
- {
- int i;
- for(i=0; i<(dstW>>1); i++){
- int j;
- int Y1=0;
- int Y2=0;
- int U=0;
- int V=0;
- int Cb, Cr, Cg;
- for(j=0; j<lumFilterSize; j++)
- {
- Y1 += lumSrc[j][2*i] * lumFilter[j];
- Y2 += lumSrc[j][2*i+1] * lumFilter[j];
- }
- for(j=0; j<chrFilterSize; j++)
- {
- U += chrSrc[j][i] * chrFilter[j];
- V += chrSrc[j][i+2048] * chrFilter[j];
+ break;
+ case IMGFMT_RGB24:
+ YSCALE_YUV_2_RGBX_C(uint8_t)
+ ((uint8_t*)dest)[0]= r[Y1];
+ ((uint8_t*)dest)[1]= g[Y1];
+ ((uint8_t*)dest)[2]= b[Y1];
+ ((uint8_t*)dest)[3]= r[Y2];
+ ((uint8_t*)dest)[4]= g[Y2];
+ ((uint8_t*)dest)[5]= b[Y2];
+ ((uint8_t*)dest)+=6;
+ }
+ break;
+ case IMGFMT_BGR24:
+ YSCALE_YUV_2_RGBX_C(uint8_t)
+ ((uint8_t*)dest)[0]= b[Y1];
+ ((uint8_t*)dest)[1]= g[Y1];
+ ((uint8_t*)dest)[2]= r[Y1];
+ ((uint8_t*)dest)[3]= b[Y2];
+ ((uint8_t*)dest)[4]= g[Y2];
+ ((uint8_t*)dest)[5]= r[Y2];
+ ((uint8_t*)dest)+=6;
+ }
+ break;
+ case IMGFMT_RGB16:
+ case IMGFMT_BGR16:
+ {
+ const int dr1= dither_2x2_8[y&1 ][0];
+ const int dg1= dither_2x2_4[y&1 ][0];
+ const int db1= dither_2x2_8[(y&1)^1][0];
+ const int dr2= dither_2x2_8[y&1 ][1];
+ const int dg2= dither_2x2_4[y&1 ][1];
+ const int db2= dither_2x2_8[(y&1)^1][1];
+ YSCALE_YUV_2_RGBX_C(uint16_t)
+ ((uint16_t*)dest)[i2+0]= r[Y1+dr1] + g[Y1+dg1] + b[Y1+db1];
+ ((uint16_t*)dest)[i2+1]= r[Y2+dr2] + g[Y2+dg2] + b[Y2+db2];
}
- Y1= clip_yuvtab_2568[ (Y1>>19) + 256 ];
- Y2= clip_yuvtab_2568[ (Y2>>19) + 256 ];
- U >>= 19;
- V >>= 19;
-
- Cb= clip_yuvtab_40cf[U+ 256];
- Cg= clip_yuvtab_1a1e[V+ 256] + yuvtab_0c92[U+ 256];
- Cr= clip_yuvtab_3343[V+ 256];
-
- dest[0]=clip_table[((Y1 + Cb) >>13)];
- dest[1]=clip_table[((Y1 + Cg) >>13)];
- dest[2]=clip_table[((Y1 + Cr) >>13)];
-
- dest[3]=clip_table[((Y2 + Cb) >>13)];
- dest[4]=clip_table[((Y2 + Cg) >>13)];
- dest[5]=clip_table[((Y2 + Cr) >>13)];
- dest+=6;
}
- }
- else if(dstFormat==IMGFMT_BGR16)
- {
- int i;
- for(i=0; i<(dstW>>1); i++){
- int j;
- int Y1=0;
- int Y2=0;
- int U=0;
- int V=0;
- int Cb, Cr, Cg;
- for(j=0; j<lumFilterSize; j++)
- {
- Y1 += lumSrc[j][2*i] * lumFilter[j];
- Y2 += lumSrc[j][2*i+1] * lumFilter[j];
+ break;
+ case IMGFMT_RGB15:
+ case IMGFMT_BGR15:
+ {
+ const int dr1= dither_2x2_8[y&1 ][0];
+ const int dg1= dither_2x2_8[y&1 ][1];
+ const int db1= dither_2x2_8[(y&1)^1][0];
+ const int dr2= dither_2x2_8[y&1 ][1];
+ const int dg2= dither_2x2_8[y&1 ][0];
+ const int db2= dither_2x2_8[(y&1)^1][1];
+ YSCALE_YUV_2_RGBX_C(uint16_t)
+ ((uint16_t*)dest)[i2+0]= r[Y1+dr1] + g[Y1+dg1] + b[Y1+db1];
+ ((uint16_t*)dest)[i2+1]= r[Y2+dr2] + g[Y2+dg2] + b[Y2+db2];
}
- for(j=0; j<chrFilterSize; j++)
- {
- U += chrSrc[j][i] * chrFilter[j];
- V += chrSrc[j][i+2048] * chrFilter[j];
+ }
+ break;
+ case IMGFMT_RGB8:
+ case IMGFMT_BGR8:
+ {
+ const uint8_t * const d64= dither_8x8_73[y&7];
+ const uint8_t * const d32= dither_8x8_32[y&7];
+ YSCALE_YUV_2_RGBX_C(uint8_t)
+ ((uint8_t*)dest)[i2+0]= r[Y1+d32[(i2+0)&7]] + g[Y1+d32[(i2+0)&7]] + b[Y1+d64[(i2+0)&7]];
+ ((uint8_t*)dest)[i2+1]= r[Y2+d32[(i2+1)&7]] + g[Y2+d32[(i2+1)&7]] + b[Y2+d64[(i2+1)&7]];
}
- Y1= clip_yuvtab_2568[ (Y1>>19) + 256 ];
- Y2= clip_yuvtab_2568[ (Y2>>19) + 256 ];
- U >>= 19;
- V >>= 19;
-
- Cb= clip_yuvtab_40cf[U+ 256];
- Cg= clip_yuvtab_1a1e[V+ 256] + yuvtab_0c92[U+ 256];
- Cr= clip_yuvtab_3343[V+ 256];
-
- ((uint16_t*)dest)[2*i] =
- clip_table16b[(Y1 + Cb) >>13] |
- clip_table16g[(Y1 + Cg) >>13] |
- clip_table16r[(Y1 + Cr) >>13];
-
- ((uint16_t*)dest)[2*i+1] =
- clip_table16b[(Y2 + Cb) >>13] |
- clip_table16g[(Y2 + Cg) >>13] |
- clip_table16r[(Y2 + Cr) >>13];
}
- }
- else if(dstFormat==IMGFMT_BGR15)
- {
- int i;
- for(i=0; i<(dstW>>1); i++){
- int j;
- int Y1=0;
- int Y2=0;
- int U=0;
- int V=0;
- int Cb, Cr, Cg;
- for(j=0; j<lumFilterSize; j++)
- {
- Y1 += lumSrc[j][2*i] * lumFilter[j];
- Y2 += lumSrc[j][2*i+1] * lumFilter[j];
+ break;
+ case IMGFMT_RGB4:
+ case IMGFMT_BGR4:
+ {
+ const uint8_t * const d64= dither_8x8_73 [y&7];
+ const uint8_t * const d128=dither_8x8_220[y&7];
+ YSCALE_YUV_2_RGBX_C(uint8_t)
+ ((uint8_t*)dest)[i2+0]= r[Y1+d128[(i2+0)&7]] + g[Y1+d64[(i2+0)&7]] + b[Y1+d128[(i2+0)&7]];
+ ((uint8_t*)dest)[i2+1]= r[Y2+d128[(i2+1)&7]] + g[Y2+d64[(i2+1)&7]] + b[Y2+d128[(i2+1)&7]];
}
- for(j=0; j<chrFilterSize; j++)
- {
- U += chrSrc[j][i] * chrFilter[j];
- V += chrSrc[j][i+2048] * chrFilter[j];
+ }
+ break;
+ case IMGFMT_RGB1:
+ case IMGFMT_BGR1:
+ {
+ const uint8_t * const d128=dither_8x8_220[y&7];
+ uint8_t *g= c->table_gU[128] + c->table_gV[128];
+ int acc=0;
+ for(i=0; i<dstW-1; i+=2){
+ int j;
+ int Y1=0;
+ int Y2=0;
+
+ for(j=0; j<lumFilterSize; j++)
+ {
+ Y1 += lumSrc[j][i] * lumFilter[j];
+ Y2 += lumSrc[j][i+1] * lumFilter[j];
+ }
+ Y1>>=19;
+ Y2>>=19;
+ if((Y1|Y2)&256)
+ {
+ if(Y1>255) Y1=255;
+ else if(Y1<0)Y1=0;
+ if(Y2>255) Y2=255;
+ else if(Y2<0)Y2=0;
+ }
+ acc+= acc + g[Y1+d128[(i+0)&7]];
+ acc+= acc + g[Y2+d128[(i+1)&7]];
+ if((i&7)==6){
+ ((uint8_t*)dest)[0]= acc;
+ ((uint8_t*)dest)++;
+ }
}
- Y1= clip_yuvtab_2568[ (Y1>>19) + 256 ];
- Y2= clip_yuvtab_2568[ (Y2>>19) + 256 ];
- U >>= 19;
- V >>= 19;
-
- Cb= clip_yuvtab_40cf[U+ 256];
- Cg= clip_yuvtab_1a1e[V+ 256] + yuvtab_0c92[U+ 256];
- Cr= clip_yuvtab_3343[V+ 256];
-
- ((uint16_t*)dest)[2*i] =
- clip_table15b[(Y1 + Cb) >>13] |
- clip_table15g[(Y1 + Cg) >>13] |
- clip_table15r[(Y1 + Cr) >>13];
-
- ((uint16_t*)dest)[2*i+1] =
- clip_table15b[(Y2 + Cb) >>13] |
- clip_table15g[(Y2 + Cg) >>13] |
- clip_table15r[(Y2 + Cr) >>13];
}
+ break;
}
}
#undef HAVE_MMX
#undef HAVE_MMX2
#undef HAVE_3DNOW
-#undef ARCH_X86
#ifdef COMPILE_C
#undef HAVE_MMX
#undef HAVE_MMX2
#undef HAVE_3DNOW
-#undef ARCH_X86
#define RENAME(a) a ## _C
#include "swscale_template.c"
#endif
#define HAVE_MMX
#undef HAVE_MMX2
#undef HAVE_3DNOW
-#define ARCH_X86
#define RENAME(a) a ## _MMX
#include "swscale_template.c"
#endif
#define HAVE_MMX
#define HAVE_MMX2
#undef HAVE_3DNOW
-#define ARCH_X86
#define RENAME(a) a ## _MMX2
#include "swscale_template.c"
#endif
#define HAVE_MMX
#undef HAVE_MMX2
#define HAVE_3DNOW
-#define ARCH_X86
#define RENAME(a) a ## _3DNow
#include "swscale_template.c"
#endif
// minor note: the HAVE_xyz is messed up after that line so dont use it
-// old global scaler, dont use for new code, unless it uses only the stuff from the command line
+// old global scaler, dont use for new code
// will use sws_flags from the command line
void SwScale_YV12slice(unsigned char* src[], int srcStride[], int srcSliceY ,
int srcSliceH, uint8_t* dst[], int dstStride, int dstbpp,
static SwsContext *context=NULL;
int dstFormat;
- int flags=0;
- static int firstTime=1;
int dstStride3[3]= {dstStride, dstStride>>1, dstStride>>1};
- if(firstTime)
- {
- flags= SWS_PRINT_INFO;
- firstTime=0;
-
- if(src_filter.lumH) freeVec(src_filter.lumH);
- if(src_filter.lumV) freeVec(src_filter.lumV);
- if(src_filter.chrH) freeVec(src_filter.chrH);
- if(src_filter.chrV) freeVec(src_filter.chrV);
-
- if(sws_lum_gblur!=0.0){
- src_filter.lumH= getGaussianVec(sws_lum_gblur, 3.0);
- src_filter.lumV= getGaussianVec(sws_lum_gblur, 3.0);
- }else{
- src_filter.lumH= getIdentityVec();
- src_filter.lumV= getIdentityVec();
- }
-
- if(sws_chr_gblur!=0.0){
- src_filter.chrH= getGaussianVec(sws_chr_gblur, 3.0);
- src_filter.chrV= getGaussianVec(sws_chr_gblur, 3.0);
- }else{
- src_filter.chrH= getIdentityVec();
- src_filter.chrV= getIdentityVec();
- }
-
- if(sws_chr_hshift)
- shiftVec(src_filter.chrH, sws_chr_hshift);
-
- if(sws_chr_vshift)
- shiftVec(src_filter.chrV, sws_chr_vshift);
-
- }
-
switch(dstbpp)
{
case 8 : dstFormat= IMGFMT_Y8; break;
default: return;
}
- switch(sws_flags)
+ if(!context) context=getSwsContextFromCmdLine(srcW, srcH, IMGFMT_YV12, dstW, dstH, dstFormat);
+
+ context->swScale(context, src, srcStride, srcSliceY, srcSliceH, dst, dstStride3);
+}
+
+void swsGetFlagsAndFilterFromCmdLine(int *flags, SwsFilter **srcFilterParam, SwsFilter **dstFilterParam)
+{
+ static int firstTime=1;
+ *flags=0;
+
+#ifdef ARCH_X86
+ if(gCpuCaps.hasMMX)
+ asm volatile("emms\n\t"::: "memory"); //FIXME this shouldnt be required but it IS (even for non mmx versions)
+#endif
+ if(firstTime)
{
- case 0: flags|= SWS_FAST_BILINEAR; break;
- case 1: flags|= SWS_BILINEAR; break;
- case 2: flags|= SWS_BICUBIC; break;
- case 3: flags|= SWS_X; break;
- default:flags|= SWS_BILINEAR; break;
+ firstTime=0;
+ *flags= SWS_PRINT_INFO;
+ }
+ else if(verbose>1) *flags= SWS_PRINT_INFO;
+
+ if(src_filter.lumH) freeVec(src_filter.lumH);
+ if(src_filter.lumV) freeVec(src_filter.lumV);
+ if(src_filter.chrH) freeVec(src_filter.chrH);
+ if(src_filter.chrV) freeVec(src_filter.chrV);
+
+ if(sws_lum_gblur!=0.0){
+ src_filter.lumH= getGaussianVec(sws_lum_gblur, 3.0);
+ src_filter.lumV= getGaussianVec(sws_lum_gblur, 3.0);
+ }else{
+ src_filter.lumH= getIdentityVec();
+ src_filter.lumV= getIdentityVec();
}
- if(!context) context=getSwsContext(srcW, srcH, IMGFMT_YV12, dstW, dstH, dstFormat, flags, &src_filter, NULL);
+ if(sws_chr_gblur!=0.0){
+ src_filter.chrH= getGaussianVec(sws_chr_gblur, 3.0);
+ src_filter.chrV= getGaussianVec(sws_chr_gblur, 3.0);
+ }else{
+ src_filter.chrH= getIdentityVec();
+ src_filter.chrV= getIdentityVec();
+ }
+
+ if(sws_chr_sharpen!=0.0){
+ SwsVector *g= getConstVec(-1.0, 3);
+ SwsVector *id= getConstVec(10.0/sws_chr_sharpen, 1);
+ g->coeff[1]=2.0;
+ addVec(id, g);
+ convVec(src_filter.chrH, id);
+ convVec(src_filter.chrV, id);
+ freeVec(g);
+ freeVec(id);
+ }
+
+ if(sws_lum_sharpen!=0.0){
+ SwsVector *g= getConstVec(-1.0, 3);
+ SwsVector *id= getConstVec(10.0/sws_lum_sharpen, 1);
+ g->coeff[1]=2.0;
+ addVec(id, g);
+ convVec(src_filter.lumH, id);
+ convVec(src_filter.lumV, id);
+ freeVec(g);
+ freeVec(id);
+ }
+ if(sws_chr_hshift)
+ shiftVec(src_filter.chrH, sws_chr_hshift);
- swScale(context, src, srcStride, srcSliceY, srcSliceH, dst, dstStride3);
+ if(sws_chr_vshift)
+ shiftVec(src_filter.chrV, sws_chr_vshift);
+
+ normalizeVec(src_filter.chrH, 1.0);
+ normalizeVec(src_filter.chrV, 1.0);
+ normalizeVec(src_filter.lumH, 1.0);
+ normalizeVec(src_filter.lumV, 1.0);
+
+ if(verbose > 1) printVec(src_filter.chrH);
+ if(verbose > 1) printVec(src_filter.lumH);
+
+ switch(sws_flags)
+ {
+ case 0: *flags|= SWS_FAST_BILINEAR; break;
+ case 1: *flags|= SWS_BILINEAR; break;
+ case 2: *flags|= SWS_BICUBIC; break;
+ case 3: *flags|= SWS_X; break;
+ case 4: *flags|= SWS_POINT; break;
+ case 5: *flags|= SWS_AREA; break;
+ case 6: *flags|= SWS_BICUBLIN; break;
+ default:*flags|= SWS_BILINEAR; break;
+ }
+
+ *srcFilterParam= &src_filter;
+ *dstFilterParam= NULL;
}
+// will use sws_flags & src_filter (from cmd line)
+SwsContext *getSwsContextFromCmdLine(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat)
+{
+ int flags;
+ SwsFilter *dstFilterParam, *srcFilterParam;
+ swsGetFlagsAndFilterFromCmdLine(&flags, &srcFilterParam, &dstFilterParam);
+
+ return getSwsContext(srcW, srcH, srcFormat, dstW, dstH, dstFormat, flags, srcFilterParam, dstFilterParam);
+}
+
+
static inline void initFilter(int16_t **outFilter, int16_t **filterPos, int *outFilterSize, int xInc,
int srcW, int dstW, int filterAlign, int one, int flags,
SwsVector *srcFilter, SwsVector *dstFilter)
asm volatile("emms\n\t"::: "memory"); //FIXME this shouldnt be required but it IS (even for non mmx versions)
#endif
- *filterPos = (int16_t*)memalign(8, dstW*sizeof(int16_t));
+ // Note the +1 is for the MMXscaler which reads over the end
+ *filterPos = (int16_t*)memalign(8, (dstW+1)*sizeof(int16_t));
if(ABS(xInc - 0x10000) <10) // unscaled
{
}
}
+ else if(flags&SWS_POINT) // lame looking point sampling mode
+ {
+ int i;
+ int xDstInSrc;
+ filterSize= 1;
+ filter= (double*)memalign(8, dstW*sizeof(double)*filterSize);
+
+ xDstInSrc= xInc/2 - 0x8000;
+ for(i=0; i<dstW; i++)
+ {
+ int xx= (xDstInSrc - ((filterSize-1)<<15) + (1<<15))>>16;
+
+ (*filterPos)[i]= xx;
+ filter[i]= 1.0;
+ xDstInSrc+= xInc;
+ }
+ }
else if(xInc <= (1<<16) || (flags&SWS_FAST_BILINEAR)) // upscale
{
int i;
int xDstInSrc;
if (flags&SWS_BICUBIC) filterSize= 4;
else if(flags&SWS_X ) filterSize= 4;
- else filterSize= 2;
-// printf("%d %d %d\n", filterSize, srcW, dstW);
+ else filterSize= 2; // SWS_BILINEAR / SWS_AREA
filter= (double*)memalign(8, dstW*sizeof(double)*filterSize);
xDstInSrc= xInc/2 - 0x8000;
for(i=0; i<dstW; i++)
{
- int xx= (xDstInSrc>>16) - (filterSize>>1) + 1;
+ int xx= (xDstInSrc - ((filterSize-1)<<15) + (1<<15))>>16;
int j;
(*filterPos)[i]= xx;
y4 = ( -1.0*d + 1.0*d*d*d)/6.0;
}
-// printf("%d %d %d \n", coeff, (int)d, xDstInSrc);
filter[i*filterSize + 0]= y1;
filter[i*filterSize + 1]= y2;
filter[i*filterSize + 2]= y3;
filter[i*filterSize + 3]= y4;
-// printf("%1.3f %1.3f %1.3f %1.3f %1.3f\n",d , y1, y2, y3, y4);
}
else
{
+ //Bilinear upscale / linear interpolate / Area averaging
for(j=0; j<filterSize; j++)
{
double d= ABS((xx<<16) - xDstInSrc)/(double)(1<<16);
double coeff= 1.0 - d;
if(coeff<0) coeff=0;
- // printf("%d %d %d \n", coeff, (int)d, xDstInSrc);
filter[i*filterSize + j]= coeff;
xx++;
}
else // downscale
{
int xDstInSrc;
- if(flags&SWS_BICUBIC) filterSize= (int)ceil(1 + 4.0*srcW / (double)dstW);
- else if(flags&SWS_X) filterSize= (int)ceil(1 + 4.0*srcW / (double)dstW);
- else filterSize= (int)ceil(1 + 2.0*srcW / (double)dstW);
-// printf("%d %d %d\n", *filterSize, srcW, dstW);
+ ASSERT(dstW <= srcW)
+
+ if(flags&SWS_BICUBIC) filterSize= (int)ceil(1 + 4.0*srcW / (double)dstW);
+ else if(flags&SWS_X) filterSize= (int)ceil(1 + 4.0*srcW / (double)dstW);
+ else if(flags&SWS_AREA) filterSize= (int)ceil(1 + 1.0*srcW / (double)dstW);
+ else /* BILINEAR */ filterSize= (int)ceil(1 + 2.0*srcW / (double)dstW);
filter= (double*)memalign(8, dstW*sizeof(double)*filterSize);
xDstInSrc= xInc/2 - 0x8000;
else
coeff=0.0;
}
-/* else if(flags & SWS_X)
+ else if(flags & SWS_AREA)
{
- }*/
+ double srcPixelSize= (1<<16)/(double)xInc;
+ if(d + srcPixelSize/2 < 0.5) coeff= 1.0;
+ else if(d - srcPixelSize/2 < 0.5) coeff= (0.5-d)/srcPixelSize + 0.5;
+ else coeff=0.0;
+ }
else
{
coeff= 1.0 - d;
if(coeff<0) coeff=0;
}
-// printf("%1.3f %d %d \n", coeff, (int)d, xDstInSrc);
filter[i*filterSize + j]= coeff;
xx++;
}
/* apply src & dst Filter to filter -> filter2
free(filter);
*/
+ ASSERT(filterSize>0)
filter2Size= filterSize;
if(srcFilter) filter2Size+= srcFilter->length - 1;
if(dstFilter) filter2Size+= dstFilter->length - 1;
+ ASSERT(filter2Size>0)
filter2= (double*)memalign(8, filter2Size*dstW*sizeof(double));
for(i=0; i<dstW; i++)
if(min>minFilterSize) minFilterSize= min;
}
+ ASSERT(minFilterSize > 0)
+ filterSize= (minFilterSize +(filterAlign-1)) & (~(filterAlign-1));
+ ASSERT(filterSize > 0)
+ filter= (double*)memalign(8, filterSize*dstW*sizeof(double));
+ *outFilterSize= filterSize;
+
+ if(flags&SWS_PRINT_INFO)
+ MSG_INFO("SwScaler: reducing / aligning filtersize %d -> %d\n", filter2Size, filterSize);
/* try to reduce the filter-size (step2 reduce it) */
for(i=0; i<dstW; i++)
{
int j;
- for(j=0; j<minFilterSize; j++)
- filter2[i*minFilterSize + j]= filter2[i*filter2Size + j];
+ for(j=0; j<filterSize; j++)
+ {
+ if(j>=filter2Size) filter[i*filterSize + j]= 0.0;
+ else filter[i*filterSize + j]= filter2[i*filter2Size + j];
+ }
}
- if((flags&SWS_PRINT_INFO) && verbose)
- printf("SwScaler: reducing filtersize %d -> %d\n", filter2Size, minFilterSize);
- filter2Size= minFilterSize;
- ASSERT(filter2Size > 0)
+ free(filter2); filter2=NULL;
+
//FIXME try to align filterpos if possible
if((*filterPos)[i] < 0)
{
// Move filter coeffs left to compensate for filterPos
- for(j=1; j<filter2Size; j++)
+ for(j=1; j<filterSize; j++)
{
int left= MAX(j + (*filterPos)[i], 0);
- filter2[i*filter2Size + left] += filter2[i*filter2Size + j];
- filter2[i*filter2Size + j]=0;
+ filter[i*filterSize + left] += filter[i*filterSize + j];
+ filter[i*filterSize + j]=0;
}
(*filterPos)[i]= 0;
}
- if((*filterPos)[i] + filter2Size > srcW)
+ if((*filterPos)[i] + filterSize > srcW)
{
- int shift= (*filterPos)[i] + filter2Size - srcW;
+ int shift= (*filterPos)[i] + filterSize - srcW;
// Move filter coeffs right to compensate for filterPos
- for(j=filter2Size-2; j>=0; j--)
+ for(j=filterSize-2; j>=0; j--)
{
- int right= MIN(j + shift, filter2Size-1);
- filter2[i*filter2Size +right] += filter2[i*filter2Size +j];
- filter2[i*filter2Size +j]=0;
+ int right= MIN(j + shift, filterSize-1);
+ filter[i*filterSize +right] += filter[i*filterSize +j];
+ filter[i*filterSize +j]=0;
}
- (*filterPos)[i]= srcW - filter2Size;
+ (*filterPos)[i]= srcW - filterSize;
}
}
-
- *outFilterSize= (filter2Size +(filterAlign-1)) & (~(filterAlign-1));
- *outFilter= (int16_t*)memalign(8, *outFilterSize*dstW*sizeof(int16_t));
- memset(*outFilter, 0, *outFilterSize*dstW*sizeof(int16_t));
+ // Note the +1 is for the MMXscaler which reads over the end
+ *outFilter= (int16_t*)memalign(8, *outFilterSize*(dstW+1)*sizeof(int16_t));
+ memset(*outFilter, 0, *outFilterSize*(dstW+1)*sizeof(int16_t));
/* Normalize & Store in outFilter */
for(i=0; i<dstW; i++)
int j;
double sum=0;
double scale= one;
- for(j=0; j<filter2Size; j++)
+ for(j=0; j<filterSize; j++)
{
- sum+= filter2[i*filter2Size + j];
+ sum+= filter[i*filterSize + j];
}
scale/= sum;
- for(j=0; j<filter2Size; j++)
+ for(j=0; j<filterSize; j++)
{
- (*outFilter)[i*(*outFilterSize) + j]= (int)(filter2[i*filter2Size + j]*scale);
+ (*outFilter)[i*(*outFilterSize) + j]= (int)(filter[i*filterSize + j]*scale);
}
}
+
+ (*filterPos)[dstW]= (*filterPos)[dstW-1]; // the MMX scaler will read over the end
+ for(i=0; i<*outFilterSize; i++)
+ {
+ int j= dstW*(*outFilterSize);
+ (*outFilter)[j + i]= (*outFilter)[j + i - (*outFilterSize)];
+ }
- free(filter2);
+ free(filter);
}
#ifdef ARCH_X86
-static void initMMX2HScaler(int dstW, int xInc, uint8_t *funnyCode)
+static void initMMX2HScaler(int dstW, int xInc, uint8_t *funnyCode, int16_t *filter, int32_t *filterPos, int numSplits)
{
- uint8_t *fragment;
- int imm8OfPShufW1;
- int imm8OfPShufW2;
- int fragmentLength;
+ uint8_t *fragmentA;
+ int imm8OfPShufW1A;
+ int imm8OfPShufW2A;
+ int fragmentLengthA;
+ uint8_t *fragmentB;
+ int imm8OfPShufW1B;
+ int imm8OfPShufW2B;
+ int fragmentLengthB;
+ int fragmentPos;
int xpos, i;
"jmp 9f \n\t"
// Begin
"0: \n\t"
- "movq (%%esi), %%mm0 \n\t" //FIXME Alignment
- "movq %%mm0, %%mm1 \n\t"
- "psrlq $8, %%mm0 \n\t"
- "punpcklbw %%mm7, %%mm1 \n\t"
- "movq %%mm2, %%mm3 \n\t"
- "punpcklbw %%mm7, %%mm0 \n\t"
- "addw %%bx, %%cx \n\t" //2*xalpha += (4*lumXInc)&0xFFFF
+ "movq (%%edx, %%eax), %%mm3 \n\t"
+ "movd (%%ecx, %%esi), %%mm0 \n\t"
+ "movd 1(%%ecx, %%esi), %%mm1 \n\t"
+ "punpcklbw %%mm7, %%mm1 \n\t"
+ "punpcklbw %%mm7, %%mm0 \n\t"
"pshufw $0xFF, %%mm1, %%mm1 \n\t"
"1: \n\t"
- "adcl %%edx, %%esi \n\t" //xx+= (4*lumXInc)>>16 + carry
"pshufw $0xFF, %%mm0, %%mm0 \n\t"
"2: \n\t"
- "psrlw $9, %%mm3 \n\t"
"psubw %%mm1, %%mm0 \n\t"
+ "movl 8(%%ebx, %%eax), %%esi \n\t"
"pmullw %%mm3, %%mm0 \n\t"
- "paddw %%mm6, %%mm2 \n\t" // 2*alpha += xpos&0xFFFF
"psllw $7, %%mm1 \n\t"
"paddw %%mm1, %%mm0 \n\t"
"subl %0, %2 \n\t"
"leal 9b, %3 \n\t"
"subl %0, %3 \n\t"
- :"=r" (fragment), "=r" (imm8OfPShufW1), "=r" (imm8OfPShufW2),
- "=r" (fragmentLength)
+
+
+ :"=r" (fragmentA), "=r" (imm8OfPShufW1A), "=r" (imm8OfPShufW2A),
+ "=r" (fragmentLengthA)
);
- xpos= 0; //lumXInc/2 - 0x8000; // difference between pixel centers
+ asm volatile(
+ "jmp 9f \n\t"
+ // Begin
+ "0: \n\t"
+ "movq (%%edx, %%eax), %%mm3 \n\t"
+ "movd (%%ecx, %%esi), %%mm0 \n\t"
+ "punpcklbw %%mm7, %%mm0 \n\t"
+ "pshufw $0xFF, %%mm0, %%mm1 \n\t"
+ "1: \n\t"
+ "pshufw $0xFF, %%mm0, %%mm0 \n\t"
+ "2: \n\t"
+ "psubw %%mm1, %%mm0 \n\t"
+ "movl 8(%%ebx, %%eax), %%esi \n\t"
+ "pmullw %%mm3, %%mm0 \n\t"
+ "psllw $7, %%mm1 \n\t"
+ "paddw %%mm1, %%mm0 \n\t"
+
+ "movq %%mm0, (%%edi, %%eax) \n\t"
+
+ "addl $8, %%eax \n\t"
+ // End
+ "9: \n\t"
+// "int $3\n\t"
+ "leal 0b, %0 \n\t"
+ "leal 1b, %1 \n\t"
+ "leal 2b, %2 \n\t"
+ "decl %1 \n\t"
+ "decl %2 \n\t"
+ "subl %0, %1 \n\t"
+ "subl %0, %2 \n\t"
+ "leal 9b, %3 \n\t"
+ "subl %0, %3 \n\t"
- for(i=0; i<dstW/8; i++)
+
+ :"=r" (fragmentB), "=r" (imm8OfPShufW1B), "=r" (imm8OfPShufW2B),
+ "=r" (fragmentLengthB)
+ );
+
+ xpos= 0; //lumXInc/2 - 0x8000; // difference between pixel centers
+ fragmentPos=0;
+
+ for(i=0; i<dstW/numSplits; i++)
{
int xx=xpos>>16;
int c=((xpos+xInc*2)>>16) - xx;
int d=((xpos+xInc*3)>>16) - xx;
- memcpy(funnyCode + fragmentLength*i/4, fragment, fragmentLength);
+ filter[i ] = (( xpos & 0xFFFF) ^ 0xFFFF)>>9;
+ filter[i+1] = (((xpos+xInc ) & 0xFFFF) ^ 0xFFFF)>>9;
+ filter[i+2] = (((xpos+xInc*2) & 0xFFFF) ^ 0xFFFF)>>9;
+ filter[i+3] = (((xpos+xInc*3) & 0xFFFF) ^ 0xFFFF)>>9;
+ filterPos[i/2]= xx;
+
+ if(d+1<4)
+ {
+ int maxShift= 3-(d+1);
+ int shift=0;
+
+ memcpy(funnyCode + fragmentPos, fragmentB, fragmentLengthB);
+
+ funnyCode[fragmentPos + imm8OfPShufW1B]=
+ (a+1) | ((b+1)<<2) | ((c+1)<<4) | ((d+1)<<6);
+ funnyCode[fragmentPos + imm8OfPShufW2B]=
+ a | (b<<2) | (c<<4) | (d<<6);
- funnyCode[fragmentLength*i/4 + imm8OfPShufW1]=
- funnyCode[fragmentLength*i/4 + imm8OfPShufW2]=
- a | (b<<2) | (c<<4) | (d<<6);
+ if(i+3>=dstW) shift=maxShift; //avoid overread
+ else if((filterPos[i/2]&3) <= maxShift) shift=filterPos[i/2]&3; //Align
- // if we dont need to read 8 bytes than dont :), reduces the chance of
- // crossing a cache line
- if(d<3) funnyCode[fragmentLength*i/4 + 1]= 0x6E;
+ if(shift && i>=shift)
+ {
+ funnyCode[fragmentPos + imm8OfPShufW1B]+= 0x55*shift;
+ funnyCode[fragmentPos + imm8OfPShufW2B]+= 0x55*shift;
+ filterPos[i/2]-=shift;
+ }
+
+ fragmentPos+= fragmentLengthB;
+ }
+ else
+ {
+ int maxShift= 3-d;
+ int shift=0;
- funnyCode[fragmentLength*(i+4)/4]= RET;
+ memcpy(funnyCode + fragmentPos, fragmentA, fragmentLengthA);
+
+ funnyCode[fragmentPos + imm8OfPShufW1A]=
+ funnyCode[fragmentPos + imm8OfPShufW2A]=
+ a | (b<<2) | (c<<4) | (d<<6);
+
+ if(i+4>=dstW) shift=maxShift; //avoid overread
+ else if((filterPos[i/2]&3) <= maxShift) shift=filterPos[i/2]&3; //partial align
+
+ if(shift && i>=shift)
+ {
+ funnyCode[fragmentPos + imm8OfPShufW1A]+= 0x55*shift;
+ funnyCode[fragmentPos + imm8OfPShufW2A]+= 0x55*shift;
+ filterPos[i/2]-=shift;
+ }
+
+ fragmentPos+= fragmentLengthA;
+ }
+
+ funnyCode[fragmentPos]= RET;
}
xpos+=xInc;
}
+ filterPos[i/2]= xpos>>16; // needed to jump to the next part
}
#endif // ARCH_X86
for(i=0; i<768; i++){
int c= MIN(MAX(i-256, 0), 255);
clip_table[i]=c;
- yuvtab_2568[c]= clip_yuvtab_2568[i]=(0x2568*(c-16))+(256<<13);
- yuvtab_3343[c]= clip_yuvtab_3343[i]=0x3343*(c-128);
- yuvtab_0c92[c]= clip_yuvtab_0c92[i]=-0x0c92*(c-128);
- yuvtab_1a1e[c]= clip_yuvtab_1a1e[i]=-0x1a1e*(c-128);
- yuvtab_40cf[c]= clip_yuvtab_40cf[i]=0x40cf*(c-128);
- }
-
- for(i=0; i<768; i++)
- {
- int v= clip_table[i];
- clip_table16b[i]= v>>3;
- clip_table16g[i]= (v<<3)&0x07E0;
- clip_table16r[i]= (v<<8)&0xF800;
- clip_table15b[i]= v>>3;
- clip_table15g[i]= (v<<2)&0x03E0;
- clip_table15r[i]= (v<<7)&0x7C00;
}
cpuCaps= gCpuCaps;
#endif //!RUNTIME_CPUDETECT
}
+static void PlanarToNV12Wrapper(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
+ int srcSliceH, uint8_t* dstParam[], int dstStride[]){
+ uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY;
+ /* Copy Y plane */
+ if(dstStride[0]==srcStride[0])
+ memcpy(dst, src[0], srcSliceH*dstStride[0]);
+ else
+ {
+ int i;
+ uint8_t *srcPtr= src[0];
+ uint8_t *dstPtr= dst;
+ for(i=0; i<srcSliceH; i++)
+ {
+ memcpy(dstPtr, srcPtr, srcStride[0]);
+ srcPtr+= srcStride[0];
+ dstPtr+= dstStride[0];
+ }
+ }
+ dst = dstParam[1] + dstStride[1]*srcSliceY;
+ if(c->srcFormat==IMGFMT_YV12)
+ interleaveBytes( src[1],src[2],dst,c->srcW,srcSliceH,srcStride[1],srcStride[2],dstStride[0] );
+ else /* I420 & IYUV */
+ interleaveBytes( src[2],src[1],dst,c->srcW,srcSliceH,srcStride[2],srcStride[1],dstStride[0] );
+}
+
+
+/* Warper functions for yuv2bgr */
+static void planarYuvToBgr(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
+ int srcSliceH, uint8_t* dstParam[], int dstStride[]){
+ uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY;
+
+ if(c->srcFormat==IMGFMT_YV12)
+ yuv2rgb( dst,src[0],src[1],src[2],c->srcW,srcSliceH,dstStride[0],srcStride[0],srcStride[1] );
+ else /* I420 & IYUV */
+ yuv2rgb( dst,src[0],src[2],src[1],c->srcW,srcSliceH,dstStride[0],srcStride[0],srcStride[1] );
+}
+
+static void PlanarToYuy2Wrapper(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
+ int srcSliceH, uint8_t* dstParam[], int dstStride[]){
+ uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY;
+
+ if(c->srcFormat==IMGFMT_YV12)
+ yv12toyuy2( src[0],src[1],src[2],dst,c->srcW,srcSliceH,srcStride[0],srcStride[1],dstStride[0] );
+ else /* I420 & IYUV */
+ yv12toyuy2( src[0],src[2],src[1],dst,c->srcW,srcSliceH,srcStride[0],srcStride[1],dstStride[0] );
+}
+
+/* {RGB,BGR}{15,16,24,32} -> {RGB,BGR}{15,16,24,32} */
+static void rgb2rgbWrapper(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
+ int srcSliceH, uint8_t* dst[], int dstStride[]){
+ const int srcFormat= c->srcFormat;
+ const int dstFormat= c->dstFormat;
+ const int srcBpp= ((srcFormat&0xFF) + 7)>>3;
+ const int dstBpp= ((dstFormat&0xFF) + 7)>>3;
+ const int srcId= (srcFormat&0xFF)>>2; // 1:0, 4:1, 8:2, 15:3, 16:4, 24:6, 32:8
+ const int dstId= (dstFormat&0xFF)>>2;
+ void (*conv)(const uint8_t *src, uint8_t *dst, unsigned src_size)=NULL;
+
+ /* BGR -> BGR */
+ if(isBGR(srcFormat) && isBGR(dstFormat)){
+ switch(srcId | (dstId<<4)){
+ case 0x34: conv= rgb16to15; break;
+ case 0x36: conv= rgb24to15; break;
+ case 0x38: conv= rgb32to15; break;
+ case 0x43: conv= rgb15to16; break;
+ case 0x46: conv= rgb24to16; break;
+ case 0x48: conv= rgb32to16; break;
+ case 0x63: conv= rgb15to24; break;
+ case 0x64: conv= rgb16to24; break;
+ case 0x68: conv= rgb32to24; break;
+ case 0x83: conv= rgb15to32; break;
+ case 0x84: conv= rgb16to32; break;
+ case 0x86: conv= rgb24to32; break;
+ default: MSG_ERR("swScaler: internal error %s -> %s converter\n",
+ vo_format_name(srcFormat), vo_format_name(dstFormat)); break;
+ }
+ }else if(isBGR(srcFormat) && isRGB(dstFormat)){
+ switch(srcId | (dstId<<4)){
+ case 0x33: conv= rgb15tobgr15; break;
+ case 0x34: conv= rgb16tobgr15; break;
+ case 0x36: conv= rgb24tobgr15; break;
+ case 0x38: conv= rgb32tobgr15; break;
+ case 0x43: conv= rgb15tobgr16; break;
+ case 0x44: conv= rgb16tobgr16; break;
+ case 0x46: conv= rgb24tobgr16; break;
+ case 0x48: conv= rgb32tobgr16; break;
+ case 0x63: conv= rgb15tobgr24; break;
+ case 0x64: conv= rgb16tobgr24; break;
+ case 0x66: conv= rgb24tobgr24; break;
+ case 0x68: conv= rgb32tobgr24; break;
+ case 0x83: conv= rgb15tobgr32; break;
+ case 0x84: conv= rgb16tobgr32; break;
+ case 0x86: conv= rgb24tobgr32; break;
+ case 0x88: conv= rgb32tobgr32; break;
+ default: MSG_ERR("swScaler: internal error %s -> %s converter\n",
+ vo_format_name(srcFormat), vo_format_name(dstFormat)); break;
+ }
+ }else if(isRGB(srcFormat) && isRGB(dstFormat)){
+ switch(srcId | (dstId<<4)){
+ case 0x34: conv= rgb16to15; break;
+ case 0x36: conv= rgb24to15; break;
+ case 0x38: conv= rgb32to15; break;
+ case 0x43: conv= rgb15to16; break;
+ case 0x46: conv= rgb24to16; break;
+ case 0x48: conv= rgb32to16; break;
+ case 0x63: conv= rgb15to24; break;
+ case 0x64: conv= rgb16to24; break;
+ case 0x68: conv= rgb32to24; break;
+ case 0x83: conv= rgb15to32; break;
+ case 0x84: conv= rgb16to32; break;
+ case 0x86: conv= rgb24to32; break;
+ default: MSG_ERR("swScaler: internal error %s -> %s converter\n",
+ vo_format_name(srcFormat), vo_format_name(dstFormat)); break;
+ }
+ }else if(isRGB(srcFormat) && isBGR(dstFormat)){
+ switch(srcId | (dstId<<4)){
+ case 0x33: conv= rgb15tobgr15; break;
+ case 0x34: conv= rgb16tobgr15; break;
+ case 0x36: conv= rgb24tobgr15; break;
+ case 0x38: conv= rgb32tobgr15; break;
+ case 0x43: conv= rgb15tobgr16; break;
+ case 0x44: conv= rgb16tobgr16; break;
+ case 0x46: conv= rgb24tobgr16; break;
+ case 0x48: conv= rgb32tobgr16; break;
+ case 0x63: conv= rgb15tobgr24; break;
+ case 0x64: conv= rgb16tobgr24; break;
+ case 0x66: conv= rgb24tobgr24; break;
+ case 0x68: conv= rgb32tobgr24; break;
+ case 0x83: conv= rgb15tobgr32; break;
+ case 0x84: conv= rgb16tobgr32; break;
+ case 0x86: conv= rgb24tobgr32; break;
+ case 0x88: conv= rgb32tobgr32; break;
+ default: MSG_ERR("swScaler: internal error %s -> %s converter\n",
+ vo_format_name(srcFormat), vo_format_name(dstFormat)); break;
+ }
+ }
+ if(dstStride[0]*srcBpp == srcStride[0]*dstBpp)
+ conv(src[0], dst[0] + dstStride[0]*srcSliceY, srcSliceH*srcStride[0]);
+ else
+ {
+ int i;
+ uint8_t *srcPtr= src[0];
+ uint8_t *dstPtr= dst[0] + dstStride[0]*srcSliceY;
+
+ for(i=0; i<srcSliceH; i++)
+ {
+ conv(srcPtr, dstPtr, c->srcW*srcBpp);
+ srcPtr+= srcStride[0];
+ dstPtr+= dstStride[0];
+ }
+ }
+}
+
+static void bgr24toyv12Wrapper(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
+ int srcSliceH, uint8_t* dst[], int dstStride[]){
+
+ rgb24toyv12(
+ src[0],
+ dst[0]+ srcSliceY *dstStride[0],
+ dst[1]+(srcSliceY>>1)*dstStride[1],
+ dst[2]+(srcSliceY>>1)*dstStride[2],
+ c->srcW, srcSliceH,
+ dstStride[0], dstStride[1], srcStride[0]);
+}
+
+static void yvu9toyv12Wrapper(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
+ int srcSliceH, uint8_t* dst[], int dstStride[]){
+ int i;
+
+ /* copy Y */
+ if(srcStride[0]==dstStride[0])
+ memcpy(dst[0]+ srcSliceY*dstStride[0], src[0], srcStride[0]*srcSliceH);
+ else{
+ uint8_t *srcPtr= src[0];
+ uint8_t *dstPtr= dst[0] + dstStride[0]*srcSliceY;
+
+ for(i=0; i<srcSliceH; i++)
+ {
+ memcpy(dstPtr, srcPtr, c->srcW);
+ srcPtr+= srcStride[0];
+ dstPtr+= dstStride[0];
+ }
+ }
+
+ if(c->dstFormat==IMGFMT_YV12){
+ planar2x(src[1], dst[1], c->chrSrcW, c->chrSrcH, srcStride[1], dstStride[1]);
+ planar2x(src[2], dst[2], c->chrSrcW, c->chrSrcH, srcStride[2], dstStride[2]);
+ }else{
+ planar2x(src[1], dst[2], c->chrSrcW, c->chrSrcH, srcStride[1], dstStride[2]);
+ planar2x(src[2], dst[1], c->chrSrcW, c->chrSrcH, srcStride[2], dstStride[1]);
+ }
+}
+
+/**
+ * bring pointers in YUV order instead of YVU
+ */
+static inline void orderYUV(int format, uint8_t * sortedP[], int sortedStride[], uint8_t * p[], int stride[]){
+ if(format == IMGFMT_YV12 || format == IMGFMT_YVU9){
+ sortedP[0]= p[0];
+ sortedP[1]= p[1];
+ sortedP[2]= p[2];
+ sortedStride[0]= stride[0];
+ sortedStride[1]= stride[1];
+ sortedStride[2]= stride[2];
+ }
+ else if(isPacked(format) || isGray(format))
+ {
+ sortedP[0]= p[0];
+ sortedP[1]=
+ sortedP[2]= NULL;
+ sortedStride[0]= stride[0];
+ sortedStride[1]=
+ sortedStride[2]= 0;
+ }
+ else if(format == IMGFMT_I420)
+ {
+ sortedP[0]= p[0];
+ sortedP[1]= p[2];
+ sortedP[2]= p[1];
+ sortedStride[0]= stride[0];
+ sortedStride[1]= stride[2];
+ sortedStride[2]= stride[1];
+ }else{
+ MSG_ERR("internal error in orderYUV\n");
+ }
+}
+
+/* unscaled copy like stuff (assumes nearly identical formats) */
+static void simpleCopy(SwsContext *c, uint8_t* srcParam[], int srcStrideParam[], int srcSliceY,
+ int srcSliceH, uint8_t* dstParam[], int dstStrideParam[]){
+
+ int srcStride[3];
+ int dstStride[3];
+ uint8_t *src[3];
+ uint8_t *dst[3];
+
+ orderYUV(c->srcFormat, src, srcStride, srcParam, srcStrideParam);
+ orderYUV(c->dstFormat, dst, dstStride, dstParam, dstStrideParam);
+
+ if(isPacked(c->srcFormat))
+ {
+ if(dstStride[0]==srcStride[0])
+ memcpy(dst[0] + dstStride[0]*srcSliceY, src[0], srcSliceH*dstStride[0]);
+ else
+ {
+ int i;
+ uint8_t *srcPtr= src[0];
+ uint8_t *dstPtr= dst[0] + dstStride[0]*srcSliceY;
+ int length=0;
+
+ /* universal length finder */
+ while(length+c->srcW <= ABS(dstStride[0])
+ && length+c->srcW <= ABS(srcStride[0])) length+= c->srcW;
+ ASSERT(length!=0);
+
+ for(i=0; i<srcSliceH; i++)
+ {
+ memcpy(dstPtr, srcPtr, length);
+ srcPtr+= srcStride[0];
+ dstPtr+= dstStride[0];
+ }
+ }
+ }
+ else
+ { /* Planar YUV or gray */
+ int plane;
+ for(plane=0; plane<3; plane++)
+ {
+ int length= plane==0 ? c->srcW : -((-c->srcW )>>c->chrDstHSubSample);
+ int y= plane==0 ? srcSliceY: -((-srcSliceY)>>c->chrDstVSubSample);
+ int height= plane==0 ? srcSliceH: -((-srcSliceH)>>c->chrDstVSubSample);
+
+ if((isGray(c->srcFormat) || isGray(c->dstFormat)) && plane>0)
+ {
+ if(!isGray(c->dstFormat))
+ memset(dst[plane], 128, dstStride[plane]*height);
+ }
+ else
+ {
+ if(dstStride[plane]==srcStride[plane])
+ memcpy(dst[plane] + dstStride[plane]*y, src[plane], height*dstStride[plane]);
+ else
+ {
+ int i;
+ uint8_t *srcPtr= src[plane];
+ uint8_t *dstPtr= dst[plane] + dstStride[plane]*y;
+ for(i=0; i<height; i++)
+ {
+ memcpy(dstPtr, srcPtr, length);
+ srcPtr+= srcStride[plane];
+ dstPtr+= dstStride[plane];
+ }
+ }
+ }
+ }
+ }
+}
+
+static int remove_dup_fourcc(int fourcc)
+{
+ switch(fourcc)
+ {
+ case IMGFMT_IYUV: return IMGFMT_I420;
+ case IMGFMT_Y8 : return IMGFMT_Y800;
+ case IMGFMT_IF09: return IMGFMT_YVU9;
+ default: return fourcc;
+ }
+}
+
+static void getSubSampleFactors(int *h, int *v, int format){
+ switch(format){
+ case IMGFMT_YUY2:
+ *h=1;
+ *v=0;
+ break;
+ case IMGFMT_YV12:
+ case IMGFMT_I420:
+ case IMGFMT_Y800: //FIXME remove after different subsamplings are fully implemented
+ *h=1;
+ *v=1;
+ break;
+ case IMGFMT_YVU9:
+ *h=2;
+ *v=2;
+ break;
+ default:
+ *h=0;
+ *v=0;
+ break;
+ }
+}
SwsContext *getSwsContext(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat, int flags,
SwsFilter *srcFilter, SwsFilter *dstFilter){
- const int widthAlign= dstFormat==IMGFMT_YV12 ? 16 : 8;
SwsContext *c;
int i;
+ int usesFilter;
+ int unscaled, needsDither;
SwsFilter dummyFilter= {NULL, NULL, NULL, NULL};
-
#ifdef ARCH_X86
if(gCpuCaps.hasMMX)
asm volatile("emms\n\t"::: "memory");
#endif
-
if(swScale==NULL) globalInit();
+//srcFormat= IMGFMT_Y800;
+//dstFormat= IMGFMT_Y800;
+ /* avoid dupplicate Formats, so we dont need to check to much */
+ srcFormat = remove_dup_fourcc(srcFormat);
+ dstFormat = remove_dup_fourcc(dstFormat);
+
+ unscaled = (srcW == dstW && srcH == dstH);
+ needsDither= (isBGR(dstFormat) || isRGB(dstFormat))
+ && (dstFormat&0xFF)<24
+ && ((dstFormat&0xFF)<(srcFormat&0xFF) || (!(isRGB(srcFormat) || isBGR(srcFormat))));
+
+ if(!isSupportedIn(srcFormat))
+ {
+ MSG_ERR("swScaler: %s is not supported as input format\n", vo_format_name(srcFormat));
+ return NULL;
+ }
+ if(!isSupportedOut(dstFormat))
+ {
+ MSG_ERR("swScaler: %s is not supported as output format\n", vo_format_name(dstFormat));
+ return NULL;
+ }
/* sanity check */
- if(srcW<1 || srcH<1 || dstW<1 || dstH<1) return NULL;
-
-/* FIXME
- if(dstStride[0]%widthAlign !=0 )
+ if(srcW<4 || srcH<1 || dstW<8 || dstH<1) //FIXME check if these are enough and try to lowwer them after fixing the relevant parts of the code
{
- if(flags & SWS_PRINT_INFO)
- fprintf(stderr, "SwScaler: Warning: dstStride is not a multiple of %d!\n"
- "SwScaler: ->cannot do aligned memory acesses anymore\n",
- widthAlign);
+ MSG_ERR("swScaler: %dx%d -> %dx%d is invalid scaling dimension\n",
+ srcW, srcH, dstW, dstH);
+ return NULL;
}
-*/
+
if(!dstFilter) dstFilter= &dummyFilter;
if(!srcFilter) srcFilter= &dummyFilter;
c->srcH= srcH;
c->dstW= dstW;
c->dstH= dstH;
- c->lumXInc= ((srcW<<16) + (1<<15))/dstW;
- c->lumYInc= ((srcH<<16) + (1<<15))/dstH;
+ c->lumXInc= ((srcW<<16) + (dstW>>1))/dstW;
+ c->lumYInc= ((srcH<<16) + (dstH>>1))/dstH;
c->flags= flags;
c->dstFormat= dstFormat;
c->srcFormat= srcFormat;
+ usesFilter=0;
+ if(dstFilter->lumV!=NULL && dstFilter->lumV->length>1) usesFilter=1;
+ if(dstFilter->lumH!=NULL && dstFilter->lumH->length>1) usesFilter=1;
+ if(dstFilter->chrV!=NULL && dstFilter->chrV->length>1) usesFilter=1;
+ if(dstFilter->chrH!=NULL && dstFilter->chrH->length>1) usesFilter=1;
+ if(srcFilter->lumV!=NULL && srcFilter->lumV->length>1) usesFilter=1;
+ if(srcFilter->lumH!=NULL && srcFilter->lumH->length>1) usesFilter=1;
+ if(srcFilter->chrV!=NULL && srcFilter->chrV->length>1) usesFilter=1;
+ if(srcFilter->chrH!=NULL && srcFilter->chrH->length>1) usesFilter=1;
+
+ getSubSampleFactors(&c->chrSrcHSubSample, &c->chrSrcVSubSample, srcFormat);
+ getSubSampleFactors(&c->chrDstHSubSample, &c->chrDstVSubSample, dstFormat);
+
+ // reuse chroma for 2 pixles rgb/bgr unless user wants full chroma interpolation
+ if((isBGR(dstFormat) || isRGB(dstFormat)) && !(flags&SWS_FULL_CHR_H_INT)) c->chrDstHSubSample=1;
+
+ // drop some chroma lines if the user wants it
+ c->vChrDrop= (flags&SWS_SRC_V_CHR_DROP_MASK)>>SWS_SRC_V_CHR_DROP_SHIFT;
+ c->chrSrcVSubSample+= c->vChrDrop;
+
+ // drop every 2. pixel for chroma calculation unless user wants full chroma
+ if((isBGR(srcFormat) || isRGB(srcFormat)) && !(flags&SWS_FULL_CHR_H_INP))
+ c->chrSrcHSubSample=1;
+
+ c->chrIntHSubSample= c->chrDstHSubSample;
+ c->chrIntVSubSample= c->chrSrcVSubSample;
+
+ // note the -((-x)>>y) is so that we allways round toward +inf
+ c->chrSrcW= -((-srcW) >> c->chrSrcHSubSample);
+ c->chrSrcH= -((-srcH) >> c->chrSrcVSubSample);
+ c->chrDstW= -((-dstW) >> c->chrDstHSubSample);
+ c->chrDstH= -((-dstH) >> c->chrDstVSubSample);
+
+ if(isBGR(dstFormat))
+ c->yuvTable= yuv2rgb_c_init(dstFormat & 0xFF, MODE_RGB, c->table_rV, c->table_gU, c->table_gV, c->table_bU);
+ if(isRGB(dstFormat))
+ c->yuvTable= yuv2rgb_c_init(dstFormat & 0xFF, MODE_BGR, c->table_rV, c->table_gU, c->table_gV, c->table_bU);
+
+ /* unscaled special Cases */
+ if(unscaled && !usesFilter)
+ {
+ /* yv12_to_nv12 */
+ if((srcFormat == IMGFMT_YV12||srcFormat==IMGFMT_I420)&&dstFormat == IMGFMT_NV12)
+ {
+ c->swScale= PlanarToNV12Wrapper;
+
+ if(flags&SWS_PRINT_INFO)
+ MSG_INFO("SwScaler: using unscaled %s -> %s special converter\n",
+ vo_format_name(srcFormat), vo_format_name(dstFormat));
+ return c;
+ }
+ /* yv12_to_yuy2 */
+ if((srcFormat == IMGFMT_YV12||srcFormat==IMGFMT_I420)&&dstFormat == IMGFMT_YUY2)
+ {
+ c->swScale= PlanarToYuy2Wrapper;
+
+ if(flags&SWS_PRINT_INFO)
+ MSG_INFO("SwScaler: using unscaled %s -> %s special converter\n",
+ vo_format_name(srcFormat), vo_format_name(dstFormat));
+ return c;
+ }
+ /* yuv2bgr */
+ if((srcFormat==IMGFMT_YV12 || srcFormat==IMGFMT_I420) && isBGR(dstFormat))
+ {
+ // FIXME multiple yuv2rgb converters wont work that way cuz that thing is full of globals&statics
+ //FIXME rgb vs. bgr ?
+#ifdef WORDS_BIGENDIAN
+ if(dstFormat==IMGFMT_BGR32)
+ yuv2rgb_init( dstFormat&0xFF /* =bpp */, MODE_BGR);
+ else
+ yuv2rgb_init( dstFormat&0xFF /* =bpp */, MODE_RGB);
+#else
+ yuv2rgb_init( dstFormat&0xFF /* =bpp */, MODE_RGB);
+#endif
+ c->swScale= planarYuvToBgr;
+
+ if(flags&SWS_PRINT_INFO)
+ MSG_INFO("SwScaler: using unscaled %s -> %s special converter\n",
+ vo_format_name(srcFormat), vo_format_name(dstFormat));
+ return c;
+ }
+
+ /* simple copy */
+ if( srcFormat == dstFormat
+ || (srcFormat==IMGFMT_YV12 && dstFormat==IMGFMT_I420)
+ || (srcFormat==IMGFMT_I420 && dstFormat==IMGFMT_YV12)
+ || (isPlanarYUV(srcFormat) && isGray(dstFormat))
+ || (isPlanarYUV(dstFormat) && isGray(srcFormat))
+ )
+ {
+ c->swScale= simpleCopy;
+
+ if(flags&SWS_PRINT_INFO)
+ MSG_INFO("SwScaler: using unscaled %s -> %s special converter\n",
+ vo_format_name(srcFormat), vo_format_name(dstFormat));
+ return c;
+ }
+
+ if( srcFormat==IMGFMT_YVU9 && (dstFormat==IMGFMT_YV12 || dstFormat==IMGFMT_I420) )
+ {
+ c->swScale= yvu9toyv12Wrapper;
+
+ if(flags&SWS_PRINT_INFO)
+ MSG_INFO("SwScaler: using unscaled %s -> %s special converter\n",
+ vo_format_name(srcFormat), vo_format_name(dstFormat));
+ return c;
+ }
+
+ /* bgr24toYV12 */
+ if(srcFormat==IMGFMT_BGR24 && dstFormat==IMGFMT_YV12)
+ c->swScale= bgr24toyv12Wrapper;
+
+ /* rgb/bgr -> rgb/bgr (no dither needed forms) */
+ if( (isBGR(srcFormat) || isRGB(srcFormat))
+ && (isBGR(dstFormat) || isRGB(dstFormat))
+ && !needsDither)
+ c->swScale= rgb2rgbWrapper;
+
+ /* LQ converters if -sws 0 or -sws 4*/
+ if(c->flags&(SWS_FAST_BILINEAR|SWS_POINT)){
+ /* rgb/bgr -> rgb/bgr (dither needed forms) */
+ if( (isBGR(srcFormat) || isRGB(srcFormat))
+ && (isBGR(dstFormat) || isRGB(dstFormat))
+ && needsDither)
+ c->swScale= rgb2rgbWrapper;
+ }
+
+ if(c->swScale){
+ if(flags&SWS_PRINT_INFO)
+ MSG_INFO("SwScaler: using unscaled %s -> %s special converter\n",
+ vo_format_name(srcFormat), vo_format_name(dstFormat));
+ return c;
+ }
+ }
+
if(cpuCaps.hasMMX2)
{
c->canMMX2BeUsed= (dstW >=srcW && (dstW&31)==0 && (srcW&15)==0) ? 1 : 0;
if(!c->canMMX2BeUsed && dstW >=srcW && (srcW&15)==0 && (flags&SWS_FAST_BILINEAR))
{
if(flags&SWS_PRINT_INFO)
- fprintf(stderr, "SwScaler: output Width is not a multiple of 32 -> no MMX2 scaler\n");
+ MSG_INFO("SwScaler: output Width is not a multiple of 32 -> no MMX2 scaler\n");
}
}
else
c->canMMX2BeUsed=0;
+ c->chrXInc= ((c->chrSrcW<<16) + (c->chrDstW>>1))/c->chrDstW;
+ c->chrYInc= ((c->chrSrcH<<16) + (c->chrDstH>>1))/c->chrDstH;
+
// match pixel 0 of the src to pixel 0 of dst and match pixel n-2 of src to pixel n-2 of dst
// but only for the FAST_BILINEAR mode otherwise do correct scaling
// n-2 is the last chrominance sample available
// first and last pixel
if(flags&SWS_FAST_BILINEAR)
{
- if(c->canMMX2BeUsed) c->lumXInc+= 20;
+ if(c->canMMX2BeUsed)
+ {
+ c->lumXInc+= 20;
+ c->chrXInc+= 20;
+ }
//we dont use the x86asm scaler if mmx is available
- else if(cpuCaps.hasMMX) c->lumXInc = ((srcW-2)<<16)/(dstW-2) - 20;
+ else if(cpuCaps.hasMMX)
+ {
+ c->lumXInc = ((srcW-2)<<16)/(dstW-2) - 20;
+ c->chrXInc = ((c->chrSrcW-2)<<16)/(c->chrDstW-2) - 20;
+ }
}
- /* set chrXInc & chrDstW */
- if((flags&SWS_FULL_UV_IPOL) && dstFormat!=IMGFMT_YV12)
- c->chrXInc= c->lumXInc>>1, c->chrDstW= dstW;
- else
- c->chrXInc= c->lumXInc, c->chrDstW= (dstW+1)>>1;
-
- /* set chrYInc & chrDstH */
- if(dstFormat==IMGFMT_YV12) c->chrYInc= c->lumYInc, c->chrDstH= (dstH+1)>>1;
- else c->chrYInc= c->lumYInc>>1, c->chrDstH= dstH;
-
/* precalculate horizontal scaler filter coefficients */
{
const int filterAlign= cpuCaps.hasMMX ? 4 : 1;
initFilter(&c->hLumFilter, &c->hLumFilterPos, &c->hLumFilterSize, c->lumXInc,
- srcW , dstW, filterAlign, 1<<14, flags,
+ srcW , dstW, filterAlign, 1<<14,
+ (flags&SWS_BICUBLIN) ? (flags|SWS_BICUBIC) : flags,
srcFilter->lumH, dstFilter->lumH);
initFilter(&c->hChrFilter, &c->hChrFilterPos, &c->hChrFilterSize, c->chrXInc,
- (srcW+1)>>1, c->chrDstW, filterAlign, 1<<14, flags,
+ c->chrSrcW, c->chrDstW, filterAlign, 1<<14,
+ (flags&SWS_BICUBLIN) ? (flags|SWS_BILINEAR) : flags,
srcFilter->chrH, dstFilter->chrH);
#ifdef ARCH_X86
// cant downscale !!!
if(c->canMMX2BeUsed && (flags & SWS_FAST_BILINEAR))
{
- initMMX2HScaler( dstW, c->lumXInc, c->funnyYCode);
- initMMX2HScaler(c->chrDstW, c->chrXInc, c->funnyUVCode);
+ c->lumMmx2Filter = (int16_t*)memalign(8, (dstW /8+8)*sizeof(int16_t));
+ c->chrMmx2Filter = (int16_t*)memalign(8, (c->chrDstW /4+8)*sizeof(int16_t));
+ c->lumMmx2FilterPos= (int32_t*)memalign(8, (dstW /2/8+8)*sizeof(int32_t));
+ c->chrMmx2FilterPos= (int32_t*)memalign(8, (c->chrDstW/2/4+8)*sizeof(int32_t));
+
+ initMMX2HScaler( dstW, c->lumXInc, c->funnyYCode , c->lumMmx2Filter, c->lumMmx2FilterPos, 8);
+ initMMX2HScaler(c->chrDstW, c->chrXInc, c->funnyUVCode, c->chrMmx2Filter, c->chrMmx2FilterPos, 4);
}
#endif
} // Init Horizontal stuff
/* precalculate vertical scaler filter coefficients */
initFilter(&c->vLumFilter, &c->vLumFilterPos, &c->vLumFilterSize, c->lumYInc,
- srcH , dstH, 1, (1<<12)-4, flags,
+ srcH , dstH, 1, (1<<12)-4,
+ (flags&SWS_BICUBLIN) ? (flags|SWS_BICUBIC) : flags,
srcFilter->lumV, dstFilter->lumV);
initFilter(&c->vChrFilter, &c->vChrFilterPos, &c->vChrFilterSize, c->chrYInc,
- (srcH+1)>>1, c->chrDstH, 1, (1<<12)-4, flags,
- srcFilter->chrV, dstFilter->chrV);
+ c->chrSrcH, c->chrDstH, 1, (1<<12)-4,
+ (flags&SWS_BICUBLIN) ? (flags|SWS_BILINEAR) : flags,
+ srcFilter->chrV, dstFilter->chrV);
// Calculate Buffer Sizes so that they wont run out while handling these damn slices
c->vLumBufSize= c->vLumFilterSize;
{
int chrI= i*c->chrDstH / dstH;
int nextSlice= MAX(c->vLumFilterPos[i ] + c->vLumFilterSize - 1,
- ((c->vChrFilterPos[chrI] + c->vChrFilterSize - 1)<<1));
- nextSlice&= ~1; // Slices start at even boundaries
+ ((c->vChrFilterPos[chrI] + c->vChrFilterSize - 1)<<c->chrSrcVSubSample));
+ nextSlice&= ~3; // Slices start at boundaries which are divisable through 4
if(c->vLumFilterPos[i ] + c->vLumBufSize < nextSlice)
c->vLumBufSize= nextSlice - c->vLumFilterPos[i ];
- if(c->vChrFilterPos[chrI] + c->vChrBufSize < (nextSlice>>1))
- c->vChrBufSize= (nextSlice>>1) - c->vChrFilterPos[chrI];
+ if(c->vChrFilterPos[chrI] + c->vChrBufSize < (nextSlice>>c->chrSrcVSubSample))
+ c->vChrBufSize= (nextSlice>>c->chrSrcVSubSample) - c->vChrFilterPos[chrI];
}
// allocate pixbufs (we use dynamic allocation because otherwise we would need to
- // allocate several megabytes to handle all possible cases)
c->lumPixBuf= (int16_t**)memalign(4, c->vLumBufSize*2*sizeof(int16_t*));
c->chrPixBuf= (int16_t**)memalign(4, c->vChrBufSize*2*sizeof(int16_t*));
+ //Note we need at least one pixel more at the end because of the mmx code (just in case someone wanna replace the 4000/8000)
for(i=0; i<c->vLumBufSize; i++)
c->lumPixBuf[i]= c->lumPixBuf[i+c->vLumBufSize]= (uint16_t*)memalign(8, 4000);
for(i=0; i<c->vChrBufSize; i++)
if(flags&SWS_PRINT_INFO)
{
#ifdef DITHER1XBPP
- char *dither= cpuCaps.hasMMX ? " dithered" : "";
+ char *dither= " dithered";
+#else
+ char *dither= "";
#endif
if(flags&SWS_FAST_BILINEAR)
- fprintf(stderr, "\nSwScaler: FAST_BILINEAR scaler ");
+ MSG_INFO("\nSwScaler: FAST_BILINEAR scaler, ");
else if(flags&SWS_BILINEAR)
- fprintf(stderr, "\nSwScaler: BILINEAR scaler ");
+ MSG_INFO("\nSwScaler: BILINEAR scaler, ");
else if(flags&SWS_BICUBIC)
- fprintf(stderr, "\nSwScaler: BICUBIC scaler ");
+ MSG_INFO("\nSwScaler: BICUBIC scaler, ");
+ else if(flags&SWS_X)
+ MSG_INFO("\nSwScaler: Experimental scaler, ");
+ else if(flags&SWS_POINT)
+ MSG_INFO("\nSwScaler: Nearest Neighbor / POINT scaler, ");
+ else if(flags&SWS_AREA)
+ MSG_INFO("\nSwScaler: Area Averageing scaler, ");
+ else if(flags&SWS_BICUBLIN)
+ MSG_INFO("\nSwScaler: luma BICUBIC / chroma BILINEAR, ");
else
- fprintf(stderr, "\nSwScaler: ehh flags invalid?! ");
+ MSG_INFO("\nSwScaler: ehh flags invalid?! ");
- if(dstFormat==IMGFMT_BGR15)
- fprintf(stderr, "with%s BGR15 output ", dither);
- else if(dstFormat==IMGFMT_BGR16)
- fprintf(stderr, "with%s BGR16 output ", dither);
- else if(dstFormat==IMGFMT_BGR24)
- fprintf(stderr, "with BGR24 output ");
- else if(dstFormat==IMGFMT_BGR32)
- fprintf(stderr, "with BGR32 output ");
- else if(dstFormat==IMGFMT_YV12)
- fprintf(stderr, "with YV12 output ");
+ if(dstFormat==IMGFMT_BGR15 || dstFormat==IMGFMT_BGR16)
+ MSG_INFO("from %s to%s %s ",
+ vo_format_name(srcFormat), dither, vo_format_name(dstFormat));
else
- fprintf(stderr, "without output ");
+ MSG_INFO("from %s to %s ",
+ vo_format_name(srcFormat), vo_format_name(dstFormat));
if(cpuCaps.hasMMX2)
- fprintf(stderr, "using MMX2\n");
+ MSG_INFO("using MMX2\n");
else if(cpuCaps.has3DNow)
- fprintf(stderr, "using 3DNOW\n");
+ MSG_INFO("using 3DNOW\n");
else if(cpuCaps.hasMMX)
- fprintf(stderr, "using MMX\n");
+ MSG_INFO("using MMX\n");
else
- fprintf(stderr, "using C\n");
+ MSG_INFO("using C\n");
}
if((flags & SWS_PRINT_INFO) && verbose)
if(cpuCaps.hasMMX)
{
if(c->canMMX2BeUsed && (flags&SWS_FAST_BILINEAR))
- printf("SwScaler: using FAST_BILINEAR MMX2 scaler for horizontal scaling\n");
+ MSG_V("SwScaler: using FAST_BILINEAR MMX2 scaler for horizontal scaling\n");
else
{
if(c->hLumFilterSize==4)
- printf("SwScaler: using 4-tap MMX scaler for horizontal luminance scaling\n");
+ MSG_V("SwScaler: using 4-tap MMX scaler for horizontal luminance scaling\n");
else if(c->hLumFilterSize==8)
- printf("SwScaler: using 8-tap MMX scaler for horizontal luminance scaling\n");
+ MSG_V("SwScaler: using 8-tap MMX scaler for horizontal luminance scaling\n");
else
- printf("SwScaler: using n-tap MMX scaler for horizontal luminance scaling\n");
+ MSG_V("SwScaler: using n-tap MMX scaler for horizontal luminance scaling\n");
if(c->hChrFilterSize==4)
- printf("SwScaler: using 4-tap MMX scaler for horizontal chrominance scaling\n");
+ MSG_V("SwScaler: using 4-tap MMX scaler for horizontal chrominance scaling\n");
else if(c->hChrFilterSize==8)
- printf("SwScaler: using 8-tap MMX scaler for horizontal chrominance scaling\n");
+ MSG_V("SwScaler: using 8-tap MMX scaler for horizontal chrominance scaling\n");
else
- printf("SwScaler: using n-tap MMX scaler for horizontal chrominance scaling\n");
+ MSG_V("SwScaler: using n-tap MMX scaler for horizontal chrominance scaling\n");
}
}
else
{
#ifdef ARCH_X86
- printf("SwScaler: using X86-Asm scaler for horizontal scaling\n");
+ MSG_V("SwScaler: using X86-Asm scaler for horizontal scaling\n");
#else
if(flags & SWS_FAST_BILINEAR)
- printf("SwScaler: using FAST_BILINEAR C scaler for horizontal scaling\n");
+ MSG_V("SwScaler: using FAST_BILINEAR C scaler for horizontal scaling\n");
else
- printf("SwScaler: using C scaler for horizontal scaling\n");
+ MSG_V("SwScaler: using C scaler for horizontal scaling\n");
#endif
}
- if(dstFormat==IMGFMT_YV12)
+ if(isPlanarYUV(dstFormat))
{
if(c->vLumFilterSize==1)
- printf("SwScaler: using 1-tap %s \"scaler\" for vertical scaling (YV12)\n", cpuCaps.hasMMX ? "MMX" : "C");
+ MSG_V("SwScaler: using 1-tap %s \"scaler\" for vertical scaling (YV12 like)\n", cpuCaps.hasMMX ? "MMX" : "C");
else
- printf("SwScaler: using n-tap %s scaler for vertical scaling (YV12)\n", cpuCaps.hasMMX ? "MMX" : "C");
+ MSG_V("SwScaler: using n-tap %s scaler for vertical scaling (YV12 like)\n", cpuCaps.hasMMX ? "MMX" : "C");
}
else
{
if(c->vLumFilterSize==1 && c->vChrFilterSize==2)
- printf("SwScaler: using 1-tap %s \"scaler\" for vertical luminance scaling (BGR)\n"
+ MSG_V("SwScaler: using 1-tap %s \"scaler\" for vertical luminance scaling (BGR)\n"
"SwScaler: 2-tap scaler for vertical chrominance scaling (BGR)\n",cpuCaps.hasMMX ? "MMX" : "C");
else if(c->vLumFilterSize==2 && c->vChrFilterSize==2)
- printf("SwScaler: using 2-tap linear %s scaler for vertical scaling (BGR)\n", cpuCaps.hasMMX ? "MMX" : "C");
+ MSG_V("SwScaler: using 2-tap linear %s scaler for vertical scaling (BGR)\n", cpuCaps.hasMMX ? "MMX" : "C");
else
- printf("SwScaler: using n-tap %s scaler for vertical scaling (BGR)\n", cpuCaps.hasMMX ? "MMX" : "C");
+ MSG_V("SwScaler: using n-tap %s scaler for vertical scaling (BGR)\n", cpuCaps.hasMMX ? "MMX" : "C");
}
if(dstFormat==IMGFMT_BGR24)
- printf("SwScaler: using %s YV12->BGR24 Converter\n",
+ MSG_V("SwScaler: using %s YV12->BGR24 Converter\n",
cpuCaps.hasMMX2 ? "MMX2" : (cpuCaps.hasMMX ? "MMX" : "C"));
- else
- printf("SwScaler: using %s YV12->BGR Converter\n", cpuCaps.hasMMX ? "MMX" : "C");//FIXME print format
+ else if(dstFormat==IMGFMT_BGR32)
+ MSG_V("SwScaler: using %s YV12->BGR32 Converter\n", cpuCaps.hasMMX ? "MMX" : "C");
+ else if(dstFormat==IMGFMT_BGR16)
+ MSG_V("SwScaler: using %s YV12->BGR16 Converter\n", cpuCaps.hasMMX ? "MMX" : "C");
+ else if(dstFormat==IMGFMT_BGR15)
+ MSG_V("SwScaler: using %s YV12->BGR15 Converter\n", cpuCaps.hasMMX ? "MMX" : "C");
- printf("SwScaler: %dx%d -> %dx%d\n", srcW, srcH, dstW, dstH);
+ MSG_V("SwScaler: %dx%d -> %dx%d\n", srcW, srcH, dstW, dstH);
+ }
+ if((flags & SWS_PRINT_INFO) && verbose>1)
+ {
+ MSG_DBG2("SwScaler:Lum srcW=%d srcH=%d dstW=%d dstH=%d xInc=%d yInc=%d\n",
+ c->srcW, c->srcH, c->dstW, c->dstH, c->lumXInc, c->lumYInc);
+ MSG_DBG2("SwScaler:Chr srcW=%d srcH=%d dstW=%d dstH=%d xInc=%d yInc=%d\n",
+ c->chrSrcW, c->chrSrcH, c->chrDstW, c->chrDstH, c->chrXInc, c->chrYInc);
}
+ c->swScale= swScale;
return c;
}
return vec;
}
+SwsVector *getConstVec(double c, int length){
+ int i;
+ double *coeff= memalign(sizeof(double), length*sizeof(double));
+ SwsVector *vec= malloc(sizeof(SwsVector));
+
+ vec->coeff= coeff;
+ vec->length= length;
+
+ for(i=0; i<length; i++)
+ coeff[i]= c;
+
+ return vec;
+}
+
+
SwsVector *getIdentityVec(void){
double *coeff= memalign(sizeof(double), sizeof(double));
SwsVector *vec= malloc(sizeof(SwsVector));
static SwsVector *getShiftedVec(SwsVector *a, int shift){
int length= a->length + ABS(shift)*2;
double *coeff= memalign(sizeof(double), length*sizeof(double));
- int i, j;
+ int i;
SwsVector *vec= malloc(sizeof(SwsVector));
vec->coeff= coeff;
for(i=0; i<a->length; i++)
{
int x= (int)((a->coeff[i]-min)*60.0/range +0.5);
- printf("%1.3f ", a->coeff[i]);
- for(;x>0; x--) printf(" ");
- printf("|\n");
+ MSG_DBG2("%1.3f ", a->coeff[i]);
+ for(;x>0; x--) MSG_DBG2(" ");
+ MSG_DBG2("|\n");
}
}
void freeSwsContext(SwsContext *c){
int i;
-
if(!c) return;
if(c->lumPixBuf)
{
- for(i=0; i<c->vLumBufSize*2; i++)
+ for(i=0; i<c->vLumBufSize; i++)
{
if(c->lumPixBuf[i]) free(c->lumPixBuf[i]);
c->lumPixBuf[i]=NULL;
if(c->chrPixBuf)
{
- for(i=0; i<c->vChrBufSize*2; i++)
+ for(i=0; i<c->vChrBufSize; i++)
{
if(c->chrPixBuf[i]) free(c->chrPixBuf[i]);
c->chrPixBuf[i]=NULL;
if(c->chrMmxFilter) free(c->chrMmxFilter);
c->chrMmxFilter = NULL;
+ if(c->lumMmx2Filter) free(c->lumMmx2Filter);
+ c->lumMmx2Filter=NULL;
+ if(c->chrMmx2Filter) free(c->chrMmx2Filter);
+ c->chrMmx2Filter=NULL;
+ if(c->lumMmx2FilterPos) free(c->lumMmx2FilterPos);
+ c->lumMmx2FilterPos=NULL;
+ if(c->chrMmx2FilterPos) free(c->chrMmx2FilterPos);
+ c->chrMmx2FilterPos=NULL;
+ if(c->yuvTable) free(c->yuvTable);
+ c->yuvTable=NULL;
+
free(c);
}
projects / ffmpeg / blobdiff