Index: webrtc/test/testsupport/yuv_frame_reader_unittest.cc |
diff --git a/webrtc/test/testsupport/frame_reader_unittest.cc b/webrtc/test/testsupport/yuv_frame_reader_unittest.cc |
similarity index 38% |
rename from webrtc/test/testsupport/frame_reader_unittest.cc |
rename to webrtc/test/testsupport/yuv_frame_reader_unittest.cc |
index 58a3245fd4784a40b149f9362c498b74dd7d8788..95908142c9be1fa8993ed83bcb25788651714f6d 100644 |
--- a/webrtc/test/testsupport/frame_reader_unittest.cc |
+++ b/webrtc/test/testsupport/yuv_frame_reader_unittest.cc |
@@ -1,5 +1,5 @@ |
/* |
- * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. |
+ * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved. |
* |
* Use of this source code is governed by a BSD-style license |
* that can be found in the LICENSE file in the root of the source |
@@ -8,62 +8,75 @@ |
* be found in the AUTHORS file in the root of the source tree. |
*/ |
-#include "webrtc/test/testsupport/frame_reader.h" |
+#include <memory> |
+#include <string> |
#include "webrtc/api/video/i420_buffer.h" |
#include "webrtc/test/gtest.h" |
#include "webrtc/test/testsupport/fileutils.h" |
+#include "webrtc/test/testsupport/frame_reader.h" |
namespace webrtc { |
namespace test { |
-const std::string kInputFileContents = "baz"; |
-const size_t kFrameLength = 3; |
+namespace { |
+const std::string kInputFileContents = "bazouk"; |
+ |
+const size_t kFrameWidth = 2; |
+const size_t kFrameHeight = 2; |
+const size_t kFrameLength = 3 * kFrameWidth * kFrameHeight / 2; // I420. |
+} // namespace |
-class FrameReaderTest: public testing::Test { |
+class YuvFrameReaderTest : public testing::Test { |
protected: |
- FrameReaderTest() {} |
- virtual ~FrameReaderTest() {} |
- void SetUp() { |
- // Create a dummy input file. |
+ YuvFrameReaderTest() = default; |
+ ~YuvFrameReaderTest() override = default; |
+ |
+ void SetUp() override { |
temp_filename_ = webrtc::test::TempFilename(webrtc::test::OutputPath(), |
- "frame_reader_unittest"); |
+ "yuv_frame_reader_unittest"); |
FILE* dummy = fopen(temp_filename_.c_str(), "wb"); |
fprintf(dummy, "%s", kInputFileContents.c_str()); |
fclose(dummy); |
- frame_reader_ = new FrameReaderImpl(temp_filename_, 1, 1); |
+ frame_reader_.reset( |
+ new YuvFrameReaderImpl(temp_filename_, kFrameWidth, kFrameHeight)); |
ASSERT_TRUE(frame_reader_->Init()); |
} |
- void TearDown() { |
- delete frame_reader_; |
- // Cleanup the dummy input file. |
- remove(temp_filename_.c_str()); |
- } |
- FrameReader* frame_reader_; |
+ |
+ void TearDown() override { remove(temp_filename_.c_str()); } |
+ |
+ std::unique_ptr<FrameReader> frame_reader_; |
std::string temp_filename_; |
}; |
-TEST_F(FrameReaderTest, InitSuccess) { |
- FrameReaderImpl frame_reader(temp_filename_, 1, 1); |
- ASSERT_TRUE(frame_reader.Init()); |
- ASSERT_EQ(kFrameLength, frame_reader.FrameLength()); |
- ASSERT_EQ(1, frame_reader.NumberOfFrames()); |
+TEST_F(YuvFrameReaderTest, InitSuccess) {} |
+ |
+TEST_F(YuvFrameReaderTest, FrameLength) { |
+ EXPECT_EQ(kFrameLength, frame_reader_->FrameLength()); |
+} |
+ |
+TEST_F(YuvFrameReaderTest, NumberOfFrames) { |
+ EXPECT_EQ(1, frame_reader_->NumberOfFrames()); |
} |
-TEST_F(FrameReaderTest, ReadFrame) { |
+TEST_F(YuvFrameReaderTest, ReadFrame) { |
rtc::scoped_refptr<VideoFrameBuffer> buffer; |
buffer = frame_reader_->ReadFrame(); |
ASSERT_TRUE(buffer); |
- ASSERT_EQ(kInputFileContents[0], buffer->DataY()[0]); |
- ASSERT_EQ(kInputFileContents[1], buffer->DataU()[0]); |
- ASSERT_EQ(kInputFileContents[2], buffer->DataV()[0]); |
- ASSERT_FALSE(frame_reader_->ReadFrame()); // End of file |
+ // Expect I420 packed as YUV. |
+ EXPECT_EQ(kInputFileContents[0], buffer->DataY()[0]); |
+ EXPECT_EQ(kInputFileContents[1], buffer->DataY()[1]); |
+ EXPECT_EQ(kInputFileContents[2], buffer->DataY()[2]); |
+ EXPECT_EQ(kInputFileContents[3], buffer->DataY()[3]); |
+ EXPECT_EQ(kInputFileContents[4], buffer->DataU()[0]); |
+ EXPECT_EQ(kInputFileContents[5], buffer->DataV()[0]); |
+ EXPECT_FALSE(frame_reader_->ReadFrame()); // End of file. |
} |
-TEST_F(FrameReaderTest, ReadFrameUninitialized) { |
- FrameReaderImpl file_reader(temp_filename_, 1, 1); |
- ASSERT_FALSE(file_reader.ReadFrame()); |
+TEST_F(YuvFrameReaderTest, ReadFrameUninitialized) { |
+ YuvFrameReaderImpl file_reader(temp_filename_, kFrameWidth, kFrameHeight); |
+ EXPECT_FALSE(file_reader.ReadFrame()); |
} |
} // namespace test |