ref: c13aaf7a3e245315d88245a710f89d14694bc56f
parent: 4bff5bca928de32122cb8fb5615e9aec2f8e3b9b
parent: 920f4ab8f89057451b8e4a7359da94bdcdcec7e5
author: James Zern <jzern@google.com>
date: Thu Mar 22 23:56:50 EDT 2018
Merge changes Ied91c7ef,If2dcc6e2,Ib7397e71,Ib6392c79 * changes: Fix implicit-fallthrough warnings Fix dangling-else warnings Fix a strict-overflow warning Rename several static NEON iht functions
--- a/test/byte_alignment_test.cc
+++ b/test/byte_alignment_test.cc
@@ -171,8 +171,9 @@
TEST_P(ByteAlignmentTest, TestAlignment) {const ByteAlignmentTestParam t = GetParam();
SetByteAlignment(t.byte_alignment, t.expected_value);
- if (t.decode_remaining)
+ if (t.decode_remaining) {ASSERT_EQ(VPX_CODEC_OK, DecodeRemainingFrames(t.byte_alignment));
+ }
}
INSTANTIATE_TEST_CASE_P(Alignments, ByteAlignmentTest,
--- a/test/convolve_test.cc
+++ b/test/convolve_test.cc
@@ -450,7 +450,9 @@
void CheckGuardBlocks() { for (int i = 0; i < kOutputBufferSize; ++i) {- if (IsIndexInBorder(i)) EXPECT_EQ(255, output_[i]);
+ if (IsIndexInBorder(i)) {+ EXPECT_EQ(255, output_[i]);
+ }
}
}
--- a/test/decode_test_driver.cc
+++ b/test/decode_test_driver.cc
@@ -52,9 +52,10 @@
/* Vp8's implementation of PeekStream returns an error if the frame you
* pass it is not a keyframe, so we only expect VPX_CODEC_OK on the first
* frame, which must be a keyframe. */
- if (video->frame_number() == 0)
+ if (video->frame_number() == 0) {ASSERT_EQ(VPX_CODEC_OK, res_peek)
<< "Peek return failed: " << vpx_codec_err_to_string(res_peek);
+ }
} else {/* The Vp9 implementation of PeekStream returns an error only if the
* data passed to it isn't a valid Vp9 chunk. */
--- a/test/keyframe_test.cc
+++ b/test/keyframe_test.cc
@@ -68,7 +68,9 @@
// In realtime mode - auto placed keyframes are exceedingly rare, don't
// bother with this check if(GetParam() > 0)
- if (GET_PARAM(1) > 0) EXPECT_GT(kf_count_, 1);
+ if (GET_PARAM(1) > 0) {+ EXPECT_GT(kf_count_, 1);
+ }
}
TEST_P(KeyframeTest, TestDisableKeyframes) {@@ -128,8 +130,9 @@
// In realtime mode - auto placed keyframes are exceedingly rare, don't
// bother with this check
- if (GET_PARAM(1) > 0)
+ if (GET_PARAM(1) > 0) {EXPECT_EQ(2u, kf_pts_list_.size()) << " Not the right number of keyframes ";
+ }
// Verify that keyframes match the file keyframes in the file.
for (std::vector<vpx_codec_pts_t>::const_iterator iter = kf_pts_list_.begin();
--- a/vp8/encoder/pickinter.c
+++ b/vp8/encoder/pickinter.c
@@ -1068,10 +1068,12 @@
rate2 +=
vp8_mv_bit_cost(&mode_mv[NEWMV], &best_ref_mv, cpi->mb.mvcost, 128);
}
+ // fall through
case NEARESTMV:
case NEARMV:
if (mode_mv[this_mode].as_int == 0) continue;
+ // fall through
case ZEROMV:
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -2135,6 +2135,7 @@
rd.rate2 +=
vp8_mv_bit_cost(&mode_mv[NEWMV], &best_ref_mv, x->mvcost, 96);
}
+ // fall through
case NEARESTMV:
case NEARMV:
@@ -2151,6 +2152,7 @@
(mode_mv[this_mode].as_int == 0)) {continue;
}
+ // fall through
case ZEROMV:
--- a/vp9/common/arm/neon/vp9_highbd_iht8x8_add_neon.c
+++ b/vp9/common/arm/neon/vp9_highbd_iht8x8_add_neon.c
@@ -18,8 +18,8 @@
#include "vpx_dsp/arm/transpose_neon.h"
#include "vpx_dsp/inv_txfm.h"
-static INLINE void iadst_half_butterfly_bd12_neon(int32x4_t *const x,
- const int32x2_t c) {+static INLINE void highbd_iadst_half_butterfly_neon(int32x4_t *const x,
+ const int32x2_t c) {const int32x4_t sum = vaddq_s32(x[0], x[1]);
const int32x4_t sub = vsubq_s32(x[0], x[1]);
const int64x2_t t0_lo = vmull_lane_s32(vget_low_s32(sum), c, 0);
@@ -35,11 +35,11 @@
x[1] = vcombine_s32(out1_lo, out1_hi);
}
-static INLINE void iadst_butterfly_lane_0_1_bd12_neon(const int32x4_t in0,
- const int32x4_t in1,
- const int32x2_t c,
- int64x2_t *const s0,
- int64x2_t *const s1) {+static INLINE void highbd_iadst_butterfly_lane_0_1_neon(const int32x4_t in0,
+ const int32x4_t in1,
+ const int32x2_t c,
+ int64x2_t *const s0,
+ int64x2_t *const s1) {const int64x2_t t0_lo = vmull_lane_s32(vget_low_s32(in0), c, 0);
const int64x2_t t1_lo = vmull_lane_s32(vget_low_s32(in0), c, 1);
const int64x2_t t0_hi = vmull_lane_s32(vget_high_s32(in0), c, 0);
@@ -51,11 +51,11 @@
s1[1] = vmlsl_lane_s32(t1_hi, vget_high_s32(in1), c, 0);
}
-static INLINE void iadst_butterfly_lane_1_0_bd12_neon(const int32x4_t in0,
- const int32x4_t in1,
- const int32x2_t c,
- int64x2_t *const s0,
- int64x2_t *const s1) {+static INLINE void highbd_iadst_butterfly_lane_1_0_neon(const int32x4_t in0,
+ const int32x4_t in1,
+ const int32x2_t c,
+ int64x2_t *const s0,
+ int64x2_t *const s1) {const int64x2_t t0_lo = vmull_lane_s32(vget_low_s32(in0), c, 1);
const int64x2_t t1_lo = vmull_lane_s32(vget_low_s32(in0), c, 0);
const int64x2_t t0_hi = vmull_lane_s32(vget_high_s32(in0), c, 1);
@@ -67,7 +67,7 @@
s1[1] = vmlsl_lane_s32(t1_hi, vget_high_s32(in1), c, 1);
}
-static INLINE int32x4_t add_dct_const_round_shift_low_8_bd12(
+static INLINE int32x4_t highbd_add_dct_const_round_shift_low_8(
const int64x2_t *const in0, const int64x2_t *const in1) {const int64x2_t sum_lo = vaddq_s64(in0[0], in1[0]);
const int64x2_t sum_hi = vaddq_s64(in0[1], in1[1]);
@@ -76,7 +76,7 @@
return vcombine_s32(out_lo, out_hi);
}
-static INLINE int32x4_t sub_dct_const_round_shift_low_8_bd12(
+static INLINE int32x4_t highbd_sub_dct_const_round_shift_low_8(
const int64x2_t *const in0, const int64x2_t *const in1) {const int64x2_t sub_lo = vsubq_s64(in0[0], in1[0]);
const int64x2_t sub_hi = vsubq_s64(in0[1], in1[1]);
@@ -108,19 +108,23 @@
x[7] = *io6;
// stage 1
- iadst_butterfly_lane_0_1_bd12_neon(x[0], x[1], vget_low_s32(c0), s[0], s[1]);
- iadst_butterfly_lane_0_1_bd12_neon(x[2], x[3], vget_high_s32(c0), s[2], s[3]);
- iadst_butterfly_lane_0_1_bd12_neon(x[4], x[5], vget_low_s32(c1), s[4], s[5]);
- iadst_butterfly_lane_0_1_bd12_neon(x[6], x[7], vget_high_s32(c1), s[6], s[7]);
+ highbd_iadst_butterfly_lane_0_1_neon(x[0], x[1], vget_low_s32(c0), s[0],
+ s[1]);
+ highbd_iadst_butterfly_lane_0_1_neon(x[2], x[3], vget_high_s32(c0), s[2],
+ s[3]);
+ highbd_iadst_butterfly_lane_0_1_neon(x[4], x[5], vget_low_s32(c1), s[4],
+ s[5]);
+ highbd_iadst_butterfly_lane_0_1_neon(x[6], x[7], vget_high_s32(c1), s[6],
+ s[7]);
- x[0] = add_dct_const_round_shift_low_8_bd12(s[0], s[4]);
- x[1] = add_dct_const_round_shift_low_8_bd12(s[1], s[5]);
- x[2] = add_dct_const_round_shift_low_8_bd12(s[2], s[6]);
- x[3] = add_dct_const_round_shift_low_8_bd12(s[3], s[7]);
- x[4] = sub_dct_const_round_shift_low_8_bd12(s[0], s[4]);
- x[5] = sub_dct_const_round_shift_low_8_bd12(s[1], s[5]);
- x[6] = sub_dct_const_round_shift_low_8_bd12(s[2], s[6]);
- x[7] = sub_dct_const_round_shift_low_8_bd12(s[3], s[7]);
+ x[0] = highbd_add_dct_const_round_shift_low_8(s[0], s[4]);
+ x[1] = highbd_add_dct_const_round_shift_low_8(s[1], s[5]);
+ x[2] = highbd_add_dct_const_round_shift_low_8(s[2], s[6]);
+ x[3] = highbd_add_dct_const_round_shift_low_8(s[3], s[7]);
+ x[4] = highbd_sub_dct_const_round_shift_low_8(s[0], s[4]);
+ x[5] = highbd_sub_dct_const_round_shift_low_8(s[1], s[5]);
+ x[6] = highbd_sub_dct_const_round_shift_low_8(s[2], s[6]);
+ x[7] = highbd_sub_dct_const_round_shift_low_8(s[3], s[7]);
// stage 2
t[0] = x[0];
@@ -127,21 +131,23 @@
t[1] = x[1];
t[2] = x[2];
t[3] = x[3];
- iadst_butterfly_lane_0_1_bd12_neon(x[4], x[5], vget_high_s32(c2), s[4], s[5]);
- iadst_butterfly_lane_1_0_bd12_neon(x[7], x[6], vget_high_s32(c2), s[7], s[6]);
+ highbd_iadst_butterfly_lane_0_1_neon(x[4], x[5], vget_high_s32(c2), s[4],
+ s[5]);
+ highbd_iadst_butterfly_lane_1_0_neon(x[7], x[6], vget_high_s32(c2), s[7],
+ s[6]);
x[0] = vaddq_s32(t[0], t[2]);
x[1] = vaddq_s32(t[1], t[3]);
x[2] = vsubq_s32(t[0], t[2]);
x[3] = vsubq_s32(t[1], t[3]);
- x[4] = add_dct_const_round_shift_low_8_bd12(s[4], s[6]);
- x[5] = add_dct_const_round_shift_low_8_bd12(s[5], s[7]);
- x[6] = sub_dct_const_round_shift_low_8_bd12(s[4], s[6]);
- x[7] = sub_dct_const_round_shift_low_8_bd12(s[5], s[7]);
+ x[4] = highbd_add_dct_const_round_shift_low_8(s[4], s[6]);
+ x[5] = highbd_add_dct_const_round_shift_low_8(s[5], s[7]);
+ x[6] = highbd_sub_dct_const_round_shift_low_8(s[4], s[6]);
+ x[7] = highbd_sub_dct_const_round_shift_low_8(s[5], s[7]);
// stage 3
- iadst_half_butterfly_bd12_neon(x + 2, vget_low_s32(c2));
- iadst_half_butterfly_bd12_neon(x + 6, vget_low_s32(c2));
+ highbd_iadst_half_butterfly_neon(x + 2, vget_low_s32(c2));
+ highbd_iadst_half_butterfly_neon(x + 6, vget_low_s32(c2));
*io0 = x[0];
*io1 = vnegq_s32(x[4]);
--- a/vp9/encoder/vp9_denoiser.c
+++ b/vp9/encoder/vp9_denoiser.c
@@ -379,7 +379,7 @@
// zero/small motion in skin detection is high, i.e, > 4).
if (consec_zeromv < 4) {i = ymis;
- j = xmis;
+ break;
}
}
}