Fix swscale compilation with Altivec enabled.

[ffmpeg.git] / libswscale / swscale_bfin.c

diff --git a/libswscale/swscale_bfin.c b/libswscale/swscale_bfin.c
index bff8f0b..0c3ea4d 100644 (file)
--- a/libswscale/swscale_bfin.c
+++ b/libswscale/swscale_bfin.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2007 Marc Hoffman <marc.hoffman@analog.com>
  *
 /*
  * Copyright (C) 2007 Marc Hoffman <marc.hoffman@analog.com>
  *

- * Blackfin Software Video SCALER Operations
+ * Blackfin software video scaler operations

  *
  * This file is part of FFmpeg.
  *
  *
  * This file is part of FFmpeg.
  *


@@ -26,21 +26,42 @@
 #include <inttypes.h>
 #include <assert.h>
 #include "config.h"
 #include <inttypes.h>
 #include <assert.h>
 #include "config.h"

-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif

 #include <unistd.h>
 #include "rgb2rgb.h"
 #include "swscale.h"
 #include "swscale_internal.h"
 
 #include <unistd.h>
 #include "rgb2rgb.h"
 #include "swscale.h"
 #include "swscale_internal.h"
 

+#ifdef __FDPIC__
+#define L1CODE __attribute__ ((l1_text))
+#else
+#define L1CODE
+#endif
+
+int ff_bfin_uyvytoyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
+                       long width, long height,
+                       long lumStride, long chromStride, long srcStride) L1CODE;
+
+int ff_bfin_yuyvtoyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
+                       long width, long height,
+                       long lumStride, long chromStride, long srcStride) L1CODE;
+
+static int uyvytoyv12_unscaled(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
+                               int srcSliceH, uint8_t* dst[], int dstStride[])
+{
+    uint8_t *dsty = dst[0] + dstStride[0]*srcSliceY;
+    uint8_t *dstu = dst[1] + dstStride[1]*srcSliceY/2;
+    uint8_t *dstv = dst[2] + dstStride[2]*srcSliceY/2;
+    uint8_t *ip   = src[0] + srcStride[0]*srcSliceY;
+    int w         = dstStride[0];
+
+    ff_bfin_uyvytoyv12(ip, dsty, dstu, dstv, w, srcSliceH,
+                       dstStride[0], dstStride[1], srcStride[0]);

 
 

-extern int ff_bfin_uyvytoyv12 (const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
-                               long width, long height,
-                               long lumStride, long chromStride, long srcStride) __attribute__ ((l1_text));
+    return srcSliceH;
+}

 
 

-static int uyvytoyv12_unscaled (SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
-                                int srcSliceH, uint8_t* dst[], int dstStride[])
+static int yuyvtoyv12_unscaled(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
+                               int srcSliceH, uint8_t* dst[], int dstStride[])

 {
     uint8_t *dsty = dst[0] + dstStride[0]*srcSliceY;
     uint8_t *dstu = dst[1] + dstStride[1]*srcSliceY/2;
 {
     uint8_t *dsty = dst[0] + dstStride[0]*srcSliceY;
     uint8_t *dstu = dst[1] + dstStride[1]*srcSliceY/2;


@@ -48,13 +69,14 @@ static int uyvytoyv12_unscaled (SwsContext *c, uint8_t* src[], int srcStride[],
     uint8_t *ip   = src[0] + srcStride[0]*srcSliceY;
     int w         = dstStride[0];
 
     uint8_t *ip   = src[0] + srcStride[0]*srcSliceY;
     int w         = dstStride[0];
 

-    ff_bfin_uyvytoyv12 (ip, dsty, dstu, dstv, w, srcSliceH, dstStride[0], dstStride[1], srcStride[0]);
+    ff_bfin_yuyvtoyv12(ip, dsty, dstu, dstv, w, srcSliceH,
+                       dstStride[0], dstStride[1], srcStride[0]);

 
     return srcSliceH;
 }
 
 
 
     return srcSliceH;
 }
 
 

-void ff_bfin_get_unscaled_swscale (SwsContext *c)
+void ff_bfin_get_unscaled_swscale(SwsContext *c)

 {
     SwsFunc swScale = c->swScale;
     if (c->flags & SWS_CPU_CAPS_BFIN)
 {
     SwsFunc swScale = c->swScale;
     if (c->flags & SWS_CPU_CAPS_BFIN)


@@ -63,4 +85,9 @@ void ff_bfin_get_unscaled_swscale (SwsContext *c)
                 av_log (NULL, AV_LOG_VERBOSE, "selecting Blackfin optimized uyvytoyv12_unscaled\n");
                 c->swScale = uyvytoyv12_unscaled;
             }
                 av_log (NULL, AV_LOG_VERBOSE, "selecting Blackfin optimized uyvytoyv12_unscaled\n");
                 c->swScale = uyvytoyv12_unscaled;
             }

+        if (c->dstFormat == PIX_FMT_YUV420P)
+            if (c->srcFormat == PIX_FMT_YUYV422) {
+                av_log (NULL, AV_LOG_VERBOSE, "selecting Blackfin optimized yuyvtoyv12_unscaled\n");
+                c->swScale = yuyvtoyv12_unscaled;
+            }

 }
 }