mirrors/librempeg
1
0
Fork 0
mirror of https://github.com/librempeg/librempeg synced 2024-11-23 03:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consistently use ff_ prefixes for internal symbols.

Browse Source 
Originally committed as revision 28988 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
This commit is contained in:
Diego Biurrun 2009-03-18 08:06:08 +00:00
parent fa3f2a3513
commit 780daf2b09
8 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libswscale/swscale.c
View File

@ -2142,12 +2142,12 @@ int sws_setColorspaceDetails(SwsContext *c, const int inv_table[4], int srcRange
c->yuv2rgb_u2g_coeff= (int16_t)roundToInt16(cgu<<13); c->yuv2rgb_u2g_coeff= (int16_t)roundToInt16(cgu<<13);
c->yuv2rgb_u2b_coeff= (int16_t)roundToInt16(cbu<<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 //FIXME factorize
#ifdef COMPILE_ALTIVEC #ifdef COMPILE_ALTIVEC
if (c->flags & SWS_CPU_CAPS_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 #endif
return 0; return 0;
} }
@ -2344,7 +2344,7 @@ SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat, int d
if ((srcFormat==PIX_FMT_YUV420P || srcFormat==PIX_FMT_YUV422P || srcFormat==PIX_FMT_YUVA420P) && (isBGR(dstFormat) || isRGB(dstFormat)) if ((srcFormat==PIX_FMT_YUV420P || srcFormat==PIX_FMT_YUV422P || srcFormat==PIX_FMT_YUVA420P) && (isBGR(dstFormat) || isRGB(dstFormat))
&& !(flags & SWS_ACCURATE_RND) && !(dstH&1)) && !(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)) if (srcFormat==PIX_FMT_YUV410P && dstFormat==PIX_FMT_YUV420P && !(flags & SWS_BITEXACT))

10
libswscale/swscale_internal.h
View File

@ -212,12 +212,12 @@ typedef struct SwsContext{
} SwsContext; } SwsContext;
//FIXME check init (where 0) //FIXME check init (where 0)
SwsFunc sws_yuv2rgb_get_func_ptr (SwsContext *c); SwsFunc ff_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); 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); void ff_yuv2rgb_init_tables_altivec(SwsContext *c, const int inv_table[4], int brightness, int contrast, int saturation);
SwsFunc sws_yuv2rgb_init_altivec (SwsContext *c); SwsFunc ff_yuv2rgb_init_altivec(SwsContext *c);
void altivec_yuv2packedX (SwsContext *c, void ff_yuv2packedX_altivec(SwsContext *c,
int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize, int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize,
int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize, int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize,
uint8_t *dest, int dstW, int dstY); uint8_t *dest, int dstW, int dstY);

8
libswscale/swscale_template.c
View File

