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

Some build fixes

Browse Source 
Related zbin boost removal.

Change-Id: I0f34d31038c29d5cb78bc5d110159df01e41e328
This commit is contained in:
Deb Mukherjee 2015-01-21 13:37:24 -08:00
parent dfed541f21
commit 760219d0fd
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vp9/encoder/vp9_encodeframe.c
View File

@ -4975,9 +4975,7 @@ static void predict_superblock(VP9_COMP *cpi,
set_ref_ptrs(cm, xd, mbmi->ref_frame[0], mbmi->ref_frame[1]);
cpi->zbin_mode_boost = get_zbin_mode_boost(mbmi,
cpi->zbin_mode_boost_enabled);
vp9_update_zbin_extra(cpi, x);
vp9_update_zbin_extra(x);
for (ref = 0; ref < 1 + is_compound; ++ref) {
YV12_BUFFER_CONFIG *cfg = get_ref_frame_buffer(cpi,
@ -5009,9 +5007,7 @@ static void predict_superblock_sub8x8_extend(VP9_COMP *cpi,
set_ref_ptrs(cm, xd, mbmi->ref_frame[0], mbmi->ref_frame[1]);
cpi->zbin_mode_boost = get_zbin_mode_boost(mbmi,
cpi->zbin_mode_boost_enabled);
vp9_update_zbin_extra(cpi, x);
vp9_update_zbin_extra(x);
for (ref = 0; ref < 1 + is_compound; ++ref) {
YV12_BUFFER_CONFIG *cfg = get_ref_frame_buffer(cpi,

6
vp9/encoder/vp9_rdopt.c
View File

@ -5070,14 +5070,14 @@ void vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
for (copy_mode = REF0;
copy_mode < (COPY_MODE)(MIN(REF0 + inter_ref_count, COPY_MODE_COUNT));
copy_mode++) {
int i, rate2, rate_y, rate_uv, rate_copy_mode, this_skip2,
skippable, skippable_y, skippable_uv;
int i, rate2, rate_y, rate_uv, rate_copy_mode, this_skip2;
int skippable = 0, skippable_y, skippable_uv;
int64_t distortion2, distortion_y, distortion_uv, this_rd,
ssey, sseuv, total_sse, tx_cache[TX_MODES];
#if CONFIG_EXT_TX
EXT_TX_TYPE tx_type, best_tx_type = NORM;
TX_SIZE best_tx_size;
int rate2_tx, this_skip2_tx;
int rate2_tx, this_skip2_tx = 0;
int64_t distortion2_tx, bestrd_tx = INT64_MAX;
uint8_t tmp_zcoeff_blk[256];
#endif // CONFIG_EXT_TX