diff options
| author | Yaowu Xu <yaowu@google.com> | 2012-07-18 10:53:46 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-07-18 10:53:46 -0700 |
| commit | df35f6b3f082a008bbcb687ea773bb513e18403a (patch) | |
| tree | 43a4af95acd68216b902991c8895585f1fac3c65 | |
| parent | 84d2298828d668f843032834fbb42a476fa2596f (diff) | |
| parent | 11e23e673d4295964fa6558c8c81741002f62aaf (diff) | |
| download | libvpx-df35f6b3f082a008bbcb687ea773bb513e18403a.tar libvpx-df35f6b3f082a008bbcb687ea773bb513e18403a.tar.gz libvpx-df35f6b3f082a008bbcb687ea773bb513e18403a.tar.bz2 libvpx-df35f6b3f082a008bbcb687ea773bb513e18403a.zip | |
Merge "cleanup experiments in configure" into experimental
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | vp8/encoder/encodeframe.c | 7 | ||||
| -rw-r--r-- | vp8/encoder/onyx_if.c | 6 | ||||
| -rw-r--r-- | vp8/encoder/rdopt.c | 3 |
4 files changed, 0 insertions, 20 deletions
@@ -214,11 +214,7 @@ HAVE_LIST=" unistd_h " EXPERIMENT_LIST=" - t8x8 csm - qimode - uvintra - compred enhanced_interp featureupdates high_precision_mv diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 52d3c8625..c8ee52fad 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -854,13 +854,6 @@ static void encode_sb(VP8_COMP *cpi, check_segref(xd, *segment_id, LAST_FRAME) + check_segref(xd, *segment_id, GOLDEN_FRAME) + check_segref(xd, *segment_id, ALTREF_FRAME)) > 1)) { -// TODO this may not be a good idea as it makes sample size small and means -// the predictor functions cannot use data about most likely value only most -// likely unpredicted value. -// #if CONFIG_COMPRED -// // Only update count for incorrectly predicted cases -// if ( !ref_pred_flag ) -// #endif { cpi->count_mb_ref_frame_usage [xd->mode_info_context->mbmi.ref_frame]++; diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 3eb25d255..7a9022a1d 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -3013,12 +3013,6 @@ static void encode_frame_to_data_rate } } -// #if !CONFIG_COMPRED - // This function has been deprecated for now but we may want to do - // something here at a late date - // update_rd_ref_frame_probs(cpi); -// #endif - // Test code for new segment features init_seg_features(cpi); diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index 00732fdc7..2c04b54b1 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -3748,9 +3748,6 @@ int vp8cx_pick_mode_inter_macroblock int distortion; int intra_error = 0; unsigned char *segment_id = &xd->mode_info_context->mbmi.segment_id; -#if CONFIG_COMPRED - unsigned char ref_pred_flag; -#endif if (xd->segmentation_enabled) x->encode_breakout = cpi->segment_encode_breakout[*segment_id]; |