diff options
| author | Jingning Han <jingning@google.com> | 2013-10-23 13:52:05 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-10-23 13:52:05 -0700 |
| commit | ae0e747d6a41ec6aab149fcdff7db357a9280353 (patch) | |
| tree | faae29c3243a4c92021520695a5fbd35b7e2d383 /vp9/encoder/vp9_rdopt.c | |
| parent | 5bdd4d9ccffa6c0fe03e5282b5562f5a794e0f42 (diff) | |
| parent | f3b31380fa555e5b20da1be7ca3ac27593cb4911 (diff) | |
| download | libvpx-ae0e747d6a41ec6aab149fcdff7db357a9280353.tar libvpx-ae0e747d6a41ec6aab149fcdff7db357a9280353.tar.gz libvpx-ae0e747d6a41ec6aab149fcdff7db357a9280353.tar.bz2 libvpx-ae0e747d6a41ec6aab149fcdff7db357a9280353.zip | |
Merge "Use inter mode flag in super_block_yrd"
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index f166b10a1..d39edf380 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -933,14 +933,15 @@ static void super_block_yrd(VP9_COMP *cpi, MACROBLOCKD *xd = &x->e_mbd; MB_MODE_INFO *const mbmi = &xd->mi_8x8[0]->mbmi; struct rdcost_block_args *rdcost_stack = &cpi->rdcost_stack; + const int b_inter_mode = is_inter_block(mbmi); assert(bs == mbmi->sb_type); - if (mbmi->ref_frame[0] > INTRA_FRAME) + if (b_inter_mode) vp9_subtract_sby(x, bs); if (cpi->sf.tx_size_search_method == USE_LARGESTALL || (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)); choose_largest_txfm_size(cpi, x, rate, distortion, skip, sse, ref_best_rd, bs); @@ -950,7 +951,7 @@ static void super_block_yrd(VP9_COMP *cpi, } if (cpi->sf.tx_size_search_method == USE_LARGESTINTRA_MODELINTER && - mbmi->ref_frame[0] > INTRA_FRAME) { + b_inter_mode) { if (bs >= BLOCK_32X32) model_rd_for_sb_y_tx(cpi, bs, TX_32X32, x, xd, &r[TX_32X32][0], &d[TX_32X32], &s[TX_32X32]); |