Commit 0b27ed43 authored by James Zern's avatar James Zern
Browse files

vp9_thread_test: factorize decode loop

+ add a SCOPED_TRACE with the current filename

Change-Id: I9ceb47a9154bc0d9f9878a83b707e8ed935790f9
parent 415b84be
...@@ -101,6 +101,11 @@ TEST_P(VP9WorkerThreadTest, HookFailure) { ...@@ -101,6 +101,11 @@ TEST_P(VP9WorkerThreadTest, HookFailure) {
// Multi-threaded decode tests // Multi-threaded decode tests
#if CONFIG_WEBM_IO #if CONFIG_WEBM_IO
struct FileList {
const char *name;
const char *expected_md5;
};
// Decodes |filename| with |num_threads|. Returns the md5 of the decoded frames. // Decodes |filename| with |num_threads|. Returns the md5 of the decoded frames.
string DecodeFile(const string& filename, int num_threads) { string DecodeFile(const string& filename, int num_threads) {
libvpx_test::WebMVideoSource video(filename); libvpx_test::WebMVideoSource video(filename);
...@@ -130,6 +135,16 @@ string DecodeFile(const string& filename, int num_threads) { ...@@ -130,6 +135,16 @@ string DecodeFile(const string& filename, int num_threads) {
return string(md5.Get()); return string(md5.Get());
} }
void DecodeFiles(const FileList files[]) {
for (const FileList *iter = files; iter->name != NULL; ++iter) {
SCOPED_TRACE(iter->name);
for (int t = 2; t <= 8; ++t) {
EXPECT_STREQ(iter->expected_md5, DecodeFile(iter->name, t).c_str())
<< "threads = " << t;
}
}
}
TEST(VP9DecodeMultiThreadedTest, Decode) { TEST(VP9DecodeMultiThreadedTest, Decode) {
// no tiles or frame parallel; this exercises loop filter threading. // no tiles or frame parallel; this exercises loop filter threading.
EXPECT_STREQ("b35a1b707b28e82be025d960aba039bc", EXPECT_STREQ("b35a1b707b28e82be025d960aba039bc",
...@@ -137,32 +152,22 @@ TEST(VP9DecodeMultiThreadedTest, Decode) { ...@@ -137,32 +152,22 @@ TEST(VP9DecodeMultiThreadedTest, Decode) {
} }
TEST(VP9DecodeMultiThreadedTest, Decode2) { TEST(VP9DecodeMultiThreadedTest, Decode2) {
static const struct { static const FileList files[] = {
const char *name;
const char *expected_md5;
} files[] = {
{ "vp90-2-08-tile_1x2_frame_parallel.webm", { "vp90-2-08-tile_1x2_frame_parallel.webm",
"68ede6abd66bae0a2edf2eb9232241b6" }, "68ede6abd66bae0a2edf2eb9232241b6" },
{ "vp90-2-08-tile_1x4_frame_parallel.webm", { "vp90-2-08-tile_1x4_frame_parallel.webm",
"368ebc6ebf3a5e478d85b2c3149b2848" }, "368ebc6ebf3a5e478d85b2c3149b2848" },
{ "vp90-2-08-tile_1x8_frame_parallel.webm", { "vp90-2-08-tile_1x8_frame_parallel.webm",
"17e439da2388aff3a0f69cb22579c6c1" }, "17e439da2388aff3a0f69cb22579c6c1" },
{ NULL, NULL }
}; };
for (int i = 0; i < static_cast<int>(sizeof(files) / sizeof(files[0])); ++i) { DecodeFiles(files);
for (int t = 2; t <= 8; ++t) {
EXPECT_STREQ(files[i].expected_md5, DecodeFile(files[i].name, t).c_str())
<< "threads = " << t;
}
}
} }
// Test tile quantity changes within one file. // Test tile quantity changes within one file.
TEST(VP9DecodeMultiThreadedTest, Decode3) { TEST(VP9DecodeMultiThreadedTest, Decode3) {
static const struct { static const FileList files[] = {
const char *name;
const char *expected_md5;
} files[] = {
{ "vp90-2-14-resize-fp-tiles-1-16.webm", { "vp90-2-14-resize-fp-tiles-1-16.webm",
"0cd5e632c326297e975f38949c31ea94" }, "0cd5e632c326297e975f38949c31ea94" },
{ "vp90-2-14-resize-fp-tiles-1-2-4-8-16.webm", { "vp90-2-14-resize-fp-tiles-1-2-4-8-16.webm",
...@@ -207,14 +212,10 @@ TEST(VP9DecodeMultiThreadedTest, Decode3) { ...@@ -207,14 +212,10 @@ TEST(VP9DecodeMultiThreadedTest, Decode3) {
"ae96f21f21b6370cc0125621b441fc52" }, "ae96f21f21b6370cc0125621b441fc52" },
{ "vp90-2-14-resize-fp-tiles-8-4.webm", { "vp90-2-14-resize-fp-tiles-8-4.webm",
"3eb4f24f10640d42218f7fd7b9fd30d4" }, "3eb4f24f10640d42218f7fd7b9fd30d4" },
{ NULL, NULL }
}; };
for (int i = 0; i < static_cast<int>(sizeof(files) / sizeof(files[0])); ++i) { DecodeFiles(files);
for (int t = 2; t <= 8; ++t) {
EXPECT_STREQ(files[i].expected_md5, DecodeFile(files[i].name, t).c_str())
<< "threads = " << t;
}
}
} }
#endif // CONFIG_WEBM_IO #endif // CONFIG_WEBM_IO
......
Markdown is supported
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