1
0
mirror of https://github.com/mpv-player/mpv synced 2025-03-06 14:17:46 +00:00

Split simpleCopy into packedCopy and planarCopy. SoC Patch from Keiji Costantini

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27212 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
lu_zero 2008-07-06 03:26:32 +00:00
parent ad1f51bcf6
commit ba7100e51c

View File

@ -1731,11 +1731,10 @@ static int yvu9toyv12Wrapper(SwsContext *c, uint8_t* src[], int srcStride[], int
} }
/* unscaled copy like stuff (assumes nearly identical formats) */ /* unscaled copy like stuff (assumes nearly identical formats) */
static int simpleCopy(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, static int packedCopy(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dst[], int dstStride[]){ int srcSliceH, uint8_t* dst[], int dstStride[]){
if (isPacked(c->srcFormat))
{
if (dstStride[0]==srcStride[0] && srcStride[0] > 0) if (dstStride[0]==srcStride[0] && srcStride[0] > 0)
memcpy(dst[0] + dstStride[0]*srcSliceY, src[0], srcSliceH*dstStride[0]); memcpy(dst[0] + dstStride[0]*srcSliceY, src[0], srcSliceH*dstStride[0]);
else else
@ -1757,9 +1756,13 @@ static int simpleCopy(SwsContext *c, uint8_t* src[], int srcStride[], int srcSli
dstPtr+= dstStride[0]; dstPtr+= dstStride[0];
} }
} }
}
else return srcSliceH;
{ /* Planar YUV or gray */ }
static int planarCopy(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dst[], int dstStride[])
{
int plane; int plane;
for (plane=0; plane<3; plane++) for (plane=0; plane<3; plane++)
{ {
@ -1790,7 +1793,7 @@ static int simpleCopy(SwsContext *c, uint8_t* src[], int srcStride[], int srcSli
} }
} }
} }
}
return srcSliceH; return srcSliceH;
} }
@ -2208,7 +2211,10 @@ SwsContext *sws_getContext(int srcW, int srcH, int srcFormat, int dstW, int dstH
|| (isPlanarYUV(srcFormat) && isGray(dstFormat)) || (isPlanarYUV(srcFormat) && isGray(dstFormat))
|| (isPlanarYUV(dstFormat) && isGray(srcFormat))) || (isPlanarYUV(dstFormat) && isGray(srcFormat)))
{ {
c->swScale= simpleCopy; if (isPacked(c->srcFormat))
c->swScale= packedCopy;
else /* Planar YUV or gray */
c->swScale= planarCopy;
} }
/* gray16{le,be} conversions */ /* gray16{le,be} conversions */