mirror of https://git.ffmpeg.org/ffmpeg.git
swscale: remove swScale_{c,MMX,MMX2} duplication.
This commit is contained in:
Ronald S. Bultje
parent
c4fd283a46
commit
aaca69c130
|
|
@ -1214,18 +1214,13 @@ SwsFunc ff_getSwsFunc(SwsContext *c)
|
||||||
|
|
||||||
sws_init_swScale_c(c);
|
sws_init_swScale_c(c);
|
||||||
|
|
||||||
#if HAVE_MMX2
|
|
||||||
// ordered per speed fastest first
|
|
||||||
if (cpu_flags & AV_CPU_FLAG_MMX2) {
|
|
||||||
sws_init_swScale_MMX2(c);
|
|
||||||
return swScale_MMX2;
|
|
||||||
} else
|
|
||||||
#endif
|
|
||||||
#if HAVE_MMX
|
#if HAVE_MMX
|
||||||
if (cpu_flags & AV_CPU_FLAG_MMX) {
|
if (cpu_flags & AV_CPU_FLAG_MMX)
|
||||||
sws_init_swScale_MMX(c);
|
sws_init_swScale_MMX(c);
|
||||||
return swScale_MMX;
|
#endif
|
||||||
} else
|
#if HAVE_MMX2
|
||||||
|
if (cpu_flags & AV_CPU_FLAG_MMX2)
|
||||||
|
sws_init_swScale_MMX2(c);
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_ALTIVEC
|
#if HAVE_ALTIVEC
|
||||||
if (cpu_flags & AV_CPU_FLAG_ALTIVEC)
|
if (cpu_flags & AV_CPU_FLAG_ALTIVEC)
|
||||||
|
|
|
||||||
|
|
@ -485,6 +485,11 @@ inline static void hcscale_c(SwsContext *c, uint16_t *dst, long dstWidth,
|
||||||
#define DEBUG_SWSCALE_BUFFERS 0
|
#define DEBUG_SWSCALE_BUFFERS 0
|
||||||
#define DEBUG_BUFFERS(...) if (DEBUG_SWSCALE_BUFFERS) av_log(c, AV_LOG_DEBUG, __VA_ARGS__)
|
#define DEBUG_BUFFERS(...) if (DEBUG_SWSCALE_BUFFERS) av_log(c, AV_LOG_DEBUG, __VA_ARGS__)
|
||||||
|
|
||||||
|
#if HAVE_MMX
|
||||||
|
static void updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrBufIndex,
|
||||||
|
int lastInLumBuf, int lastInChrBuf);
|
||||||
|
#endif
|
||||||
|
|
||||||
static int swScale_c(SwsContext *c, const uint8_t* src[], int srcStride[],
|
static int swScale_c(SwsContext *c, const uint8_t* src[], int srcStride[],
|
||||||
int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[])
|
int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[])
|
||||||
{
|
{
|
||||||
|
|
@ -656,6 +661,7 @@ static int swScale_c(SwsContext *c, const uint8_t* src[], int srcStride[],
|
||||||
if (!enough_lines)
|
if (!enough_lines)
|
||||||
break; //we can't output a dstY line so let's try with the next slice
|
break; //we can't output a dstY line so let's try with the next slice
|
||||||
|
|
||||||
|
if (HAVE_MMX) updateMMXDitherTables(c, dstY, lumBufIndex, chrBufIndex, lastInLumBuf, lastInChrBuf);
|
||||||
if (dstY < dstH-2) {
|
if (dstY < dstH-2) {
|
||||||
const int16_t **lumSrcPtr= (const int16_t **) lumPixBuf + lumBufIndex + firstLumSrcY - lastInLumBuf + vLumBufSize;
|
const int16_t **lumSrcPtr= (const int16_t **) lumPixBuf + lumBufIndex + firstLumSrcY - lastInLumBuf + vLumBufSize;
|
||||||
const int16_t **chrSrcPtr= (const int16_t **) chrPixBuf + chrBufIndex + firstChrSrcY - lastInChrBuf + vChrBufSize;
|
const int16_t **chrSrcPtr= (const int16_t **) chrPixBuf + chrBufIndex + firstChrSrcY - lastInChrBuf + vChrBufSize;
|
||||||
|
|
@ -780,6 +786,10 @@ static int swScale_c(SwsContext *c, const uint8_t* src[], int srcStride[],
|
||||||
if ((dstFormat == PIX_FMT_YUVA420P) && !alpPixBuf)
|
if ((dstFormat == PIX_FMT_YUVA420P) && !alpPixBuf)
|
||||||
fillPlane(dst[3], dstStride[3], dstW, dstY-lastDstY, lastDstY, 255);
|
fillPlane(dst[3], dstStride[3], dstW, dstY-lastDstY, lastDstY, 255);
|
||||||
|
|
||||||
|
if (HAVE_MMX2 && av_get_cpu_flags() & AV_CPU_FLAG_MMX2)
|
||||||
|
__asm__ volatile("sfence":::"memory");
|
||||||
|
emms_c();
|
||||||
|
|
||||||
/* store changed local vars back in the context */
|
/* store changed local vars back in the context */
|
||||||
c->dstY= dstY;
|
c->dstY= dstY;
|
||||||
c->lumBufIndex= lumBufIndex;
|
c->lumBufIndex= lumBufIndex;
|
||||||
|
|
|
||||||
|
|
@ -2144,179 +2144,29 @@ which is needed to support GCC 4.0. */
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#define DEBUG_SWSCALE_BUFFERS 0
|
#if !COMPILE_TEMPLATE_MMX2
|
||||||
#define DEBUG_BUFFERS(...) if (DEBUG_SWSCALE_BUFFERS) av_log(c, AV_LOG_DEBUG, __VA_ARGS__)
|
static void updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrBufIndex,
|
||||||
|
int lastInLumBuf, int lastInChrBuf)
|
||||||
static int RENAME(swScale)(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
|
|
||||||
int srcSliceH, uint8_t* dst[], int dstStride[])
|
|
||||||
{
|
{
|
||||||
/* load a few things into local vars to make the code more readable? and faster */
|
|
||||||
const int srcW= c->srcW;
|
|
||||||
const int dstW= c->dstW;
|
|
||||||
const int dstH= c->dstH;
|
const int dstH= c->dstH;
|
||||||
const int chrDstW= c->chrDstW;
|
|
||||||
const int chrSrcW= c->chrSrcW;
|
|
||||||
const int lumXInc= c->lumXInc;
|
|
||||||
const int chrXInc= c->chrXInc;
|
|
||||||
const enum PixelFormat dstFormat= c->dstFormat;
|
|
||||||
const int flags= c->flags;
|
const int flags= c->flags;
|
||||||
int16_t *vLumFilterPos= c->vLumFilterPos;
|
|
||||||
int16_t *vChrFilterPos= c->vChrFilterPos;
|
|
||||||
int16_t *hLumFilterPos= c->hLumFilterPos;
|
|
||||||
int16_t *hChrFilterPos= c->hChrFilterPos;
|
|
||||||
int16_t *vLumFilter= c->vLumFilter;
|
|
||||||
int16_t *vChrFilter= c->vChrFilter;
|
|
||||||
int16_t *hLumFilter= c->hLumFilter;
|
|
||||||
int16_t *hChrFilter= c->hChrFilter;
|
|
||||||
int32_t *lumMmxFilter= c->lumMmxFilter;
|
|
||||||
int32_t *chrMmxFilter= c->chrMmxFilter;
|
|
||||||
int32_t av_unused *alpMmxFilter= c->alpMmxFilter;
|
|
||||||
const int vLumFilterSize= c->vLumFilterSize;
|
|
||||||
const int vChrFilterSize= c->vChrFilterSize;
|
|
||||||
const int hLumFilterSize= c->hLumFilterSize;
|
|
||||||
const int hChrFilterSize= c->hChrFilterSize;
|
|
||||||
int16_t **lumPixBuf= c->lumPixBuf;
|
int16_t **lumPixBuf= c->lumPixBuf;
|
||||||
int16_t **chrPixBuf= c->chrPixBuf;
|
int16_t **chrPixBuf= c->chrPixBuf;
|
||||||
int16_t **alpPixBuf= c->alpPixBuf;
|
int16_t **alpPixBuf= c->alpPixBuf;
|
||||||
const int vLumBufSize= c->vLumBufSize;
|
const int vLumBufSize= c->vLumBufSize;
|
||||||
const int vChrBufSize= c->vChrBufSize;
|
const int vChrBufSize= c->vChrBufSize;
|
||||||
uint8_t *formatConvBuffer= c->formatConvBuffer;
|
int16_t *vLumFilterPos= c->vLumFilterPos;
|
||||||
const int chrSrcSliceY= srcSliceY >> c->chrSrcVSubSample;
|
int16_t *vChrFilterPos= c->vChrFilterPos;
|
||||||
const int chrSrcSliceH= -((-srcSliceH) >> c->chrSrcVSubSample);
|
int16_t *vLumFilter= c->vLumFilter;
|
||||||
int lastDstY;
|
int16_t *vChrFilter= c->vChrFilter;
|
||||||
uint32_t *pal=c->pal_yuv;
|
int32_t *lumMmxFilter= c->lumMmxFilter;
|
||||||
|
int32_t *chrMmxFilter= c->chrMmxFilter;
|
||||||
/* vars which will change and which we need to store back in the context */
|
int32_t av_unused *alpMmxFilter= c->alpMmxFilter;
|
||||||
int dstY= c->dstY;
|
const int vLumFilterSize= c->vLumFilterSize;
|
||||||
int lumBufIndex= c->lumBufIndex;
|
const int vChrFilterSize= c->vChrFilterSize;
|
||||||
int chrBufIndex= c->chrBufIndex;
|
const int chrDstY= dstY>>c->chrDstVSubSample;
|
||||||
int lastInLumBuf= c->lastInLumBuf;
|
const int firstLumSrcY= vLumFilterPos[dstY]; //First line needed as input
|
||||||
int lastInChrBuf= c->lastInChrBuf;
|
const int firstChrSrcY= vChrFilterPos[chrDstY]; //First line needed as input
|
||||||
|
|
||||||
if (isPacked(c->srcFormat)) {
|
|
||||||
src[0]=
|
|
||||||
src[1]=
|
|
||||||
src[2]=
|
|
||||||
src[3]= src[0];
|
|
||||||
srcStride[0]=
|
|
||||||
srcStride[1]=
|
|
||||||
srcStride[2]=
|
|
||||||
srcStride[3]= srcStride[0];
|
|
||||||
}
|
|
||||||
srcStride[1]<<= c->vChrDrop;
|
|
||||||
srcStride[2]<<= c->vChrDrop;
|
|
||||||
|
|
||||||
DEBUG_BUFFERS("swScale() %p[%d] %p[%d] %p[%d] %p[%d] -> %p[%d] %p[%d] %p[%d] %p[%d]\n",
|
|
||||||
src[0], srcStride[0], src[1], srcStride[1], src[2], srcStride[2], src[3], srcStride[3],
|
|
||||||
dst[0], dstStride[0], dst[1], dstStride[1], dst[2], dstStride[2], dst[3], dstStride[3]);
|
|
||||||
DEBUG_BUFFERS("srcSliceY: %d srcSliceH: %d dstY: %d dstH: %d\n",
|
|
||||||
srcSliceY, srcSliceH, dstY, dstH);
|
|
||||||
DEBUG_BUFFERS("vLumFilterSize: %d vLumBufSize: %d vChrFilterSize: %d vChrBufSize: %d\n",
|
|
||||||
vLumFilterSize, vLumBufSize, vChrFilterSize, vChrBufSize);
|
|
||||||
|
|
||||||
if (dstStride[0]%8 !=0 || dstStride[1]%8 !=0 || dstStride[2]%8 !=0 || dstStride[3]%8 != 0) {
|
|
||||||
static int warnedAlready=0; //FIXME move this into the context perhaps
|
|
||||||
if (flags & SWS_PRINT_INFO && !warnedAlready) {
|
|
||||||
av_log(c, AV_LOG_WARNING, "Warning: dstStride is not aligned!\n"
|
|
||||||
" ->cannot do aligned memory accesses anymore\n");
|
|
||||||
warnedAlready=1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 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=-1;
|
|
||||||
chrBufIndex=-1;
|
|
||||||
dstY=0;
|
|
||||||
lastInLumBuf= -1;
|
|
||||||
lastInChrBuf= -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
lastDstY= dstY;
|
|
||||||
|
|
||||||
for (;dstY < dstH; dstY++) {
|
|
||||||
unsigned char *dest =dst[0]+dstStride[0]*dstY;
|
|
||||||
const int chrDstY= dstY>>c->chrDstVSubSample;
|
|
||||||
unsigned char *uDest=dst[1]+dstStride[1]*chrDstY;
|
|
||||||
unsigned char *vDest=dst[2]+dstStride[2]*chrDstY;
|
|
||||||
unsigned char *aDest=(CONFIG_SWSCALE_ALPHA && alpPixBuf) ? dst[3]+dstStride[3]*dstY : NULL;
|
|
||||||
|
|
||||||
const int firstLumSrcY= vLumFilterPos[dstY]; //First line needed as input
|
|
||||||
const int firstLumSrcY2= vLumFilterPos[FFMIN(dstY | ((1<<c->chrDstVSubSample) - 1), dstH-1)];
|
|
||||||
const int firstChrSrcY= vChrFilterPos[chrDstY]; //First line needed as input
|
|
||||||
int lastLumSrcY= firstLumSrcY + vLumFilterSize -1; // Last line needed as input
|
|
||||||
int lastLumSrcY2=firstLumSrcY2+ vLumFilterSize -1; // Last line needed as input
|
|
||||||
int lastChrSrcY= firstChrSrcY + vChrFilterSize -1; // Last line needed as input
|
|
||||||
int enough_lines;
|
|
||||||
|
|
||||||
//handle holes (FAST_BILINEAR & weird filters)
|
|
||||||
if (firstLumSrcY > lastInLumBuf) lastInLumBuf= firstLumSrcY-1;
|
|
||||||
if (firstChrSrcY > lastInChrBuf) lastInChrBuf= firstChrSrcY-1;
|
|
||||||
assert(firstLumSrcY >= lastInLumBuf - vLumBufSize + 1);
|
|
||||||
assert(firstChrSrcY >= lastInChrBuf - vChrBufSize + 1);
|
|
||||||
|
|
||||||
DEBUG_BUFFERS("dstY: %d\n", dstY);
|
|
||||||
DEBUG_BUFFERS("\tfirstLumSrcY: %d lastLumSrcY: %d lastInLumBuf: %d\n",
|
|
||||||
firstLumSrcY, lastLumSrcY, lastInLumBuf);
|
|
||||||
DEBUG_BUFFERS("\tfirstChrSrcY: %d lastChrSrcY: %d lastInChrBuf: %d\n",
|
|
||||||
firstChrSrcY, lastChrSrcY, lastInChrBuf);
|
|
||||||
|
|
||||||
// Do we have enough lines in this slice to output the dstY line
|
|
||||||
enough_lines = lastLumSrcY2 < srcSliceY + srcSliceH && lastChrSrcY < -((-srcSliceY - srcSliceH)>>c->chrSrcVSubSample);
|
|
||||||
|
|
||||||
if (!enough_lines) {
|
|
||||||
lastLumSrcY = srcSliceY + srcSliceH - 1;
|
|
||||||
lastChrSrcY = chrSrcSliceY + chrSrcSliceH - 1;
|
|
||||||
DEBUG_BUFFERS("buffering slice: lastLumSrcY %d lastChrSrcY %d\n",
|
|
||||||
lastLumSrcY, lastChrSrcY);
|
|
||||||
}
|
|
||||||
|
|
||||||
//Do horizontal scaling
|
|
||||||
while(lastInLumBuf < lastLumSrcY) {
|
|
||||||
const uint8_t *src1= src[0]+(lastInLumBuf + 1 - srcSliceY)*srcStride[0];
|
|
||||||
const uint8_t *src2= src[3]+(lastInLumBuf + 1 - srcSliceY)*srcStride[3];
|
|
||||||
lumBufIndex++;
|
|
||||||
assert(lumBufIndex < 2*vLumBufSize);
|
|
||||||
assert(lastInLumBuf + 1 - srcSliceY < srcSliceH);
|
|
||||||
assert(lastInLumBuf + 1 - srcSliceY >= 0);
|
|
||||||
hyscale_c(c, lumPixBuf[ lumBufIndex ], dstW, src1, srcW, lumXInc,
|
|
||||||
hLumFilter, hLumFilterPos, hLumFilterSize,
|
|
||||||
formatConvBuffer,
|
|
||||||
pal, 0);
|
|
||||||
if (CONFIG_SWSCALE_ALPHA && alpPixBuf)
|
|
||||||
hyscale_c(c, alpPixBuf[ lumBufIndex ], dstW, src2, srcW, lumXInc,
|
|
||||||
hLumFilter, hLumFilterPos, hLumFilterSize,
|
|
||||||
formatConvBuffer,
|
|
||||||
pal, 1);
|
|
||||||
lastInLumBuf++;
|
|
||||||
DEBUG_BUFFERS("\t\tlumBufIndex %d: lastInLumBuf: %d\n",
|
|
||||||
lumBufIndex, lastInLumBuf);
|
|
||||||
}
|
|
||||||
while(lastInChrBuf < lastChrSrcY) {
|
|
||||||
const uint8_t *src1= src[1]+(lastInChrBuf + 1 - chrSrcSliceY)*srcStride[1];
|
|
||||||
const uint8_t *src2= src[2]+(lastInChrBuf + 1 - chrSrcSliceY)*srcStride[2];
|
|
||||||
chrBufIndex++;
|
|
||||||
assert(chrBufIndex < 2*vChrBufSize);
|
|
||||||
assert(lastInChrBuf + 1 - chrSrcSliceY < (chrSrcSliceH));
|
|
||||||
assert(lastInChrBuf + 1 - chrSrcSliceY >= 0);
|
|
||||||
//FIXME replace parameters through context struct (some at least)
|
|
||||||
|
|
||||||
if (c->needs_hcscale)
|
|
||||||
hcscale_c(c, chrPixBuf[ chrBufIndex ], chrDstW, src1, src2, chrSrcW, chrXInc,
|
|
||||||
hChrFilter, hChrFilterPos, hChrFilterSize,
|
|
||||||
formatConvBuffer,
|
|
||||||
pal);
|
|
||||||
lastInChrBuf++;
|
|
||||||
DEBUG_BUFFERS("\t\tchrBufIndex %d: lastInChrBuf: %d\n",
|
|
||||||
chrBufIndex, lastInChrBuf);
|
|
||||||
}
|
|
||||||
//wrap buf index around to stay inside the ring buffer
|
|
||||||
if (lumBufIndex >= vLumBufSize) lumBufIndex-= vLumBufSize;
|
|
||||||
if (chrBufIndex >= vChrBufSize) chrBufIndex-= vChrBufSize;
|
|
||||||
if (!enough_lines)
|
|
||||||
break; //we can't output a dstY line so let's try with the next slice
|
|
||||||
|
|
||||||
c->blueDither= ff_dither8[dstY&1];
|
c->blueDither= ff_dither8[dstY&1];
|
||||||
if (c->dstFormat == PIX_FMT_RGB555 || c->dstFormat == PIX_FMT_BGR555)
|
if (c->dstFormat == PIX_FMT_RGB555 || c->dstFormat == PIX_FMT_BGR555)
|
||||||
|
|
@ -2324,7 +2174,7 @@ static int RENAME(swScale)(SwsContext *c, const uint8_t* src[], int srcStride[],
|
||||||
else
|
else
|
||||||
c->greenDither= ff_dither4[dstY&1];
|
c->greenDither= ff_dither4[dstY&1];
|
||||||
c->redDither= ff_dither8[(dstY+1)&1];
|
c->redDither= ff_dither8[(dstY+1)&1];
|
||||||
if (dstY < dstH-2) {
|
if (dstY < dstH - 2) {
|
||||||
const int16_t **lumSrcPtr= (const int16_t **) lumPixBuf + lumBufIndex + firstLumSrcY - lastInLumBuf + vLumBufSize;
|
const int16_t **lumSrcPtr= (const int16_t **) lumPixBuf + lumBufIndex + firstLumSrcY - lastInLumBuf + vLumBufSize;
|
||||||
const int16_t **chrSrcPtr= (const int16_t **) chrPixBuf + chrBufIndex + firstChrSrcY - lastInChrBuf + vChrBufSize;
|
const int16_t **chrSrcPtr= (const int16_t **) chrPixBuf + chrBufIndex + firstChrSrcY - lastInChrBuf + vChrBufSize;
|
||||||
const int16_t **alpSrcPtr= (CONFIG_SWSCALE_ALPHA && alpPixBuf) ? (const int16_t **) alpPixBuf + lumBufIndex + firstLumSrcY - lastInLumBuf + vLumBufSize : NULL;
|
const int16_t **alpSrcPtr= (CONFIG_SWSCALE_ALPHA && alpPixBuf) ? (const int16_t **) alpPixBuf + lumBufIndex + firstLumSrcY - lastInLumBuf + vLumBufSize : NULL;
|
||||||
|
|
@ -2373,138 +2223,9 @@ static int RENAME(swScale)(SwsContext *c, const uint8_t* src[], int srcStride[],
|
||||||
((uint16_t)vChrFilter[chrDstY*vChrFilterSize + i])*0x10001;
|
((uint16_t)vChrFilter[chrDstY*vChrFilterSize + i])*0x10001;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (dstFormat == PIX_FMT_NV12 || dstFormat == PIX_FMT_NV21) {
|
|
||||||
const int chrSkipMask= (1<<c->chrDstVSubSample)-1;
|
|
||||||
if (dstY&chrSkipMask) uDest= NULL; //FIXME split functions in lumi / chromi
|
|
||||||
c->yuv2nv12X(c,
|
|
||||||
vLumFilter+dstY*vLumFilterSize , lumSrcPtr, vLumFilterSize,
|
|
||||||
vChrFilter+chrDstY*vChrFilterSize, chrSrcPtr, vChrFilterSize,
|
|
||||||
dest, uDest, dstW, chrDstW, dstFormat);
|
|
||||||
} else if (isPlanarYUV(dstFormat) || dstFormat==PIX_FMT_GRAY8) { //YV12 like
|
|
||||||
const int chrSkipMask= (1<<c->chrDstVSubSample)-1;
|
|
||||||
if ((dstY&chrSkipMask) || isGray(dstFormat)) uDest=vDest= NULL; //FIXME split functions in lumi / chromi
|
|
||||||
if (is16BPS(dstFormat) || is9_OR_10BPS(dstFormat)) {
|
|
||||||
yuv2yuvX16inC(
|
|
||||||
vLumFilter+dstY*vLumFilterSize , lumSrcPtr, vLumFilterSize,
|
|
||||||
vChrFilter+chrDstY*vChrFilterSize, chrSrcPtr, vChrFilterSize,
|
|
||||||
alpSrcPtr, (uint16_t *) dest, (uint16_t *) uDest, (uint16_t *) vDest, (uint16_t *) aDest, dstW, chrDstW,
|
|
||||||
dstFormat);
|
|
||||||
} else if (vLumFilterSize == 1 && vChrFilterSize == 1) { // unscaled YV12
|
|
||||||
const int16_t *lumBuf = lumSrcPtr[0];
|
|
||||||
const int16_t *chrBuf= chrSrcPtr[0];
|
|
||||||
const int16_t *alpBuf= (CONFIG_SWSCALE_ALPHA && alpPixBuf) ? alpSrcPtr[0] : NULL;
|
|
||||||
c->yuv2yuv1(c, lumBuf, chrBuf, alpBuf, dest, uDest, vDest, aDest, dstW, chrDstW);
|
|
||||||
} else { //General YV12
|
|
||||||
c->yuv2yuvX(c,
|
|
||||||
vLumFilter+dstY*vLumFilterSize , lumSrcPtr, vLumFilterSize,
|
|
||||||
vChrFilter+chrDstY*vChrFilterSize, chrSrcPtr, vChrFilterSize,
|
|
||||||
alpSrcPtr, dest, uDest, vDest, aDest, dstW, chrDstW);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
assert(lumSrcPtr + vLumFilterSize - 1 < lumPixBuf + vLumBufSize*2);
|
|
||||||
assert(chrSrcPtr + vChrFilterSize - 1 < chrPixBuf + vChrBufSize*2);
|
|
||||||
if (vLumFilterSize == 1 && vChrFilterSize == 2) { //unscaled RGB
|
|
||||||
int chrAlpha= vChrFilter[2*dstY+1];
|
|
||||||
if(flags & SWS_FULL_CHR_H_INT) {
|
|
||||||
yuv2rgbXinC_full(c, //FIXME write a packed1_full function
|
|
||||||
vLumFilter+dstY*vLumFilterSize, lumSrcPtr, vLumFilterSize,
|
|
||||||
vChrFilter+dstY*vChrFilterSize, chrSrcPtr, vChrFilterSize,
|
|
||||||
alpSrcPtr, dest, dstW, dstY);
|
|
||||||
} else {
|
|
||||||
c->yuv2packed1(c, *lumSrcPtr, *chrSrcPtr, *(chrSrcPtr+1),
|
|
||||||
alpPixBuf ? *alpSrcPtr : NULL,
|
|
||||||
dest, dstW, chrAlpha, dstFormat, flags, dstY);
|
|
||||||
}
|
|
||||||
} else if (vLumFilterSize == 2 && vChrFilterSize == 2) { //bilinear upscale RGB
|
|
||||||
int lumAlpha= vLumFilter[2*dstY+1];
|
|
||||||
int chrAlpha= vChrFilter[2*dstY+1];
|
|
||||||
lumMmxFilter[2]=
|
|
||||||
lumMmxFilter[3]= vLumFilter[2*dstY ]*0x10001;
|
|
||||||
chrMmxFilter[2]=
|
|
||||||
chrMmxFilter[3]= vChrFilter[2*chrDstY]*0x10001;
|
|
||||||
if(flags & SWS_FULL_CHR_H_INT) {
|
|
||||||
yuv2rgbXinC_full(c, //FIXME write a packed2_full function
|
|
||||||
vLumFilter+dstY*vLumFilterSize, lumSrcPtr, vLumFilterSize,
|
|
||||||
vChrFilter+dstY*vChrFilterSize, chrSrcPtr, vChrFilterSize,
|
|
||||||
alpSrcPtr, dest, dstW, dstY);
|
|
||||||
} else {
|
|
||||||
c->yuv2packed2(c, *lumSrcPtr, *(lumSrcPtr+1), *chrSrcPtr, *(chrSrcPtr+1),
|
|
||||||
alpPixBuf ? *alpSrcPtr : NULL, alpPixBuf ? *(alpSrcPtr+1) : NULL,
|
|
||||||
dest, dstW, lumAlpha, chrAlpha, dstY);
|
|
||||||
}
|
|
||||||
} else { //general RGB
|
|
||||||
if(flags & SWS_FULL_CHR_H_INT) {
|
|
||||||
yuv2rgbXinC_full(c,
|
|
||||||
vLumFilter+dstY*vLumFilterSize, lumSrcPtr, vLumFilterSize,
|
|
||||||
vChrFilter+dstY*vChrFilterSize, chrSrcPtr, vChrFilterSize,
|
|
||||||
alpSrcPtr, dest, dstW, dstY);
|
|
||||||
} else {
|
|
||||||
c->yuv2packedX(c,
|
|
||||||
vLumFilter+dstY*vLumFilterSize, lumSrcPtr, vLumFilterSize,
|
|
||||||
vChrFilter+dstY*vChrFilterSize, chrSrcPtr, vChrFilterSize,
|
|
||||||
alpSrcPtr, dest, dstW, dstY);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else { // hmm looks like we can't use MMX here without overwriting this array's tail
|
|
||||||
const int16_t **lumSrcPtr= (const int16_t **)lumPixBuf + lumBufIndex + firstLumSrcY - lastInLumBuf + vLumBufSize;
|
|
||||||
const int16_t **chrSrcPtr= (const int16_t **)chrPixBuf + chrBufIndex + firstChrSrcY - lastInChrBuf + vChrBufSize;
|
|
||||||
const int16_t **alpSrcPtr= (CONFIG_SWSCALE_ALPHA && alpPixBuf) ? (const int16_t **)alpPixBuf + lumBufIndex + firstLumSrcY - lastInLumBuf + vLumBufSize : NULL;
|
|
||||||
if (dstFormat == PIX_FMT_NV12 || dstFormat == PIX_FMT_NV21) {
|
|
||||||
const int chrSkipMask= (1<<c->chrDstVSubSample)-1;
|
|
||||||
if (dstY&chrSkipMask) uDest= NULL; //FIXME split functions in lumi / chromi
|
|
||||||
yuv2nv12XinC(
|
|
||||||
vLumFilter+dstY*vLumFilterSize , lumSrcPtr, vLumFilterSize,
|
|
||||||
vChrFilter+chrDstY*vChrFilterSize, chrSrcPtr, vChrFilterSize,
|
|
||||||
dest, uDest, dstW, chrDstW, dstFormat);
|
|
||||||
} else if (isPlanarYUV(dstFormat) || dstFormat==PIX_FMT_GRAY8) { //YV12
|
|
||||||
const int chrSkipMask= (1<<c->chrDstVSubSample)-1;
|
|
||||||
if ((dstY&chrSkipMask) || isGray(dstFormat)) uDest=vDest= NULL; //FIXME split functions in lumi / chromi
|
|
||||||
if (is16BPS(dstFormat) || is9_OR_10BPS(dstFormat)) {
|
|
||||||
yuv2yuvX16inC(
|
|
||||||
vLumFilter+dstY*vLumFilterSize , lumSrcPtr, vLumFilterSize,
|
|
||||||
vChrFilter+chrDstY*vChrFilterSize, chrSrcPtr, vChrFilterSize,
|
|
||||||
alpSrcPtr, (uint16_t *) dest, (uint16_t *) uDest, (uint16_t *) vDest, (uint16_t *) aDest, dstW, chrDstW,
|
|
||||||
dstFormat);
|
|
||||||
} else {
|
|
||||||
yuv2yuvXinC(
|
|
||||||
vLumFilter+dstY*vLumFilterSize , lumSrcPtr, vLumFilterSize,
|
|
||||||
vChrFilter+chrDstY*vChrFilterSize, chrSrcPtr, vChrFilterSize,
|
|
||||||
alpSrcPtr, dest, uDest, vDest, aDest, dstW, chrDstW);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
assert(lumSrcPtr + vLumFilterSize - 1 < lumPixBuf + vLumBufSize*2);
|
|
||||||
assert(chrSrcPtr + vChrFilterSize - 1 < chrPixBuf + vChrBufSize*2);
|
|
||||||
if(flags & SWS_FULL_CHR_H_INT) {
|
|
||||||
yuv2rgbXinC_full(c,
|
|
||||||
vLumFilter+dstY*vLumFilterSize, lumSrcPtr, vLumFilterSize,
|
|
||||||
vChrFilter+dstY*vChrFilterSize, chrSrcPtr, vChrFilterSize,
|
|
||||||
alpSrcPtr, dest, dstW, dstY);
|
|
||||||
} else {
|
|
||||||
yuv2packedXinC(c,
|
|
||||||
vLumFilter+dstY*vLumFilterSize, lumSrcPtr, vLumFilterSize,
|
|
||||||
vChrFilter+dstY*vChrFilterSize, chrSrcPtr, vChrFilterSize,
|
|
||||||
alpSrcPtr, dest, dstW, dstY);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if ((dstFormat == PIX_FMT_YUVA420P) && !alpPixBuf)
|
|
||||||
fillPlane(dst[3], dstStride[3], dstW, dstY-lastDstY, lastDstY, 255);
|
|
||||||
|
|
||||||
if (COMPILE_TEMPLATE_MMX2) __asm__ volatile("sfence":::"memory");
|
|
||||||
emms_c();
|
|
||||||
|
|
||||||
/* store changed local vars back in the context */
|
|
||||||
c->dstY= dstY;
|
|
||||||
c->lumBufIndex= lumBufIndex;
|
|
||||||
c->chrBufIndex= chrBufIndex;
|
|
||||||
c->lastInLumBuf= lastInLumBuf;
|
|
||||||
c->lastInChrBuf= lastInChrBuf;
|
|
||||||
|
|
||||||
return dstY - lastDstY;
|
|
||||||
}
|
}
|
||||||
|
#endif /* !COMPILE_TEMPLATE_MMX2 */
|
||||||
|
|
||||||
static void RENAME(sws_init_swScale)(SwsContext *c)
|
static void RENAME(sws_init_swScale)(SwsContext *c)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue