commit 72481755326038ef31098fd1c1110eec86a81565
author Venkat <sanampudi.venkatarao@ittiam.com> Mon Jul 01 16:33:49 2019 +0530
committer Venkat <sanampudi.venkatarao@ittiam.com> Mon Jul 01 20:00:28 2019 +0530
tree b2040731be4a25e2496179ac84c7f692034d374a
parent 5695d730c11495f2540f181347f148a7d33809e8

Modify rate accumulation in av1_merge_rd_stats

Change-Id: I00966ccbd0984b5c9e501bce1d153ef97538ff91

av1/encoder/rd.h

diff --git a/av1/encoder/rd.h b/av1/encoder/rd.h
index 0f6cd7e..67add28 100644
--- a/av1/encoder/rd.h
+++ b/av1/encoder/rd.h
@@ -351,7 +351,8 @@
 static INLINE void av1_merge_rd_stats(RD_STATS *rd_stats_dst,
                                       const RD_STATS *rd_stats_src) {
   assert(rd_stats_dst->rate != INT_MAX && rd_stats_src->rate != INT_MAX);
-  rd_stats_dst->rate += rd_stats_src->rate;
+  rd_stats_dst->rate = (int)AOMMIN(
+      ((int64_t)rd_stats_dst->rate + (int64_t)rd_stats_src->rate), INT_MAX);
   if (!rd_stats_dst->zero_rate)
     rd_stats_dst->zero_rate = rd_stats_src->zero_rate;
   rd_stats_dst->dist += rd_stats_src->dist;