ref: 0b0ef4c7b122c0d3cd1c6747365a277620e6eb05
parent: 310f5a769c52f80f5973bea74d9429684ccebcf3
parent: dbe691709ee68ef8bd9cd81508c6d619fccc1480
author: James Zern <[email protected]>
date: Fri Aug 22 13:03:21 EDT 2014
Merge changes I86b21186,Ifde2849f,Ic53cdb8c,Id3db2ae8,Iba3c63cd,I744342b1,I627dc800,Ie1c8830c,I1d43acef,I3e29d8d2,I521ca615 * changes: resize_test.cc: remove unused param warnings invalid_file_test.cc: remove unused param warnings fdct8x8_test.cc: remove unused param warnings fdct4x4_test.cc: remove unused param warnings tests/reference_32x32_dct_1d: remove unused stride param dct16x16_test.cc: remove unused param warnings datarate_test.cc: remove unused param warnings frame_size_tests.cc: remove unused param warnings encode_test_driver.cc: remove unused param warnings encode_test_driver.h: remove unused param warnings decode_test_driver.h: remove unused param warnings
--- a/test/datarate_test.cc
+++ b/test/datarate_test.cc
@@ -41,7 +41,7 @@
}
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<double>(tb.num) / tb.den;
duration_ = 0;
--- a/test/dct16x16_test.cc
+++ b/test/dct16x16_test.cc
@@ -268,11 +268,13 @@
typedef std::tr1::tuple<FdctFunc, IdctFunc, int> Dct16x16Param;
typedef std::tr1::tuple<FhtFunc, IhtFunc, int> 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);
}
--- a/test/dct32x32_test.cc
+++ b/test/dct32x32_test.cc
@@ -37,7 +37,7 @@
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 @@
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 @@
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;
--- a/test/decode_test_driver.h
+++ b/test/decode_test_driver.h
@@ -125,12 +125,12 @@
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;
@@ -137,8 +137,8 @@
}
// 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,
--- a/test/encode_test_driver.cc
+++ b/test/encode_test_driver.cc
@@ -133,8 +133,8 @@
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";
}
--- a/test/encode_test_driver.h
+++ b/test/encode_test_driver.h
@@ -189,20 +189,21 @@
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,12 +219,12 @@
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;
@@ -230,7 +231,7 @@
}
// 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;
}
--- a/test/fdct4x4_test.cc
+++ b/test/fdct4x4_test.cc
@@ -40,7 +40,7 @@
typedef std::tr1::tuple<FdctFunc, IdctFunc, int> Dct4x4Param;
typedef std::tr1::tuple<FhtFunc, IhtFunc, int> 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 @@
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);
}
--- a/test/fdct8x8_test.cc
+++ b/test/fdct8x8_test.cc
@@ -39,7 +39,7 @@
typedef std::tr1::tuple<FdctFunc, IdctFunc, int> Dct8x8Param;
typedef std::tr1::tuple<FhtFunc, IhtFunc, int> 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);
}
--- a/test/frame_size_tests.cc
+++ b/test/frame_size_tests.cc
@@ -27,7 +27,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) {EXPECT_EQ(expected_res_, res_dec) << decoder->DecodeError();
return !::testing::Test::HasFailure();
--- a/test/invalid_file_test.cc
+++ b/test/invalid_file_test.cc
@@ -126,9 +126,9 @@
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) {--- a/test/resize_test.cc
+++ b/test/resize_test.cc
@@ -211,8 +211,8 @@
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 @@
// 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