lavc: mark the old audio/video encoding API as deprecated

[ffmpeg] / libavcodec / rv34dsp.c

diff --git a/libavcodec/rv34dsp.c b/libavcodec/rv34dsp.c
index 4145c4dd856ad58dc59be8bdbe37e3c572f4b4fd..7234ee808b8f5683ce61c3e1210e4765458e9aec 100644 (file)
--- a/libavcodec/rv34dsp.c
+++ b/libavcodec/rv34dsp.c
@@ -24,15 +24,16 @@
  * @file
  * RV30/40 decoder common dsp functions
  */
-#include "dsputil.h"
+
 #include "rv34dsp.h"
+#include "libavutil/common.h"
 
 /**
  * @name RV30/40 inverse transform functions
  * @{
  */
 
-static av_always_inline void rv34_row_transform(int temp[16], DCTELEM *block)
+static av_always_inline void rv34_row_transform(int temp[16], int16_t *block)
 {
     int i;
 
@@ -53,12 +54,12 @@ static av_always_inline void rv34_row_transform(int temp[16], DCTELEM *block)
  * Real Video 3.0/4.0 inverse transform + sample reconstruction
  * Code is almost the same as in SVQ3, only scaling is different.
  */
-static void rv34_idct_add_c(uint8_t *dst, ptrdiff_t stride, DCTELEM *block){
+static void rv34_idct_add_c(uint8_t *dst, ptrdiff_t stride, int16_t *block){
     int      temp[16];
     int      i;
 
     rv34_row_transform(temp, block);
-    memset(block, 0, 16*sizeof(DCTELEM));
+    memset(block, 0, 16*sizeof(int16_t));
 
     for(i = 0; i < 4; i++){
         const int z0 = 13*(temp[4*0+i] +    temp[4*2+i]) + 0x200;
@@ -81,22 +82,22 @@ static void rv34_idct_add_c(uint8_t *dst, ptrdiff_t stride, DCTELEM *block){
  * Code is almost the same as rv34_inv_transform()
  * but final coefficients are multiplied by 1.5 and have no rounding.
  */
-static void rv34_inv_transform_noround_c(DCTELEM *block){
+static void rv34_inv_transform_noround_c(int16_t *block){
     int temp[16];
     int i;
 
     rv34_row_transform(temp, block);
 
     for(i = 0; i < 4; i++){
-        const int z0 = 13*(temp[4*0+i] +    temp[4*2+i]);
-        const int z1 = 13*(temp[4*0+i] -    temp[4*2+i]);
-        const int z2 =  7* temp[4*1+i] - 17*temp[4*3+i];
-        const int z3 = 17* temp[4*1+i] +  7*temp[4*3+i];
-
-        block[i*4+0] = ((z0 + z3) * 3) >> 11;
-        block[i*4+1] = ((z1 + z2) * 3) >> 11;
-        block[i*4+2] = ((z1 - z2) * 3) >> 11;
-        block[i*4+3] = ((z0 - z3) * 3) >> 11;
+        const int z0 = 39*(temp[4*0+i] +    temp[4*2+i]);
+        const int z1 = 39*(temp[4*0+i] -    temp[4*2+i]);
+        const int z2 = 21* temp[4*1+i] - 51*temp[4*3+i];
+        const int z3 = 51* temp[4*1+i] + 21*temp[4*3+i];
+
+        block[i*4+0] = (z0 + z3) >> 11;
+        block[i*4+1] = (z1 + z2) >> 11;
+        block[i*4+2] = (z1 - z2) >> 11;
+        block[i*4+3] = (z0 - z3) >> 11;
     }
 }
 
@@ -114,9 +115,9 @@ static void rv34_idct_dc_add_c(uint8_t *dst, ptrdiff_t stride, int dc)
     }
 }
 
-static void rv34_inv_transform_dc_noround_c(DCTELEM *block)
+static void rv34_inv_transform_dc_noround_c(int16_t *block)
 {
-    DCTELEM dc = (13 * 13 * 3 * block[0]) >> 11;
+    int16_t dc = (13 * 13 * 3 * block[0]) >> 11;
     int i, j;
 
     for (i = 0; i < 4; i++, block += 4)
@@ -127,15 +128,16 @@ static void rv34_inv_transform_dc_noround_c(DCTELEM *block)
 /** @} */ // transform
 
 
-av_cold void ff_rv34dsp_init(RV34DSPContext *c, DSPContext* dsp) {
+av_cold void ff_rv34dsp_init(RV34DSPContext *c)
+{
     c->rv34_inv_transform    = rv34_inv_transform_noround_c;
     c->rv34_inv_transform_dc = rv34_inv_transform_dc_noround_c;
 
     c->rv34_idct_add    = rv34_idct_add_c;
     c->rv34_idct_dc_add = rv34_idct_dc_add_c;
 
-    if (HAVE_NEON)
-        ff_rv34dsp_init_neon(c, dsp);
-    if (HAVE_MMX)
-        ff_rv34dsp_init_x86(c, dsp);
+    if (ARCH_ARM)
+        ff_rv34dsp_init_arm(c);
+    if (ARCH_X86)
+        ff_rv34dsp_init_x86(c);
 }