generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Properly set the estimate of rate_nocoef" into nextgenv2

Browse Source
This commit is contained in:
Yaowu Xu
2016-03-15 23:23:11 +00:00
committed by Gerrit Code Review
parent c67dd39adc 2becffaef5
commit fced640a0a
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vp10/encoder/encodeframe.c
View File

@@ -1654,6 +1654,7 @@ static void rd_pick_sb_modes(VP10_COMP *cpi,
totalrate_nocoef, totalrate_nocoef,
#endif // CONFIG_SUPERTX #endif // CONFIG_SUPERTX
bsize, ctx, best_rd); bsize, ctx, best_rd);
assert(*totalrate_nocoef >= 0);
} }
} else { } else {
vp10_rd_pick_inter_mode_sub8x8(cpi, tile_data, x, mi_row, mi_col, rd_cost, vp10_rd_pick_inter_mode_sub8x8(cpi, tile_data, x, mi_row, mi_col, rd_cost,
@@ -1661,6 +1662,7 @@ static void rd_pick_sb_modes(VP10_COMP *cpi,
totalrate_nocoef, totalrate_nocoef,
#endif // CONFIG_SUPERTX #endif // CONFIG_SUPERTX
bsize, ctx, best_rd); bsize, ctx, best_rd);
assert(*totalrate_nocoef >= 0);
} }
} }

11
vp10/encoder/rdopt.c
View File

@@ -8333,11 +8333,12 @@ void vp10_rd_pick_inter_mode_sb(VP10_COMP *cpi,
rd_cost->rate = rate2; rd_cost->rate = rate2;
#if CONFIG_SUPERTX #if CONFIG_SUPERTX
*returnrate_nocoef = rate2 - rate_y - rate_uv; if (x->skip && rate_y == INT_MAX)
if (!disable_skip) { *returnrate_nocoef = rate2;
*returnrate_nocoef -= vp10_cost_bit(vp10_get_skip_prob(cm, xd), else
skippable || this_skip2); *returnrate_nocoef = rate2 - rate_y - rate_uv;
} *returnrate_nocoef -= vp10_cost_bit(vp10_get_skip_prob(cm, xd),
disable_skip || skippable || this_skip2);
*returnrate_nocoef -= vp10_cost_bit(vp10_get_intra_inter_prob(cm, xd), *returnrate_nocoef -= vp10_cost_bit(vp10_get_intra_inter_prob(cm, xd),
mbmi->ref_frame[0] != INTRA_FRAME); mbmi->ref_frame[0] != INTRA_FRAME);
#if CONFIG_OBMC #if CONFIG_OBMC