Remove unused vp9_idct_add_{y,uv}_block

These functions are not used, and appear to have been superceded.

Change-Id: I86fe51b088264f6b1b8d4d232bba97b371b98120

diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h
index e1901d87debeb7e48ab52fe7fa63c76ffaa41ec9..98b19e8aedbc69954175729daac3d0d16bb6a97f 100644 (file)
--- a/vp9/common/vp9_blockd.h
+++ b/vp9/common/vp9_blockd.h
@@ -355,10 +355,6 @@ typedef struct macroblockd {
   void (*inv_txm4x4_1_add)(int16_t *input, uint8_t *dest, int stride);
   void (*inv_txm4x4_add)(int16_t *input, uint8_t *dest, int stride);
   void (*itxm_add)(int16_t *input, uint8_t *dest, int stride, int eob);
-  void (*itxm_add_y_block)(int16_t *q, uint8_t *dst, int stride,
-    struct macroblockd *xd);
-  void (*itxm_add_uv_block)(int16_t *q, uint8_t *dst, int stride,
-    uint16_t *eobs);
 
   struct subpix_fn_table  subpix;
 

diff --git a/vp9/common/vp9_rtcd_defs.sh b/vp9/common/vp9_rtcd_defs.sh
index 74d3ab57f771367af4cb5642afc4bfa342846efb..90eb7e9994740988a37e5f82518ae3480054fa62 100644 (file)
--- a/vp9/common/vp9_rtcd_defs.sh
+++ b/vp9/common/vp9_rtcd_defs.sh
@@ -25,8 +25,6 @@ forward_decls vp9_common_forward_decls
 #
 # Dequant
 #
-prototype void vp9_idct_add_y_block_8x8 "int16_t *q, uint8_t *dst, int stride, struct macroblockd *xd"
-specialize vp9_idct_add_y_block_8x8
 
 prototype void vp9_idct_add_16x16 "int16_t *input, uint8_t *dest, int stride, int eob"
 specialize vp9_idct_add_16x16
@@ -37,11 +35,7 @@ specialize vp9_idct_add_8x8
 prototype void vp9_idct_add "int16_t *input, uint8_t *dest, int stride, int eob"
 specialize vp9_idct_add
 
-prototype void vp9_idct_add_y_block "int16_t *q, uint8_t *dst, int stride, struct macroblockd *xd"
-specialize vp9_idct_add_y_block
 
-prototype void vp9_idct_add_uv_block "int16_t *q, uint8_t *dst, int stride, uint16_t *eobs"
-specialize vp9_idct_add_uv_block
 
 prototype void vp9_idct_add_32x32 "int16_t *q, uint8_t *dst, int stride, int eob"
 specialize vp9_idct_add_32x32

diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c
index 703aa0623974749eba7c0e5a9d85e259672df0a5..d9fd77c8aaf99ef4e584330621644e0c5f88363f 100644 (file)
--- a/vp9/decoder/vp9_decodframe.c
+++ b/vp9/decoder/vp9_decodframe.c
@@ -717,12 +717,8 @@ static void setup_quantization(VP9D_COMP *pbi, struct vp9_read_bit_buffer *rb) {
                  cm->uv_ac_delta_q == 0;
   if (xd->lossless) {
     xd->itxm_add          = vp9_idct_add_lossless_c;
-    xd->itxm_add_y_block  = vp9_idct_add_y_block_lossless_c;
-    xd->itxm_add_uv_block = vp9_idct_add_uv_block_lossless_c;
   } else {
     xd->itxm_add          = vp9_idct_add;
-    xd->itxm_add_y_block  = vp9_idct_add_y_block;
-    xd->itxm_add_uv_block = vp9_idct_add_uv_block;
   }
 }
 

diff --git a/vp9/decoder/vp9_idct_blk.c b/vp9/decoder/vp9_idct_blk.c
index 417f89177978c4b7fc4455f20fcb8c37b65b615c..c52963c4934d5f239d0b22e25bb35a5cf8c243dd 100644 (file)
--- a/vp9/decoder/vp9_idct_blk.c
+++ b/vp9/decoder/vp9_idct_blk.c
@@ -12,78 +12,6 @@
 #include "vp9/common/vp9_blockd.h"
 #include "vp9/decoder/vp9_idct_blk.h"
 
-void vp9_idct_add_y_block_c(int16_t *q, uint8_t *dst, int stride,
-                            MACROBLOCKD *xd) {
-  int i, j;
-
-  for (i = 0; i < 4; i++) {
-    for (j = 0; j < 4; j++) {
-      vp9_idct_add(q, dst, stride, xd->plane[0].eobs[i * 4  + j]);
-      q   += 16;
-      dst += 4;
-    }
-
-    dst += 4 * stride - 16;
-  }
-}
-
-void vp9_idct_add_uv_block_c(int16_t *q, uint8_t *dst, int stride,
-                             uint16_t *eobs) {
-  int i, j;
-
-  for (i = 0; i < 2; i++) {
-    for (j = 0; j < 2; j++) {
-      vp9_idct_add(q, dst, stride, eobs[i * 2 + j]);
-      q   += 16;
-      dst += 4;
-    }
-
-    dst += 4 * stride - 8;
-  }
-}
-
-void vp9_idct_add_y_block_8x8_c(int16_t *q, uint8_t *dst, int stride,
-                                MACROBLOCKD *xd) {
-  uint8_t *origdest = dst;
-
-  vp9_idct_add_8x8_c(q, dst, stride, xd->plane[0].eobs[0]);
-  vp9_idct_add_8x8_c(&q[64], origdest + 8, stride, xd->plane[0].eobs[4]);
-  vp9_idct_add_8x8_c(&q[128], origdest + 8 * stride, stride,
-                     xd->plane[0].eobs[8]);
-  vp9_idct_add_8x8_c(&q[192], origdest + 8 * stride + 8, stride,
-                     xd->plane[0].eobs[12]);
-}
-
-void vp9_idct_add_y_block_lossless_c(int16_t *q, uint8_t *dst, int stride,
-                                     MACROBLOCKD *xd) {
-  int i, j;
-
-  for (i = 0; i < 4; i++) {
-    for (j = 0; j < 4; j++) {
-      vp9_idct_add_lossless_c(q, dst, stride, xd->plane[0].eobs[i * 4 + j]);
-      q   += 16;
-      dst += 4;
-    }
-
-    dst += 4 * stride - 16;
-  }
-}
-
-void vp9_idct_add_uv_block_lossless_c(int16_t *q, uint8_t *dst, int stride,
-                                      uint16_t *eobs) {
-  int i, j;
-
-  for (i = 0; i < 2; i++) {
-    for (j = 0; j < 2; j++) {
-      vp9_idct_add_lossless_c(q, dst, stride, eobs[i * 2 + j]);
-      q   += 16;
-      dst += 4;
-    }
-
-    dst += 4 * stride - 8;
-  }
-}
-
 static void add_constant_residual(const int16_t diff, uint8_t *dest, int stride,
                                   int width, int height) {
   int r, c;

diff --git a/vp9/decoder/vp9_idct_blk.h b/vp9/decoder/vp9_idct_blk.h
index 42dcc817080bbd74a3f5401e816c63339072ccbc..1810bd02fb9af4be4dd6851934930f5406177431 100644 (file)
--- a/vp9/decoder/vp9_idct_blk.h
+++ b/vp9/decoder/vp9_idct_blk.h
@@ -18,12 +18,6 @@
 void vp9_idct_add_lossless_c(int16_t *input, unsigned char *dest, int stride,
                              int eob);
 
-void vp9_idct_add_y_block_lossless_c(int16_t *q, unsigned char *dst, int stride,
-                                     struct macroblockd *xd);
-
-void vp9_idct_add_uv_block_lossless_c(int16_t *q, unsigned char *dst,
-                                      int stride, uint16_t *eobs);
-
 void vp9_iht_add_c(TX_TYPE tx_type, int16_t *input, unsigned char *dest,
                    int stride, int eob);