Merge "Add assert for zero_motion_factor range"
diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c
index 6e12e38..8d3044f 100644
--- a/vp8/vp8_cx_iface.c
+++ b/vp8/vp8_cx_iface.c
@@ -152,8 +152,8 @@
RANGE_CHECK_HI(cfg, g_lag_in_frames, 25);
#endif
RANGE_CHECK(cfg, rc_end_usage, VPX_VBR, VPX_Q);
- RANGE_CHECK_HI(cfg, rc_undershoot_pct, 1000);
- RANGE_CHECK_HI(cfg, rc_overshoot_pct, 1000);
+ RANGE_CHECK_HI(cfg, rc_undershoot_pct, 100);
+ RANGE_CHECK_HI(cfg, rc_overshoot_pct, 100);
RANGE_CHECK_HI(cfg, rc_2pass_vbr_bias_pct, 100);
RANGE_CHECK(cfg, kf_mode, VPX_KF_DISABLED, VPX_KF_AUTO);
diff --git a/vpx/vpx_encoder.h b/vpx/vpx_encoder.h
index d62d9ee..f8fdfc0 100644
--- a/vpx/vpx_encoder.h
+++ b/vpx/vpx_encoder.h
@@ -58,7 +58,7 @@
* fields to structures
*/
#define VPX_ENCODER_ABI_VERSION \
- (14 + VPX_CODEC_ABI_VERSION + \
+ (15 + VPX_CODEC_ABI_VERSION + \
VPX_EXT_RATECTRL_ABI_VERSION) /**<\hideinitializer*/
/*! \brief Encoder capabilities bitfield
@@ -498,7 +498,7 @@
* undershoot level (current rate vs target) beyond which more aggressive
* corrective measures are taken.
* *
- * Valid values in the range VP8:0-1000 VP9: 0-100.
+ * Valid values in the range VP8:0-100 VP9: 0-100.
*/
unsigned int rc_undershoot_pct;
@@ -513,7 +513,7 @@
* overshoot level (current rate vs target) beyond which more aggressive
* corrective measures are taken.
*
- * Valid values in the range VP8:0-1000 VP9: 0-100.
+ * Valid values in the range VP8:0-100 VP9: 0-100.
*/
unsigned int rc_overshoot_pct;
diff --git a/vpx_dsp/arm/vpx_convolve8_neon.c b/vpx_dsp/arm/vpx_convolve8_neon.c
index 08ae17d..c55c9fb 100644
--- a/vpx_dsp/arm/vpx_convolve8_neon.c
+++ b/vpx_dsp/arm/vpx_convolve8_neon.c
@@ -145,7 +145,7 @@
src += 4;
dst += 4;
w -= 4;
- } while (w > 0);
+ } while (w != 0);
} else {
const int16x8_t filter3 = vdupq_lane_s16(vget_low_s16(filters), 3);
const int16x8_t filter4 = vdupq_lane_s16(vget_high_s16(filters), 0);
@@ -296,7 +296,7 @@
s += 8;
d += 8;
width -= 8;
- } while (width > 0);
+ } while (width != 0);
src += 8 * src_stride;
dst += 8 * dst_stride;
h -= 8;
@@ -402,7 +402,7 @@
src += 4;
dst += 4;
w -= 4;
- } while (w > 0);
+ } while (w != 0);
} else {
const int16x8_t filter3 = vdupq_lane_s16(vget_low_s16(filters), 3);
const int16x8_t filter4 = vdupq_lane_s16(vget_high_s16(filters), 0);
@@ -586,7 +586,7 @@
s += 8;
d += 8;
width -= 8;
- } while (width > 0);
+ } while (width != 0);
src += 8 * src_stride;
dst += 8 * dst_stride;
h -= 8;
@@ -679,7 +679,7 @@
s5 = s9;
s6 = s10;
h -= 4;
- } while (h > 0);
+ } while (h != 0);
} else {
const int16x8_t filter3 = vdupq_lane_s16(vget_low_s16(filters), 3);
const int16x8_t filter4 = vdupq_lane_s16(vget_high_s16(filters), 0);
@@ -759,11 +759,11 @@
s5 = s9;
s6 = s10;
height -= 4;
- } while (height > 0);
+ } while (height != 0);
src += 8;
dst += 8;
w -= 8;
- } while (w > 0);
+ } while (w != 0);
}
}
@@ -860,7 +860,7 @@
s5 = s9;
s6 = s10;
h -= 4;
- } while (h > 0);
+ } while (h != 0);
} else {
const int16x8_t filter3 = vdupq_lane_s16(vget_low_s16(filters), 3);
const int16x8_t filter4 = vdupq_lane_s16(vget_high_s16(filters), 0);
@@ -950,10 +950,10 @@
s5 = s9;
s6 = s10;
height -= 4;
- } while (height > 0);
+ } while (height != 0);
src += 8;
dst += 8;
w -= 8;
- } while (w > 0);
+ } while (w != 0);
}
}
diff --git a/vpx_dsp/arm/vpx_convolve_avg_neon.c b/vpx_dsp/arm/vpx_convolve_avg_neon.c
index 07349d0..8e3ee59 100644
--- a/vpx_dsp/arm/vpx_convolve_avg_neon.c
+++ b/vpx_dsp/arm/vpx_convolve_avg_neon.c
@@ -43,7 +43,7 @@
vst1_lane_u32((uint32_t *)dst, vreinterpret_u32_u8(dd0), 1);
dst += dst_stride;
h -= 2;
- } while (h > 0);
+ } while (h != 0);
} else if (w == 8) { // avg8
uint8x8_t s0, s1, d0, d1;
uint8x16_t s01, d01;
@@ -64,7 +64,7 @@
vst1_u8(dst, vget_high_u8(d01));
dst += dst_stride;
h -= 2;
- } while (h > 0);
+ } while (h != 0);
} else if (w < 32) { // avg16
uint8x16_t s0, s1, d0, d1;
do {
@@ -83,7 +83,7 @@
vst1q_u8(dst, d1);
dst += dst_stride;
h -= 2;
- } while (h > 0);
+ } while (h != 0);
} else if (w == 32) { // avg32
uint8x16_t s0, s1, s2, s3, d0, d1, d2, d3;
do {
@@ -110,7 +110,7 @@
vst1q_u8(dst + 16, d3);
dst += dst_stride;
h -= 2;
- } while (h > 0);
+ } while (h != 0);
} else { // avg64
uint8x16_t s0, s1, s2, s3, d0, d1, d2, d3;
do {
diff --git a/vpx_dsp/arm/vpx_convolve_copy_neon.c b/vpx_dsp/arm/vpx_convolve_copy_neon.c
index 7abed67..361ec8a 100644
--- a/vpx_dsp/arm/vpx_convolve_copy_neon.c
+++ b/vpx_dsp/arm/vpx_convolve_copy_neon.c
@@ -33,7 +33,7 @@
src += src_stride;
dst += dst_stride;
h -= 2;
- } while (h > 0);
+ } while (h != 0);
} else if (w == 8) { // copy8
uint8x8_t s0, s1;
do {
@@ -47,7 +47,7 @@
vst1_u8(dst, s1);
dst += dst_stride;
h -= 2;
- } while (h > 0);
+ } while (h != 0);
} else if (w < 32) { // copy16
uint8x16_t s0, s1;
do {
@@ -61,7 +61,7 @@
vst1q_u8(dst, s1);
dst += dst_stride;
h -= 2;
- } while (h > 0);
+ } while (h != 0);
} else if (w == 32) { // copy32
uint8x16_t s0, s1, s2, s3;
do {
@@ -79,7 +79,7 @@
vst1q_u8(dst + 16, s3);
dst += dst_stride;
h -= 2;
- } while (h > 0);
+ } while (h != 0);
} else { // copy64
uint8x16_t s0, s1, s2, s3;
do {
