Update internal FFmpeg copy.

1 files changed, 186 insertions, 132 deletions

diff --git a/contrib/ffmpeg/libswscale/swscale_internal.h b/contrib/ffmpeg/libswscale/swscale_internal.h
index 5b62ea065..aa583a6b1 100644
--- a/contrib/ffmpeg/libswscale/swscale_internal.h
+++ b/contrib/ffmpeg/libswscale/swscale_internal.h
@@ -15,11 +15,13 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef SWSCALE_INTERNAL_H
-#define SWSCALE_INTERNAL_H
+#ifndef FFMPEG_SWSCALE_INTERNAL_H
+#define FFMPEG_SWSCALE_INTERNAL_H
+
+#include "config.h"
 
 #ifdef HAVE_ALTIVEC_H
 #include <altivec.h>
@@ -27,12 +29,6 @@
 
 #include "avutil.h"
 
-#ifdef CONFIG_DARWIN
-#define AVV(x...) (x)
-#else
-#define AVV(x...) {x}
-#endif
-
 #define MAX_FILTER_SIZE 256
 
 typedef int (*SwsFunc)(struct SwsContext *context, uint8_t* src[], int srcStride[], int srcSliceY,
@@ -40,114 +36,114 @@ typedef int (*SwsFunc)(struct SwsContext *context, uint8_t* src[], int srcStride
 
 /* this struct should be aligned on at least 32-byte boundary */
 typedef struct SwsContext{
-        /**
-         * info on struct for av_log
-         */
-        AVClass *av_class;
-
-	/**
-	 *
-	 * Note the src,dst,srcStride,dstStride will be copied, in the sws_scale() warper so they can freely be modified here
-	 */
-	SwsFunc swScale;
-	int srcW, srcH, dstH;
-	int chrSrcW, chrSrcH, chrDstW, chrDstH;
-	int lumXInc, chrXInc;
-	int lumYInc, chrYInc;
-	int dstFormat, srcFormat;               ///< format 4:2:0 type is allways YV12
-	int origDstFormat, origSrcFormat;       ///< format
-	int chrSrcHSubSample, chrSrcVSubSample;
-	int chrIntHSubSample, chrIntVSubSample;
-	int chrDstHSubSample, chrDstVSubSample;
-	int vChrDrop;
-        int sliceDir;
-	double param[2];
-
-	int16_t **lumPixBuf;
-	int16_t **chrPixBuf;
-	int16_t *hLumFilter;
-	int16_t *hLumFilterPos;
-	int16_t *hChrFilter;
-	int16_t *hChrFilterPos;
-	int16_t *vLumFilter;
-	int16_t *vLumFilterPos;
-	int16_t *vChrFilter;
-	int16_t *vChrFilterPos;
-
-	uint8_t formatConvBuffer[4000]; //FIXME dynamic alloc, but we have to change a lot of code for this to be useful
-
-	int hLumFilterSize;
-	int hChrFilterSize;
-	int vLumFilterSize;
-	int vChrFilterSize;
-	int vLumBufSize;
-	int vChrBufSize;
-
-	uint8_t *funnyYCode;
-	uint8_t *funnyUVCode;
-	int32_t *lumMmx2FilterPos;
-	int32_t *chrMmx2FilterPos;
-	int16_t *lumMmx2Filter;
-	int16_t *chrMmx2Filter;
-
-	int canMMX2BeUsed;
-
-	int lastInLumBuf;
-	int lastInChrBuf;
-	int lumBufIndex;
-	int chrBufIndex;
-	int dstY;
-	int flags;
-	void * yuvTable;			// pointer to the yuv->rgb table start so it can be freed()
-	uint8_t * table_rV[256];
-	uint8_t * table_gU[256];
-	int    table_gV[256];
-	uint8_t * table_bU[256];
-
-	//Colorspace stuff
-	int contrast, brightness, saturation;	// for sws_getColorspaceDetails
-	int srcColorspaceTable[4];
-	int dstColorspaceTable[4];
-	int srcRange, dstRange;
-
-#define RED_DITHER   "0*8"
-#define GREEN_DITHER "1*8"
-#define BLUE_DITHER  "2*8"
-#define Y_COEFF      "3*8"
-#define VR_COEFF     "4*8"
-#define UB_COEFF     "5*8"
-#define VG_COEFF     "6*8"
-#define UG_COEFF     "7*8"
-#define Y_OFFSET     "8*8"
-#define U_OFFSET     "9*8"
-#define V_OFFSET     "10*8"
+    /**
+     * info on struct for av_log
+     */
+    AVClass *av_class;
+
+    /**
+     * Note that src, dst, srcStride, dstStride will be copied in the
+     * sws_scale() wrapper so they can be freely modified here.
+     */
+    SwsFunc swScale;
+    int srcW, srcH, dstH;
+    int chrSrcW, chrSrcH, chrDstW, chrDstH;
+    int lumXInc, chrXInc;
+    int lumYInc, chrYInc;
+    int dstFormat, srcFormat;               ///< format 4:2:0 type is always YV12
+    int origDstFormat, origSrcFormat;       ///< format
+    int chrSrcHSubSample, chrSrcVSubSample;
+    int chrIntHSubSample, chrIntVSubSample;
+    int chrDstHSubSample, chrDstVSubSample;
+    int vChrDrop;
+    int sliceDir;
+    double param[2];
+
+    int16_t **lumPixBuf;
+    int16_t **chrPixBuf;
+    int16_t *hLumFilter;
+    int16_t *hLumFilterPos;
+    int16_t *hChrFilter;
+    int16_t *hChrFilterPos;
+    int16_t *vLumFilter;
+    int16_t *vLumFilterPos;
+    int16_t *vChrFilter;
+    int16_t *vChrFilterPos;
+
+    uint8_t formatConvBuffer[4000]; //FIXME dynamic alloc, but we have to change a lot of code for this to be useful
+
+    int hLumFilterSize;
+    int hChrFilterSize;
+    int vLumFilterSize;
+    int vChrFilterSize;
+    int vLumBufSize;
+    int vChrBufSize;
+
+    uint8_t *funnyYCode;
+    uint8_t *funnyUVCode;
+    int32_t *lumMmx2FilterPos;
+    int32_t *chrMmx2FilterPos;
+    int16_t *lumMmx2Filter;
+    int16_t *chrMmx2Filter;
+
+    int canMMX2BeUsed;
+
+    int lastInLumBuf;
+    int lastInChrBuf;
+    int lumBufIndex;
+    int chrBufIndex;
+    int dstY;
+    int flags;
+    void * yuvTable;            // pointer to the yuv->rgb table start so it can be freed()
+    uint8_t * table_rV[256];
+    uint8_t * table_gU[256];
+    int    table_gV[256];
+    uint8_t * table_bU[256];
+
+    //Colorspace stuff
+    int contrast, brightness, saturation;    // for sws_getColorspaceDetails
+    int srcColorspaceTable[4];
+    int dstColorspaceTable[4];
+    int srcRange, dstRange;
+
+#define RED_DITHER            "0*8"
+#define GREEN_DITHER          "1*8"
+#define BLUE_DITHER           "2*8"
+#define Y_COEFF               "3*8"
+#define VR_COEFF              "4*8"
+#define UB_COEFF              "5*8"
+#define VG_COEFF              "6*8"
+#define UG_COEFF              "7*8"
+#define Y_OFFSET              "8*8"
+#define U_OFFSET              "9*8"
+#define V_OFFSET              "10*8"
 #define LUM_MMX_FILTER_OFFSET "11*8"
 #define CHR_MMX_FILTER_OFFSET "11*8+4*4*256"
-#define DSTW_OFFSET  "11*8+4*4*256*2" //do not change, its hardcoded in the asm
-#define ESP_OFFSET  "11*8+4*4*256*2+8"
-#define VROUNDER_OFFSET "11*8+4*4*256*2+16"
-#define U_TEMP       "11*8+4*4*256*2+24"
-#define V_TEMP       "11*8+4*4*256*2+32"
-
-	uint64_t redDither   __attribute__((aligned(8)));
-	uint64_t greenDither __attribute__((aligned(8)));
-	uint64_t blueDither  __attribute__((aligned(8)));
-
-	uint64_t yCoeff      __attribute__((aligned(8)));
-	uint64_t vrCoeff     __attribute__((aligned(8)));
-	uint64_t ubCoeff     __attribute__((aligned(8)));
-	uint64_t vgCoeff     __attribute__((aligned(8)));
-	uint64_t ugCoeff     __attribute__((aligned(8)));
-	uint64_t yOffset     __attribute__((aligned(8)));
-	uint64_t uOffset     __attribute__((aligned(8)));
-	uint64_t vOffset     __attribute__((aligned(8)));
-	int32_t  lumMmxFilter[4*MAX_FILTER_SIZE];
-	int32_t  chrMmxFilter[4*MAX_FILTER_SIZE];
-	int dstW;
-	uint64_t esp __attribute__((aligned(8)));
-	uint64_t vRounder     __attribute__((aligned(8)));
-	uint64_t u_temp       __attribute__((aligned(8)));
-	uint64_t v_temp       __attribute__((aligned(8)));
+#define DSTW_OFFSET           "11*8+4*4*256*2" //do not change, it is hardcoded in the asm
+#define ESP_OFFSET            "11*8+4*4*256*2+8"
+#define VROUNDER_OFFSET       "11*8+4*4*256*2+16"
+#define U_TEMP                "11*8+4*4*256*2+24"
+#define V_TEMP                "11*8+4*4*256*2+32"
+
+    uint64_t redDither   __attribute__((aligned(8)));
+    uint64_t greenDither __attribute__((aligned(8)));
+    uint64_t blueDither  __attribute__((aligned(8)));
+
+    uint64_t yCoeff      __attribute__((aligned(8)));
+    uint64_t vrCoeff     __attribute__((aligned(8)));
+    uint64_t ubCoeff     __attribute__((aligned(8)));
+    uint64_t vgCoeff     __attribute__((aligned(8)));
+    uint64_t ugCoeff     __attribute__((aligned(8)));
+    uint64_t yOffset     __attribute__((aligned(8)));
+    uint64_t uOffset     __attribute__((aligned(8)));
+    uint64_t vOffset     __attribute__((aligned(8)));
+    int32_t  lumMmxFilter[4*MAX_FILTER_SIZE];
+    int32_t  chrMmxFilter[4*MAX_FILTER_SIZE];
+    int dstW;
+    uint64_t esp          __attribute__((aligned(8)));
+    uint64_t vRounder     __attribute__((aligned(8)));
+    uint64_t u_temp       __attribute__((aligned(8)));
+    uint64_t v_temp       __attribute__((aligned(8)));
 
 #ifdef HAVE_ALTIVEC
 
@@ -158,8 +154,27 @@ typedef struct SwsContext{
   vector signed short   CGV;
   vector signed short   OY;
   vector unsigned short CSHIFT;
-  vector signed short *vYCoeffsBank, *vCCoeffsBank;
+  vector signed short   *vYCoeffsBank, *vCCoeffsBank;
+
+#endif
+
 
+#ifdef ARCH_BFIN
+    uint32_t oy           __attribute__((aligned(4)));
+    uint32_t oc           __attribute__((aligned(4)));
+    uint32_t zero         __attribute__((aligned(4)));
+    uint32_t cy           __attribute__((aligned(4)));
+    uint32_t crv          __attribute__((aligned(4)));
+    uint32_t rmask        __attribute__((aligned(4)));
+    uint32_t cbu          __attribute__((aligned(4)));
+    uint32_t bmask        __attribute__((aligned(4)));
+    uint32_t cgu          __attribute__((aligned(4)));
+    uint32_t cgv          __attribute__((aligned(4)));
+    uint32_t gmask        __attribute__((aligned(4)));
+#endif
+
+#ifdef HAVE_VIS
+    uint64_t sparc_coeffs[10] __attribute__((aligned(8)));
 #endif
 
 } SwsContext;
@@ -168,24 +183,60 @@ typedef struct SwsContext{
 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);
 
+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 altivec_yuv2packedX (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);
+
 char *sws_format_name(int format);
 
 //FIXME replace this with something faster
-#define isPlanarYUV(x) ((x)==PIX_FMT_YUV410P || (x)==PIX_FMT_YUV420P	\
-			|| (x)==PIX_FMT_YUV411P || (x)==PIX_FMT_YUV422P	\
-			|| (x)==PIX_FMT_YUV444P || (x)==PIX_FMT_NV12	\
-			|| (x)==PIX_FMT_NV21)
-#define isYUV(x)       ((x)==PIX_FMT_UYVY422 || (x)==PIX_FMT_YUYV422 || isPlanarYUV(x))
-#define isGray(x)      ((x)==PIX_FMT_GRAY8 || (x)==PIX_FMT_GRAY16BE || (x)==PIX_FMT_GRAY16LE)
-#define isGray16(x)    ((x)==PIX_FMT_GRAY16BE || (x)==PIX_FMT_GRAY16LE)
-#define isRGB(x)       ((x)==PIX_FMT_BGR32 || (x)==PIX_FMT_RGB24	\
-			|| (x)==PIX_FMT_RGB565 || (x)==PIX_FMT_RGB555	\
-			|| (x)==PIX_FMT_RGB8 || (x)==PIX_FMT_RGB4 || (x)==PIX_FMT_RGB4_BYTE	\
-			|| (x)==PIX_FMT_MONOBLACK)
-#define isBGR(x)       ((x)==PIX_FMT_RGB32 || (x)==PIX_FMT_BGR24	\
-			|| (x)==PIX_FMT_BGR565 || (x)==PIX_FMT_BGR555	\
-			|| (x)==PIX_FMT_BGR8 || (x)==PIX_FMT_BGR4 || (x)==PIX_FMT_BGR4_BYTE	\
-			|| (x)==PIX_FMT_MONOBLACK)
+#define isPlanarYUV(x)  (           \
+           (x)==PIX_FMT_YUV410P     \
+        || (x)==PIX_FMT_YUV420P     \
+        || (x)==PIX_FMT_YUV411P     \
+        || (x)==PIX_FMT_YUV422P     \
+        || (x)==PIX_FMT_YUV444P     \
+        || (x)==PIX_FMT_YUV440P     \
+        || (x)==PIX_FMT_NV12        \
+        || (x)==PIX_FMT_NV21        \
+    )
+#define isYUV(x)        (           \
+           (x)==PIX_FMT_UYVY422     \
+        || (x)==PIX_FMT_YUYV422     \
+        || isPlanarYUV(x)           \
+    )
+#define isGray(x)       (           \
+           (x)==PIX_FMT_GRAY8       \
+        || (x)==PIX_FMT_GRAY16BE    \
+        || (x)==PIX_FMT_GRAY16LE    \
+    )
+#define isGray16(x)     (           \
+           (x)==PIX_FMT_GRAY16BE    \
+        || (x)==PIX_FMT_GRAY16LE    \
+    )
+#define isRGB(x)        (           \
+           (x)==PIX_FMT_BGR32       \
+        || (x)==PIX_FMT_RGB24       \
+        || (x)==PIX_FMT_RGB565      \
+        || (x)==PIX_FMT_RGB555      \
+        || (x)==PIX_FMT_RGB8        \
+        || (x)==PIX_FMT_RGB4        \
+        || (x)==PIX_FMT_RGB4_BYTE   \
+        || (x)==PIX_FMT_MONOBLACK   \
+    )
+#define isBGR(x)        (           \
+           (x)==PIX_FMT_RGB32       \
+        || (x)==PIX_FMT_BGR24       \
+        || (x)==PIX_FMT_BGR565      \
+        || (x)==PIX_FMT_BGR555      \
+        || (x)==PIX_FMT_BGR8        \
+        || (x)==PIX_FMT_BGR4        \
+        || (x)==PIX_FMT_BGR4_BYTE   \
+        || (x)==PIX_FMT_MONOBLACK   \
+    )
 
 static inline int fmt_depth(int fmt)
 {
@@ -221,4 +272,7 @@ static inline int fmt_depth(int fmt)
     }
 }
 
-#endif
+extern const DECLARE_ALIGNED(8, uint64_t, ff_dither4[2]);
+extern const DECLARE_ALIGNED(8, uint64_t, ff_dither8[2]);
+
+#endif /* FFMPEG_SWSCALE_INTERNAL_H */