diff options
| author | Jingning Han <jingning@google.com> | 2013-10-23 10:06:11 -0700 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2013-10-23 11:18:23 -0700 |
| commit | f3b31380fa555e5b20da1be7ca3ac27593cb4911 (patch) | |
| tree | 124a84ad6b211ce2ad93ee18ae3b02fdd453c8ce /vp9/encoder/vp9_rdopt.c | |
| parent | 2f58b813bbe4a2dfd8a004288dc0655f4f4bb9c7 (diff) | |
| download | libvpx-f3b31380fa555e5b20da1be7ca3ac27593cb4911.tar libvpx-f3b31380fa555e5b20da1be7ca3ac27593cb4911.tar.gz libvpx-f3b31380fa555e5b20da1be7ca3ac27593cb4911.tar.bz2 libvpx-f3b31380fa555e5b20da1be7ca3ac27593cb4911.zip | |
Use inter mode flag in super_block_yrd
Use a flag variable to determine if coded in inter mode, thus avoiding
multiple inter mode checks in super_block_yrd.
Change-Id: I0ef998b2811c38e185a2e0583f0f636cee45d2cf
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 b6f37e9e1..47ec4590d 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]); |