diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-05-21 00:05:14 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-05-21 00:05:14 -0400 |
| commit | 4d240d1eae9fc88278a358a075735b84f8da89e2 (patch) | |
| tree | e3f79482b16237981269b413da7787885dde56e6 /vp8/encoder/picklpf.c | |
| parent | 54bc4fde77f0c3ed42907d3c86ecc51cf8cddc80 (diff) | |
| parent | ad6fe4a88c9d051a34c85d3f422cde5819f2bbdf (diff) | |
| download | libvpx-4d240d1eae9fc88278a358a075735b84f8da89e2.tar libvpx-4d240d1eae9fc88278a358a075735b84f8da89e2.tar.gz libvpx-4d240d1eae9fc88278a358a075735b84f8da89e2.tar.bz2 libvpx-4d240d1eae9fc88278a358a075735b84f8da89e2.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: I90a1d0095712e0474b0c03773b57376911027fc6
Diffstat (limited to 'vp8/encoder/picklpf.c')
| -rw-r--r-- | vp8/encoder/picklpf.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/vp8/encoder/picklpf.c b/vp8/encoder/picklpf.c index d294af6c0..4f9d4126e 100644 --- a/vp8/encoder/picklpf.c +++ b/vp8/encoder/picklpf.c @@ -142,7 +142,7 @@ static int get_max_filter_level(VP8_COMP *cpi, int base_qindex) // with lots of intra coming in. int max_filter_level = MAX_LOOP_FILTER ;//* 3 / 4; - if (cpi->section_intra_rating > 8) + if (cpi->twopass.section_intra_rating > 8) max_filter_level = MAX_LOOP_FILTER * 3 / 4; (void) cpi; @@ -377,8 +377,8 @@ void vp8cx_pick_filter_level(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi) Bias = (best_err >> (15 - (filt_mid / 8))) * filter_step; //PGW change 12/12/06 for small images // jbb chg: 20100118 - in sections with lots of new material coming in don't bias as much to a low filter value - if (cpi->section_intra_rating < 20) - Bias = Bias * cpi->section_intra_rating / 20; + if (cpi->twopass.section_intra_rating < 20) + Bias = Bias * cpi->twopass.section_intra_rating / 20; filt_high = ((filt_mid + filter_step) > max_filter_level) ? max_filter_level : (filt_mid + filter_step); filt_low = ((filt_mid - filter_step) < min_filter_level) ? min_filter_level : (filt_mid - filter_step); @@ -474,8 +474,4 @@ void vp8cx_pick_filter_level(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi) } cm->filter_level = filt_best; - cpi->last_auto_filt_val = filt_best; - cpi->last_auto_filt_q = cm->base_qindex; - - cpi->frames_since_auto_filter = 0; } |