From ab3f56987f7f26e5a8fcb81c0236e4c514110ba9 Mon Sep 17 00:00:00 2001 From: kostya Date: Mon, 9 Feb 2009 14:31:53 +0000 Subject: [PATCH] Prefix visible YUV2RGB functions with sws_ git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28496 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/swscale.c | 6 +++--- libswscale/swscale_internal.h | 8 ++++---- libswscale/yuv2rgb.c | 10 +++++----- libswscale/yuv2rgb_altivec.c | 4 ++-- libswscale/yuv2rgb_mlib.c | 2 +- libswscale/yuv2rgb_vis.c | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 5ea9122d2e..0be1c7bd5c 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -2133,12 +2133,12 @@ int sws_setColorspaceDetails(SwsContext *c, const int inv_table[4], int srcRange c->yuv2rgb_u2g_coeff= (int16_t)roundToInt16(cgu<<13); c->yuv2rgb_u2b_coeff= (int16_t)roundToInt16(cbu<<13); - yuv2rgb_c_init_tables(c, inv_table, srcRange, brightness, contrast, saturation); + sws_yuv2rgb_c_init_tables(c, inv_table, srcRange, brightness, contrast, saturation); //FIXME factorize #ifdef COMPILE_ALTIVEC if (c->flags & SWS_CPU_CAPS_ALTIVEC) - yuv2rgb_altivec_init_tables (c, inv_table, brightness, contrast, saturation); + sws_yuv2rgb_altivec_init_tables (c, inv_table, brightness, contrast, saturation); #endif return 0; } @@ -2336,7 +2336,7 @@ SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat, int d if ((srcFormat==PIX_FMT_YUV420P || srcFormat==PIX_FMT_YUV422P) && (isBGR(dstFormat) || isRGB(dstFormat)) && !(flags & SWS_ACCURATE_RND) && !(dstH&1)) { - c->swScale= yuv2rgb_get_func_ptr(c); + c->swScale= sws_yuv2rgb_get_func_ptr(c); } #endif diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 38db01023a..ebd1fb5117 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -212,11 +212,11 @@ typedef struct SwsContext{ } SwsContext; //FIXME check init (where 0) -SwsFunc yuv2rgb_get_func_ptr (SwsContext *c); -int yuv2rgb_c_init_tables (SwsContext *c, const int inv_table[4], int fullRange, int brightness, int contrast, int saturation); +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); -void yuv2rgb_altivec_init_tables (SwsContext *c, const int inv_table[4],int brightness,int contrast, int saturation); -SwsFunc yuv2rgb_init_altivec (SwsContext *c); +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, int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize, int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize, diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c index 507f0b55bb..fe90a04f22 100644 --- a/libswscale/yuv2rgb.c +++ b/libswscale/yuv2rgb.c @@ -481,7 +481,7 @@ PROLOG(yuv2rgb_c_1_ordered_dither, uint8_t) dst_2[0]= out_2; EPILOG(1) -SwsFunc yuv2rgb_get_func_ptr (SwsContext *c) +SwsFunc sws_yuv2rgb_get_func_ptr (SwsContext *c) { #if HAVE_MMX2 || HAVE_MMX if (c->flags & SWS_CPU_CAPS_MMX2){ @@ -503,20 +503,20 @@ SwsFunc yuv2rgb_get_func_ptr (SwsContext *c) #endif #if HAVE_VIS { - SwsFunc t= yuv2rgb_init_vis(c); + SwsFunc t= sws_yuv2rgb_init_vis(c); if (t) return t; } #endif #if CONFIG_MLIB { - SwsFunc t= yuv2rgb_init_mlib(c); + SwsFunc t= sws_yuv2rgb_init_mlib(c); if (t) return t; } #endif #if HAVE_ALTIVEC if (c->flags & SWS_CPU_CAPS_ALTIVEC) { - SwsFunc t = yuv2rgb_init_altivec(c); + SwsFunc t = sws_yuv2rgb_init_altivec(c); if (t) return t; } #endif @@ -563,7 +563,7 @@ static int div_round (int dividend, int divisor) return -((-dividend + (divisor>>1)) / divisor); } -int yuv2rgb_c_init_tables (SwsContext *c, const int inv_table[4], int fullRange, int brightness, int contrast, int saturation) +int sws_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 diff --git a/libswscale/yuv2rgb_altivec.c b/libswscale/yuv2rgb_altivec.c index baffbc80a6..a4cdcf898f 100644 --- a/libswscale/yuv2rgb_altivec.c +++ b/libswscale/yuv2rgb_altivec.c @@ -690,7 +690,7 @@ static int altivec_uyvy_rgb32 (SwsContext *c, So we just fall back to the C codes for this. */ -SwsFunc yuv2rgb_init_altivec (SwsContext *c) +SwsFunc sws_yuv2rgb_init_altivec (SwsContext *c) { if (!(c->flags & SWS_CPU_CAPS_ALTIVEC)) return NULL; @@ -750,7 +750,7 @@ SwsFunc yuv2rgb_init_altivec (SwsContext *c) return NULL; } -void yuv2rgb_altivec_init_tables (SwsContext *c, const int inv_table[4],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) { union { signed short tmp[8] __attribute__ ((aligned(16))); diff --git a/libswscale/yuv2rgb_mlib.c b/libswscale/yuv2rgb_mlib.c index ff2e50a2b0..68247914e7 100644 --- a/libswscale/yuv2rgb_mlib.c +++ b/libswscale/yuv2rgb_mlib.c @@ -73,7 +73,7 @@ static int mlib_YUV2RGB420_24(SwsContext *c, uint8_t* src[], int srcStride[], in } -SwsFunc yuv2rgb_init_mlib(SwsContext *c) +SwsFunc sws_yuv2rgb_init_mlib(SwsContext *c) { switch(c->dstFormat){ case PIX_FMT_RGB24: return mlib_YUV2RGB420_24; diff --git a/libswscale/yuv2rgb_vis.c b/libswscale/yuv2rgb_vis.c index 42a0094f68..5c9698510d 100644 --- a/libswscale/yuv2rgb_vis.c +++ b/libswscale/yuv2rgb_vis.c @@ -182,7 +182,7 @@ static int vis_422P_ARGB32(SwsContext *c, uint8_t* src[], int srcStride[], int s return srcSliceH; } -SwsFunc yuv2rgb_init_vis(SwsContext *c) { +SwsFunc sws_yuv2rgb_init_vis(SwsContext *c) { c->sparc_coeffs[5]=c->yCoeff; c->sparc_coeffs[6]=c->vgCoeff; c->sparc_coeffs[7]=c->vrCoeff; -- 2.11.4.GIT