Skip to content

L
libswscale
Commit 11b4a261 authored by stefano's avatar stefano
Browse files
Options

Use a consistent convention for the names of the internal wrapper 

functions. Improve readability.
 -This line, and those below, will be ignored--

     swscale.c


git-svn-id: file:///var/local/repositories/mplayer/trunk/libswscale@30466 b3059339-0415-0410-9bf9-f77b7e298cf2
parent 265e3bbc
Show whitespace changes
Inline Side-by-side
Showing with 30 additions and 30 deletions
swscale.c
View file @ 11b4a261
...@@ -1267,7 +1267,7 @@ SwsFunc ff_getSwsFunc(SwsContext *c) ...@@ -1267,7 +1267,7 @@ SwsFunc ff_getSwsFunc(SwsContext *c)
#endif //!CONFIG_RUNTIME_CPUDETECT #endif //!CONFIG_RUNTIME_CPUDETECT
} }
static int PlanarToNV12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int planarToNv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dstParam[], int dstStride[]) int srcSliceH, uint8_t* dstParam[], int dstStride[])
{ {
uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY; uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY;
...@@ -1293,7 +1293,7 @@ static int PlanarToNV12Wrapper(SwsContext *c, const uint8_t* src[], int srcStrid ...@@ -1293,7 +1293,7 @@ static int PlanarToNV12Wrapper(SwsContext *c, const uint8_t* src[], int srcStrid
return srcSliceH; return srcSliceH;
} }
static int PlanarToYuy2Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int planarToYuy2Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dstParam[], int dstStride[]) int srcSliceH, uint8_t* dstParam[], int dstStride[])
{ {
uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY; uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY;
...@@ -1303,7 +1303,7 @@ static int PlanarToYuy2Wrapper(SwsContext *c, const uint8_t* src[], int srcStrid ...@@ -1303,7 +1303,7 @@ static int PlanarToYuy2Wrapper(SwsContext *c, const uint8_t* src[], int srcStrid
return srcSliceH; return srcSliceH;
} }
static int PlanarToUyvyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int planarToUyvyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dstParam[], int dstStride[]) int srcSliceH, uint8_t* dstParam[], int dstStride[])
{ {
uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY; uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY;
...@@ -1313,7 +1313,7 @@ static int PlanarToUyvyWrapper(SwsContext *c, const uint8_t* src[], int srcStrid ...@@ -1313,7 +1313,7 @@ static int PlanarToUyvyWrapper(SwsContext *c, const uint8_t* src[], int srcStrid
return srcSliceH; return srcSliceH;
} }
static int YUV422PToYuy2Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int yuv422pToYuy2Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dstParam[], int dstStride[]) int srcSliceH, uint8_t* dstParam[], int dstStride[])
{ {
uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY; uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY;
...@@ -1323,7 +1323,7 @@ static int YUV422PToYuy2Wrapper(SwsContext *c, const uint8_t* src[], int srcStri ...@@ -1323,7 +1323,7 @@ static int YUV422PToYuy2Wrapper(SwsContext *c, const uint8_t* src[], int srcStri
return srcSliceH; return srcSliceH;
} }
static int YUV422PToUyvyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int yuv422pToUyvyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dstParam[], int dstStride[]) int srcSliceH, uint8_t* dstParam[], int dstStride[])
{ {
uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY; uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY;
...@@ -1333,7 +1333,7 @@ static int YUV422PToUyvyWrapper(SwsContext *c, const uint8_t* src[], int srcStri ...@@ -1333,7 +1333,7 @@ static int YUV422PToUyvyWrapper(SwsContext *c, const uint8_t* src[], int srcStri
return srcSliceH; return srcSliceH;
} }
static int YUYV2YUV420Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int yuyvToYuv420Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dstParam[], int dstStride[]) int srcSliceH, uint8_t* dstParam[], int dstStride[])
{ {
uint8_t *ydst=dstParam[0] + dstStride[0]*srcSliceY; uint8_t *ydst=dstParam[0] + dstStride[0]*srcSliceY;
...@@ -1348,7 +1348,7 @@ static int YUYV2YUV420Wrapper(SwsContext *c, const uint8_t* src[], int srcStride ...@@ -1348,7 +1348,7 @@ static int YUYV2YUV420Wrapper(SwsContext *c, const uint8_t* src[], int srcStride
return srcSliceH; return srcSliceH;
} }
static int YUYV2YUV422Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int yuyvToYuv422Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dstParam[], int dstStride[]) int srcSliceH, uint8_t* dstParam[], int dstStride[])
{ {
uint8_t *ydst=dstParam[0] + dstStride[0]*srcSliceY; uint8_t *ydst=dstParam[0] + dstStride[0]*srcSliceY;
...@@ -1360,7 +1360,7 @@ static int YUYV2YUV422Wrapper(SwsContext *c, const uint8_t* src[], int srcStride ...@@ -1360,7 +1360,7 @@ static int YUYV2YUV422Wrapper(SwsContext *c, const uint8_t* src[], int srcStride
return srcSliceH; return srcSliceH;
} }
static int UYVY2YUV420Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int uyvyToYuv420Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dstParam[], int dstStride[]) int srcSliceH, uint8_t* dstParam[], int dstStride[])
{ {
uint8_t *ydst=dstParam[0] + dstStride[0]*srcSliceY; uint8_t *ydst=dstParam[0] + dstStride[0]*srcSliceY;
...@@ -1375,7 +1375,7 @@ static int UYVY2YUV420Wrapper(SwsContext *c, const uint8_t* src[], int srcStride ...@@ -1375,7 +1375,7 @@ static int UYVY2YUV420Wrapper(SwsContext *c, const uint8_t* src[], int srcStride
return srcSliceH; return srcSliceH;
} }
static int UYVY2YUV422Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int uyvyToYuv422Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dstParam[], int dstStride[]) int srcSliceH, uint8_t* dstParam[], int dstStride[])
{ {
uint8_t *ydst=dstParam[0] + dstStride[0]*srcSliceY; uint8_t *ydst=dstParam[0] + dstStride[0]*srcSliceY;
...@@ -1387,7 +1387,7 @@ static int UYVY2YUV422Wrapper(SwsContext *c, const uint8_t* src[], int srcStride ...@@ -1387,7 +1387,7 @@ static int UYVY2YUV422Wrapper(SwsContext *c, const uint8_t* src[], int srcStride
return srcSliceH; return srcSliceH;
} }
static int pal2rgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int palToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dst[], int dstStride[]) int srcSliceH, uint8_t* dst[], int dstStride[])
{ {
const enum PixelFormat srcFormat= c->srcFormat; const enum PixelFormat srcFormat= c->srcFormat;
...@@ -1424,7 +1424,7 @@ static int pal2rgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], ...@@ -1424,7 +1424,7 @@ static int pal2rgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[],
} }
/* {RGB,BGR}{15,16,24,32,32_1} -> {RGB,BGR}{15,16,24,32} */ /* {RGB,BGR}{15,16,24,32,32_1} -> {RGB,BGR}{15,16,24,32} */
static int rgb2rgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int rgbToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dst[], int dstStride[]) int srcSliceH, uint8_t* dst[], int dstStride[])
{ {
const enum PixelFormat srcFormat= c->srcFormat; const enum PixelFormat srcFormat= c->srcFormat;
...@@ -1498,7 +1498,7 @@ static int rgb2rgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], ...@@ -1498,7 +1498,7 @@ static int rgb2rgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[],
return srcSliceH; return srcSliceH;
} }
static int bgr24toyv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int bgr24ToYv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dst[], int dstStride[]) int srcSliceH, uint8_t* dst[], int dstStride[])
{ {
rgb24toyv12( rgb24toyv12(
...@@ -1513,7 +1513,7 @@ static int bgr24toyv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride ...@@ -1513,7 +1513,7 @@ static int bgr24toyv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride
return srcSliceH; return srcSliceH;
} }
static int yvu9toyv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int yvu9ToYv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dst[], int dstStride[]) int srcSliceH, uint8_t* dst[], int dstStride[])
{ {
int i; int i;
...@@ -1549,7 +1549,7 @@ static int yvu9toyv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[ ...@@ -1549,7 +1549,7 @@ static int yvu9toyv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[
} }
/* unscaled copy like stuff (assumes nearly identical formats) */ /* unscaled copy like stuff (assumes nearly identical formats) */
static int packedCopy(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int packedCopyWrapper(SwsContext *c, const 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) if (dstStride[0]==srcStride[0] && srcStride[0] > 0)
...@@ -1574,7 +1574,7 @@ static int packedCopy(SwsContext *c, const uint8_t* src[], int srcStride[], int ...@@ -1574,7 +1574,7 @@ static int packedCopy(SwsContext *c, const uint8_t* src[], int srcStride[], int
return srcSliceH; return srcSliceH;
} }
static int planarCopy(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, static int planarCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dst[], int dstStride[]) int srcSliceH, uint8_t* dst[], int dstStride[])
{ {
int plane, i, j; int plane, i, j;
...@@ -1665,7 +1665,7 @@ void ff_get_unscaled_swscale(SwsContext *c) ...@@ -1665,7 +1665,7 @@ void ff_get_unscaled_swscale(SwsContext *c)
/* yv12_to_nv12 */ /* yv12_to_nv12 */
if ((srcFormat == PIX_FMT_YUV420P || srcFormat == PIX_FMT_YUVA420P) && (dstFormat == PIX_FMT_NV12 || dstFormat == PIX_FMT_NV21)) { if ((srcFormat == PIX_FMT_YUV420P || srcFormat == PIX_FMT_YUVA420P) && (dstFormat == PIX_FMT_NV12 || dstFormat == PIX_FMT_NV21)) {
c->swScale= PlanarToNV12Wrapper; c->swScale= planarToNv12Wrapper;
} }
/* yuv2bgr */ /* yuv2bgr */
if ((srcFormat==PIX_FMT_YUV420P || srcFormat==PIX_FMT_YUV422P || srcFormat==PIX_FMT_YUVA420P) && isAnyRGB(dstFormat) if ((srcFormat==PIX_FMT_YUV420P || srcFormat==PIX_FMT_YUV422P || srcFormat==PIX_FMT_YUVA420P) && isAnyRGB(dstFormat)
...@@ -1674,12 +1674,12 @@ void ff_get_unscaled_swscale(SwsContext *c) ...@@ -1674,12 +1674,12 @@ void ff_get_unscaled_swscale(SwsContext *c)
} }
if (srcFormat==PIX_FMT_YUV410P && (dstFormat==PIX_FMT_YUV420P || dstFormat==PIX_FMT_YUVA420P) && !(flags & SWS_BITEXACT)) { if (srcFormat==PIX_FMT_YUV410P && (dstFormat==PIX_FMT_YUV420P || dstFormat==PIX_FMT_YUVA420P) && !(flags & SWS_BITEXACT)) {
c->swScale= yvu9toyv12Wrapper; c->swScale= yvu9ToYv12Wrapper;
} }
/* bgr24toYV12 */ /* bgr24toYV12 */
if (srcFormat==PIX_FMT_BGR24 && (dstFormat==PIX_FMT_YUV420P || dstFormat==PIX_FMT_YUVA420P) && !(flags & SWS_ACCURATE_RND)) if (srcFormat==PIX_FMT_BGR24 && (dstFormat==PIX_FMT_YUV420P || dstFormat==PIX_FMT_YUVA420P) && !(flags & SWS_ACCURATE_RND))
c->swScale= bgr24toyv12Wrapper; c->swScale= bgr24ToYv12Wrapper;
/* RGB/BGR -> RGB/BGR (no dither needed forms) */ /* RGB/BGR -> RGB/BGR (no dither needed forms) */
if ( isAnyRGB(srcFormat) if ( isAnyRGB(srcFormat)
...@@ -1697,7 +1697,7 @@ void ff_get_unscaled_swscale(SwsContext *c) ...@@ -1697,7 +1697,7 @@ void ff_get_unscaled_swscale(SwsContext *c)
&& srcFormat != PIX_FMT_RGB48LE && dstFormat != PIX_FMT_RGB48LE && srcFormat != PIX_FMT_RGB48LE && dstFormat != PIX_FMT_RGB48LE
&& srcFormat != PIX_FMT_RGB48BE && dstFormat != PIX_FMT_RGB48BE && srcFormat != PIX_FMT_RGB48BE && dstFormat != PIX_FMT_RGB48BE
&& (!needsDither || (c->flags&(SWS_FAST_BILINEAR|SWS_POINT)))) && (!needsDither || (c->flags&(SWS_FAST_BILINEAR|SWS_POINT))))
c->swScale= rgb2rgbWrapper; c->swScale= rgbToRgbWrapper;
if ((usePal(srcFormat) && ( if ((usePal(srcFormat) && (
dstFormat == PIX_FMT_RGB32 || dstFormat == PIX_FMT_RGB32 ||
...@@ -1706,13 +1706,13 @@ void ff_get_unscaled_swscale(SwsContext *c) ...@@ -1706,13 +1706,13 @@ void ff_get_unscaled_swscale(SwsContext *c)
dstFormat == PIX_FMT_BGR32 || dstFormat == PIX_FMT_BGR32 ||
dstFormat == PIX_FMT_BGR32_1 || dstFormat == PIX_FMT_BGR32_1 ||
dstFormat == PIX_FMT_BGR24))) dstFormat == PIX_FMT_BGR24)))
c->swScale= pal2rgbWrapper; c->swScale= palToRgbWrapper;
if (srcFormat == PIX_FMT_YUV422P) { if (srcFormat == PIX_FMT_YUV422P) {
if (dstFormat == PIX_FMT_YUYV422) if (dstFormat == PIX_FMT_YUYV422)
c->swScale= YUV422PToYuy2Wrapper; c->swScale= yuv422pToYuy2Wrapper;
else if (dstFormat == PIX_FMT_UYVY422) else if (dstFormat == PIX_FMT_UYVY422)
c->swScale= YUV422PToUyvyWrapper; c->swScale= yuv422pToUyvyWrapper;
} }
/* LQ converters if -sws 0 or -sws 4*/ /* LQ converters if -sws 0 or -sws 4*/
...@@ -1720,19 +1720,19 @@ void ff_get_unscaled_swscale(SwsContext *c) ...@@ -1720,19 +1720,19 @@ void ff_get_unscaled_swscale(SwsContext *c)
/* yv12_to_yuy2 */ /* yv12_to_yuy2 */
if (srcFormat == PIX_FMT_YUV420P || srcFormat == PIX_FMT_YUVA420P) { if (srcFormat == PIX_FMT_YUV420P || srcFormat == PIX_FMT_YUVA420P) {
if (dstFormat == PIX_FMT_YUYV422) if (dstFormat == PIX_FMT_YUYV422)
c->swScale= PlanarToYuy2Wrapper; c->swScale= planarToYuy2Wrapper;
else if (dstFormat == PIX_FMT_UYVY422) else if (dstFormat == PIX_FMT_UYVY422)
c->swScale= PlanarToUyvyWrapper; c->swScale= planarToUyvyWrapper;
} }
} }
if(srcFormat == PIX_FMT_YUYV422 && (dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P)) if(srcFormat == PIX_FMT_YUYV422 && (dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P))
c->swScale= YUYV2YUV420Wrapper; c->swScale= yuyvToYuv420Wrapper;
if(srcFormat == PIX_FMT_UYVY422 && (dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P)) if(srcFormat == PIX_FMT_UYVY422 && (dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P))
c->swScale= UYVY2YUV420Wrapper; c->swScale= uyvyToYuv420Wrapper;
if(srcFormat == PIX_FMT_YUYV422 && dstFormat == PIX_FMT_YUV422P) if(srcFormat == PIX_FMT_YUYV422 && dstFormat == PIX_FMT_YUV422P)
c->swScale= YUYV2YUV422Wrapper; c->swScale= yuyvToYuv422Wrapper;
if(srcFormat == PIX_FMT_UYVY422 && dstFormat == PIX_FMT_YUV422P) if(srcFormat == PIX_FMT_UYVY422 && dstFormat == PIX_FMT_YUV422P)
c->swScale= UYVY2YUV422Wrapper; c->swScale= uyvyToYuv422Wrapper;
#ifdef COMPILE_ALTIVEC #ifdef COMPILE_ALTIVEC
if ((c->flags & SWS_CPU_CAPS_ALTIVEC) && if ((c->flags & SWS_CPU_CAPS_ALTIVEC) &&
...@@ -1760,9 +1760,9 @@ void ff_get_unscaled_swscale(SwsContext *c) ...@@ -1760,9 +1760,9 @@ void ff_get_unscaled_swscale(SwsContext *c)
&& srcFormat != PIX_FMT_NV12 && srcFormat != PIX_FMT_NV21)) && srcFormat != PIX_FMT_NV12 && srcFormat != PIX_FMT_NV21))
{ {
if (isPacked(c->srcFormat)) if (isPacked(c->srcFormat))
c->swScale= packedCopy; c->swScale= packedCopyWrapper;
else /* Planar YUV or gray */ else /* Planar YUV or gray */
c->swScale= planarCopy; c->swScale= planarCopyWrapper;
} }
#if ARCH_BFIN #if ARCH_BFIN
if (flags & SWS_CPU_CAPS_BFIN) if (flags & SWS_CPU_CAPS_BFIN)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment