diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2014-05-27 09:01:48 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-27 09:01:48 -0700 |
| commit | e767cdeda31a49f19cb84f38cb7984e85226363b (patch) | |
| tree | 05f6593002097a600df3b858de7b55bc2b4d0a46 | |
| parent | debd0485311e455e9aa4394fb0586769704c06b3 (diff) | |
| parent | 03de5a38e2ba9ee56d3b1d89d3626f6882ddbfff (diff) | |
| download | libvpx-e767cdeda31a49f19cb84f38cb7984e85226363b.tar libvpx-e767cdeda31a49f19cb84f38cb7984e85226363b.tar.gz libvpx-e767cdeda31a49f19cb84f38cb7984e85226363b.tar.bz2 libvpx-e767cdeda31a49f19cb84f38cb7984e85226363b.zip | |
Merge "neon matches "C" when using increase_denoising"
| -rw-r--r-- | vp8/encoder/arm/neon/denoising_neon.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/vp8/encoder/arm/neon/denoising_neon.c b/vp8/encoder/arm/neon/denoising_neon.c index 32ce65abf..b8e403419 100644 --- a/vp8/encoder/arm/neon/denoising_neon.c +++ b/vp8/encoder/arm/neon/denoising_neon.c @@ -56,11 +56,13 @@ int vp8_denoiser_filter_neon(unsigned char *mc_running_avg_y, * increasing the adjustment for each level, level1 adjustment is * increased, the deltas stay the same. */ - const uint8x16_t v_level1_adjustment = vdupq_n_u8( - (motion_magnitude <= MOTION_MAGNITUDE_THRESHOLD) ? 4 : 3); + int shift_inc = (increase_denoising && + motion_magnitude <= MOTION_MAGNITUDE_THRESHOLD) ? 1 : 0; + const uint8x16_t v_level1_adjustment = vmovq_n_u8( + (motion_magnitude <= MOTION_MAGNITUDE_THRESHOLD) ? 4 + shift_inc : 3); const uint8x16_t v_delta_level_1_and_2 = vdupq_n_u8(1); const uint8x16_t v_delta_level_2_and_3 = vdupq_n_u8(2); - const uint8x16_t v_level1_threshold = vdupq_n_u8(4); + const uint8x16_t v_level1_threshold = vmovq_n_u8(4 + shift_inc); const uint8x16_t v_level2_threshold = vdupq_n_u8(8); const uint8x16_t v_level3_threshold = vdupq_n_u8(16); int64x2_t v_sum_diff_total = vdupq_n_s64(0); @@ -146,8 +148,10 @@ int vp8_denoiser_filter_neon(unsigned char *mc_running_avg_y, const int64x1_t x = vqadd_s64(vget_high_s64(v_sum_diff_total), vget_low_s64(v_sum_diff_total)); const int s0 = vget_lane_s32(vabs_s32(vreinterpret_s32_s64(x)), 0); + int sum_diff_thresh = SUM_DIFF_THRESHOLD; - if (s0 > SUM_DIFF_THRESHOLD) + if (increase_denoising) sum_diff_thresh = SUM_DIFF_THRESHOLD_HIGH; + if (s0 > sum_diff_thresh) return COPY_BLOCK; } |