Commit ae0e747d authored by Jingning Han's avatar Jingning Han Committed by Gerrit Code Review
Browse files

Merge "Use inter mode flag in super_block_yrd"

parents 5bdd4d9c f3b31380
...@@ -933,14 +933,15 @@ static void super_block_yrd(VP9_COMP *cpi, ...@@ -933,14 +933,15 @@ static void super_block_yrd(VP9_COMP *cpi,
MACROBLOCKD *xd = &x->e_mbd; MACROBLOCKD *xd = &x->e_mbd;
MB_MODE_INFO *const mbmi = &xd->mi_8x8[0]->mbmi; MB_MODE_INFO *const mbmi = &xd->mi_8x8[0]->mbmi;
struct rdcost_block_args *rdcost_stack = &cpi->rdcost_stack; struct rdcost_block_args *rdcost_stack = &cpi->rdcost_stack;
const int b_inter_mode = is_inter_block(mbmi);
assert(bs == mbmi->sb_type); assert(bs == mbmi->sb_type);
if (mbmi->ref_frame[0] > INTRA_FRAME) if (b_inter_mode)
vp9_subtract_sby(x, bs); vp9_subtract_sby(x, bs);
if (cpi->sf.tx_size_search_method == USE_LARGESTALL || if (cpi->sf.tx_size_search_method == USE_LARGESTALL ||
(cpi->sf.tx_size_search_method != USE_FULL_RD && (cpi->sf.tx_size_search_method != USE_FULL_RD &&
mbmi->ref_frame[0] == INTRA_FRAME)) { !b_inter_mode)) {
vpx_memset(txfm_cache, 0, TX_MODES * sizeof(int64_t)); vpx_memset(txfm_cache, 0, TX_MODES * sizeof(int64_t));
choose_largest_txfm_size(cpi, x, rate, distortion, skip, sse, choose_largest_txfm_size(cpi, x, rate, distortion, skip, sse,
ref_best_rd, bs); ref_best_rd, bs);
...@@ -950,7 +951,7 @@ static void super_block_yrd(VP9_COMP *cpi, ...@@ -950,7 +951,7 @@ static void super_block_yrd(VP9_COMP *cpi,
} }
if (cpi->sf.tx_size_search_method == USE_LARGESTINTRA_MODELINTER && if (cpi->sf.tx_size_search_method == USE_LARGESTINTRA_MODELINTER &&
mbmi->ref_frame[0] > INTRA_FRAME) { b_inter_mode) {
if (bs >= BLOCK_32X32) if (bs >= BLOCK_32X32)
model_rd_for_sb_y_tx(cpi, bs, TX_32X32, x, xd, model_rd_for_sb_y_tx(cpi, bs, TX_32X32, x, xd,
&r[TX_32X32][0], &d[TX_32X32], &s[TX_32X32]); &r[TX_32X32][0], &d[TX_32X32], &s[TX_32X32]);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment