[FFmpeg-cvslog] r28988 - in trunk/libswscale: swscale.c swscale_internal.h swscale_template.c yuv2rgb.c yuv2rgb_altivec.c yuv2rgb_bfin.c yuv2rgb_mlib.c yuv2rgb_vis.c
diego
subversion
Wed Mar 18 09:06:08 CET 2009
Author: diego
Date: Wed Mar 18 09:06:08 2009
New Revision: 28988
Log:
Consistently use ff_ prefixes for internal symbols.
Modified:
trunk/libswscale/swscale.c
trunk/libswscale/swscale_internal.h
trunk/libswscale/swscale_template.c
trunk/libswscale/yuv2rgb.c
trunk/libswscale/yuv2rgb_altivec.c
trunk/libswscale/yuv2rgb_bfin.c
trunk/libswscale/yuv2rgb_mlib.c
trunk/libswscale/yuv2rgb_vis.c
Modified: trunk/libswscale/swscale.c
==============================================================================
--- trunk/libswscale/swscale.c Wed Mar 18 01:17:26 2009 (r28987)
+++ trunk/libswscale/swscale.c Wed Mar 18 09:06:08 2009 (r28988)
@@ -2142,12 +2142,12 @@ int sws_setColorspaceDetails(SwsContext
c->yuv2rgb_u2g_coeff= (int16_t)roundToInt16(cgu<<13);
c->yuv2rgb_u2b_coeff= (int16_t)roundToInt16(cbu<<13);
- sws_yuv2rgb_c_init_tables(c, inv_table, srcRange, brightness, contrast, saturation);
+ ff_yuv2rgb_c_init_tables(c, inv_table, srcRange, brightness, contrast, saturation);
//FIXME factorize
#ifdef COMPILE_ALTIVEC
if (c->flags & SWS_CPU_CAPS_ALTIVEC)
- sws_yuv2rgb_altivec_init_tables (c, inv_table, brightness, contrast, saturation);
+ ff_yuv2rgb_init_tables_altivec(c, inv_table, brightness, contrast, saturation);
#endif
return 0;
}
@@ -2344,7 +2344,7 @@ SwsContext *sws_getContext(int srcW, int
if ((srcFormat==PIX_FMT_YUV420P || srcFormat==PIX_FMT_YUV422P || srcFormat==PIX_FMT_YUVA420P) && (isBGR(dstFormat) || isRGB(dstFormat))
&& !(flags & SWS_ACCURATE_RND) && !(dstH&1))
{
- c->swScale= sws_yuv2rgb_get_func_ptr(c);
+ c->swScale= ff_yuv2rgb_get_func_ptr(c);
}
if (srcFormat==PIX_FMT_YUV410P && dstFormat==PIX_FMT_YUV420P && !(flags & SWS_BITEXACT))
Modified: trunk/libswscale/swscale_internal.h
==============================================================================
--- trunk/libswscale/swscale_internal.h Wed Mar 18 01:17:26 2009 (r28987)
+++ trunk/libswscale/swscale_internal.h Wed Mar 18 09:06:08 2009 (r28988)
@@ -212,12 +212,12 @@ typedef struct SwsContext{
} SwsContext;
//FIXME check init (where 0)
-SwsFunc sws_yuv2rgb_get_func_ptr (SwsContext *c);
-int sws_yuv2rgb_c_init_tables (SwsContext *c, const int inv_table[4], int fullRange, int brightness, int contrast, int saturation);
+SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c);
+int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], int fullRange, int brightness, int contrast, int saturation);
-void sws_yuv2rgb_altivec_init_tables (SwsContext *c, const int inv_table[4],int brightness,int contrast, int saturation);
-SwsFunc sws_yuv2rgb_init_altivec (SwsContext *c);
-void altivec_yuv2packedX (SwsContext *c,
+void ff_yuv2rgb_init_tables_altivec(SwsContext *c, const int inv_table[4], int brightness, int contrast, int saturation);
+SwsFunc ff_yuv2rgb_init_altivec(SwsContext *c);
+void ff_yuv2packedX_altivec(SwsContext *c,
int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize,
int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize,
uint8_t *dest, int dstW, int dstY);
Modified: trunk/libswscale/swscale_template.c
==============================================================================
--- trunk/libswscale/swscale_template.c Wed Mar 18 01:17:26 2009 (r28987)
+++ trunk/libswscale/swscale_template.c Wed Mar 18 09:06:08 2009 (r28988)
@@ -1160,14 +1160,14 @@ static inline void RENAME(yuv2packedX)(S
#endif /* HAVE_MMX */
#if HAVE_ALTIVEC
/* The following list of supported dstFormat values should
- match what's found in the body of altivec_yuv2packedX() */
+ match what's found in the body of ff_yuv2packedX_altivec() */
if (!(c->flags & SWS_BITEXACT) &&
(c->dstFormat==PIX_FMT_ABGR || c->dstFormat==PIX_FMT_BGRA ||
c->dstFormat==PIX_FMT_BGR24 || c->dstFormat==PIX_FMT_RGB24 ||
c->dstFormat==PIX_FMT_RGBA || c->dstFormat==PIX_FMT_ARGB))
- altivec_yuv2packedX (c, lumFilter, lumSrc, lumFilterSize,
- chrFilter, chrSrc, chrFilterSize,
- dest, dstW, dstY);
+ ff_yuv2packedX_altivec(c, lumFilter, lumSrc, lumFilterSize,
+ chrFilter, chrSrc, chrFilterSize,
+ dest, dstW, dstY);
else
#endif
yuv2packedXinC(c, lumFilter, lumSrc, lumFilterSize,
Modified: trunk/libswscale/yuv2rgb.c
==============================================================================
--- trunk/libswscale/yuv2rgb.c Wed Mar 18 01:17:26 2009 (r28987)
+++ trunk/libswscale/yuv2rgb.c Wed Mar 18 09:06:08 2009 (r28988)
@@ -426,7 +426,7 @@ YUV2RGBFUNC(yuv2rgb_c_1_ordered_dither,
dst_2[0]= out_2;
CLOSEYUV2RGBFUNC(1)
-SwsFunc sws_yuv2rgb_get_func_ptr(SwsContext *c)
+SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c)
{
SwsFunc t = NULL;
#if (HAVE_MMX2 || HAVE_MMX) && CONFIG_GPL
@@ -448,19 +448,19 @@ SwsFunc sws_yuv2rgb_get_func_ptr(SwsCont
}
#endif
#if HAVE_VIS
- t = sws_yuv2rgb_init_vis(c);
+ t = ff_yuv2rgb_init_vis(c);
#endif
#if CONFIG_MLIB
- t = sws_yuv2rgb_init_mlib(c);
+ t = ff_yuv2rgb_init_mlib(c);
#endif
#if HAVE_ALTIVEC && CONFIG_GPL
if (c->flags & SWS_CPU_CAPS_ALTIVEC)
- t = sws_yuv2rgb_init_altivec(c);
+ t = ff_yuv2rgb_init_altivec(c);
#endif
#if ARCH_BFIN
if (c->flags & SWS_CPU_CAPS_BFIN)
- t = sws_yuv2rgb_get_func_ptr_bfin(c);
+ t = ff_yuv2rgb_get_func_ptr_bfin(c);
#endif
if (t)
@@ -517,8 +517,8 @@ static void fill_gv_table(int table[256]
}
}
-av_cold int sws_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], int fullRange,
- int brightness, int contrast, int saturation)
+av_cold int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], int fullRange,
+ int brightness, int contrast, int saturation)
{
const int isRgb = c->dstFormat==PIX_FMT_RGB32
|| c->dstFormat==PIX_FMT_RGB32_1
Modified: trunk/libswscale/yuv2rgb_altivec.c
==============================================================================
--- trunk/libswscale/yuv2rgb_altivec.c Wed Mar 18 01:17:26 2009 (r28987)
+++ trunk/libswscale/yuv2rgb_altivec.c Wed Mar 18 09:06:08 2009 (r28988)
@@ -690,7 +690,7 @@ static int altivec_uyvy_rgb32 (SwsContex
So we just fall back to the C codes for this.
*/
-SwsFunc sws_yuv2rgb_init_altivec (SwsContext *c)
+SwsFunc ff_yuv2rgb_init_altivec(SwsContext *c)
{
if (!(c->flags & SWS_CPU_CAPS_ALTIVEC))
return NULL;
@@ -750,7 +750,7 @@ SwsFunc sws_yuv2rgb_init_altivec (SwsCon
return NULL;
}
-void sws_yuv2rgb_altivec_init_tables (SwsContext *c, const int inv_table[4],int brightness,int contrast, int saturation)
+void ff_yuv2rgb_init_tables_altivec(SwsContext *c, const int inv_table[4], int brightness, int contrast, int saturation)
{
union {
signed short tmp[8] __attribute__ ((aligned(16)));
@@ -786,7 +786,7 @@ void sws_yuv2rgb_altivec_init_tables (Sw
void
-altivec_yuv2packedX (SwsContext *c,
+ff_yuv2packedX_altivec(SwsContext *c,
int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize,
int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize,
uint8_t *dest, int dstW, int dstY)
Modified: trunk/libswscale/yuv2rgb_bfin.c
==============================================================================
--- trunk/libswscale/yuv2rgb_bfin.c Wed Mar 18 01:17:26 2009 (r28987)
+++ trunk/libswscale/yuv2rgb_bfin.c Wed Mar 18 09:06:08 2009 (r28988)
@@ -181,7 +181,7 @@ static int bfin_yuv420_bgr565(SwsContext
}
-SwsFunc sws_yuv2rgb_get_func_ptr_bfin(SwsContext *c)
+SwsFunc ff_yuv2rgb_get_func_ptr_bfin(SwsContext *c)
{
SwsFunc f;
Modified: trunk/libswscale/yuv2rgb_mlib.c
==============================================================================
--- trunk/libswscale/yuv2rgb_mlib.c Wed Mar 18 01:17:26 2009 (r28987)
+++ trunk/libswscale/yuv2rgb_mlib.c Wed Mar 18 09:06:08 2009 (r28988)
@@ -73,7 +73,7 @@ static int mlib_YUV2RGB420_24(SwsContext
}
-SwsFunc sws_yuv2rgb_init_mlib(SwsContext *c)
+SwsFunc ff_yuv2rgb_init_mlib(SwsContext *c)
{
switch(c->dstFormat){
case PIX_FMT_RGB24: return mlib_YUV2RGB420_24;
Modified: trunk/libswscale/yuv2rgb_vis.c
==============================================================================
--- trunk/libswscale/yuv2rgb_vis.c Wed Mar 18 01:17:26 2009 (r28987)
+++ trunk/libswscale/yuv2rgb_vis.c Wed Mar 18 09:06:08 2009 (r28988)
@@ -184,7 +184,7 @@ static int vis_422P_ARGB32(SwsContext *c
return srcSliceH;
}
-SwsFunc sws_yuv2rgb_init_vis(SwsContext *c) {
+SwsFunc ff_yuv2rgb_init_vis(SwsContext *c){
c->sparc_coeffs[5]=c->yCoeff;
c->sparc_coeffs[6]=c->vgCoeff;
c->sparc_coeffs[7]=c->vrCoeff;
More information about the ffmpeg-cvslog
mailing list