Commit de80e764 authored by Debargha Mukherjee's avatar Debargha Mukherjee

Small rd fixes

1. Turns off hash based rd for rectangular blocks temporarily.
2. A small fix for zero_rate aggregation.

Change-Id: I571e5b2b5441cc0d1b8b0a522d9ab23787441103
parent 14965edd
......@@ -385,6 +385,8 @@ static INLINE void av1_merge_rd_stats(RD_STATS *rd_stats_dst,
int plane;
#endif
rd_stats_dst->rate += rd_stats_src->rate;
if (!rd_stats_dst->zero_rate)
rd_stats_dst->zero_rate = rd_stats_src->zero_rate;
rd_stats_dst->dist += rd_stats_src->dist;
rd_stats_dst->sse += rd_stats_src->sse;
rd_stats_dst->skip &= rd_stats_src->skip;
......
......@@ -4534,12 +4534,12 @@ static int find_tx_size_rd_records(MACROBLOCK *x, BLOCK_SIZE bsize, int mi_row,
x->tx_size_rd_record_32X32 };
#endif
const TX_SIZE max_square_tx_size = max_txsize_lookup[bsize];
const int bw = block_size_wide[bsize];
const int bh = block_size_high[bsize];
// Hashing is performed only for square TX sizes larger than TX_4X4
if (max_square_tx_size < TX_8X8) return 0;
if (max_square_tx_size < TX_8X8 || bw != bh) return 0;
const int bw = block_size_wide[bsize];
const int bh = block_size_high[bsize];
const int diff_stride = bw;
const struct macroblock_plane *const p = &x->plane[0];
const int16_t *diff = &p->src_diff[0];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment