From 1c8567ff09ee57dda7e2d09091a089c9da04810a Mon Sep 17 00:00:00 2001 From: Debargha Mukherjee Date: Fri, 4 Sep 2015 17:31:51 -0700 Subject: [PATCH] Remove some trailing whitespaces Change-Id: Icf06d35ca347713253d1eba341a894b51efa81a9 --- test/invalid_file_test.cc | 2 +- test/test-data.mk | 4 ++-- test/test-data.sha1 | 4 ++-- vp8/encoder/pickinter.c | 4 ++-- vp8/vp8_cx_iface.c | 2 +- vpx_dsp/mips/loopfilter_masks_dspr2.h | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/invalid_file_test.cc b/test/invalid_file_test.cc index 1b5ef5c87..129cd786f 100644 --- a/test/invalid_file_test.cc +++ b/test/invalid_file_test.cc @@ -145,7 +145,7 @@ TEST_P(InvalidFileInvalidPeekTest, ReturnCode) { } const DecodeParam kVP9InvalidFileInvalidPeekTests[] = { - {1, "invalid-vp90-01-v2.webm"}, + {1, "invalid-vp90-01-v3.webm"}, }; VP9_INSTANTIATE_TEST_CASE(InvalidFileInvalidPeekTest, diff --git a/test/test-data.mk b/test/test-data.mk index dda1c1821..e3217fbb1 100644 --- a/test/test-data.mk +++ b/test/test-data.mk @@ -687,8 +687,8 @@ LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += vp93-2-20-12bit-yuv444.webm.md5 endif # CONFIG_VP9_HIGHBITDEPTH # Invalid files for testing libvpx error checking. -LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-01-v2.webm -LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-01-v2.webm.res +LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-01-v3.webm +LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-01-v3.webm.res LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-02-v2.webm LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-02-v2.webm.res LIBVPX_TEST_DATA-$(CONFIG_VP9_DECODER) += invalid-vp90-03-v3.webm diff --git a/test/test-data.sha1 b/test/test-data.sha1 index 3590f4e3f..fb7ea7dde 100644 --- a/test/test-data.sha1 +++ b/test/test-data.sha1 @@ -6,8 +6,8 @@ b87815bf86020c592ccc7a846ba2e28ec8043902 *hantro_odd.yuv 456d1493e52d32a5c30edf44a27debc1fa6b253a *invalid-vp90-2-00-quantizer-11.webm.ivf.s52984_r01-05_b6-.ivf.res c123d1f9f02fb4143abb5e271916e3a3080de8f6 *invalid-vp90-2-00-quantizer-11.webm.ivf.s52984_r01-05_b6-z.ivf 456d1493e52d32a5c30edf44a27debc1fa6b253a *invalid-vp90-2-00-quantizer-11.webm.ivf.s52984_r01-05_b6-z.ivf.res -fe346136b9b8c1e6f6084cc106485706915795e4 *invalid-vp90-01-v2.webm -25751f5d3b05ff03f0719ad42cd625348eb8961e *invalid-vp90-01-v2.webm.res +fe346136b9b8c1e6f6084cc106485706915795e4 *invalid-vp90-01-v3.webm +5d9474c0309b7ca09a182d888f73b37a8fe1362c *invalid-vp90-01-v3.webm.res d78e2fceba5ac942246503ec8366f879c4775ca5 *invalid-vp90-02-v2.webm 8e2eff4af87d2b561cce2365713269e301457ef3 *invalid-vp90-02-v2.webm.res df1a1453feb3c00d7d89746c7003b4163523bff3 *invalid-vp90-03-v3.webm diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c index fef98f3c3..b50838550 100644 --- a/vp8/encoder/pickinter.c +++ b/vp8/encoder/pickinter.c @@ -834,7 +834,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, if (cpi->oxcf.noise_sensitivity) { // Under aggressive denoising mode, should we use skin map to reduce denoiser // and ZEROMV bias? Will need to revisit the accuracy of this detection for - // very noisy input. For now keep this as is (i.e., don't turn it off). + // very noisy input. For now keep this as is (i.e., don't turn it off). // if (cpi->denoiser.denoiser_mode == kDenoiserOnYUVAggressive) // x->is_skin = 0; } @@ -884,7 +884,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, /* If the frame has big static background and current MB is in low * motion area, its mode decision is biased to ZEROMV mode. - * No adjustment if cpu_used is <= -12 (i.e., cpi->Speed >= 12). + * No adjustment if cpu_used is <= -12 (i.e., cpi->Speed >= 12). * At such speed settings, ZEROMV is already heavily favored. */ if (cpi->Speed < 12) { diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c index 960c2f4ef..74eccd7a3 100644 --- a/vp8/vp8_cx_iface.c +++ b/vp8/vp8_cx_iface.c @@ -237,7 +237,7 @@ static vpx_codec_err_t validate_config(vpx_codec_alg_priv_t *ctx, RANGE_CHECK_HI(cfg, ts_periodicity, 16); for (i=1; its_number_layers; i++) - if (cfg->ts_target_bitrate[i] <= cfg->ts_target_bitrate[i-1] && + if (cfg->ts_target_bitrate[i] <= cfg->ts_target_bitrate[i-1] && cfg->rc_target_bitrate > 0) ERROR("ts_target_bitrate entries are not strictly increasing"); diff --git a/vpx_dsp/mips/loopfilter_masks_dspr2.h b/vpx_dsp/mips/loopfilter_masks_dspr2.h index e82dfb7eb..2c964afaa 100644 --- a/vpx_dsp/mips/loopfilter_masks_dspr2.h +++ b/vpx_dsp/mips/loopfilter_masks_dspr2.h @@ -355,7 +355,7 @@ static INLINE void flatmask5(uint32_t p4, uint32_t p3, /* flat & flatmask4(thresh, p3, p2, p1, p0, q0, q1, q2, q3) */ "and %[flat1], %[flat3], %[flat1] \n\t" - : [c] "=&r" (c), [r_k] "=&r" (r_k), [r] "=&r" (r), + : [c] "=&r" (c), [r_k] "=&r" (r_k), [r] "=&r" (r), [r_flat] "=&r" (r_flat), [flat1] "=&r" (flat1), [flat3] "=&r" (flat3) : [p4] "r" (p4), [p3] "r" (p3), [p2] "r" (p2), [p1] "r" (p1), [p0] "r" (p0), [q0] "r" (q0), [q1] "r" (q1),