@ -1160,14 +1160,14 @@ static inline void RENAME(yuv2packedX)(SwsContext *c, int16_t *lumFilter, int16_
#endif /* HAVE_MMX */ #endif /* HAVE_MMX */
#if HAVE_ALTIVEC #if HAVE_ALTIVEC
/* The following list of supported dstFormat values should /* 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) && if (!(c->flags & SWS_BITEXACT) &&
(c->dstFormat==PIX_FMT_ABGR || c->dstFormat==PIX_FMT_BGRA || (c->dstFormat==PIX_FMT_ABGR || c->dstFormat==PIX_FMT_BGRA ||
c->dstFormat==PIX_FMT_BGR24 || c->dstFormat==PIX_FMT_RGB24 || c->dstFormat==PIX_FMT_BGR24 || c->dstFormat==PIX_FMT_RGB24 ||
c->dstFormat==PIX_FMT_RGBA || c->dstFormat==PIX_FMT_ARGB)) c->dstFormat==PIX_FMT_RGBA || c->dstFormat==PIX_FMT_ARGB))
altivec_yuv2packedX (c, lumFilter, lumSrc, lumFilterSize, ff_yuv2packedX_altivec(c, lumFilter, lumSrc, lumFilterSize,
chrFilter, chrSrc, chrFilterSize, chrFilter, chrSrc, chrFilterSize,
dest, dstW, dstY); dest, dstW, dstY);
else else
#endif #endif
yuv2packedXinC(c, lumFilter, lumSrc, lumFilterSize, yuv2packedXinC(c, lumFilter, lumSrc, lumFilterSize,

14
libswscale/yuv2rgb.c
View File

@ -426,7 +426,7 @@ YUV2RGBFUNC(yuv2rgb_c_1_ordered_dither, uint8_t, 0)
dst_2[0]= out_2; dst_2[0]= out_2;
CLOSEYUV2RGBFUNC(1) CLOSEYUV2RGBFUNC(1)
SwsFunc sws_yuv2rgb_get_func_ptr(SwsContext *c) SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c)
{ {
SwsFunc t = NULL; SwsFunc t = NULL;
#if (HAVE_MMX2 || HAVE_MMX) && CONFIG_GPL #if (HAVE_MMX2 || HAVE_MMX) && CONFIG_GPL
@ -448,19 +448,19 @@ SwsFunc sws_yuv2rgb_get_func_ptr(SwsContext *c)
} }
#endif #endif
#if HAVE_VIS #if HAVE_VIS
t = sws_yuv2rgb_init_vis(c); t = ff_yuv2rgb_init_vis(c);
#endif #endif
#if CONFIG_MLIB #if CONFIG_MLIB
t = sws_yuv2rgb_init_mlib(c); t = ff_yuv2rgb_init_mlib(c);
#endif #endif
#if HAVE_ALTIVEC && CONFIG_GPL #if HAVE_ALTIVEC && CONFIG_GPL
if (c->flags & SWS_CPU_CAPS_ALTIVEC) if (c->flags & SWS_CPU_CAPS_ALTIVEC)
t = sws_yuv2rgb_init_altivec(c); t = ff_yuv2rgb_init_altivec(c);
#endif #endif
#if ARCH_BFIN #if ARCH_BFIN
if (c->flags & SWS_CPU_CAPS_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 #endif
if (t) if (t)
@ -517,8 +517,8 @@ static void fill_gv_table(int table[256], const int elemsize, const int inc)
} }
} }
av_cold int sws_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], int fullRange, av_cold int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], int fullRange,
int brightness, int contrast, int saturation) int brightness, int contrast, int saturation)
{ {
const int isRgb = c->dstFormat==PIX_FMT_RGB32 const int isRgb = c->dstFormat==PIX_FMT_RGB32
|| c->dstFormat==PIX_FMT_RGB32_1 || c->dstFormat==PIX_FMT_RGB32_1

6
libswscale/yuv2rgb_altivec.c
View File

@ -690,7 +690,7 @@ static int altivec_uyvy_rgb32 (SwsContext *c,
So we just fall back to the C codes for this. 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)) if (!(c->flags & SWS_CPU_CAPS_ALTIVEC))
return NULL; return NULL;
@ -750,7 +750,7 @@ SwsFunc sws_yuv2rgb_init_altivec (SwsContext *c)
return NULL; 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 { union {
signed short tmp[8] __attribute__ ((aligned(16))); signed short tmp[8] __attribute__ ((aligned(16)));
@ -786,7 +786,7 @@ void sws_yuv2rgb_altivec_init_tables (SwsContext *c, const int inv_table[4],int
void void
altivec_yuv2packedX (SwsContext *c, ff_yuv2packedX_altivec(SwsContext *c,
int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize, int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize,
int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize, int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize,
uint8_t *dest, int dstW, int dstY) uint8_t *dest, int dstW, int dstY)

2
libswscale/yuv2rgb_bfin.c
View File

@ -181,7 +181,7 @@ static int bfin_yuv420_bgr565(SwsContext *c,
} }
SwsFunc sws_yuv2rgb_get_func_ptr_bfin(SwsContext *c) SwsFunc ff_yuv2rgb_get_func_ptr_bfin(SwsContext *c)
{ {
SwsFunc f; SwsFunc f;

2
libswscale/yuv2rgb_mlib.c
View File

@ -73,7 +73,7 @@ static int mlib_YUV2RGB420_24(SwsContext *c, uint8_t* src[], int srcStride[], in
} }
SwsFunc sws_yuv2rgb_init_mlib(SwsContext *c) SwsFunc ff_yuv2rgb_init_mlib(SwsContext *c)
{ {
switch(c->dstFormat){ switch(c->dstFormat){
case PIX_FMT_RGB24: return mlib_YUV2RGB420_24; case PIX_FMT_RGB24: return mlib_YUV2RGB420_24;

2
libswscale/yuv2rgb_vis.c
View File

@ -184,7 +184,7 @@ static int vis_422P_ARGB32(SwsContext *c, uint8_t* src[], int srcStride[], int s
return srcSliceH; 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[5]=c->yCoeff;
c->sparc_coeffs[6]=c->vgCoeff; c->sparc_coeffs[6]=c->vgCoeff;
c->sparc_coeffs[7]=c->vrCoeff; c->sparc_coeffs[7]=c->vrCoeff;