summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2012-03-22 15:06:53 -0700
committerJohn Koleszar <jkoleszar@google.com>2012-03-22 15:06:53 -0700
commitb76c4c6ba74970683556176701427bfbe57b68e7 (patch)
tree559d4b19a52d141685fc92c3d845df4282665a07
parent7f6a695771835222c37f9addf64cd593f67cbb8e (diff)
downloadlibvpx-sandbox/jkoleszar/reuse-modemv.tar.gz
WIP: reuse splitmv segmentation (partial)sandbox/jkoleszar/reuse-modemv
still not reusing split mvs, but reusing partition size (8x8, 8x16, etc) Change-Id: I4655b06fcdcbc71a97bff07def78297ae8e5104c
-rw-r--r--vp8/encoder/rdopt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index 961806022..3c7bcc270 100644
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -1682,7 +1682,7 @@ static int vp8_rd_reuse_mbsegmentation(VP8_COMP *cpi, MACROBLOCK *x,
if(i==16)
break;
}
- rd_reuse_segment(cpi, x, &bsi, s);
+ rd_check_segment(cpi, x, &bsi, s);
}
/* set it to the best */
@@ -2231,7 +2231,7 @@ void vp8_rd_use_external_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
//this_rd_thresh = (this_ref_frame == 2) ? cpi->rd_threshes[THR_NEW2] : this_rd_thresh;
this_rd_thresh = 0;
-#if 1
+#if 0
tmp_rd = vp8_rd_pick_best_mbsegmentation(cpi, x, &best_ref_mv,
best_yrd, mdcounts,
&rate, &rate_y, &distortion, this_rd_thresh) ;