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

Slight simplification of SB RD loop recursion conditions.

Browse Source 
Change-Id: I87a406fcd18ab043253ca0c009d1182fdc5c3046
This commit is contained in:
Ronald S. Bultje 2013-04-11 09:14:55 -07:00
parent 4eb537c0e6
commit 38d7945345
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vp9/encoder/vp9_encodeframe.c
View File

@ -1097,9 +1097,8 @@ static void encode_sb_row(VP9_COMP *cpi,
sb64_skip += splitmodes_used; sb64_skip += splitmodes_used;
} }
if ( !sb32_skip && if (!sb32_skip && !(mb_col + x_idx + 1 >= cm->mb_cols ||
!(((cm->mb_cols & 1) && mb_col + x_idx == cm->mb_cols - 1) || mb_row + y_idx + 1 >= cm->mb_rows)) {
((cm->mb_rows & 1) && mb_row + y_idx == cm->mb_rows - 1))) {
/* Pick a mode assuming that it applies to all 4 of the MBs in the SB */ /* Pick a mode assuming that it applies to all 4 of the MBs in the SB */
pick_sb_modes(cpi, mb_row + y_idx, mb_col + x_idx, pick_sb_modes(cpi, mb_row + y_idx, mb_col + x_idx,
tp, &sb_rate, &sb_dist); tp, &sb_rate, &sb_dist);
@ -1137,9 +1136,8 @@ static void encode_sb_row(VP9_COMP *cpi,
memcpy(cm->left_context, &l, sizeof(l)); memcpy(cm->left_context, &l, sizeof(l));
sb32_rate += vp9_cost_bit(cm->prob_sb64_coded, 0); sb32_rate += vp9_cost_bit(cm->prob_sb64_coded, 0);
if (!sb64_skip && if (!sb64_skip && !(mb_col + 3 >= cm->mb_cols ||
!(((cm->mb_cols & 3) && mb_col + 3 >= cm->mb_cols) || mb_row + 3 >= cm->mb_rows)) {
((cm->mb_rows & 3) && mb_row + 3 >= cm->mb_rows))) {
pick_sb64_modes(cpi, mb_row, mb_col, tp, &sb64_rate, &sb64_dist); pick_sb64_modes(cpi, mb_row, mb_col, tp, &sb64_rate, &sb64_dist);
sb64_rate += vp9_cost_bit(cm->prob_sb64_coded, 1); sb64_rate += vp9_cost_bit(cm->prob_sb64_coded, 1);
} }