mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-02-17 04:17:05 +00:00
swscale: Use function pointers for swScale functions.
Originally committed as revision 29145 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
This commit is contained in:
parent
14d5c18c98
commit
40fa514033
@ -1776,42 +1776,55 @@ static void globalInit(void){
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static SwsFunc getSwsFunc(int flags)
|
static SwsFunc getSwsFunc(SwsContext *c)
|
||||||
{
|
{
|
||||||
|
int flags = c->flags;
|
||||||
|
|
||||||
#if defined(RUNTIME_CPUDETECT) && CONFIG_GPL
|
#if defined(RUNTIME_CPUDETECT) && CONFIG_GPL
|
||||||
#if ARCH_X86
|
#if ARCH_X86
|
||||||
// ordered per speed fastest first
|
// ordered per speed fastest first
|
||||||
if (flags & SWS_CPU_CAPS_MMX2) {
|
if (flags & SWS_CPU_CAPS_MMX2) {
|
||||||
|
sws_init_swScale_MMX2(c);
|
||||||
return swScale_MMX2;
|
return swScale_MMX2;
|
||||||
} else if (flags & SWS_CPU_CAPS_3DNOW) {
|
} else if (flags & SWS_CPU_CAPS_3DNOW) {
|
||||||
|
sws_init_swScale_3DNow(c);
|
||||||
return swScale_3DNow;
|
return swScale_3DNow;
|
||||||
} else if (flags & SWS_CPU_CAPS_MMX) {
|
} else if (flags & SWS_CPU_CAPS_MMX) {
|
||||||
|
sws_init_swScale_MMX(c);
|
||||||
return swScale_MMX;
|
return swScale_MMX;
|
||||||
} else {
|
} else {
|
||||||
|
sws_init_swScale_C(c);
|
||||||
return swScale_C;
|
return swScale_C;
|
||||||
}
|
}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
#if ARCH_PPC
|
#if ARCH_PPC
|
||||||
if (flags & SWS_CPU_CAPS_ALTIVEC) {
|
if (flags & SWS_CPU_CAPS_ALTIVEC) {
|
||||||
|
sws_init_swScale_altivec(c);
|
||||||
return swScale_altivec;
|
return swScale_altivec;
|
||||||
} else {
|
} else {
|
||||||
|
sws_init_swScale_C(c);
|
||||||
return swScale_C;
|
return swScale_C;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
sws_init_swScale_C(c);
|
||||||
return swScale_C;
|
return swScale_C;
|
||||||
#endif /* ARCH_X86 */
|
#endif /* ARCH_X86 */
|
||||||
#else //RUNTIME_CPUDETECT
|
#else //RUNTIME_CPUDETECT
|
||||||
#if HAVE_MMX2
|
#if HAVE_MMX2
|
||||||
|
sws_init_swScale_MMX2(c);
|
||||||
return swScale_MMX2;
|
return swScale_MMX2;
|
||||||
#elif HAVE_AMD3DNOW
|
#elif HAVE_AMD3DNOW
|
||||||
|
sws_init_swScale_3DNow(c);
|
||||||
return swScale_3DNow;
|
return swScale_3DNow;
|
||||||
#elif HAVE_MMX
|
#elif HAVE_MMX
|
||||||
|
sws_init_swScale_MMX(c);
|
||||||
return swScale_MMX;
|
return swScale_MMX;
|
||||||
#elif HAVE_ALTIVEC
|
#elif HAVE_ALTIVEC
|
||||||
|
sws_init_swScale_altivec(c);
|
||||||
return swScale_altivec;
|
return swScale_altivec;
|
||||||
#else
|
#else
|
||||||
|
sws_init_swScale_C(c);
|
||||||
return swScale_C;
|
return swScale_C;
|
||||||
#endif
|
#endif
|
||||||
#endif //!RUNTIME_CPUDETECT
|
#endif //!RUNTIME_CPUDETECT
|
||||||
@ -2932,7 +2945,7 @@ SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat, int d
|
|||||||
c->chrSrcW, c->chrSrcH, c->chrDstW, c->chrDstH, c->chrXInc, c->chrYInc);
|
c->chrSrcW, c->chrSrcH, c->chrDstW, c->chrDstH, c->chrXInc, c->chrYInc);
|
||||||
}
|
}
|
||||||
|
|
||||||
c->swScale= getSwsFunc(flags);
|
c->swScale= getSwsFunc(c);
|
||||||
return c;
|
return c;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -214,6 +214,57 @@ typedef struct SwsContext{
|
|||||||
uint64_t sparc_coeffs[10] __attribute__((aligned(8)));
|
uint64_t sparc_coeffs[10] __attribute__((aligned(8)));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* function pointers for swScale() */
|
||||||
|
void (*yuv2nv12X )(struct SwsContext *c,
|
||||||
|
const int16_t *lumFilter, const int16_t **lumSrc, int lumFilterSize,
|
||||||
|
const int16_t *chrFilter, const int16_t **chrSrc, int chrFilterSize,
|
||||||
|
uint8_t *dest, uint8_t *uDest,
|
||||||
|
int dstW, int chrDstW, int dstFormat);
|
||||||
|
void (*yuv2yuv1 )(struct SwsContext *c,
|
||||||
|
const int16_t *lumSrc, const int16_t *chrSrc, const int16_t *alpSrc,
|
||||||
|
uint8_t *dest,
|
||||||
|
uint8_t *uDest, uint8_t *vDest, uint8_t *aDest,
|
||||||
|
long dstW, long chrDstW);
|
||||||
|
void (*yuv2yuvX )(struct SwsContext *c,
|
||||||
|
const int16_t *lumFilter, const int16_t **lumSrc, int lumFilterSize,
|
||||||
|
const int16_t *chrFilter, const int16_t **chrSrc, int chrFilterSize,
|
||||||
|
const int16_t **alpSrc,
|
||||||
|
uint8_t *dest,
|
||||||
|
uint8_t *uDest, uint8_t *vDest, uint8_t *aDest,
|
||||||
|
long dstW, long chrDstW);
|
||||||
|
void (*yuv2packed1)(struct SwsContext *c,
|
||||||
|
const uint16_t *buf0,
|
||||||
|
const uint16_t *uvbuf0, const uint16_t *uvbuf1,
|
||||||
|
const uint16_t *abuf0,
|
||||||
|
uint8_t *dest,
|
||||||
|
int dstW, int uvalpha, int dstFormat, int flags, int y);
|
||||||
|
void (*yuv2packed2)(struct SwsContext *c,
|
||||||
|
const uint16_t *buf0, const uint16_t *buf1,
|
||||||
|
const uint16_t *uvbuf0, const uint16_t *uvbuf1,
|
||||||
|
const uint16_t *abuf0, const uint16_t *abuf1,
|
||||||
|
uint8_t *dest,
|
||||||
|
int dstW, int yalpha, int uvalpha, int y);
|
||||||
|
void (*yuv2packedX)(struct SwsContext *c,
|
||||||
|
const int16_t *lumFilter, const int16_t **lumSrc, int lumFilterSize,
|
||||||
|
const int16_t *chrFilter, const int16_t **chrSrc, int chrFilterSize,
|
||||||
|
const int16_t **alpSrc, uint8_t *dest,
|
||||||
|
long dstW, long dstY);
|
||||||
|
|
||||||
|
void (*hyscale_internal)(uint8_t *dst, const uint8_t *src,
|
||||||
|
long width, uint32_t *pal);
|
||||||
|
void (*hcscale_internal)(uint8_t *dstU, uint8_t *dstV,
|
||||||
|
const uint8_t *src1, const uint8_t *src2,
|
||||||
|
long width, uint32_t *pal);
|
||||||
|
void (*hyscale_fast)(struct SwsContext *c,
|
||||||
|
int16_t *dst, int dstWidth,
|
||||||
|
const uint8_t *src, int srcW, int xInc);
|
||||||
|
void (*hcscale_fast)(struct SwsContext *c,
|
||||||
|
int16_t *dst, int dstWidth,
|
||||||
|
const uint8_t *src1, const uint8_t *src2, int srcW, int xInc);
|
||||||
|
|
||||||
|
void (*hScale)(int16_t *dst, int dstW, const uint8_t *src, int srcW,
|
||||||
|
int xInc, const int16_t *filter, const int16_t *filterPos, long filterSize);
|
||||||
|
|
||||||
} SwsContext;
|
} SwsContext;
|
||||||
//FIXME check init (where 0)
|
//FIXME check init (where 0)
|
||||||
|
|
||||||
|
@ -1375,7 +1375,7 @@ static inline void RENAME(yuv2packed1)(SwsContext *c, const uint16_t *buf0, cons
|
|||||||
|
|
||||||
if (flags&SWS_FULL_CHR_H_INT)
|
if (flags&SWS_FULL_CHR_H_INT)
|
||||||
{
|
{
|
||||||
RENAME(yuv2packed2)(c, buf0, buf0, uvbuf0, uvbuf1, abuf0, abuf0, dest, dstW, 0, uvalpha, y);
|
c->yuv2packed2(c, buf0, buf0, uvbuf0, uvbuf1, abuf0, abuf0, dest, dstW, 0, uvalpha, y);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2273,91 +2273,16 @@ static inline void RENAME(hyscale)(SwsContext *c, uint16_t *dst, long dstWidth,
|
|||||||
int canMMX2BeUsed = c->canMMX2BeUsed;
|
int canMMX2BeUsed = c->canMMX2BeUsed;
|
||||||
void *funnyYCode = c->funnyYCode;
|
void *funnyYCode = c->funnyYCode;
|
||||||
|
|
||||||
if (srcFormat==PIX_FMT_YUYV422 || srcFormat==PIX_FMT_GRAY16BE)
|
if (isAlpha) {
|
||||||
{
|
if (srcFormat == PIX_FMT_RGB32 || srcFormat == PIX_FMT_BGR32 )
|
||||||
RENAME(yuy2ToY)(formatConvBuffer, src, srcW, pal);
|
src += 3;
|
||||||
src= formatConvBuffer;
|
} else {
|
||||||
|
if (srcFormat == PIX_FMT_RGB32_1 || srcFormat == PIX_FMT_BGR32_1)
|
||||||
|
src += ALT32_CORR;
|
||||||
}
|
}
|
||||||
else if (srcFormat==PIX_FMT_UYVY422 || srcFormat==PIX_FMT_GRAY16LE)
|
|
||||||
{
|
if (c->hyscale_internal) {
|
||||||
RENAME(uyvyToY)(formatConvBuffer, src, srcW, pal);
|
c->hyscale_internal(formatConvBuffer, src, srcW, pal);
|
||||||
src= formatConvBuffer;
|
|
||||||
}
|
|
||||||
else if (srcFormat==PIX_FMT_RGB32)
|
|
||||||
{
|
|
||||||
if (isAlpha)
|
|
||||||
RENAME(abgrToA)(formatConvBuffer, src+3, srcW, pal);
|
|
||||||
else
|
|
||||||
RENAME(bgr32ToY)(formatConvBuffer, src, srcW, pal);
|
|
||||||
src= formatConvBuffer;
|
|
||||||
}
|
|
||||||
else if (srcFormat==PIX_FMT_RGB32_1)
|
|
||||||
{
|
|
||||||
if (isAlpha)
|
|
||||||
RENAME(abgrToA)(formatConvBuffer, src, srcW, pal);
|
|
||||||
else
|
|
||||||
RENAME(bgr32ToY)(formatConvBuffer, src+ALT32_CORR, srcW, pal);
|
|
||||||
src= formatConvBuffer;
|
|
||||||
}
|
|
||||||
else if (srcFormat==PIX_FMT_BGR24)
|
|
||||||
{
|
|
||||||
RENAME(bgr24ToY)(formatConvBuffer, src, srcW, pal);
|
|
||||||
src= formatConvBuffer;
|
|
||||||
}
|
|
||||||
else if (srcFormat==PIX_FMT_BGR565)
|
|
||||||
{
|
|
||||||
RENAME(bgr16ToY)(formatConvBuffer, src, srcW, pal);
|
|
||||||
src= formatConvBuffer;
|
|
||||||
}
|
|
||||||
else if (srcFormat==PIX_FMT_BGR555)
|
|
||||||
{
|
|
||||||
RENAME(bgr15ToY)(formatConvBuffer, src, srcW, pal);
|
|
||||||
src= formatConvBuffer;
|
|
||||||
}
|
|
||||||
else if (srcFormat==PIX_FMT_BGR32)
|
|
||||||
{
|
|
||||||
if (isAlpha)
|
|
||||||
RENAME(abgrToA)(formatConvBuffer, src+3, srcW, pal);
|
|
||||||
else
|
|
||||||
RENAME(rgb32ToY)(formatConvBuffer, src, srcW, pal);
|
|
||||||
src= formatConvBuffer;
|
|
||||||
}
|
|
||||||
else if (srcFormat==PIX_FMT_BGR32_1)
|
|
||||||
{
|
|
||||||
if (isAlpha)
|
|
||||||
RENAME(abgrToA)(formatConvBuffer, src, srcW, pal);
|
|
||||||
else
|
|
||||||
RENAME(rgb32ToY)(formatConvBuffer, src+ALT32_CORR, srcW, pal);
|
|
||||||
src= formatConvBuffer;
|
|
||||||
}
|
|
||||||
else if (srcFormat==PIX_FMT_RGB24)
|
|
||||||
{
|
|
||||||
RENAME(rgb24ToY)(formatConvBuffer, src, srcW, pal);
|
|
||||||
src= formatConvBuffer;
|
|
||||||
}
|
|
||||||
else if (srcFormat==PIX_FMT_RGB565)
|
|
||||||
{
|
|
||||||
RENAME(rgb16ToY)(formatConvBuffer, src, srcW, pal);
|
|
||||||
src= formatConvBuffer;
|
|
||||||
}
|
|
||||||
else if (srcFormat==PIX_FMT_RGB555)
|
|
||||||
{
|
|
||||||
RENAME(rgb15ToY)(formatConvBuffer, src, srcW, pal);
|
|
||||||
src= formatConvBuffer;
|
|
||||||
}
|
|
||||||
else if (srcFormat==PIX_FMT_RGB8 || srcFormat==PIX_FMT_BGR8 || srcFormat==PIX_FMT_PAL8 || srcFormat==PIX_FMT_BGR4_BYTE || srcFormat==PIX_FMT_RGB4_BYTE)
|
|
||||||
{
|
|
||||||
RENAME(palToY)(formatConvBuffer, src, srcW, pal);
|
|
||||||
src= formatConvBuffer;
|
|
||||||
}
|
|
||||||
else if (srcFormat==PIX_FMT_MONOBLACK)
|
|
||||||
{
|
|
||||||
RENAME(monoblack2Y)(formatConvBuffer, src, srcW, pal);
|
|
||||||
src= formatConvBuffer;
|
|
||||||
}
|
|
||||||
else if (srcFormat==PIX_FMT_MONOWHITE)
|
|
||||||
{
|
|
||||||
RENAME(monowhite2Y)(formatConvBuffer, src, srcW, pal);
|
|
||||||
src= formatConvBuffer;
|
src= formatConvBuffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2368,7 +2293,7 @@ static inline void RENAME(hyscale)(SwsContext *c, uint16_t *dst, long dstWidth,
|
|||||||
if (!(flags&SWS_FAST_BILINEAR))
|
if (!(flags&SWS_FAST_BILINEAR))
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
RENAME(hScale)(dst, dstWidth, src, srcW, xInc, hLumFilter, hLumFilterPos, hLumFilterSize);
|
c->hScale(dst, dstWidth, src, srcW, xInc, hLumFilter, hLumFilterPos, hLumFilterSize);
|
||||||
}
|
}
|
||||||
else // fast bilinear upscale / crap downscale
|
else // fast bilinear upscale / crap downscale
|
||||||
{
|
{
|
||||||
@ -2488,7 +2413,7 @@ FUNNY_Y_CODE
|
|||||||
} //if MMX2 can't be used
|
} //if MMX2 can't be used
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
RENAME(hyscale_fast)(c, dst, dstWidth, src, srcW, xInc);
|
c->hyscale_fast(c, dst, dstWidth, src, srcW, xInc);
|
||||||
#endif /* ARCH_X86 */
|
#endif /* ARCH_X86 */
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2537,115 +2462,16 @@ inline static void RENAME(hcscale)(SwsContext *c, uint16_t *dst, long dstWidth,
|
|||||||
int canMMX2BeUsed = c->canMMX2BeUsed;
|
int canMMX2BeUsed = c->canMMX2BeUsed;
|
||||||
void *funnyUVCode = c->funnyUVCode;
|
void *funnyUVCode = c->funnyUVCode;
|
||||||
|
|
||||||
if (srcFormat==PIX_FMT_YUYV422)
|
if (isGray(srcFormat) || srcFormat==PIX_FMT_MONOBLACK || srcFormat==PIX_FMT_MONOWHITE)
|
||||||
{
|
|
||||||
RENAME(yuy2ToUV)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, pal);
|
|
||||||
src1= formatConvBuffer;
|
|
||||||
src2= formatConvBuffer+VOFW;
|
|
||||||
}
|
|
||||||
else if (srcFormat==PIX_FMT_UYVY422)
|
|
||||||
{
|
|
||||||
RENAME(uyvyToUV)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, pal);
|
|
||||||
src1= formatConvBuffer;
|
|
||||||
src2= formatConvBuffer+VOFW;
|
|
||||||
}
|
|
||||||
else if (srcFormat==PIX_FMT_RGB32)
|
|
||||||
{
|
|
||||||
if(c->chrSrcHSubSample)
|
|
||||||
RENAME(bgr32ToUV_half)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, pal);
|
|
||||||
else
|
|
||||||
RENAME(bgr32ToUV)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, pal);
|
|
||||||
src1= formatConvBuffer;
|
|
||||||
src2= formatConvBuffer+VOFW;
|
|
||||||
}
|
|
||||||
else if (srcFormat==PIX_FMT_RGB32_1)
|
|
||||||
{
|
|
||||||
if(c->chrSrcHSubSample)
|
|
||||||
RENAME(bgr32ToUV_half)(formatConvBuffer, formatConvBuffer+VOFW, src1+ALT32_CORR, src2+ALT32_CORR, srcW, pal);
|
|
||||||
else
|
|
||||||
RENAME(bgr32ToUV)(formatConvBuffer, formatConvBuffer+VOFW, src1+ALT32_CORR, src2+ALT32_CORR, srcW, pal);
|
|
||||||
src1= formatConvBuffer;
|
|
||||||
src2= formatConvBuffer+VOFW;
|
|
||||||
}
|
|
||||||
else if (srcFormat==PIX_FMT_BGR24)
|
|
||||||
{
|
|
||||||
if(c->chrSrcHSubSample)
|
|
||||||
RENAME(bgr24ToUV_half)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, pal);
|
|
||||||
else
|
|
||||||
RENAME(bgr24ToUV)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, pal);
|
|
||||||
src1= formatConvBuffer;
|
|
||||||
src2= formatConvBuffer+VOFW;
|
|
||||||
}
|
|
||||||
else if (srcFormat==PIX_FMT_BGR565)
|
|
||||||
{
|
|
||||||
if(c->chrSrcHSubSample)
|
|
||||||
RENAME(bgr16ToUV_half)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, pal);
|
|
||||||
else
|
|
||||||
RENAME(bgr16ToUV)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, pal);
|
|
||||||
src1= formatConvBuffer;
|
|
||||||
src2= formatConvBuffer+VOFW;
|
|
||||||
}
|
|
||||||
else if (srcFormat==PIX_FMT_BGR555)
|
|
||||||
{
|
|
||||||
if(c->chrSrcHSubSample)
|
|
||||||
RENAME(bgr15ToUV_half)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, pal);
|
|
||||||
else
|
|
||||||
RENAME(bgr15ToUV)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, pal);
|
|
||||||
src1= formatConvBuffer;
|
|
||||||
src2= formatConvBuffer+VOFW;
|
|
||||||
}
|
|
||||||
else if (srcFormat==PIX_FMT_BGR32)
|
|
||||||
{
|
|
||||||
if(c->chrSrcHSubSample)
|
|
||||||
RENAME(rgb32ToUV_half)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, pal);
|
|
||||||
else
|
|
||||||
RENAME(rgb32ToUV)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, pal);
|
|
||||||
src1= formatConvBuffer;
|
|
||||||
src2= formatConvBuffer+VOFW;
|
|
||||||
}
|
|
||||||
else if (srcFormat==PIX_FMT_BGR32_1)
|
|
||||||
{
|
|
||||||
if(c->chrSrcHSubSample)
|
|
||||||
RENAME(rgb32ToUV_half)(formatConvBuffer, formatConvBuffer+VOFW, src1+ALT32_CORR, src2+ALT32_CORR, srcW, pal);
|
|
||||||
else
|
|
||||||
RENAME(rgb32ToUV)(formatConvBuffer, formatConvBuffer+VOFW, src1+ALT32_CORR, src2+ALT32_CORR, srcW, pal);
|
|
||||||
src1= formatConvBuffer;
|
|
||||||
src2= formatConvBuffer+VOFW;
|
|
||||||
}
|
|
||||||
else if (srcFormat==PIX_FMT_RGB24)
|
|
||||||
{
|
|
||||||
if(c->chrSrcHSubSample)
|
|
||||||
RENAME(rgb24ToUV_half)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, pal);
|
|
||||||
else
|
|
||||||
RENAME(rgb24ToUV)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, pal);
|
|
||||||
src1= formatConvBuffer;
|
|
||||||
src2= formatConvBuffer+VOFW;
|
|
||||||
}
|
|
||||||
else if (srcFormat==PIX_FMT_RGB565)
|
|
||||||
{
|
|
||||||
if(c->chrSrcHSubSample)
|
|
||||||
RENAME(rgb16ToUV_half)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, pal);
|
|
||||||
else
|
|
||||||
RENAME(rgb16ToUV)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, pal);
|
|
||||||
src1= formatConvBuffer;
|
|
||||||
src2= formatConvBuffer+VOFW;
|
|
||||||
}
|
|
||||||
else if (srcFormat==PIX_FMT_RGB555)
|
|
||||||
{
|
|
||||||
if(c->chrSrcHSubSample)
|
|
||||||
RENAME(rgb15ToUV_half)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, pal);
|
|
||||||
else
|
|
||||||
RENAME(rgb15ToUV)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, pal);
|
|
||||||
src1= formatConvBuffer;
|
|
||||||
src2= formatConvBuffer+VOFW;
|
|
||||||
}
|
|
||||||
else if (isGray(srcFormat) || srcFormat==PIX_FMT_MONOBLACK || srcFormat==PIX_FMT_MONOWHITE)
|
|
||||||
{
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (srcFormat==PIX_FMT_RGB32_1) {
|
||||||
|
src1 += ALT32_CORR;
|
||||||
|
src2 += ALT32_CORR;
|
||||||
}
|
}
|
||||||
else if (srcFormat==PIX_FMT_RGB8 || srcFormat==PIX_FMT_BGR8 || srcFormat==PIX_FMT_PAL8 || srcFormat==PIX_FMT_BGR4_BYTE || srcFormat==PIX_FMT_RGB4_BYTE)
|
|
||||||
{
|
if (c->hcscale_internal) {
|
||||||
RENAME(palToUV)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, pal);
|
c->hcscale_internal(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, pal);
|
||||||
src1= formatConvBuffer;
|
src1= formatConvBuffer;
|
||||||
src2= formatConvBuffer+VOFW;
|
src2= formatConvBuffer+VOFW;
|
||||||
}
|
}
|
||||||
@ -2657,8 +2483,8 @@ inline static void RENAME(hcscale)(SwsContext *c, uint16_t *dst, long dstWidth,
|
|||||||
if (!(flags&SWS_FAST_BILINEAR))
|
if (!(flags&SWS_FAST_BILINEAR))
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
RENAME(hScale)(dst , dstWidth, src1, srcW, xInc, hChrFilter, hChrFilterPos, hChrFilterSize);
|
c->hScale(dst , dstWidth, src1, srcW, xInc, hChrFilter, hChrFilterPos, hChrFilterSize);
|
||||||
RENAME(hScale)(dst+VOFW, dstWidth, src2, srcW, xInc, hChrFilter, hChrFilterPos, hChrFilterSize);
|
c->hScale(dst+VOFW, dstWidth, src2, srcW, xInc, hChrFilter, hChrFilterPos, hChrFilterSize);
|
||||||
}
|
}
|
||||||
else // fast bilinear upscale / crap downscale
|
else // fast bilinear upscale / crap downscale
|
||||||
{
|
{
|
||||||
@ -2794,7 +2620,7 @@ FUNNY_UV_CODE
|
|||||||
} //if MMX2 can't be used
|
} //if MMX2 can't be used
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
RENAME(hcscale_fast)(c, dst, dstWidth, src1, src2, srcW, xInc);
|
c->hcscale_fast(c, dst, dstWidth, src1, src2, srcW, xInc);
|
||||||
#endif /* ARCH_X86 */
|
#endif /* ARCH_X86 */
|
||||||
}
|
}
|
||||||
if(c->srcRange != c->dstRange && !(isRGB(c->dstFormat) || isBGR(c->dstFormat))){
|
if(c->srcRange != c->dstRange && !(isRGB(c->dstFormat) || isBGR(c->dstFormat))){
|
||||||
@ -3096,7 +2922,7 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s
|
|||||||
if (dstFormat == PIX_FMT_NV12 || dstFormat == PIX_FMT_NV21){
|
if (dstFormat == PIX_FMT_NV12 || dstFormat == PIX_FMT_NV21){
|
||||||
const int chrSkipMask= (1<<c->chrDstVSubSample)-1;
|
const int chrSkipMask= (1<<c->chrDstVSubSample)-1;
|
||||||
if (dstY&chrSkipMask) uDest= NULL; //FIXME split functions in lumi / chromi
|
if (dstY&chrSkipMask) uDest= NULL; //FIXME split functions in lumi / chromi
|
||||||
RENAME(yuv2nv12X)(c,
|
c->yuv2nv12X(c,
|
||||||
vLumFilter+dstY*vLumFilterSize , lumSrcPtr, vLumFilterSize,
|
vLumFilter+dstY*vLumFilterSize , lumSrcPtr, vLumFilterSize,
|
||||||
vChrFilter+chrDstY*vChrFilterSize, chrSrcPtr, vChrFilterSize,
|
vChrFilter+chrDstY*vChrFilterSize, chrSrcPtr, vChrFilterSize,
|
||||||
dest, uDest, dstW, chrDstW, dstFormat);
|
dest, uDest, dstW, chrDstW, dstFormat);
|
||||||
@ -3110,11 +2936,11 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s
|
|||||||
int16_t *lumBuf = lumPixBuf[0];
|
int16_t *lumBuf = lumPixBuf[0];
|
||||||
int16_t *chrBuf= chrPixBuf[0];
|
int16_t *chrBuf= chrPixBuf[0];
|
||||||
int16_t *alpBuf= (CONFIG_SWSCALE_ALPHA && alpPixBuf) ? alpPixBuf[0] : NULL;
|
int16_t *alpBuf= (CONFIG_SWSCALE_ALPHA && alpPixBuf) ? alpPixBuf[0] : NULL;
|
||||||
RENAME(yuv2yuv1)(c, lumBuf, chrBuf, alpBuf, dest, uDest, vDest, aDest, dstW, chrDstW);
|
c->yuv2yuv1(c, lumBuf, chrBuf, alpBuf, dest, uDest, vDest, aDest, dstW, chrDstW);
|
||||||
}
|
}
|
||||||
else //General YV12
|
else //General YV12
|
||||||
{
|
{
|
||||||
RENAME(yuv2yuvX)(c,
|
c->yuv2yuvX(c,
|
||||||
vLumFilter+dstY*vLumFilterSize , lumSrcPtr, vLumFilterSize,
|
vLumFilter+dstY*vLumFilterSize , lumSrcPtr, vLumFilterSize,
|
||||||
vChrFilter+chrDstY*vChrFilterSize, chrSrcPtr, vChrFilterSize,
|
vChrFilter+chrDstY*vChrFilterSize, chrSrcPtr, vChrFilterSize,
|
||||||
alpSrcPtr, dest, uDest, vDest, aDest, dstW, chrDstW);
|
alpSrcPtr, dest, uDest, vDest, aDest, dstW, chrDstW);
|
||||||
@ -3133,7 +2959,7 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s
|
|||||||
vChrFilter+dstY*vChrFilterSize, chrSrcPtr, vChrFilterSize,
|
vChrFilter+dstY*vChrFilterSize, chrSrcPtr, vChrFilterSize,
|
||||||
alpSrcPtr, dest, dstW, dstY);
|
alpSrcPtr, dest, dstW, dstY);
|
||||||
}else{
|
}else{
|
||||||
RENAME(yuv2packed1)(c, *lumSrcPtr, *chrSrcPtr, *(chrSrcPtr+1),
|
c->yuv2packed1(c, *lumSrcPtr, *chrSrcPtr, *(chrSrcPtr+1),
|
||||||
alpPixBuf ? *alpSrcPtr : NULL,
|
alpPixBuf ? *alpSrcPtr : NULL,
|
||||||
dest, dstW, chrAlpha, dstFormat, flags, dstY);
|
dest, dstW, chrAlpha, dstFormat, flags, dstY);
|
||||||
}
|
}
|
||||||
@ -3152,7 +2978,7 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s
|
|||||||
vChrFilter+dstY*vChrFilterSize, chrSrcPtr, vChrFilterSize,
|
vChrFilter+dstY*vChrFilterSize, chrSrcPtr, vChrFilterSize,
|
||||||
alpSrcPtr, dest, dstW, dstY);
|
alpSrcPtr, dest, dstW, dstY);
|
||||||
}else{
|
}else{
|
||||||
RENAME(yuv2packed2)(c, *lumSrcPtr, *(lumSrcPtr+1), *chrSrcPtr, *(chrSrcPtr+1),
|
c->yuv2packed2(c, *lumSrcPtr, *(lumSrcPtr+1), *chrSrcPtr, *(chrSrcPtr+1),
|
||||||
alpPixBuf ? *alpSrcPtr : NULL, alpPixBuf ? *(alpSrcPtr+1) : NULL,
|
alpPixBuf ? *alpSrcPtr : NULL, alpPixBuf ? *(alpSrcPtr+1) : NULL,
|
||||||
dest, dstW, lumAlpha, chrAlpha, dstY);
|
dest, dstW, lumAlpha, chrAlpha, dstY);
|
||||||
}
|
}
|
||||||
@ -3165,7 +2991,7 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s
|
|||||||
vChrFilter+dstY*vChrFilterSize, chrSrcPtr, vChrFilterSize,
|
vChrFilter+dstY*vChrFilterSize, chrSrcPtr, vChrFilterSize,
|
||||||
alpSrcPtr, dest, dstW, dstY);
|
alpSrcPtr, dest, dstW, dstY);
|
||||||
}else{
|
}else{
|
||||||
RENAME(yuv2packedX)(c,
|
c->yuv2packedX(c,
|
||||||
vLumFilter+dstY*vLumFilterSize, lumSrcPtr, vLumFilterSize,
|
vLumFilter+dstY*vLumFilterSize, lumSrcPtr, vLumFilterSize,
|
||||||
vChrFilter+dstY*vChrFilterSize, chrSrcPtr, vChrFilterSize,
|
vChrFilter+dstY*vChrFilterSize, chrSrcPtr, vChrFilterSize,
|
||||||
alpSrcPtr, dest, dstW, dstY);
|
alpSrcPtr, dest, dstW, dstY);
|
||||||
@ -3232,3 +3058,94 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s
|
|||||||
|
|
||||||
return dstY - lastDstY;
|
return dstY - lastDstY;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void RENAME(sws_init_swScale)(SwsContext *c)
|
||||||
|
{
|
||||||
|
enum PixelFormat srcFormat = c->srcFormat;
|
||||||
|
|
||||||
|
c->yuv2nv12X = RENAME(yuv2nv12X );
|
||||||
|
c->yuv2yuv1 = RENAME(yuv2yuv1 );
|
||||||
|
c->yuv2yuvX = RENAME(yuv2yuvX );
|
||||||
|
c->yuv2packed1 = RENAME(yuv2packed1 );
|
||||||
|
c->yuv2packed2 = RENAME(yuv2packed2 );
|
||||||
|
c->yuv2packedX = RENAME(yuv2packedX );
|
||||||
|
|
||||||
|
c->hScale = RENAME(hScale );
|
||||||
|
|
||||||
|
c->hyscale_fast = RENAME(hyscale_fast);
|
||||||
|
c->hcscale_fast = RENAME(hcscale_fast);
|
||||||
|
|
||||||
|
c->hcscale_internal = NULL;
|
||||||
|
switch(srcFormat) {
|
||||||
|
case PIX_FMT_YUYV422 : c->hcscale_internal = RENAME(yuy2ToUV); break;
|
||||||
|
case PIX_FMT_UYVY422 : c->hcscale_internal = RENAME(uyvyToUV); break;
|
||||||
|
case PIX_FMT_RGB8 :
|
||||||
|
case PIX_FMT_BGR8 :
|
||||||
|
case PIX_FMT_PAL8 :
|
||||||
|
case PIX_FMT_BGR4_BYTE:
|
||||||
|
case PIX_FMT_RGB4_BYTE: c->hcscale_internal = RENAME(palToUV); break;
|
||||||
|
}
|
||||||
|
if (c->chrSrcHSubSample) {
|
||||||
|
switch(srcFormat) {
|
||||||
|
case PIX_FMT_RGB32 :
|
||||||
|
case PIX_FMT_RGB32_1: c->hcscale_internal = RENAME(bgr32ToUV_half); break;
|
||||||
|
case PIX_FMT_BGR24 : c->hcscale_internal = RENAME(bgr24ToUV_half); break;
|
||||||
|
case PIX_FMT_BGR565 : c->hcscale_internal = RENAME(bgr16ToUV_half); break;
|
||||||
|
case PIX_FMT_BGR555 : c->hcscale_internal = RENAME(bgr15ToUV_half); break;
|
||||||
|
case PIX_FMT_BGR32 :
|
||||||
|
case PIX_FMT_BGR32_1: c->hcscale_internal = RENAME(rgb32ToUV_half); break;
|
||||||
|
case PIX_FMT_RGB24 : c->hcscale_internal = RENAME(rgb24ToUV_half); break;
|
||||||
|
case PIX_FMT_RGB565 : c->hcscale_internal = RENAME(rgb16ToUV_half); break;
|
||||||
|
case PIX_FMT_RGB555 : c->hcscale_internal = RENAME(rgb15ToUV_half); break;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
switch(srcFormat) {
|
||||||
|
case PIX_FMT_RGB32 :
|
||||||
|
case PIX_FMT_RGB32_1: c->hcscale_internal = RENAME(bgr32ToUV); break;
|
||||||
|
case PIX_FMT_BGR24 : c->hcscale_internal = RENAME(bgr24ToUV); break;
|
||||||
|
case PIX_FMT_BGR565 : c->hcscale_internal = RENAME(bgr16ToUV); break;
|
||||||
|
case PIX_FMT_BGR555 : c->hcscale_internal = RENAME(bgr15ToUV); break;
|
||||||
|
case PIX_FMT_BGR32 :
|
||||||
|
case PIX_FMT_BGR32_1: c->hcscale_internal = RENAME(rgb32ToUV); break;
|
||||||
|
case PIX_FMT_RGB24 : c->hcscale_internal = RENAME(rgb24ToUV); break;
|
||||||
|
case PIX_FMT_RGB565 : c->hcscale_internal = RENAME(rgb16ToUV); break;
|
||||||
|
case PIX_FMT_RGB555 : c->hcscale_internal = RENAME(rgb15ToUV); break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
c->hyscale_internal = NULL;
|
||||||
|
switch (srcFormat) {
|
||||||
|
case PIX_FMT_YUYV422 :
|
||||||
|
case PIX_FMT_GRAY16BE : c->hyscale_internal = RENAME(yuy2ToY); break;
|
||||||
|
case PIX_FMT_UYVY422 :
|
||||||
|
case PIX_FMT_GRAY16LE : c->hyscale_internal = RENAME(uyvyToY); break;
|
||||||
|
case PIX_FMT_BGR24 : c->hyscale_internal = RENAME(bgr24ToY); break;
|
||||||
|
case PIX_FMT_BGR565 : c->hyscale_internal = RENAME(bgr16ToY); break;
|
||||||
|
case PIX_FMT_BGR555 : c->hyscale_internal = RENAME(bgr15ToY); break;
|
||||||
|
case PIX_FMT_RGB24 : c->hyscale_internal = RENAME(rgb24ToY); break;
|
||||||
|
case PIX_FMT_RGB565 : c->hyscale_internal = RENAME(rgb16ToY); break;
|
||||||
|
case PIX_FMT_RGB555 : c->hyscale_internal = RENAME(rgb15ToY); break;
|
||||||
|
case PIX_FMT_RGB8 :
|
||||||
|
case PIX_FMT_BGR8 :
|
||||||
|
case PIX_FMT_PAL8 :
|
||||||
|
case PIX_FMT_BGR4_BYTE:
|
||||||
|
case PIX_FMT_RGB4_BYTE: c->hyscale_internal = RENAME(palToY); break;
|
||||||
|
case PIX_FMT_MONOBLACK: c->hyscale_internal = RENAME(monoblack2Y); break;
|
||||||
|
case PIX_FMT_MONOWHITE: c->hyscale_internal = RENAME(monowhite2Y); break;
|
||||||
|
}
|
||||||
|
if (c->alpPixBuf) {
|
||||||
|
switch (srcFormat) {
|
||||||
|
case PIX_FMT_RGB32 :
|
||||||
|
case PIX_FMT_RGB32_1:
|
||||||
|
case PIX_FMT_BGR32 :
|
||||||
|
case PIX_FMT_BGR32_1: c->hyscale_internal = RENAME(abgrToA); break;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
switch (srcFormat) {
|
||||||
|
case PIX_FMT_RGB32 :
|
||||||
|
case PIX_FMT_RGB32_1: c->hyscale_internal = RENAME(bgr32ToY); break;
|
||||||
|
case PIX_FMT_BGR32 :
|
||||||
|
case PIX_FMT_BGR32_1: c->hyscale_internal = RENAME(rgb32ToY); break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user