From adfda32a8d31412805af5501a13b73cf840e408c Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 22 Aug 2014 11:58:48 -0700 Subject: [PATCH 01/11] decode_test_driver.h: remove unused param warnings in DecoderTest default implementations Change-Id: I521ca61569356d51aef9379d6ce68542e88da84b --- test/decode_test_driver.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/decode_test_driver.h b/test/decode_test_driver.h index 1f73c7d20..a757b5974 100644 --- a/test/decode_test_driver.h +++ b/test/decode_test_driver.h @@ -125,20 +125,20 @@ class DecoderTest { const vpx_codec_dec_cfg_t &dec_cfg); // Hook to be called before decompressing every frame. - virtual void PreDecodeFrameHook(const CompressedVideoSource& video, - Decoder *decoder) {} + virtual void PreDecodeFrameHook(const CompressedVideoSource& /*video*/, + Decoder* /*decoder*/) {} // Hook to be called to handle decode result. Return true to continue. virtual bool HandleDecodeResult(const vpx_codec_err_t res_dec, - const CompressedVideoSource& /* video */, + const CompressedVideoSource& /*video*/, Decoder *decoder) { EXPECT_EQ(VPX_CODEC_OK, res_dec) << decoder->DecodeError(); return VPX_CODEC_OK == res_dec; } // Hook to be called on every decompressed frame. - virtual void DecompressedFrameHook(const vpx_image_t& img, - const unsigned int frame_number) {} + virtual void DecompressedFrameHook(const vpx_image_t& /*img*/, + const unsigned int /*frame_number*/) {} // Hook to be called on peek result virtual void HandlePeekResult(Decoder* const decoder, From cae810ac5ea04ffca13f1137d1b089d561932300 Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 22 Aug 2014 11:58:48 -0700 Subject: [PATCH 02/11] encode_test_driver.h: remove unused param warnings in EncoderTest default implementations Change-Id: I3e29d8d2a834fece87aab35813b5e275a30c32fd --- test/encode_test_driver.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/test/encode_test_driver.h b/test/encode_test_driver.h index 2270ce22f..a77bd6478 100644 --- a/test/encode_test_driver.h +++ b/test/encode_test_driver.h @@ -189,20 +189,21 @@ class EncoderTest { virtual void RunLoop(VideoSource *video); // Hook to be called at the beginning of a pass. - virtual void BeginPassHook(unsigned int pass) {} + virtual void BeginPassHook(unsigned int /*pass*/) {} // Hook to be called at the end of a pass. virtual void EndPassHook() {} // Hook to be called before encoding a frame. - virtual void PreEncodeFrameHook(VideoSource *video) {} - virtual void PreEncodeFrameHook(VideoSource *video, Encoder *encoder) {} + virtual void PreEncodeFrameHook(VideoSource* /*video*/) {} + virtual void PreEncodeFrameHook(VideoSource* /*video*/, + Encoder* /*encoder*/) {} // Hook to be called on every compressed data packet. - virtual void FramePktHook(const vpx_codec_cx_pkt_t *pkt) {} + virtual void FramePktHook(const vpx_codec_cx_pkt_t* /*pkt*/) {} // Hook to be called on every PSNR packet. - virtual void PSNRPktHook(const vpx_codec_cx_pkt_t *pkt) {} + virtual void PSNRPktHook(const vpx_codec_cx_pkt_t* /*pkt*/) {} // Hook to determine whether the encode loop should continue. virtual bool Continue() const { @@ -218,19 +219,19 @@ class EncoderTest { const vpx_image_t *img2); // Hook to be called on every decompressed frame. - virtual void DecompressedFrameHook(const vpx_image_t& img, - vpx_codec_pts_t pts) {} + virtual void DecompressedFrameHook(const vpx_image_t& /*img*/, + vpx_codec_pts_t /*pts*/) {} // Hook to be called to handle decode result. Return true to continue. virtual bool HandleDecodeResult(const vpx_codec_err_t res_dec, - const VideoSource& /* video */, + const VideoSource& /*video*/, Decoder *decoder) { EXPECT_EQ(VPX_CODEC_OK, res_dec) << decoder->DecodeError(); return VPX_CODEC_OK == res_dec; } // Hook that can modify the encoder's output data - virtual const vpx_codec_cx_pkt_t * MutateEncoderOutputHook( + virtual const vpx_codec_cx_pkt_t *MutateEncoderOutputHook( const vpx_codec_cx_pkt_t *pkt) { return pkt; } From 53bd212dc5267cfc430a446d263d911ab792bff1 Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 22 Aug 2014 12:11:42 -0700 Subject: [PATCH 03/11] encode_test_driver.cc: remove unused param warnings Change-Id: I1d43acef0983d10bda9fa495d6d723a4f9e2deaf --- test/encode_test_driver.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/encode_test_driver.cc b/test/encode_test_driver.cc index 6d4281d67..13f8c76c3 100644 --- a/test/encode_test_driver.cc +++ b/test/encode_test_driver.cc @@ -133,8 +133,8 @@ static bool compare_img(const vpx_image_t *img1, return match; } -void EncoderTest::MismatchHook(const vpx_image_t *img1, - const vpx_image_t *img2) { +void EncoderTest::MismatchHook(const vpx_image_t* /*img1*/, + const vpx_image_t* /*img2*/) { ASSERT_TRUE(0) << "Encode/Decode mismatch found"; } From 5c3d4f6ab84104294f08717f3b0c8716556cbe78 Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 22 Aug 2014 12:11:42 -0700 Subject: [PATCH 04/11] frame_size_tests.cc: remove unused param warnings Change-Id: Ie1c8830ca3b73f19764d79f122ee990f3f297d63 --- test/frame_size_tests.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/frame_size_tests.cc b/test/frame_size_tests.cc index db27975a8..1c9a52297 100644 --- a/test/frame_size_tests.cc +++ b/test/frame_size_tests.cc @@ -27,7 +27,7 @@ class VP9FrameSizeTestsLarge } virtual bool HandleDecodeResult(const vpx_codec_err_t res_dec, - const libvpx_test::VideoSource &video, + const libvpx_test::VideoSource& /*video*/, libvpx_test::Decoder *decoder) { EXPECT_EQ(expected_res_, res_dec) << decoder->DecodeError(); return !::testing::Test::HasFailure(); From cd2ac828cc60aeba14100e2591af4cdc628169fb Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 22 Aug 2014 12:11:42 -0700 Subject: [PATCH 05/11] datarate_test.cc: remove unused param warnings Change-Id: I627dc800f1925cc5a5d68630009cf8a454f07567 --- test/datarate_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/datarate_test.cc b/test/datarate_test.cc index 8dcf26ca2..a8d8d4250 100644 --- a/test/datarate_test.cc +++ b/test/datarate_test.cc @@ -41,7 +41,7 @@ class DatarateTestLarge : public ::libvpx_test::EncoderTest, } virtual void PreEncodeFrameHook(::libvpx_test::VideoSource *video, - ::libvpx_test::Encoder *encoder) { + ::libvpx_test::Encoder* /*encoder*/) { const vpx_rational_t tb = video->timebase(); timebase_ = static_cast(tb.num) / tb.den; duration_ = 0; From 632e41976e8f77e7756578d521d27e7da1bed0d7 Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 22 Aug 2014 12:11:42 -0700 Subject: [PATCH 06/11] dct16x16_test.cc: remove unused param warnings Change-Id: I744342b12ae7e5423b06b87ceec2d2ab4a3a3cbb --- test/dct16x16_test.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/dct16x16_test.cc b/test/dct16x16_test.cc index ee417ce2e..c38cc2ea5 100644 --- a/test/dct16x16_test.cc +++ b/test/dct16x16_test.cc @@ -268,11 +268,13 @@ typedef void (*IhtFunc)(const int16_t *in, uint8_t *out, int stride, typedef std::tr1::tuple Dct16x16Param; typedef std::tr1::tuple Ht16x16Param; -void fdct16x16_ref(const int16_t *in, int16_t *out, int stride, int tx_type) { +void fdct16x16_ref(const int16_t *in, int16_t *out, int stride, + int /*tx_type*/) { vp9_fdct16x16_c(in, out, stride); } -void idct16x16_ref(const int16_t *in, uint8_t *dest, int stride, int tx_type) { +void idct16x16_ref(const int16_t *in, uint8_t *dest, int stride, + int /*tx_type*/) { vp9_idct16x16_256_add_c(in, dest, stride); } From eb2f0009e454a70b231ff840a6e459f32e8650da Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 22 Aug 2014 12:29:37 -0700 Subject: [PATCH 07/11] tests/reference_32x32_dct_1d: remove unused stride param Change-Id: Iba3c63cda2d825e72879b567589615aded522fbb --- test/dct32x32_test.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/dct32x32_test.cc b/test/dct32x32_test.cc index 4f34a44f7..d2d437c66 100644 --- a/test/dct32x32_test.cc +++ b/test/dct32x32_test.cc @@ -37,7 +37,7 @@ static int round(double x) { const int kNumCoeffs = 1024; const double kPi = 3.141592653589793238462643383279502884; -void reference_32x32_dct_1d(const double in[32], double out[32], int stride) { +void reference_32x32_dct_1d(const double in[32], double out[32]) { const double kInvSqrt2 = 0.707106781186547524400844362104; for (int k = 0; k < 32; k++) { out[k] = 0.0; @@ -55,7 +55,7 @@ void reference_32x32_dct_2d(const int16_t input[kNumCoeffs], double temp_in[32], temp_out[32]; for (int j = 0; j < 32; ++j) temp_in[j] = input[j*32 + i]; - reference_32x32_dct_1d(temp_in, temp_out, 1); + reference_32x32_dct_1d(temp_in, temp_out); for (int j = 0; j < 32; ++j) output[j * 32 + i] = temp_out[j]; } @@ -64,7 +64,7 @@ void reference_32x32_dct_2d(const int16_t input[kNumCoeffs], double temp_in[32], temp_out[32]; for (int j = 0; j < 32; ++j) temp_in[j] = output[j + i*32]; - reference_32x32_dct_1d(temp_in, temp_out, 1); + reference_32x32_dct_1d(temp_in, temp_out); // Scale by some magic number for (int j = 0; j < 32; ++j) output[j + i * 32] = temp_out[j] / 4; From 771dd6ef5e3dd03a2648a3c8806fb174d97afebb Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 22 Aug 2014 12:11:42 -0700 Subject: [PATCH 08/11] fdct4x4_test.cc: remove unused param warnings Change-Id: Id3db2ae8e88f9ac64a00f7d989c1ec3ff0c8ef84 --- test/fdct4x4_test.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/fdct4x4_test.cc b/test/fdct4x4_test.cc index 7c4826086..08a69abee 100644 --- a/test/fdct4x4_test.cc +++ b/test/fdct4x4_test.cc @@ -40,7 +40,7 @@ typedef void (*IhtFunc)(const int16_t *in, uint8_t *out, int stride, typedef std::tr1::tuple Dct4x4Param; typedef std::tr1::tuple Ht4x4Param; -void fdct4x4_ref(const int16_t *in, int16_t *out, int stride, int tx_type) { +void fdct4x4_ref(const int16_t *in, int16_t *out, int stride, int /*tx_type*/) { vp9_fdct4x4_c(in, out, stride); } @@ -48,7 +48,7 @@ void fht4x4_ref(const int16_t *in, int16_t *out, int stride, int tx_type) { vp9_fht4x4_c(in, out, stride, tx_type); } -void fwht4x4_ref(const int16_t *in, int16_t *out, int stride, int tx_type) { +void fwht4x4_ref(const int16_t *in, int16_t *out, int stride, int /*tx_type*/) { vp9_fwht4x4_c(in, out, stride); } From 722eecfa35d444b9c39bd424b4df867c39bbfd70 Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 22 Aug 2014 12:11:42 -0700 Subject: [PATCH 09/11] fdct8x8_test.cc: remove unused param warnings Change-Id: Ic53cdb8c9f8312e7404505fcec653d5b9e9587d1 --- test/fdct8x8_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/fdct8x8_test.cc b/test/fdct8x8_test.cc index 567e5f698..a694f0c45 100644 --- a/test/fdct8x8_test.cc +++ b/test/fdct8x8_test.cc @@ -39,7 +39,7 @@ typedef void (*IhtFunc)(const int16_t *in, uint8_t *out, int stride, typedef std::tr1::tuple Dct8x8Param; typedef std::tr1::tuple Ht8x8Param; -void fdct8x8_ref(const int16_t *in, int16_t *out, int stride, int tx_type) { +void fdct8x8_ref(const int16_t *in, int16_t *out, int stride, int /*tx_type*/) { vp9_fdct8x8_c(in, out, stride); } From f0f9ab68ae356c76b0a42eec6c799497c06b448d Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 22 Aug 2014 12:11:42 -0700 Subject: [PATCH 10/11] invalid_file_test.cc: remove unused param warnings Change-Id: Ifde2849f45acb59fbcf29c8735ef0a10d4d9041e --- test/invalid_file_test.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/invalid_file_test.cc b/test/invalid_file_test.cc index 0a1c17c99..1e188fbc5 100644 --- a/test/invalid_file_test.cc +++ b/test/invalid_file_test.cc @@ -126,9 +126,9 @@ VP9_INSTANTIATE_TEST_CASE(InvalidFileTest, class InvalidFileInvalidPeekTest : public InvalidFileTest { protected: InvalidFileInvalidPeekTest() : InvalidFileTest() {} - virtual void HandlePeekResult(libvpx_test::Decoder *const decoder, - libvpx_test::CompressedVideoSource *video, - const vpx_codec_err_t res_peek) {} + virtual void HandlePeekResult(libvpx_test::Decoder* /*decoder*/, + libvpx_test::CompressedVideoSource* /*video*/, + const vpx_codec_err_t /*res_peek*/) {} }; TEST_P(InvalidFileInvalidPeekTest, ReturnCode) { From dbe691709ee68ef8bd9cd81508c6d619fccc1480 Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 22 Aug 2014 12:11:42 -0700 Subject: [PATCH 11/11] resize_test.cc: remove unused param warnings Change-Id: I86b21186e49f9e0ec0d8eb3addaa44b9fd196a6b --- test/resize_test.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/resize_test.cc b/test/resize_test.cc index 8d08f1ee3..9d0c570ae 100644 --- a/test/resize_test.cc +++ b/test/resize_test.cc @@ -211,8 +211,8 @@ class ResizeInternalTest : public ResizeTest { EXPECT_NEAR(pkt->data.psnr.psnr[0], frame0_psnr_, 2.0); } - virtual void FramePktHook(const vpx_codec_cx_pkt_t *pkt) { #if WRITE_COMPRESSED_STREAM + virtual void FramePktHook(const vpx_codec_cx_pkt_t *pkt) { ++out_frames_; // Write initial file header if first frame. @@ -222,8 +222,8 @@ class ResizeInternalTest : public ResizeTest { // Write frame header and data. write_ivf_frame_header(pkt, outfile_); (void)fwrite(pkt->data.frame.buf, 1, pkt->data.frame.sz, outfile_); -#endif } +#endif double frame0_psnr_; #if WRITE_COMPRESSED_STREAM