>From 2cbe8811b6dbc414436cbe66cd1d88f2f11cbae3 Mon Sep 17 00:00:00 2001
From: Keiji Costantini <lists@strites.net>
Date: Wed, 13 Aug 2008 18:02:27 +0200
Subject: [PATCH] standardized convert-to-UV methods for work with "pal" argument

---
 swscale_C.c |   40 ++++++++++++++++++++--------------------
 1 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/swscale_C.c b/swscale_C.c
index c10126d..82e3382 100644
--- a/swscale_C.c
+++ b/swscale_C.c
@@ -210,7 +210,7 @@ static inline void yuy2ToY_C(uint8_t *dst, uint8_t *src, long width, uint32_t *p
         dst[i]= src[2*i];
 }
 
-static inline void yuy2ToUV_C(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, long width)
+static inline void yuy2ToUV_C(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, long width, uint32_t *pal)
 {
     int i;
     for (i=0; i<width; i++)
@@ -230,7 +230,7 @@ static inline void uyvyToY_C(uint8_t *dst, uint8_t *src, long width, uint32_t *p
         dst[i]= src[2*i+1];
 }
 
-static inline void uyvyToUV_C(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, long width)
+static inline void uyvyToUV_C(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, long width, uint32_t *pal)
 {
     int i;
     for (i=0; i<width; i++)
@@ -254,7 +254,7 @@ static inline void bgr32ToY_C(uint8_t *dst, uint8_t *src, int width, uint32_t *p
     }
 }
 
-static inline void bgr32ToUV_C(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width)
+static inline void bgr32ToUV_C(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width, uint32_t *pal)
 {
     int i;
     assert(src1 == src2);
@@ -286,7 +286,7 @@ static inline void bgr24ToY_C(uint8_t *dst, uint8_t *src, long width, uint32_t *
     }
 }
 
-static inline void bgr24ToUV_C(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, long width)
+static inline void bgr24ToUV_C(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, long width, uint32_t *pal)
 {
     int i;
     for (i=0; i<width; i++)
@@ -315,7 +315,7 @@ static inline void rgb16ToY_C(uint8_t *dst, uint8_t *src, int width, uint32_t *p
     }
 }
 
-static inline void rgb16ToUV_C(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width)
+static inline void rgb16ToUV_C(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width, uint32_t *pal)
 {
     int i;
     assert(src1==src2);
@@ -351,7 +351,7 @@ static inline void rgb15ToY_C(uint8_t *dst, uint8_t *src, int width, uint32_t *p
     }
 }
 
-static inline void rgb15ToUV_C(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width)
+static inline void rgb15ToUV_C(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width, uint32_t *pal)
 {
     int i;
     assert(src1==src2);
@@ -387,7 +387,7 @@ static inline void rgb32ToY_C(uint8_t *dst, uint8_t *src, int width, uint32_t *p
     }
 }
 
-static inline void rgb32ToUV_C(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width)
+static inline void rgb32ToUV_C(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width, uint32_t *pal)
 {
     int i;
     assert(src1==src2);
@@ -419,7 +419,7 @@ static inline void rgb24ToY_C(uint8_t *dst, uint8_t *src, int width, uint32_t *p
     }
 }
 
-static inline void rgb24ToUV_C(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width)
+static inline void rgb24ToUV_C(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width, uint32_t *pal)
 {
     int i;
     assert(src1==src2);
@@ -448,7 +448,7 @@ static inline void bgr16ToY_C(uint8_t *dst, uint8_t *src, int width, uint32_t *p
     }
 }
 
-static inline void bgr16ToUV_C(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width)
+static inline void bgr16ToUV_C(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width, uint32_t *pal)
 {
     int i;
     assert(src1 == src2);
@@ -481,7 +481,7 @@ static inline void bgr15ToY_C(uint8_t *dst, uint8_t *src, int width, uint32_t *p
     }
 }
 
-static inline void bgr15ToUV_C(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width)
+static inline void bgr15ToUV_C(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width, uint32_t *pal)
 {
     int i;
     assert(src1 == src2);
@@ -641,61 +641,61 @@ static inline uint8_t *convert_to_UV_C(int srcFormat,
 {
     if (srcFormat==PIX_FMT_YUYV422)
     {
-        yuy2ToUV_C(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW);
+        yuy2ToUV_C(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, (uint32_t*)pal);
         src1= formatConvBuffer;
         src2= formatConvBuffer+VOFW;
     }
     else if (srcFormat==PIX_FMT_UYVY422)
     {
-        uyvyToUV_C(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW);
+        uyvyToUV_C(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, (uint32_t*)pal);
         src1= formatConvBuffer;
         src2= formatConvBuffer+VOFW;
     }
     else if (srcFormat==PIX_FMT_RGB32)
     {
-        bgr32ToUV_C(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW);
+        bgr32ToUV_C(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, (uint32_t*)pal);
         src1= formatConvBuffer;
         src2= formatConvBuffer+VOFW;
     }
     else if (srcFormat==PIX_FMT_BGR24)
     {
-        bgr24ToUV_C(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW);
+        bgr24ToUV_C(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, (uint32_t*)pal);
         src1= formatConvBuffer;
         src2= formatConvBuffer+VOFW;
     }
     else if (srcFormat==PIX_FMT_BGR565)
     {
-        bgr16ToUV_C(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW);
+        bgr16ToUV_C(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, (uint32_t*)pal);
         src1= formatConvBuffer;
         src2= formatConvBuffer+VOFW;
     }
     else if (srcFormat==PIX_FMT_BGR555)
     {
-        bgr15ToUV_C(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW);
+        bgr15ToUV_C(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, (uint32_t*)pal);
         src1= formatConvBuffer;
         src2= formatConvBuffer+VOFW;
     }
     else if (srcFormat==PIX_FMT_BGR32)
     {
-        rgb32ToUV_C(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW);
+        rgb32ToUV_C(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, (uint32_t*)pal);
         src1= formatConvBuffer;
         src2= formatConvBuffer+VOFW;
     }
     else if (srcFormat==PIX_FMT_RGB24)
     {
-        rgb24ToUV_C(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW);
+        rgb24ToUV_C(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, (uint32_t*)pal);
         src1= formatConvBuffer;
         src2= formatConvBuffer+VOFW;
     }
     else if (srcFormat==PIX_FMT_RGB565)
     {
-        rgb16ToUV_C(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW);
+        rgb16ToUV_C(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, (uint32_t*)pal);
         src1= formatConvBuffer;
         src2= formatConvBuffer+VOFW;
     }
     else if (srcFormat==PIX_FMT_RGB555)
     {
-        rgb15ToUV_C(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW);
+        rgb15ToUV_C(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, (uint32_t*)pal);
         src1= formatConvBuffer;
         src2= formatConvBuffer+VOFW;
     }
-- 
1.5.6.4