Merge "tests: use consistent case for VP[89]"

This commit is contained in:
James Zern 2014-03-26 12:40:16 -07:00 committed by Gerrit Code Review
commit 4fe45a83b2
6 changed files with 16 additions and 16 deletions

View File

@ -210,7 +210,7 @@ class ExternalFrameBufferMD5Test
ASSERT_TRUE(fb_list_.CreateBufferList(num_buffers_)); ASSERT_TRUE(fb_list_.CreateBufferList(num_buffers_));
ASSERT_EQ(VPX_CODEC_OK, ASSERT_EQ(VPX_CODEC_OK,
decoder->SetFrameBufferFunctions( decoder->SetFrameBufferFunctions(
GetVp9FrameBuffer, ReleaseVP9FrameBuffer, this)); GetVP9FrameBuffer, ReleaseVP9FrameBuffer, this));
} }
} }
@ -242,7 +242,7 @@ class ExternalFrameBufferMD5Test
// Callback to get a free external frame buffer. Return value < 0 is an // Callback to get a free external frame buffer. Return value < 0 is an
// error. // error.
static int GetVp9FrameBuffer(void *user_priv, size_t min_size, static int GetVP9FrameBuffer(void *user_priv, size_t min_size,
vpx_codec_frame_buffer_t *fb) { vpx_codec_frame_buffer_t *fb) {
ExternalFrameBufferMD5Test *const md5Test = ExternalFrameBufferMD5Test *const md5Test =
reinterpret_cast<ExternalFrameBufferMD5Test*>(user_priv); reinterpret_cast<ExternalFrameBufferMD5Test*>(user_priv);

View File

@ -25,7 +25,7 @@ typedef void (*post_proc_func_t)(unsigned char *src_ptr,
namespace { namespace {
class Vp8PostProcessingFilterTest class VP8PostProcessingFilterTest
: public ::testing::TestWithParam<post_proc_func_t> { : public ::testing::TestWithParam<post_proc_func_t> {
public: public:
virtual void TearDown() { virtual void TearDown() {
@ -36,7 +36,7 @@ class Vp8PostProcessingFilterTest
// Test routine for the VP8 post-processing function // Test routine for the VP8 post-processing function
// vp8_post_proc_down_and_across_mb_row_c. // vp8_post_proc_down_and_across_mb_row_c.
TEST_P(Vp8PostProcessingFilterTest, FilterOutputCheck) { TEST_P(VP8PostProcessingFilterTest, FilterOutputCheck) {
// Size of the underlying data block that will be filtered. // Size of the underlying data block that will be filtered.
const int block_width = 16; const int block_width = 16;
const int block_height = 16; const int block_height = 16;
@ -91,7 +91,7 @@ TEST_P(Vp8PostProcessingFilterTest, FilterOutputCheck) {
for (int i = 0; i < block_height; ++i) { for (int i = 0; i < block_height; ++i) {
for (int j = 0; j < block_width; ++j) { for (int j = 0; j < block_width; ++j) {
EXPECT_EQ(expected_data[i], pixel_ptr[j]) EXPECT_EQ(expected_data[i], pixel_ptr[j])
<< "Vp8PostProcessingFilterTest failed with invalid filter output"; << "VP8PostProcessingFilterTest failed with invalid filter output";
} }
pixel_ptr += output_stride; pixel_ptr += output_stride;
} }
@ -101,11 +101,11 @@ TEST_P(Vp8PostProcessingFilterTest, FilterOutputCheck) {
vpx_free(flimits); vpx_free(flimits);
}; };
INSTANTIATE_TEST_CASE_P(C, Vp8PostProcessingFilterTest, INSTANTIATE_TEST_CASE_P(C, VP8PostProcessingFilterTest,
::testing::Values(vp8_post_proc_down_and_across_mb_row_c)); ::testing::Values(vp8_post_proc_down_and_across_mb_row_c));
#if HAVE_SSE2 #if HAVE_SSE2
INSTANTIATE_TEST_CASE_P(SSE2, Vp8PostProcessingFilterTest, INSTANTIATE_TEST_CASE_P(SSE2, VP8PostProcessingFilterTest,
::testing::Values(vp8_post_proc_down_and_across_mb_row_sse2)); ::testing::Values(vp8_post_proc_down_and_across_mb_row_sse2));
#endif #endif

View File

@ -26,7 +26,7 @@ using libvpx_test::ACMRandom;
namespace { namespace {
TEST(Vp8RoiMapTest, ParameterCheck) { TEST(VP8RoiMapTest, ParameterCheck) {
ACMRandom rnd(ACMRandom::DeterministicSeed()); ACMRandom rnd(ACMRandom::DeterministicSeed());
int delta_q[MAX_MB_SEGMENTS] = { -2, -25, 0, 31 }; int delta_q[MAX_MB_SEGMENTS] = { -2, -25, 0, 31 };
int delta_lf[MAX_MB_SEGMENTS] = { -2, -25, 0, 31 }; int delta_lf[MAX_MB_SEGMENTS] = { -2, -25, 0, 31 };

View File

@ -13,7 +13,7 @@
namespace libvpx_test { namespace libvpx_test {
#if CONFIG_VP8_DECODER #if CONFIG_VP8_DECODER
const char *kVP8TestVectors[kNumVp8TestVectors] = { const char *kVP8TestVectors[kNumVP8TestVectors] = {
"vp80-00-comprehensive-001.ivf", "vp80-00-comprehensive-001.ivf",
"vp80-00-comprehensive-002.ivf", "vp80-00-comprehensive-003.ivf", "vp80-00-comprehensive-002.ivf", "vp80-00-comprehensive-003.ivf",
"vp80-00-comprehensive-004.ivf", "vp80-00-comprehensive-005.ivf", "vp80-00-comprehensive-004.ivf", "vp80-00-comprehensive-005.ivf",
@ -49,7 +49,7 @@ const char *kVP8TestVectors[kNumVp8TestVectors] = {
}; };
#endif // CONFIG_VP8_DECODER #endif // CONFIG_VP8_DECODER
#if CONFIG_VP9_DECODER #if CONFIG_VP9_DECODER
const char *kVP9TestVectors[kNumVp9TestVectors] = { const char *kVP9TestVectors[kNumVP9TestVectors] = {
"vp90-2-00-quantizer-00.webm", "vp90-2-00-quantizer-01.webm", "vp90-2-00-quantizer-00.webm", "vp90-2-00-quantizer-01.webm",
"vp90-2-00-quantizer-02.webm", "vp90-2-00-quantizer-03.webm", "vp90-2-00-quantizer-02.webm", "vp90-2-00-quantizer-03.webm",
"vp90-2-00-quantizer-04.webm", "vp90-2-00-quantizer-05.webm", "vp90-2-00-quantizer-04.webm", "vp90-2-00-quantizer-05.webm",

View File

@ -16,14 +16,14 @@
namespace libvpx_test { namespace libvpx_test {
#if CONFIG_VP8_DECODER #if CONFIG_VP8_DECODER
const int kNumVp8TestVectors = 62; const int kNumVP8TestVectors = 62;
extern const char *kVP8TestVectors[kNumVp8TestVectors]; extern const char *kVP8TestVectors[kNumVP8TestVectors];
#endif #endif
#if CONFIG_VP9_DECODER #if CONFIG_VP9_DECODER
const int kNumVp9TestVectors = 223; const int kNumVP9TestVectors = 223;
extern const char *kVP9TestVectors[kNumVp9TestVectors]; extern const char *kVP9TestVectors[kNumVP9TestVectors];
#endif // CONFIG_VP9_DECODER #endif // CONFIG_VP9_DECODER
} // namespace libvpx_test } // namespace libvpx_test

View File

@ -68,7 +68,7 @@ void reference_idct4x4(const int16_t *input, int16_t *output) {
using libvpx_test::ACMRandom; using libvpx_test::ACMRandom;
TEST(Vp8FdctTest, SignBiasCheck) { TEST(VP8FdctTest, SignBiasCheck) {
ACMRandom rnd(ACMRandom::DeterministicSeed()); ACMRandom rnd(ACMRandom::DeterministicSeed());
int16_t test_input_block[16]; int16_t test_input_block[16];
int16_t test_output_block[16]; int16_t test_output_block[16];
@ -127,7 +127,7 @@ TEST(Vp8FdctTest, SignBiasCheck) {
<< "Error: 4x4 FDCT has a sign bias > 10% for input range [-15, 15]"; << "Error: 4x4 FDCT has a sign bias > 10% for input range [-15, 15]";
}; };
TEST(Vp8FdctTest, RoundTripErrorCheck) { TEST(VP8FdctTest, RoundTripErrorCheck) {
ACMRandom rnd(ACMRandom::DeterministicSeed()); ACMRandom rnd(ACMRandom::DeterministicSeed());
int max_error = 0; int max_error = 0;
double total_error = 0; double total_error = 0;