summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Grange <agrange@google.com>2013-01-04 09:00:47 -0800
committerAdrian Grange <agrange@google.com>2013-01-04 09:00:47 -0800
commit81d1171fd4614c3b60439b97007a3ec7ea5e3d0c (patch)
tree78b51f7be3f22df141e06d475abc0ab645d7bbf2
parentc6ba3a3d8509779168e144ba273c14be5c063bc2 (diff)
downloadlibvpx-81d1171fd4614c3b60439b97007a3ec7ea5e3d0c.tar
libvpx-81d1171fd4614c3b60439b97007a3ec7ea5e3d0c.tar.gz
libvpx-81d1171fd4614c3b60439b97007a3ec7ea5e3d0c.tar.bz2
libvpx-81d1171fd4614c3b60439b97007a3ec7ea5e3d0c.zip
Fix mode selection infinite loop bug
Mode selection for SBs could enter an infinite loop because the interpolation filter mode index was not being reset correctly. Change-Id: I4bbe726f29ef5b6836e94884067c46084713cc11
-rw-r--r--vp9/encoder/vp9_rdopt.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index 282bf0c6a..774b577a0 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -4605,6 +4605,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
// Test best rd so far against threshold for trying this mode.
if (best_rd <= cpi->rd_threshes[mode_index] ||
cpi->rd_threshes[mode_index] == INT_MAX) {
+ switchable_filter_index = 0;
continue;
}