ref: 425b1562c47717383a27799b8c7e647630e28533
parent: 8628898acf6637fdc59e3d15f60030ac759481e4
parent: cffef113b95cb0ff0a2e18cca0ab2b0e77f96020
author: James Zern <[email protected]>
date: Fri Feb 12 20:03:45 EST 2016
Merge changes from topic 'unused-params' * changes: tests: quiet some unused parameter warnings vp9_error_block_test: prefer EXPECT over assert() vp9_encoder_parms_get_to_decoder: add missing initializers vpxenc: quiet unused param warning vpx_ve_predictor_4x4_c: quiet unused param warning
--- a/test/avg_test.cc
+++ b/test/avg_test.cc
@@ -55,19 +55,19 @@
}
// Sum Pixels
- unsigned int ReferenceAverage8x8(const uint8_t* source, int pitch ) {+ unsigned int ReferenceAverage8x8(const uint8_t* source, int pitch) {unsigned int average = 0;
for (int h = 0; h < 8; ++h)
for (int w = 0; w < 8; ++w)
- average += source[h * source_stride_ + w];
+ average += source[h * pitch + w];
return ((average + 32) >> 6);
}
- unsigned int ReferenceAverage4x4(const uint8_t* source, int pitch ) {+ unsigned int ReferenceAverage4x4(const uint8_t* source, int pitch) {unsigned int average = 0;
for (int h = 0; h < 4; ++h)
for (int w = 0; w < 4; ++w)
- average += source[h * source_stride_ + w];
+ average += source[h * pitch + w];
return ((average + 8) >> 4);
}
--- a/test/convolve_test.cc
+++ b/test/convolve_test.cc
@@ -279,8 +279,7 @@
uint16_t *output_ptr,
unsigned int output_stride,
unsigned int output_width,
- unsigned int output_height,
- int bd) {+ unsigned int output_height) {unsigned int i, j;
for (i = 0; i < output_height; ++i) { for (j = 0; j < output_width; ++j) {@@ -306,7 +305,7 @@
highbd_filter_block2d_8_c(src_ptr, src_stride, HFilter, VFilter, tmp, 64,
output_width, output_height, bd);
highbd_block2d_average_c(tmp, 64, dst_ptr, dst_stride,
- output_width, output_height, bd);
+ output_width, output_height);
}
#endif // CONFIG_VP9_HIGHBITDEPTH
--- a/test/datarate_test.cc
+++ b/test/datarate_test.cc
@@ -850,8 +850,7 @@
const vpx_svc_extra_cfg_t *svc_params,
int spatial_layers,
int temporal_layers,
- int temporal_layering_mode,
- unsigned int total_rate) {+ int temporal_layering_mode) {int sl, spatial_layer_target;
float total = 0;
float alloc_ratio[VPX_MAX_LAYERS] = {0};@@ -914,8 +913,7 @@
cfg_.rc_target_bitrate = i;
ResetModel();
assign_layer_bitrates(&cfg_, &svc_params_, cfg_.ss_number_layers,
- cfg_.ts_number_layers, cfg_.temporal_layering_mode,
- cfg_.rc_target_bitrate);
+ cfg_.ts_number_layers, cfg_.temporal_layering_mode);
ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
ASSERT_GE(cfg_.rc_target_bitrate, effective_datarate_ * 0.85)
<< " The datarate for the file exceeds the target by too much!";
@@ -953,8 +951,7 @@
cfg_.rc_target_bitrate = 800;
ResetModel();
assign_layer_bitrates(&cfg_, &svc_params_, cfg_.ss_number_layers,
- cfg_.ts_number_layers, cfg_.temporal_layering_mode,
- cfg_.rc_target_bitrate);
+ cfg_.ts_number_layers, cfg_.temporal_layering_mode);
ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
ASSERT_GE(cfg_.rc_target_bitrate, effective_datarate_ * 0.85)
<< " The datarate for the file exceeds the target by too much!";
--- a/test/dct16x16_test.cc
+++ b/test/dct16x16_test.cc
@@ -276,12 +276,12 @@
}
void idct16x16_10_ref(const tran_low_t *in, uint8_t *out, int stride,
- int tx_type) {+ int /*tx_type*/) {idct16x16_10(in, out, stride);
}
void idct16x16_12_ref(const tran_low_t *in, uint8_t *out, int stride,
- int tx_type) {+ int /*tx_type*/) {idct16x16_12(in, out, stride);
}
@@ -778,7 +778,7 @@
virtual void TearDown() { libvpx_test::ClearSystemState(); }protected:
- void RunFwdTxfm(int16_t *in, tran_low_t *out, int stride) {}+ void RunFwdTxfm(int16_t * /*in*/, tran_low_t * /*out*/, int /*stride*/) {} void RunInvTxfm(tran_low_t *out, uint8_t *dst, int stride) {inv_txfm_(out, dst, stride);
}
--- a/test/error_resilience_test.cc
+++ b/test/error_resilience_test.cc
@@ -100,7 +100,7 @@
}
virtual void PreEncodeFrameHook(libvpx_test::VideoSource *video,
- ::libvpx_test::Encoder *encoder) {+ ::libvpx_test::Encoder * /*encoder*/) {frame_flags_ &= ~(VP8_EFLAG_NO_UPD_LAST |
VP8_EFLAG_NO_UPD_GF |
VP8_EFLAG_NO_UPD_ARF);
--- a/test/fdct4x4_test.cc
+++ b/test/fdct4x4_test.cc
@@ -40,7 +40,7 @@
typedef std::tr1::tuple<FhtFunc, IhtFunc, int, vpx_bit_depth_t> Ht4x4Param;
void fdct4x4_ref(const int16_t *in, tran_low_t *out, int stride,
- int tx_type) {+ int /*tx_type*/) {vpx_fdct4x4_c(in, out, stride);
}
@@ -49,7 +49,7 @@
}
void fwht4x4_ref(const int16_t *in, tran_low_t *out, int stride,
- int tx_type) {+ int /*tx_type*/) {vp9_fwht4x4_c(in, out, stride);
}
--- a/test/fdct8x8_test.cc
+++ b/test/fdct8x8_test.cc
@@ -47,7 +47,7 @@
typedef std::tr1::tuple<FhtFunc, IhtFunc, int, vpx_bit_depth_t> Ht8x8Param;
typedef std::tr1::tuple<IdctFunc, IdctFunc, int, vpx_bit_depth_t> Idct8x8Param;
-void reference_8x8_dct_1d(const double in[8], double out[8], int stride) {+void reference_8x8_dct_1d(const double in[8], double out[8]) {const double kInvSqrt2 = 0.707106781186547524400844362104;
for (int k = 0; k < 8; k++) {out[k] = 0.0;
@@ -65,7 +65,7 @@
double temp_in[8], temp_out[8];
for (int j = 0; j < 8; ++j)
temp_in[j] = input[j*8 + i];
- reference_8x8_dct_1d(temp_in, temp_out, 1);
+ reference_8x8_dct_1d(temp_in, temp_out);
for (int j = 0; j < 8; ++j)
output[j * 8 + i] = temp_out[j];
}
@@ -74,7 +74,7 @@
double temp_in[8], temp_out[8];
for (int j = 0; j < 8; ++j)
temp_in[j] = output[j + i*8];
- reference_8x8_dct_1d(temp_in, temp_out, 1);
+ reference_8x8_dct_1d(temp_in, temp_out);
// Scale by some magic number
for (int j = 0; j < 8; ++j)
output[j + i * 8] = temp_out[j] * 2;
@@ -82,7 +82,8 @@
}
-void fdct8x8_ref(const int16_t *in, tran_low_t *out, int stride, int tx_type) {+void fdct8x8_ref(const int16_t *in, tran_low_t *out, int stride,
+ int /*tx_type*/) {vpx_fdct8x8_c(in, out, stride);
}
@@ -642,7 +643,7 @@
void RunInvTxfm(tran_low_t *out, uint8_t *dst, int stride) {inv_txfm_(out, dst, stride);
}
- void RunFwdTxfm(int16_t *out, tran_low_t *dst, int stride) {}+ void RunFwdTxfm(int16_t * /*out*/, tran_low_t * /*dst*/, int /*stride*/) {}IdctFunc ref_txfm_;
IdctFunc inv_txfm_;
--- a/test/test_vector_test.cc
+++ b/test/test_vector_test.cc
@@ -103,7 +103,7 @@
const int mode = std::tr1::get<kDecodeMode>(input);
libvpx_test::CompressedVideoSource *video = NULL;
vpx_codec_flags_t flags = 0;
- vpx_codec_dec_cfg_t cfg = {0};+ vpx_codec_dec_cfg_t cfg = vpx_codec_dec_cfg_t();
char str[256];
if (mode == kFrameParallelMode) {--- a/test/vp9_encoder_parms_get_to_decoder.cc
+++ b/test/vp9_encoder_parms_get_to_decoder.cc
@@ -45,9 +45,9 @@
};
const EncodeParameters kVP9EncodeParameterSet[] = {- {0, 0, 0, 1, 0, VPX_CR_STUDIO_RANGE, VPX_CS_BT_601},- {0, 0, 0, 0, 0, VPX_CR_FULL_RANGE, VPX_CS_BT_709},- {0, 0, 1, 0, 0, VPX_CR_FULL_RANGE, VPX_CS_BT_2020},+ {0, 0, 0, 1, 0, VPX_CR_STUDIO_RANGE, VPX_CS_BT_601, { 0, 0 }},+ {0, 0, 0, 0, 0, VPX_CR_FULL_RANGE, VPX_CS_BT_709, { 0, 0 }},+ {0, 0, 1, 0, 0, VPX_CR_FULL_RANGE, VPX_CS_BT_2020, { 0, 0 }}, {0, 2, 0, 0, 1, VPX_CR_STUDIO_RANGE, VPX_CS_UNKNOWN, { 640, 480 }},// TODO(JBB): Test profiles (requires more work).
};
@@ -93,7 +93,7 @@
}
virtual bool HandleDecodeResult(const vpx_codec_err_t res_dec,
- const libvpx_test::VideoSource &video,
+ const libvpx_test::VideoSource & /*video*/,
libvpx_test::Decoder *decoder) {vpx_codec_ctx_t *const vp9_decoder = decoder->GetDecoder();
vpx_codec_alg_priv_t *const priv =
--- a/test/vp9_error_block_test.cc
+++ b/test/vp9_error_block_test.cc
@@ -164,7 +164,7 @@
const tran_low_t *dqcoeff,
intptr_t block_size,
int64_t *ssz, int bps) {- assert(bps == 8);
+ EXPECT_EQ(8, bps);
return vp9_highbd_block_error_8bit_c(coeff, dqcoeff, block_size, ssz);
}
@@ -173,7 +173,7 @@
const tran_low_t *dqcoeff,
intptr_t block_size,
int64_t *ssz, int bps) {- assert(bps == 8);
+ EXPECT_EQ(8, bps);
return vp9_highbd_block_error_8bit_sse2(coeff, dqcoeff, block_size, ssz);
}
@@ -195,7 +195,7 @@
const tran_low_t *dqcoeff,
intptr_t block_size,
int64_t *ssz, int bps) {- assert(bps == 8);
+ EXPECT_EQ(8, bps);
return vp9_highbd_block_error_8bit_avx(coeff, dqcoeff, block_size, ssz);
}
--- a/test/vp9_ethread_test.cc
+++ b/test/vp9_ethread_test.cc
@@ -62,7 +62,7 @@
encoder_initialized_ = false;
}
- virtual void PreEncodeFrameHook(::libvpx_test::VideoSource *video,
+ virtual void PreEncodeFrameHook(::libvpx_test::VideoSource * /*video*/,
::libvpx_test::Encoder *encoder) { if (!encoder_initialized_) {// Encode 4 column tiles.
--- a/test/vp9_intrapred_test.cc
+++ b/test/vp9_intrapred_test.cc
@@ -34,7 +34,7 @@
virtual ~VP9IntraPredBase() { libvpx_test::ClearSystemState(); }protected:
- virtual void Predict(PREDICTION_MODE mode) = 0;
+ virtual void Predict() = 0;
void CheckPrediction(int test_case_number, int *error_count) const {// For each pixel ensure that the calculated value is the same as reference.
@@ -73,7 +73,7 @@
left_col_[y] = rnd.Rand16() & mask_;
}
}
- Predict(DC_PRED);
+ Predict();
CheckPrediction(i, &error_count);
}
ASSERT_EQ(0, error_count);
@@ -106,7 +106,7 @@
mask_ = (1 << bit_depth_) - 1;
}
- virtual void Predict(PREDICTION_MODE mode) {+ virtual void Predict() {const uint16_t *const_above_row = above_row_;
const uint16_t *const_left_col = left_col_;
ref_fn_(ref_dst_, stride_, const_above_row, const_left_col, bit_depth_);
--- a/vpx_dsp/intrapred.c
+++ b/vpx_dsp/intrapred.c
@@ -326,6 +326,7 @@
const int K = above[2];
const int L = above[3];
const int M = above[4];
+ (void)left;
dst[0] = AVG3(H, I, J);
dst[1] = AVG3(I, J, K);
--- a/vpxenc.c
+++ b/vpxenc.c
@@ -1470,6 +1470,8 @@
global->codec->fourcc,
pixel_aspect_ratio);
}
+#else
+ (void)pixel_aspect_ratio;
#endif
if (!stream->config.write_webm) {