Index: source/libvpx/test/test_vectors.cc |
=================================================================== |
--- source/libvpx/test/test_vectors.cc (revision 263011) |
+++ source/libvpx/test/test_vectors.cc (working copy) |
@@ -12,8 +12,10 @@ |
namespace libvpx_test { |
+#define NELEMENTS(x) static_cast<int>(sizeof(x) / sizeof(x[0])) |
+ |
#if CONFIG_VP8_DECODER |
-const char *kVP8TestVectors[kNumVp8TestVectors] = { |
+const char *const kVP8TestVectors[] = { |
"vp80-00-comprehensive-001.ivf", |
"vp80-00-comprehensive-002.ivf", "vp80-00-comprehensive-003.ivf", |
"vp80-00-comprehensive-004.ivf", "vp80-00-comprehensive-005.ivf", |
@@ -47,9 +49,10 @@ |
"vp80-05-sharpness-1440.ivf", "vp80-05-sharpness-1443.ivf", |
"vp80-06-smallsize.ivf" |
}; |
+const int kNumVP8TestVectors = NELEMENTS(kVP8TestVectors); |
#endif // CONFIG_VP8_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-02.webm", "vp90-2-00-quantizer-03.webm", |
"vp90-2-00-quantizer-04.webm", "vp90-2-00-quantizer-05.webm", |
@@ -161,8 +164,22 @@ |
"vp90-2-11-size-351x287.webm", "vp90-2-11-size-351x288.webm", |
"vp90-2-11-size-352x287.webm", "vp90-2-12-droppable_1.ivf", |
"vp90-2-12-droppable_2.ivf", "vp90-2-12-droppable_3.ivf", |
- "vp91-2-04-yv444.webm" |
+ "vp90-2-13-largescaling.webm", "vp91-2-04-yv444.webm", |
+ "vp90-2-14-resize-fp-tiles-1-16.webm", |
+ "vp90-2-14-resize-fp-tiles-1-2-4-8-16.webm", |
+ "vp90-2-14-resize-fp-tiles-1-2.webm", "vp90-2-14-resize-fp-tiles-1-4.webm", |
+ "vp90-2-14-resize-fp-tiles-16-1.webm", "vp90-2-14-resize-fp-tiles-16-2.webm", |
+ "vp90-2-14-resize-fp-tiles-16-4.webm", |
+ "vp90-2-14-resize-fp-tiles-16-8-4-2-1.webm", |
+ "vp90-2-14-resize-fp-tiles-16-8.webm", "vp90-2-14-resize-fp-tiles-1-8.webm", |
+ "vp90-2-14-resize-fp-tiles-2-16.webm", "vp90-2-14-resize-fp-tiles-2-1.webm", |
+ "vp90-2-14-resize-fp-tiles-2-4.webm", "vp90-2-14-resize-fp-tiles-2-8.webm", |
+ "vp90-2-14-resize-fp-tiles-4-16.webm", "vp90-2-14-resize-fp-tiles-4-1.webm", |
+ "vp90-2-14-resize-fp-tiles-4-2.webm", "vp90-2-14-resize-fp-tiles-4-8.webm", |
+ "vp90-2-14-resize-fp-tiles-8-16.webm", "vp90-2-14-resize-fp-tiles-8-1.webm", |
+ "vp90-2-14-resize-fp-tiles-8-2.webm", "vp90-2-14-resize-fp-tiles-8-4.webm" |
}; |
+const int kNumVP9TestVectors = NELEMENTS(kVP9TestVectors); |
#endif // CONFIG_VP9_DECODER |
} // namespace libvpx_test |