RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-06 14:17:46 +00:00
Code Issues Releases Wiki Activity

Reindent. SoC Patch from Keiji Costantini

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27213 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
lu_zero 2008-07-06 03:27:31 +00:00
parent ba7100e51c
commit 4e3106460f
1 changed files with 42 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
libswscale/swscale.c
View File

@ -1732,68 +1732,65 @@ 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 packedCopy(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 (dstStride[0]==srcStride[0] && srcStride[0] > 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 <= FFABS(dstStride[0])
&& length+c->srcW <= FFABS(srcStride[0])) length+= c->srcW;
ASSERT(length!=0);
if (dstStride[0]==srcStride[0] && srcStride[0] > 0) for (i=0; i<srcSliceH; i++)
memcpy(dst[0] + dstStride[0]*srcSliceY, src[0], srcSliceH*dstStride[0]);
else
{ {
int i; memcpy(dstPtr, srcPtr, length);
uint8_t *srcPtr= src[0]; srcPtr+= srcStride[0];
uint8_t *dstPtr= dst[0] + dstStride[0]*srcSliceY; dstPtr+= dstStride[0];
int length=0;
/* universal length finder */
while(length+c->srcW <= FFABS(dstStride[0])
&& length+c->srcW <= FFABS(srcStride[0])) length+= c->srcW;
ASSERT(length!=0);
for (i=0; i<srcSliceH; i++)
{
memcpy(dstPtr, srcPtr, length);
srcPtr+= srcStride[0];
dstPtr+= dstStride[0];
}
} }
}
return srcSliceH; return srcSliceH;
} }
static int planarCopy(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, static int planarCopy(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dst[], int dstStride[]) int srcSliceH, uint8_t* dst[], int dstStride[])
{ {
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);
int plane; if ((isGray(c->srcFormat) || isGray(c->dstFormat)) && plane>0)
for (plane=0; plane<3; plane++)
{ {
int length= plane==0 ? c->srcW : -((-c->srcW )>>c->chrDstHSubSample); if (!isGray(c->dstFormat))
int y= plane==0 ? srcSliceY: -((-srcSliceY)>>c->chrDstVSubSample); memset(dst[plane], 128, dstStride[plane]*height);
int height= plane==0 ? srcSliceH: -((-srcSliceH)>>c->chrDstVSubSample); }
else
if ((isGray(c->srcFormat) || isGray(c->dstFormat)) && plane>0) {
{ if (dstStride[plane]==srcStride[plane] && srcStride[plane] > 0)
if (!isGray(c->dstFormat)) memcpy(dst[plane] + dstStride[plane]*y, src[plane], height*dstStride[plane]);
memset(dst[plane], 128, dstStride[plane]*height);
}
else else
{ {
if (dstStride[plane]==srcStride[plane] && srcStride[plane] > 0) int i;
memcpy(dst[plane] + dstStride[plane]*y, src[plane], height*dstStride[plane]); uint8_t *srcPtr= src[plane];
else uint8_t *dstPtr= dst[plane] + dstStride[plane]*y;
for (i=0; i<height; i++)
{ {
int i; memcpy(dstPtr, srcPtr, length);
uint8_t *srcPtr= src[plane]; srcPtr+= srcStride[plane];
uint8_t *dstPtr= dst[plane] + dstStride[plane]*y; dstPtr+= dstStride[plane];
for (i=0; i<height; i++)
{
memcpy(dstPtr, srcPtr, length);
srcPtr+= srcStride[plane];
dstPtr+= dstStride[plane];
}
} }
} }
} }
}
return srcSliceH; return srcSliceH;
} }