Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(102)

Side by Side Diff: source/libvpx/test/invalid_file_test.cc

Issue 341343004: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « README.chromium ('k') | source/libvpx/test/test.mk » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebM project authors. All Rights Reserved. 2 * Copyright (c) 2014 The WebM project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 EXPECT_EQ(expected_res_dec, res_dec) 57 EXPECT_EQ(expected_res_dec, res_dec)
58 << "Results don't match: frame number = " << video.frame_number(); 58 << "Results don't match: frame number = " << video.frame_number();
59 59
60 return !HasFailure(); 60 return !HasFailure();
61 } 61 }
62 62
63 private: 63 private:
64 FILE *res_file_; 64 FILE *res_file_;
65 }; 65 };
66 66
67 TEST_P(InvalidFileTest, DISABLED_ReturnCode) { 67 TEST_P(InvalidFileTest, ReturnCode) {
68 const std::string filename = GET_PARAM(1); 68 const std::string filename = GET_PARAM(1);
69 libvpx_test::CompressedVideoSource *video = NULL; 69 libvpx_test::CompressedVideoSource *video = NULL;
70 70
71 // Open compressed video file. 71 // Open compressed video file.
72 if (filename.substr(filename.length() - 3, 3) == "ivf") { 72 if (filename.substr(filename.length() - 3, 3) == "ivf") {
73 video = new libvpx_test::IVFVideoSource(filename); 73 video = new libvpx_test::IVFVideoSource(filename);
74 } else if (filename.substr(filename.length() - 4, 4) == "webm") { 74 } else if (filename.substr(filename.length() - 4, 4) == "webm") {
75 #if CONFIG_WEBM_IO 75 #if CONFIG_WEBM_IO
76 video = new libvpx_test::WebMVideoSource(filename); 76 video = new libvpx_test::WebMVideoSource(filename);
77 #else 77 #else
(...skipping 20 matching lines...) Expand all
98 }; 98 };
99 99
100 #define NELEMENTS(x) static_cast<int>(sizeof(x) / sizeof(x[0])) 100 #define NELEMENTS(x) static_cast<int>(sizeof(x) / sizeof(x[0]))
101 101
102 VP9_INSTANTIATE_TEST_CASE(InvalidFileTest, 102 VP9_INSTANTIATE_TEST_CASE(InvalidFileTest,
103 ::testing::ValuesIn(kVP9InvalidFileTests, 103 ::testing::ValuesIn(kVP9InvalidFileTests,
104 kVP9InvalidFileTests + 104 kVP9InvalidFileTests +
105 NELEMENTS(kVP9InvalidFileTests))); 105 NELEMENTS(kVP9InvalidFileTests)));
106 106
107 } // namespace 107 } // namespace
OLDNEW
« no previous file with comments | « README.chromium ('k') | source/libvpx/test/test.mk » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698