diff options
| author | Jim Bankoski <jimbankoski@google.com> | 2014-02-13 06:22:08 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-02-13 06:22:08 -0800 |
| commit | d7be0fd5ea932f7ea9bb992c6bf707b4e6676474 (patch) | |
| tree | ecce12f0aeb11c6490f147e5e2e92d1d42fa7cc5 | |
| parent | 7336dfe2aef0eba6aa7d81acdefc8a0a82074661 (diff) | |
| parent | bb2d683c2687531b081771920925f975b662022d (diff) | |
| download | libvpx-d7be0fd5ea932f7ea9bb992c6bf707b4e6676474.tar libvpx-d7be0fd5ea932f7ea9bb992c6bf707b4e6676474.tar.gz libvpx-d7be0fd5ea932f7ea9bb992c6bf707b4e6676474.tar.bz2 libvpx-d7be0fd5ea932f7ea9bb992c6bf707b4e6676474.zip | |
Merge "vp9_rdopt.c static analysis issues resolved"
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index e7a8f1112..03def2095 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -778,7 +778,10 @@ static void choose_txfm_size_from_rd(VP9_COMP *cpi, MACROBLOCK *x, MACROBLOCKD *const xd = &x->e_mbd; MB_MODE_INFO *const mbmi = &xd->mi_8x8[0]->mbmi; vp9_prob skip_prob = vp9_get_skip_prob(cm, xd); - int64_t rd[TX_SIZES][2]; + int64_t rd[TX_SIZES][2] = {{INT64_MAX, INT64_MAX}, + {INT64_MAX, INT64_MAX}, + {INT64_MAX, INT64_MAX}, + {INT64_MAX, INT64_MAX}}; int n, m; int s0, s1; const TX_SIZE max_mode_tx_size = tx_mode_to_biggest_tx_size[cm->tx_mode]; @@ -853,7 +856,10 @@ static void choose_txfm_size_from_modelrd(VP9_COMP *cpi, MACROBLOCK *x, MACROBLOCKD *const xd = &x->e_mbd; MB_MODE_INFO *const mbmi = &xd->mi_8x8[0]->mbmi; vp9_prob skip_prob = vp9_get_skip_prob(cm, xd); - int64_t rd[TX_SIZES][2]; + int64_t rd[TX_SIZES][2] = {{INT64_MAX, INT64_MAX}, + {INT64_MAX, INT64_MAX}, + {INT64_MAX, INT64_MAX}, + {INT64_MAX, INT64_MAX}}; int n, m; int s0, s1; double scale_rd[TX_SIZES] = {1.73, 1.44, 1.20, 1.00}; @@ -4100,11 +4106,6 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x, if (tmp_rd == INT64_MAX) continue; } else { - if (cm->interp_filter == SWITCHABLE) { - int rs = get_switchable_rate(x); - tmp_best_rdu -= RDCOST(x->rdmult, x->rddiv, rs, 0); - } - tmp_rd = tmp_best_rdu; total_sse = tmp_best_sse; rate = tmp_best_rate; rate_y = tmp_best_ratey; |