diff options
| author | Sai Deng <sdeng@google.com> | 2019-01-25 18:51:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-01-25 18:51:23 +0000 |
| commit | 2f82761b131dad118f1bfc92f3e824f37914b39b (patch) | |
| tree | b739d11b0f1a1b06223bc0e47caaac2738b7eeb3 /vp9 | |
| parent | d3f3f42216a307b2e235014b84a749a7ef54de91 (diff) | |
| parent | c3ceb45aae2d858264df1b7af6d12e6ad663ee1b (diff) | |
| download | libvpx-2f82761b131dad118f1bfc92f3e824f37914b39b.tar libvpx-2f82761b131dad118f1bfc92f3e824f37914b39b.tar.gz libvpx-2f82761b131dad118f1bfc92f3e824f37914b39b.tar.bz2 libvpx-2f82761b131dad118f1bfc92f3e824f37914b39b.zip | |
Merge "Fix a bug in tune-content film mode"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_temporal_filter.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index c1a079ff0..c73b0ed87 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -3034,7 +3034,7 @@ static void rd_variance_adjustment(VP9_COMP *cpi, MACROBLOCK *x, if (content_type == VP9E_CONTENT_FILM) { if (src_rec_min <= VERY_LOW_VAR_THRESH) { if (ref_frame == INTRA_FRAME) *this_rd *= 2; - if (bsize > 6) *this_rd *= 2; + if (bsize > BLOCK_16X16) *this_rd *= 2; } } } diff --git a/vp9/encoder/vp9_temporal_filter.c b/vp9/encoder/vp9_temporal_filter.c index 04b589ac3..bc2f24268 100644 --- a/vp9/encoder/vp9_temporal_filter.c +++ b/vp9/encoder/vp9_temporal_filter.c @@ -680,7 +680,9 @@ void vp9_temporal_filter_iterate_row_c(VP9_COMP *cpi, ThreadData *td, src_variance = vp9_get_sby_perpixel_variance(cpi, &src, TF_BLOCK); #endif // CONFIG_VP9_HIGHBITDEPTH - if (src_variance <= 2) strength = VPXMAX(0, (int)strength - 2); + if (src_variance <= 2) { + strength = VPXMAX(0, arnr_filter_data->strength - 2); + } } for (frame = 0; frame < frame_count; frame++) { |