Mercurial > mplayer.hg

changeset 28461:75586eb0750d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Prefix visible YUV2RGB functions with sws_
author kostya
date Mon, 09 Feb 2009 14:31:53 +0000
parents 12c0dfccf149
children f26f60223e72
files libswscale/swscale.c libswscale/swscale_internal.h libswscale/yuv2rgb.c libswscale/yuv2rgb_altivec.c libswscale/yuv2rgb_mlib.c libswscale/yuv2rgb_vis.c
diffstat 6 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/libswscale/swscale.c	Mon Feb 09 14:17:30 2009 +0000
+++ b/libswscale/swscale.c	Mon Feb 09 14:31:53 2009 +0000
@@ -2133,12 +2133,12 @@
     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 @@
         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
 
--- a/libswscale/swscale_internal.h	Mon Feb 09 14:17:30 2009 +0000
+++ b/libswscale/swscale_internal.h	Mon Feb 09 14:31:53 2009 +0000
@@ -212,11 +212,11 @@
 } 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,
--- a/libswscale/yuv2rgb.c	Mon Feb 09 14:17:30 2009 +0000
+++ b/libswscale/yuv2rgb.c	Mon Feb 09 14:31:53 2009 +0000
@@ -481,7 +481,7 @@
     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 @@
 #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 @@
         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
--- a/libswscale/yuv2rgb_altivec.c	Mon Feb 09 14:17:30 2009 +0000
+++ b/libswscale/yuv2rgb_altivec.c	Mon Feb 09 14:31:53 2009 +0000
@@ -690,7 +690,7 @@
 
    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 @@
     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)));
--- a/libswscale/yuv2rgb_mlib.c	Mon Feb 09 14:17:30 2009 +0000
+++ b/libswscale/yuv2rgb_mlib.c	Mon Feb 09 14:31:53 2009 +0000
@@ -73,7 +73,7 @@
 }
 
 
-SwsFunc yuv2rgb_init_mlib(SwsContext *c)
+SwsFunc sws_yuv2rgb_init_mlib(SwsContext *c)
 {
     switch(c->dstFormat){
     case PIX_FMT_RGB24: return mlib_YUV2RGB420_24;
--- a/libswscale/yuv2rgb_vis.c	Mon Feb 09 14:17:30 2009 +0000
+++ b/libswscale/yuv2rgb_vis.c	Mon Feb 09 14:31:53 2009 +0000
@@ -182,7 +182,7 @@
   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;