corrected - attaching subsequent patch also
--
Keiji Costantini
>From 3c6492ab0ea7b8512eab5eeb121bbe3bfc083c17 Mon Sep 17 00:00:00 2001
From: Keiji Costantini <[EMAIL PROTECTED]>
Date: Sat, 5 Jul 2008 10:37:08 +0900
Subject: [PATCH] simpleCopy splitted into packedCopy and planarCopy
---
swscale.c | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/swscale.c b/swscale.c
index 069d75e..ed240b6 100644
--- a/swscale.c
+++ b/swscale.c
@@ -1648,11 +1648,10 @@ static int yvu9toyv12Wrapper(SwsContext *c, uint8_t*
src[], int srcStride[], int
}
/* 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[]){
- if (isPacked(c->srcFormat))
- {
+
if (dstStride[0]==srcStride[0] && srcStride[0] > 0)
memcpy(dst[0] + dstStride[0]*srcSliceY, src[0],
srcSliceH*dstStride[0]);
else
@@ -1674,9 +1673,13 @@ static int simpleCopy(SwsContext *c, uint8_t* src[], int
srcStride[], int srcSli
dstPtr+= dstStride[0];
}
}
- }
- else
- { /* Planar YUV or gray */
+
+ return srcSliceH;
+}
+static int planarCopy(SwsContext *c, uint8_t* src[], int srcStride[], int
srcSliceY,
+ int srcSliceH, uint8_t* dst[], int dstStride[])
+{
+
int plane;
for (plane=0; plane<3; plane++)
{
@@ -1707,7 +1710,7 @@ static int simpleCopy(SwsContext *c, uint8_t* src[], int
srcStride[], int srcSli
}
}
}
- }
+
return srcSliceH;
}
@@ -2125,7 +2128,10 @@ SwsContext *sws_getContext(int srcW, int srcH, int
srcFormat, int dstW, int dstH
|| (isPlanarYUV(srcFormat) && isGray(dstFormat))
|| (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 */
--
1.5.4.5
>From 7b040720d5aba9cad7d58ea08c0b6d41e7085962 Mon Sep 17 00:00:00 2001
From: Keiji Costantini <[EMAIL PROTECTED]>
Date: Sat, 5 Jul 2008 10:46:01 +0900
Subject: [PATCH] reindent packedCopy and planarCopy + cosmetic between them
---
swscale.c | 87 +++++++++++++++++++++++++++++-------------------------------
1 files changed, 42 insertions(+), 45 deletions(-)
diff --git a/swscale.c b/swscale.c
index ed240b6..9e7d064 100644
--- a/swscale.c
+++ b/swscale.c
@@ -1649,68 +1649,65 @@ static int yvu9toyv12Wrapper(SwsContext *c, uint8_t*
src[], int srcStride[], int
/* unscaled copy like stuff (assumes nearly identical formats) */
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)
- memcpy(dst[0] + dstStride[0]*srcSliceY, src[0],
srcSliceH*dstStride[0]);
- else
+ for (i=0; i<srcSliceH; i++)
{
- 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);
-
- for (i=0; i<srcSliceH; i++)
- {
- memcpy(dstPtr, srcPtr, length);
- srcPtr+= srcStride[0];
- dstPtr+= dstStride[0];
- }
+ memcpy(dstPtr, srcPtr, length);
+ srcPtr+= srcStride[0];
+ dstPtr+= dstStride[0];
}
-
+ }
return srcSliceH;
}
+
static int planarCopy(SwsContext *c, uint8_t* src[], int srcStride[], int
srcSliceY,
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;
- for (plane=0; plane<3; plane++)
+ if ((isGray(c->srcFormat) || isGray(c->dstFormat)) && plane>0)
{
- 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);
-
- if ((isGray(c->srcFormat) || isGray(c->dstFormat)) && plane>0)
- {
- if (!isGray(c->dstFormat))
- memset(dst[plane], 128, dstStride[plane]*height);
- }
+ if (!isGray(c->dstFormat))
+ memset(dst[plane], 128, dstStride[plane]*height);
+ }
+ else
+ {
+ if (dstStride[plane]==srcStride[plane] && srcStride[plane] > 0)
+ memcpy(dst[plane] + dstStride[plane]*y, src[plane],
height*dstStride[plane]);
else
{
- if (dstStride[plane]==srcStride[plane] && srcStride[plane] > 0)
- memcpy(dst[plane] + dstStride[plane]*y, src[plane],
height*dstStride[plane]);
- else
+ int i;
+ uint8_t *srcPtr= src[plane];
+ uint8_t *dstPtr= dst[plane] + dstStride[plane]*y;
+ for (i=0; i<height; i++)
{
- int i;
- uint8_t *srcPtr= src[plane];
- uint8_t *dstPtr= dst[plane] + dstStride[plane]*y;
- for (i=0; i<height; i++)
- {
- memcpy(dstPtr, srcPtr, length);
- srcPtr+= srcStride[plane];
- dstPtr+= dstStride[plane];
- }
+ memcpy(dstPtr, srcPtr, length);
+ srcPtr+= srcStride[plane];
+ dstPtr+= dstStride[plane];
}
}
}
-
+ }
return srcSliceH;
}
--
1.5.4.5
_______________________________________________
FFmpeg-soc mailing list
[email protected]
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
