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

Merge remote branch 'origin/master' into experimental

Browse Source 
Change-Id: I90a1d0095712e0474b0c03773b57376911027fc6
This commit is contained in:
John Koleszar
2011-05-21 00:05:14 -04:00
parent 54bc4fde77 ad6fe4a88c
commit 4d240d1eae
13 changed files with 360 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vp8/encoder/rdopt.c
View File

@@ -278,10 +278,11 @@ void vp8_initialize_rd_consts(VP8_COMP *cpi, int QIndex)
if (cpi->pass == 2 && (cpi->common.frame_type != KEY_FRAME))
{
if (cpi->next_iiratio > 31)
if (cpi->twopass.next_iiratio > 31)
cpi->RDMULT += (cpi->RDMULT * rd_iifactor[31]) >> 4;
else
cpi->RDMULT += (cpi->RDMULT * rd_iifactor[cpi->next_iiratio]) >> 4;
cpi->RDMULT +=
(cpi->RDMULT * rd_iifactor[cpi->twopass.next_iiratio]) >> 4;
}
#if !CONFIG_EXTEND_QRANGE
@@ -2448,9 +2449,6 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
}
// Keep a record of best mode index that we chose
cpi->last_best_mode_index = best_mode_index;
// Note how often each mode chosen as best
cpi->mode_chosen_counts[best_mode_index] ++;