|
|
|
|
@ -17,8 +17,8 @@ |
|
|
|
|
* along with FFmpeg; if not, write to the Free Software |
|
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
|
|
|
|
* |
|
|
|
|
* the C code (not assembly, mmx, ...) of this file can be used |
|
|
|
|
* under the LGPL license too |
|
|
|
|
* The C code (not assembly, MMX, ...) of this file can be used |
|
|
|
|
* under the LGPL license. |
|
|
|
|
*/ |
|
|
|
|
|
|
|
|
|
#undef REAL_MOVNTQ |
|
|
|
|
@ -30,7 +30,7 @@ |
|
|
|
|
#undef SFENCE |
|
|
|
|
|
|
|
|
|
#ifdef HAVE_3DNOW |
|
|
|
|
/* On K6 femms is faster of emms. On K7 femms is directly mapped on emms. */ |
|
|
|
|
/* On K6 femms is faster than emms. On K7 femms is directly mapped on emms. */ |
|
|
|
|
#define EMMS "femms" |
|
|
|
|
#else |
|
|
|
|
#define EMMS "emms" |
|
|
|
|
@ -1503,7 +1503,7 @@ static inline void RENAME(yuv2packed1)(SwsContext *c, uint16_t *buf0, uint16_t * |
|
|
|
|
const int yalpha1=0; |
|
|
|
|
int i; |
|
|
|
|
|
|
|
|
|
uint16_t *buf1= buf0; //FIXME needed for the rgb1/bgr1
|
|
|
|
|
uint16_t *buf1= buf0; //FIXME needed for RGB1/BGR1
|
|
|
|
|
const int yalpha= 4096; //FIXME ...
|
|
|
|
|
|
|
|
|
|
if (flags&SWS_FULL_CHR_H_INT) |
|
|
|
|
@ -1700,7 +1700,7 @@ static inline void RENAME(yuv2packed1)(SwsContext *c, uint16_t *buf0, uint16_t * |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//FIXME yuy2* can read upto 7 samples to much
|
|
|
|
|
//FIXME yuy2* can read up to 7 samples too much
|
|
|
|
|
|
|
|
|
|
static inline void RENAME(yuy2ToY)(uint8_t *dst, uint8_t *src, long width) |
|
|
|
|
{ |
|
|
|
|
@ -2297,7 +2297,7 @@ static inline void RENAME(palToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Bilinear / Bicubic scaling
|
|
|
|
|
// bilinear / bicubic scaling
|
|
|
|
|
static inline void RENAME(hScale)(int16_t *dst, int dstW, uint8_t *src, int srcW, int xInc, |
|
|
|
|
int16_t *filter, int16_t *filterPos, long filterSize) |
|
|
|
|
{ |
|
|
|
|
@ -2544,7 +2544,7 @@ static inline void RENAME(hyscale)(uint16_t *dst, long dstWidth, uint8_t *src, i |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
#ifdef HAVE_MMX |
|
|
|
|
// use the new MMX scaler if the mmx2 can't be used (it is faster than the x86 ASM one)
|
|
|
|
|
// Use the new MMX scaler if the MMX2 one can't be used (it is faster than the x86 ASM one).
|
|
|
|
|
if (!(flags&SWS_FAST_BILINEAR) || (!canMMX2BeUsed)) |
|
|
|
|
#else |
|
|
|
|
if (!(flags&SWS_FAST_BILINEAR)) |
|
|
|
|
@ -2552,7 +2552,7 @@ static inline void RENAME(hyscale)(uint16_t *dst, long dstWidth, uint8_t *src, i |
|
|
|
|
{ |
|
|
|
|
RENAME(hScale)(dst, dstWidth, src, srcW, xInc, hLumFilter, hLumFilterPos, hLumFilterSize); |
|
|
|
|
} |
|
|
|
|
else // Fast Bilinear upscale / crap downscale
|
|
|
|
|
else // fast bilinear upscale / crap downscale
|
|
|
|
|
{ |
|
|
|
|
#if defined(ARCH_X86) |
|
|
|
|
#ifdef HAVE_MMX2 |
|
|
|
|
@ -2761,7 +2761,7 @@ inline static void RENAME(hcscale)(uint16_t *dst, long dstWidth, uint8_t *src1, |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
#ifdef HAVE_MMX |
|
|
|
|
// use the new MMX scaler if the mmx2 can't be used (it is faster than the x86 ASM one)
|
|
|
|
|
// Use the new MMX scaler if the MMX2 one can't be used (it is faster than the x86 ASM one).
|
|
|
|
|
if (!(flags&SWS_FAST_BILINEAR) || (!canMMX2BeUsed)) |
|
|
|
|
#else |
|
|
|
|
if (!(flags&SWS_FAST_BILINEAR)) |
|
|
|
|
@ -2770,7 +2770,7 @@ inline static void RENAME(hcscale)(uint16_t *dst, long dstWidth, uint8_t *src1, |
|
|
|
|
RENAME(hScale)(dst , dstWidth, src1, srcW, xInc, hChrFilter, hChrFilterPos, hChrFilterSize); |
|
|
|
|
RENAME(hScale)(dst+VOFW, dstWidth, src2, srcW, xInc, hChrFilter, hChrFilterPos, hChrFilterSize); |
|
|
|
|
} |
|
|
|
|
else // Fast Bilinear upscale / crap downscale
|
|
|
|
|
else // fast bilinear upscale / crap downscale
|
|
|
|
|
{ |
|
|
|
|
#if defined(ARCH_X86) |
|
|
|
|
#ifdef HAVE_MMX2 |
|
|
|
|
@ -2890,8 +2890,8 @@ FUNNY_UV_CODE |
|
|
|
|
"cmp %2, %%"REG_a" \n\t" |
|
|
|
|
" jb 1b \n\t" |
|
|
|
|
|
|
|
|
|
/* GCC-3.3 makes MPlayer crash on IA-32 machines when using "g" operand here,
|
|
|
|
|
which is needed to support GCC-4.0 */ |
|
|
|
|
/* GCC 3.3 makes MPlayer crash on IA-32 machines when using "g" operand here,
|
|
|
|
|
which is needed to support GCC 4.0. */ |
|
|
|
|
#if defined(ARCH_X86_64) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) |
|
|
|
|
:: "m" (src1), "m" (dst), "g" ((long)dstWidth), "m" (xInc_shr16), "m" (xInc_mask), |
|
|
|
|
#else |
|
|
|
|
@ -2963,7 +2963,7 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s |
|
|
|
|
int lastDstY; |
|
|
|
|
uint8_t *pal=NULL; |
|
|
|
|
|
|
|
|
|
/* vars whch will change and which we need to storw back in the context */ |
|
|
|
|
/* vars which will change and which we need to store back in the context */ |
|
|
|
|
int dstY= c->dstY; |
|
|
|
|
int lumBufIndex= c->lumBufIndex; |
|
|
|
|
int chrBufIndex= c->chrBufIndex; |
|
|
|
|
@ -3004,13 +3004,14 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s |
|
|
|
|
if (flags & SWS_PRINT_INFO && firstTime) |
|
|
|
|
{ |
|
|
|
|
av_log(c, AV_LOG_WARNING, "Warning: dstStride is not aligned!\n" |
|
|
|
|
" ->cannot do aligned memory acesses anymore\n"); |
|
|
|
|
" ->cannot do aligned memory accesses anymore\n"); |
|
|
|
|
firstTime=0; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/* Note the user might start scaling the picture in the middle so this will not get executed
|
|
|
|
|
this is not really intended but works currently, so ppl might do it */ |
|
|
|
|
/* Note the user might start scaling the picture in the middle so this
|
|
|
|
|
will not get executed. This is not really intended but works |
|
|
|
|
currently, so people might do it. */ |
|
|
|
|
if (srcSliceY ==0){ |
|
|
|
|
lumBufIndex=0; |
|
|
|
|
chrBufIndex=0; |
|
|
|
|
@ -3182,7 +3183,7 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s |
|
|
|
|
{ |
|
|
|
|
const int chrSkipMask= (1<<c->chrDstVSubSample)-1; |
|
|
|
|
if ((dstY&chrSkipMask) || isGray(dstFormat)) uDest=vDest= NULL; //FIXME split functions in lumi / chromi
|
|
|
|
|
if (vLumFilterSize == 1 && vChrFilterSize == 1) // Unscaled YV12
|
|
|
|
|
if (vLumFilterSize == 1 && vChrFilterSize == 1) // unscaled YV12
|
|
|
|
|
{ |
|
|
|
|
int16_t *lumBuf = lumPixBuf[0]; |
|
|
|
|
int16_t *chrBuf= chrPixBuf[0]; |
|
|
|
|
@ -3200,13 +3201,13 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s |
|
|
|
|
{ |
|
|
|
|
ASSERT(lumSrcPtr + vLumFilterSize - 1 < lumPixBuf + vLumBufSize*2); |
|
|
|
|
ASSERT(chrSrcPtr + vChrFilterSize - 1 < chrPixBuf + vChrBufSize*2); |
|
|
|
|
if (vLumFilterSize == 1 && vChrFilterSize == 2) //Unscaled RGB
|
|
|
|
|
if (vLumFilterSize == 1 && vChrFilterSize == 2) //unscaled RGB
|
|
|
|
|
{ |
|
|
|
|
int chrAlpha= vChrFilter[2*dstY+1]; |
|
|
|
|
RENAME(yuv2packed1)(c, *lumSrcPtr, *chrSrcPtr, *(chrSrcPtr+1), |
|
|
|
|
dest, dstW, chrAlpha, dstFormat, flags, dstY); |
|
|
|
|
} |
|
|
|
|
else if (vLumFilterSize == 2 && vChrFilterSize == 2) //BiLinear Upscale RGB
|
|
|
|
|
else if (vLumFilterSize == 2 && vChrFilterSize == 2) //bilinear upscale RGB
|
|
|
|
|
{ |
|
|
|
|
int lumAlpha= vLumFilter[2*dstY+1]; |
|
|
|
|
int chrAlpha= vChrFilter[2*dstY+1]; |
|
|
|
|
@ -3217,7 +3218,7 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s |
|
|
|
|
RENAME(yuv2packed2)(c, *lumSrcPtr, *(lumSrcPtr+1), *chrSrcPtr, *(chrSrcPtr+1), |
|
|
|
|
dest, dstW, lumAlpha, chrAlpha, dstY); |
|
|
|
|
} |
|
|
|
|
else //General RGB
|
|
|
|
|
else //general RGB
|
|
|
|
|
{ |
|
|
|
|
RENAME(yuv2packedX)(c, |
|
|
|
|
vLumFilter+dstY*vLumFilterSize, lumSrcPtr, vLumFilterSize, |
|
|
|
|
|
Diego Biurrun
17 years ago