tests: quiet some unused parameter warnings
Change-Id: Iff8b0d77234f78bf407676891bccad92825bfcc6
This commit is contained in:
@@ -55,19 +55,19 @@ class AverageTestBase : public ::testing::Test {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Sum Pixels
|
// Sum Pixels
|
||||||
unsigned int ReferenceAverage8x8(const uint8_t* source, int pitch ) {
|
unsigned int ReferenceAverage8x8(const uint8_t* source, int pitch) {
|
||||||
unsigned int average = 0;
|
unsigned int average = 0;
|
||||||
for (int h = 0; h < 8; ++h)
|
for (int h = 0; h < 8; ++h)
|
||||||
for (int w = 0; w < 8; ++w)
|
for (int w = 0; w < 8; ++w)
|
||||||
average += source[h * source_stride_ + w];
|
average += source[h * pitch + w];
|
||||||
return ((average + 32) >> 6);
|
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;
|
unsigned int average = 0;
|
||||||
for (int h = 0; h < 4; ++h)
|
for (int h = 0; h < 4; ++h)
|
||||||
for (int w = 0; w < 4; ++w)
|
for (int w = 0; w < 4; ++w)
|
||||||
average += source[h * source_stride_ + w];
|
average += source[h * pitch + w];
|
||||||
return ((average + 8) >> 4);
|
return ((average + 8) >> 4);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -279,8 +279,7 @@ void highbd_block2d_average_c(uint16_t *src,
|
|||||||
uint16_t *output_ptr,
|
uint16_t *output_ptr,
|
||||||
unsigned int output_stride,
|
unsigned int output_stride,
|
||||||
unsigned int output_width,
|
unsigned int output_width,
|
||||||
unsigned int output_height,
|
unsigned int output_height) {
|
||||||
int bd) {
|
|
||||||
unsigned int i, j;
|
unsigned int i, j;
|
||||||
for (i = 0; i < output_height; ++i) {
|
for (i = 0; i < output_height; ++i) {
|
||||||
for (j = 0; j < output_width; ++j) {
|
for (j = 0; j < output_width; ++j) {
|
||||||
@@ -306,7 +305,7 @@ void highbd_filter_average_block2d_8_c(const uint16_t *src_ptr,
|
|||||||
highbd_filter_block2d_8_c(src_ptr, src_stride, HFilter, VFilter, tmp, 64,
|
highbd_filter_block2d_8_c(src_ptr, src_stride, HFilter, VFilter, tmp, 64,
|
||||||
output_width, output_height, bd);
|
output_width, output_height, bd);
|
||||||
highbd_block2d_average_c(tmp, 64, dst_ptr, dst_stride,
|
highbd_block2d_average_c(tmp, 64, dst_ptr, dst_stride,
|
||||||
output_width, output_height, bd);
|
output_width, output_height);
|
||||||
}
|
}
|
||||||
#endif // CONFIG_VP9_HIGHBITDEPTH
|
#endif // CONFIG_VP9_HIGHBITDEPTH
|
||||||
|
|
||||||
|
|||||||
@@ -850,8 +850,7 @@ static void assign_layer_bitrates(vpx_codec_enc_cfg_t *const enc_cfg,
|
|||||||
const vpx_svc_extra_cfg_t *svc_params,
|
const vpx_svc_extra_cfg_t *svc_params,
|
||||||
int spatial_layers,
|
int spatial_layers,
|
||||||
int temporal_layers,
|
int temporal_layers,
|
||||||
int temporal_layering_mode,
|
int temporal_layering_mode) {
|
||||||
unsigned int total_rate) {
|
|
||||||
int sl, spatial_layer_target;
|
int sl, spatial_layer_target;
|
||||||
float total = 0;
|
float total = 0;
|
||||||
float alloc_ratio[VPX_MAX_LAYERS] = {0};
|
float alloc_ratio[VPX_MAX_LAYERS] = {0};
|
||||||
@@ -914,8 +913,7 @@ TEST_P(DatarateOnePassCbrSvc, OnePassCbrSvc) {
|
|||||||
cfg_.rc_target_bitrate = i;
|
cfg_.rc_target_bitrate = i;
|
||||||
ResetModel();
|
ResetModel();
|
||||||
assign_layer_bitrates(&cfg_, &svc_params_, cfg_.ss_number_layers,
|
assign_layer_bitrates(&cfg_, &svc_params_, cfg_.ss_number_layers,
|
||||||
cfg_.ts_number_layers, cfg_.temporal_layering_mode,
|
cfg_.ts_number_layers, cfg_.temporal_layering_mode);
|
||||||
cfg_.rc_target_bitrate);
|
|
||||||
ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
|
ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
|
||||||
ASSERT_GE(cfg_.rc_target_bitrate, effective_datarate_ * 0.85)
|
ASSERT_GE(cfg_.rc_target_bitrate, effective_datarate_ * 0.85)
|
||||||
<< " The datarate for the file exceeds the target by too much!";
|
<< " The datarate for the file exceeds the target by too much!";
|
||||||
@@ -953,8 +951,7 @@ TEST_P(DatarateOnePassCbrSvc, OnePassCbrSvc4threads) {
|
|||||||
cfg_.rc_target_bitrate = 800;
|
cfg_.rc_target_bitrate = 800;
|
||||||
ResetModel();
|
ResetModel();
|
||||||
assign_layer_bitrates(&cfg_, &svc_params_, cfg_.ss_number_layers,
|
assign_layer_bitrates(&cfg_, &svc_params_, cfg_.ss_number_layers,
|
||||||
cfg_.ts_number_layers, cfg_.temporal_layering_mode,
|
cfg_.ts_number_layers, cfg_.temporal_layering_mode);
|
||||||
cfg_.rc_target_bitrate);
|
|
||||||
ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
|
ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
|
||||||
ASSERT_GE(cfg_.rc_target_bitrate, effective_datarate_ * 0.85)
|
ASSERT_GE(cfg_.rc_target_bitrate, effective_datarate_ * 0.85)
|
||||||
<< " The datarate for the file exceeds the target by too much!";
|
<< " The datarate for the file exceeds the target by too much!";
|
||||||
|
|||||||
@@ -276,12 +276,12 @@ void idct16x16_12(const tran_low_t *in, uint8_t *out, int stride) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void idct16x16_10_ref(const tran_low_t *in, uint8_t *out, int stride,
|
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);
|
idct16x16_10(in, out, stride);
|
||||||
}
|
}
|
||||||
|
|
||||||
void idct16x16_12_ref(const tran_low_t *in, uint8_t *out, int 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);
|
idct16x16_12(in, out, stride);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -778,7 +778,7 @@ class InvTrans16x16DCT
|
|||||||
virtual void TearDown() { libvpx_test::ClearSystemState(); }
|
virtual void TearDown() { libvpx_test::ClearSystemState(); }
|
||||||
|
|
||||||
protected:
|
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) {
|
void RunInvTxfm(tran_low_t *out, uint8_t *dst, int stride) {
|
||||||
inv_txfm_(out, dst, stride);
|
inv_txfm_(out, dst, stride);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ class ErrorResilienceTestLarge : public ::libvpx_test::EncoderTest,
|
|||||||
}
|
}
|
||||||
|
|
||||||
virtual void PreEncodeFrameHook(libvpx_test::VideoSource *video,
|
virtual void PreEncodeFrameHook(libvpx_test::VideoSource *video,
|
||||||
::libvpx_test::Encoder *encoder) {
|
::libvpx_test::Encoder * /*encoder*/) {
|
||||||
frame_flags_ &= ~(VP8_EFLAG_NO_UPD_LAST |
|
frame_flags_ &= ~(VP8_EFLAG_NO_UPD_LAST |
|
||||||
VP8_EFLAG_NO_UPD_GF |
|
VP8_EFLAG_NO_UPD_GF |
|
||||||
VP8_EFLAG_NO_UPD_ARF);
|
VP8_EFLAG_NO_UPD_ARF);
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ typedef std::tr1::tuple<FdctFunc, IdctFunc, int, vpx_bit_depth_t> Dct4x4Param;
|
|||||||
typedef std::tr1::tuple<FhtFunc, IhtFunc, int, vpx_bit_depth_t> Ht4x4Param;
|
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,
|
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);
|
vpx_fdct4x4_c(in, out, stride);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -49,7 +49,7 @@ void fht4x4_ref(const int16_t *in, tran_low_t *out, int stride, int tx_type) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void fwht4x4_ref(const int16_t *in, tran_low_t *out, int stride,
|
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);
|
vp9_fwht4x4_c(in, out, stride);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ typedef std::tr1::tuple<FdctFunc, IdctFunc, int, vpx_bit_depth_t> Dct8x8Param;
|
|||||||
typedef std::tr1::tuple<FhtFunc, IhtFunc, int, vpx_bit_depth_t> Ht8x8Param;
|
typedef std::tr1::tuple<FhtFunc, IhtFunc, int, vpx_bit_depth_t> Ht8x8Param;
|
||||||
typedef std::tr1::tuple<IdctFunc, IdctFunc, int, vpx_bit_depth_t> Idct8x8Param;
|
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;
|
const double kInvSqrt2 = 0.707106781186547524400844362104;
|
||||||
for (int k = 0; k < 8; k++) {
|
for (int k = 0; k < 8; k++) {
|
||||||
out[k] = 0.0;
|
out[k] = 0.0;
|
||||||
@@ -65,7 +65,7 @@ void reference_8x8_dct_2d(const int16_t input[kNumCoeffs],
|
|||||||
double temp_in[8], temp_out[8];
|
double temp_in[8], temp_out[8];
|
||||||
for (int j = 0; j < 8; ++j)
|
for (int j = 0; j < 8; ++j)
|
||||||
temp_in[j] = input[j*8 + i];
|
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)
|
for (int j = 0; j < 8; ++j)
|
||||||
output[j * 8 + i] = temp_out[j];
|
output[j * 8 + i] = temp_out[j];
|
||||||
}
|
}
|
||||||
@@ -74,7 +74,7 @@ void reference_8x8_dct_2d(const int16_t input[kNumCoeffs],
|
|||||||
double temp_in[8], temp_out[8];
|
double temp_in[8], temp_out[8];
|
||||||
for (int j = 0; j < 8; ++j)
|
for (int j = 0; j < 8; ++j)
|
||||||
temp_in[j] = output[j + i*8];
|
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
|
// Scale by some magic number
|
||||||
for (int j = 0; j < 8; ++j)
|
for (int j = 0; j < 8; ++j)
|
||||||
output[j + i * 8] = temp_out[j] * 2;
|
output[j + i * 8] = temp_out[j] * 2;
|
||||||
@@ -82,7 +82,8 @@ void reference_8x8_dct_2d(const int16_t input[kNumCoeffs],
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
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);
|
vpx_fdct8x8_c(in, out, stride);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -642,7 +643,7 @@ class InvTrans8x8DCT
|
|||||||
void RunInvTxfm(tran_low_t *out, uint8_t *dst, int stride) {
|
void RunInvTxfm(tran_low_t *out, uint8_t *dst, int stride) {
|
||||||
inv_txfm_(out, dst, 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 ref_txfm_;
|
||||||
IdctFunc inv_txfm_;
|
IdctFunc inv_txfm_;
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ class VPxEncoderThreadTest
|
|||||||
encoder_initialized_ = false;
|
encoder_initialized_ = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void PreEncodeFrameHook(::libvpx_test::VideoSource *video,
|
virtual void PreEncodeFrameHook(::libvpx_test::VideoSource * /*video*/,
|
||||||
::libvpx_test::Encoder *encoder) {
|
::libvpx_test::Encoder *encoder) {
|
||||||
if (!encoder_initialized_) {
|
if (!encoder_initialized_) {
|
||||||
// Encode 4 column tiles.
|
// Encode 4 column tiles.
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ class VP9IntraPredBase {
|
|||||||
virtual ~VP9IntraPredBase() { libvpx_test::ClearSystemState(); }
|
virtual ~VP9IntraPredBase() { libvpx_test::ClearSystemState(); }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void Predict(PREDICTION_MODE mode) = 0;
|
virtual void Predict() = 0;
|
||||||
|
|
||||||
void CheckPrediction(int test_case_number, int *error_count) const {
|
void CheckPrediction(int test_case_number, int *error_count) const {
|
||||||
// For each pixel ensure that the calculated value is the same as reference.
|
// For each pixel ensure that the calculated value is the same as reference.
|
||||||
@@ -73,7 +73,7 @@ class VP9IntraPredBase {
|
|||||||
left_col_[y] = rnd.Rand16() & mask_;
|
left_col_[y] = rnd.Rand16() & mask_;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Predict(DC_PRED);
|
Predict();
|
||||||
CheckPrediction(i, &error_count);
|
CheckPrediction(i, &error_count);
|
||||||
}
|
}
|
||||||
ASSERT_EQ(0, error_count);
|
ASSERT_EQ(0, error_count);
|
||||||
@@ -106,7 +106,7 @@ class VP9IntraPredTest
|
|||||||
mask_ = (1 << bit_depth_) - 1;
|
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_above_row = above_row_;
|
||||||
const uint16_t *const_left_col = left_col_;
|
const uint16_t *const_left_col = left_col_;
|
||||||
ref_fn_(ref_dst_, stride_, const_above_row, const_left_col, bit_depth_);
|
ref_fn_(ref_dst_, stride_, const_above_row, const_left_col, bit_depth_);
|
||||||
|
|||||||
Reference in New Issue
Block a user