Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / cavsdsp.c

diff --git a/libavcodec/cavsdsp.c b/libavcodec/cavsdsp.c
index 3aa028dec7da951cdb74abbf427e3cc4b3cb500f..192e0f976d4a3714bafe29986d04a3f74fa7fbf3 100644 (file)
--- a/libavcodec/cavsdsp.c
+++ b/libavcodec/cavsdsp.c
@@ -19,11 +19,12 @@
  *
  * 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
  */
 
 #include <stdio.h>
 #include "dsputil.h"
+#include "cavsdsp.h"
 
 /*****************************************************************************
  *
@@ -63,16 +64,16 @@ static inline void loop_filter_l1(uint8_t *p0_p, int stride, int alpha, int beta
     int q0 = Q0;
 
     if(abs(p0-q0)<alpha && abs(P1-p0)<beta && abs(Q1-q0)<beta) {
-        int delta = clip(((q0-p0)*3+P1-Q1+4)>>3,-tc, tc);
-        P0 = clip_uint8(p0+delta);
-        Q0 = clip_uint8(q0-delta);
+        int delta = av_clip(((q0-p0)*3+P1-Q1+4)>>3,-tc, tc);
+        P0 = av_clip_uint8(p0+delta);
+        Q0 = av_clip_uint8(q0-delta);
         if(abs(P2-p0)<beta) {
-            delta = clip(((P0-P1)*3+P2-Q0+4)>>3, -tc, tc);
-            P1 = clip_uint8(P1+delta);
+            delta = av_clip(((P0-P1)*3+P2-Q0+4)>>3, -tc, tc);
+            P1 = av_clip_uint8(P1+delta);
         }
         if(abs(Q2-q0)<beta) {
-            delta = clip(((Q1-Q0)*3+P0-Q2+4)>>3, -tc, tc);
-            Q1 = clip_uint8(Q1-delta);
+            delta = av_clip(((Q1-Q0)*3+P0-Q2+4)>>3, -tc, tc);
+            Q1 = av_clip_uint8(Q1-delta);
         }
     }
 }
@@ -98,9 +99,9 @@ static inline void loop_filter_c2(uint8_t *p0_p,int stride,int alpha, int beta)
 static inline void loop_filter_c1(uint8_t *p0_p,int stride,int alpha, int beta,
                                   int tc) {
     if(abs(P0-Q0)<alpha && abs(P1-P0)<beta && abs(Q1-Q0)<beta) {
-        int delta = clip(((Q0-P0)*3+P1-Q1+4)>>3, -tc, tc);
-        P0 = clip_uint8(P0+delta);
-        Q0 = clip_uint8(Q0-delta);
+        int delta = av_clip(((Q0-P0)*3+P1-Q1+4)>>3, -tc, tc);
+        P0 = av_clip_uint8(P0+delta);
+        Q0 = av_clip_uint8(Q0-delta);
     }
 }
 
@@ -184,7 +185,7 @@ static void cavs_filter_ch_c(uint8_t *d, int stride, int alpha, int beta, int tc
 static void cavs_idct8_add_c(uint8_t *dst, DCTELEM *block, int stride) {
     int i;
     DCTELEM (*src)[8] = (DCTELEM(*)[8])block;
-    uint8_t *cm = cropTbl + MAX_NEG_CROP;
+    uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
 
     src[0][0] += 8;
 
@@ -248,7 +249,6 @@ static void cavs_idct8_add_c(uint8_t *dst, DCTELEM *block, int stride) {
         dst[i + 6*stride] = cm[ dst[i + 6*stride] + ((b1 - b5) >> 7)];
         dst[i + 7*stride] = cm[ dst[i + 7*stride] + ((b0 - b4) >> 7)];
     }
-    memset(block,0,64*sizeof(DCTELEM));
 }
 
 /*****************************************************************************
@@ -260,7 +260,7 @@ static void cavs_idct8_add_c(uint8_t *dst, DCTELEM *block, int stride) {
 #define CAVS_SUBPIX(OPNAME, OP, NAME, A, B, C, D, E, F) \
 static void OPNAME ## cavs_filt8_h_ ## NAME(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
     const int h=8;\
-    uint8_t *cm = cropTbl + MAX_NEG_CROP;\
+    uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
     int i;\
     for(i=0; i<h; i++)\
     {\
@@ -279,7 +279,7 @@ static void OPNAME ## cavs_filt8_h_ ## NAME(uint8_t *dst, uint8_t *src, int dstS
 \
 static void OPNAME ## cavs_filt8_v_  ## NAME(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\
     const int w=8;\
-    uint8_t *cm = cropTbl + MAX_NEG_CROP;\
+    uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
     int i;\
     for(i=0; i<w; i++)\
     {\
@@ -333,7 +333,7 @@ static void OPNAME ## cavs_filt8_hv_ ## NAME(uint8_t *dst, uint8_t *src1, uint8_
     int16_t *tmp = temp;\
     const int h=8;\
     const int w=8;\
-    uint8_t *cm = cropTbl + MAX_NEG_CROP;\
+    uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\
     int i;\
     src1 -= 2*srcStride;\
     for(i=0; i<h+5; i++)\
@@ -511,12 +511,12 @@ CAVS_MC(put_, 16)
 CAVS_MC(avg_, 8)
 CAVS_MC(avg_, 16)
 
-void ff_put_cavs_qpel8_mc00_c(uint8_t *dst, uint8_t *src, int stride);
-void ff_avg_cavs_qpel8_mc00_c(uint8_t *dst, uint8_t *src, int stride);
-void ff_put_cavs_qpel16_mc00_c(uint8_t *dst, uint8_t *src, int stride);
-void ff_avg_cavs_qpel16_mc00_c(uint8_t *dst, uint8_t *src, int stride);
+#define ff_put_cavs_qpel8_mc00_c  ff_put_pixels8x8_c
+#define ff_avg_cavs_qpel8_mc00_c  ff_avg_pixels8x8_c
+#define ff_put_cavs_qpel16_mc00_c ff_put_pixels16x16_c
+#define ff_avg_cavs_qpel16_mc00_c ff_avg_pixels16x16_c
 
-void ff_cavsdsp_init(DSPContext* c, AVCodecContext *avctx) {
+av_cold void ff_cavsdsp_init(CAVSDSPContext* c, AVCodecContext *avctx) {
 #define dspfunc(PFX, IDX, NUM) \
     c->PFX ## _pixels_tab[IDX][ 0] = ff_ ## PFX ## NUM ## _mc00_c; \
     c->PFX ## _pixels_tab[IDX][ 1] = ff_ ## PFX ## NUM ## _mc10_c; \
@@ -543,4 +543,6 @@ void ff_cavsdsp_init(DSPContext* c, AVCodecContext *avctx) {
     c->cavs_filter_cv = cavs_filter_cv_c;
     c->cavs_filter_ch = cavs_filter_ch_c;
     c->cavs_idct8_add = cavs_idct8_add_c;
+
+    if (HAVE_MMX) ff_cavsdsp_init_mmx(c, avctx);
 }