commit 2a2a7dde1a8850e6105aaab7e53cc06220118367
author Angie Chiang <angiebird@google.com> Tue Apr 25 16:08:47 2017 -0700
committer Angie Chiang <angiebird@google.com> Wed Apr 26 17:55:11 2017 +0000
tree 1256b51b85cf625482d7b9b6e699a7d4301356b0
parent ddcea3950d695289a95cabf5364016104bf2a08d

Merge RD_COST and RD_STATS

BUG=aomedia:442

Change-Id: I9b304230acd2f64d6eab59418c9535f8c302765b

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 6a19c6e..c6b049a 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -9068,7 +9068,7 @@
 // This is a dummy function that forces intrabc on for testing purposes
 // TODO(aconverse@google.com): Implement a real intrabc search
 static int64_t rd_pick_intrabc_mode_sb(const AV1_COMP *cpi, MACROBLOCK *x,
-                                       RD_COST *rd_cost, BLOCK_SIZE bsize,
+                                       RD_STATS *rd_cost, BLOCK_SIZE bsize,
                                        int64_t best_rd) {
   MACROBLOCKD *const xd = &x->e_mbd;
   (void)best_rd;
@@ -9105,7 +9105,7 @@
 #endif  // CONFIG_INTRABC
 
 void av1_rd_pick_intra_mode_sb(const AV1_COMP *cpi, MACROBLOCK *x,
-                               RD_COST *rd_cost, BLOCK_SIZE bsize,
+                               RD_STATS *rd_cost, BLOCK_SIZE bsize,
                                PICK_MODE_CONTEXT *ctx, int64_t best_rd) {
   const AV1_COMMON *const cm = &cpi->common;
   MACROBLOCKD *const xd = &x->e_mbd;
@@ -9310,7 +9310,7 @@
 #if CONFIG_SUPERTX
     int *returnrate_nocoef,
 #endif  // CONFIG_SUPERTX
-    int64_t *best_pred_rd, MB_MODE_INFO *best_mbmode, RD_COST *rd_cost) {
+    int64_t *best_pred_rd, MB_MODE_INFO *best_mbmode, RD_STATS *rd_cost) {
   const AV1_COMMON *const cm = &cpi->common;
   MACROBLOCKD *const xd = &x->e_mbd;
   MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi;
@@ -9473,7 +9473,7 @@
 
 void av1_rd_pick_inter_mode_sb(const AV1_COMP *cpi, TileDataEnc *tile_data,
                                MACROBLOCK *x, int mi_row, int mi_col,
-                               RD_COST *rd_cost,
+                               RD_STATS *rd_cost,
 #if CONFIG_SUPERTX
                                int *returnrate_nocoef,
 #endif  // CONFIG_SUPERTX
@@ -11358,7 +11358,7 @@
 void av1_rd_pick_inter_mode_sb_seg_skip(const AV1_COMP *cpi,
                                         TileDataEnc *tile_data, MACROBLOCK *x,
                                         int mi_row, int mi_col,
-                                        RD_COST *rd_cost, BLOCK_SIZE bsize,
+                                        RD_STATS *rd_cost, BLOCK_SIZE bsize,
                                         PICK_MODE_CONTEXT *ctx,
                                         int64_t best_rd_so_far) {
   const AV1_COMMON *const cm = &cpi->common;
@@ -11498,7 +11498,7 @@
 void av1_rd_pick_inter_mode_sub8x8(const struct AV1_COMP *cpi,
                                    TileDataEnc *tile_data, struct macroblock *x,
                                    int mi_row, int mi_col,
-                                   struct RD_COST *rd_cost,
+                                   struct RD_STATS *rd_cost,
 #if CONFIG_SUPERTX
                                    int *returnrate_nocoef,
 #endif  // CONFIG_SUPERTX