| Index: webrtc/modules/video_processing/test/video_processing_unittest.h
|
| diff --git a/webrtc/modules/video_processing/test/video_processing_unittest.h b/webrtc/modules/video_processing/test/video_processing_unittest.h
|
| index 3433c6ca868f8c2d7a4e32d73b4e1e5147f7eab8..1c548d36c6a83fb6c179258cb34aedcef7e051e5 100644
|
| --- a/webrtc/modules/video_processing/test/video_processing_unittest.h
|
| +++ b/webrtc/modules/video_processing/test/video_processing_unittest.h
|
| @@ -20,26 +20,27 @@
|
|
|
| namespace webrtc {
|
|
|
| -class VideoProcessingTest : public ::testing::Test {
|
| +typedef struct {
|
| + std::string file_name;
|
| + int width;
|
| + int height;
|
| +} VideoToTest;
|
| +
|
| +class VideoProcessingTest : public ::testing::TestWithParam<VideoToTest> {
|
| protected:
|
| VideoProcessingTest();
|
| virtual void SetUp();
|
| virtual void TearDown();
|
| - static void SetUpTestCase() {
|
| - Trace::CreateTrace();
|
| - std::string trace_file = webrtc::test::OutputPath() + "VPMTrace.txt";
|
| - ASSERT_EQ(0, Trace::SetTraceFile(trace_file.c_str()));
|
| - }
|
| - static void TearDownTestCase() { Trace::ReturnTrace(); }
|
| VideoProcessing* vp_;
|
| FILE* source_file_;
|
| VideoFrame video_frame_;
|
| - const int width_;
|
| - const int half_width_;
|
| - const int height_;
|
| - const int size_y_;
|
| - const int size_uv_;
|
| - const size_t frame_length_;
|
| + VideoToTest vtt_;
|
| + int width_;
|
| + int half_width_;
|
| + int height_;
|
| + int size_y_;
|
| + int size_uv_;
|
| + size_t frame_length_;
|
| };
|
|
|
| } // namespace webrtc
|
|
|