Skip to content
GitLab
Commit 41928eed authored by Alex Converse's avatar Alex Converse Committed by Gerrit Code Review
Browse files

Merge "Automatically count test vectors and make the tables const."

parents 4df4b526 c2cc5598
v1.14.0-linphone 1.4.X feature/update_to_v1.9.0-linphone feature/uwp_nuget frame_parallel highbitdepth indianrunnerduck javanwhistlingduck khakicampbell linphone linphone-android linphone-old longtailedduck m49-2623 m52-2743 m54-2840 m56-2924 m66-3359 m68-3440 mandarinduck nextgen nextgenv2 playground sandbox/Jingning/experimental sandbox/Jingning/transcode sandbox/Jingning/vpx sandbox/aconverse@google.com/ansbench sandbox/hkuang/frame_parallel sandbox/hkuang@google.com/decode sandbox/jimbankoski@google.com/proposed-aom sandbox/jingning@google.com/decoder_test_suite sandbox/jingning@google.com/experimental sandbox/jzern@google.com/test sandbox/wangch@google.com/vp9 sandbox/yaowu@google.com/mergeaom v1.12.0-linphone v1.6.1_linphone v1.7.0-linphone v1.9.0-linphone v1.9.0 v1.9.0-rc1 v1.8.2 v1.8.1 v1.8.0 v1.7.0 v1.6.1 v1.6.0 v1.5.0 v1.4.0
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 19 additions and 10 deletions
test/external_frame_buffer_test.cc
+ 3
− 1
View file @ 41928eed
...@@ -462,5 +462,7 @@ TEST_F(ExternalFrameBufferTest, SetAfterDecode) { ...@@ -462,5 +462,7 @@ TEST_F(ExternalFrameBufferTest, SetAfterDecode) {
} }
VP9_INSTANTIATE_TEST_CASE(ExternalFrameBufferMD5Test, VP9_INSTANTIATE_TEST_CASE(ExternalFrameBufferMD5Test,
::testing::ValuesIn(libvpx_test::kVP9TestVectors)); ::testing::ValuesIn(libvpx_test::kVP9TestVectors,
libvpx_test::kVP9TestVectors +
libvpx_test::kNumVP9TestVectors));
} // namespace } // namespace
test/test_vector_test.cc
+ 6
− 2
View file @ 41928eed
...@@ -89,8 +89,12 @@ TEST_P(TestVectorTest, MD5Match) { ...@@ -89,8 +89,12 @@ TEST_P(TestVectorTest, MD5Match) {
} }
VP8_INSTANTIATE_TEST_CASE(TestVectorTest, VP8_INSTANTIATE_TEST_CASE(TestVectorTest,
::testing::ValuesIn(libvpx_test::kVP8TestVectors)); ::testing::ValuesIn(libvpx_test::kVP8TestVectors,
libvpx_test::kVP8TestVectors +
libvpx_test::kNumVP8TestVectors));
VP9_INSTANTIATE_TEST_CASE(TestVectorTest, VP9_INSTANTIATE_TEST_CASE(TestVectorTest,
::testing::ValuesIn(libvpx_test::kVP9TestVectors)); ::testing::ValuesIn(libvpx_test::kVP9TestVectors,
libvpx_test::kVP9TestVectors +
libvpx_test::kNumVP9TestVectors));
} // namespace } // namespace
test/test_vectors.cc
+ 6
− 2
View file @ 41928eed
...@@ -12,8 +12,10 @@ ...@@ -12,8 +12,10 @@
namespace libvpx_test { namespace libvpx_test {
#define NELEMENTS(x) static_cast<int>(sizeof(x) / sizeof(x[0]))
#if CONFIG_VP8_DECODER #if CONFIG_VP8_DECODER
const char *kVP8TestVectors[kNumVP8TestVectors] = { const char *const kVP8TestVectors[] = {
"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",
...@@ -47,9 +49,10 @@ const char *kVP8TestVectors[kNumVP8TestVectors] = { ...@@ -47,9 +49,10 @@ const char *kVP8TestVectors[kNumVP8TestVectors] = {
"vp80-05-sharpness-1440.ivf", "vp80-05-sharpness-1443.ivf", "vp80-05-sharpness-1440.ivf", "vp80-05-sharpness-1443.ivf",
"vp80-06-smallsize.ivf" "vp80-06-smallsize.ivf"
}; };
const int kNumVP8TestVectors = NELEMENTS(kVP8TestVectors);
#endif // CONFIG_VP8_DECODER #endif // CONFIG_VP8_DECODER
#if CONFIG_VP9_DECODER #if CONFIG_VP9_DECODER
const char *kVP9TestVectors[kNumVP9TestVectors] = { const char *const kVP9TestVectors[] = {
"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",
...@@ -163,6 +166,7 @@ const char *kVP9TestVectors[kNumVP9TestVectors] = { ...@@ -163,6 +166,7 @@ const char *kVP9TestVectors[kNumVP9TestVectors] = {
"vp90-2-12-droppable_2.ivf", "vp90-2-12-droppable_3.ivf", "vp90-2-12-droppable_2.ivf", "vp90-2-12-droppable_3.ivf",
"vp91-2-04-yv444.webm" "vp91-2-04-yv444.webm"
}; };
const int kNumVP9TestVectors = NELEMENTS(kVP9TestVectors);
#endif // CONFIG_VP9_DECODER #endif // CONFIG_VP9_DECODER
} // namespace libvpx_test } // namespace libvpx_test
test/test_vectors.h
+ 4
− 5
View file @ 41928eed
...@@ -16,14 +16,13 @@ ...@@ -16,14 +16,13 @@
namespace libvpx_test { namespace libvpx_test {
#if CONFIG_VP8_DECODER #if CONFIG_VP8_DECODER
const int kNumVP8TestVectors = 62; extern const int kNumVP8TestVectors;
extern const char *kVP8TestVectors[kNumVP8TestVectors]; extern const char *const kVP8TestVectors[];
#endif #endif
#if CONFIG_VP9_DECODER #if CONFIG_VP9_DECODER
const int kNumVP9TestVectors = 223; extern const int kNumVP9TestVectors;
extern const char *const kVP9TestVectors[];
extern const char *kVP9TestVectors[kNumVP9TestVectors];
#endif // CONFIG_VP9_DECODER #endif // CONFIG_VP9_DECODER
} // namespace libvpx_test } // namespace libvpx_test
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment