Clean up Stats class used in VideoProcessor tests.

* Reorder and rename members of FrameStatistic.
* Rename corresponding temp variables used in the summary calculations.
* Make Stats class less structy.
* Try to enforce consistent frame numbers at all times.
* Remove VideoProcessor::FrameInfo struct and use the Stats class
  for keeping track of encode/decode start times, etc.

BUG=webrtc:6634

Review-Url: https://codereview.webrtc.org/3011923002
Cr-Commit-Position: refs/heads/master@{#19703}
This commit is contained in:
brandtr
2017-09-06 01:53:22 -07:00
committed by Commit Bot
parent 42a70e31d6
commit 8935d97f16
7 changed files with 182 additions and 184 deletions

View File

@ -11,36 +11,32 @@
#include "webrtc/modules/video_coding/codecs/test/stats.h"
#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
namespace webrtc {
namespace test {
TEST(StatsTest, TestEmptyObject) {
Stats stats;
EXPECT_EQ(0u, stats.stats_.size());
stats.PrintSummary(); // should not crash
stats.PrintSummary(); // Should not crash.
}
TEST(StatsTest, AddSingleFrame) {
const int kFrameNumber = 0;
Stats stats;
stats.NewFrame(kFrameNumber);
EXPECT_EQ(1u, stats.stats_.size());
FrameStatistic* frame_stat = &stats.stats_[0];
EXPECT_EQ(kFrameNumber, frame_stat->frame_number);
FrameStatistic* frame_stat = stats.AddFrame();
EXPECT_EQ(0, frame_stat->frame_number);
EXPECT_EQ(1u, stats.size());
}
TEST(StatsTest, AddMultipleFrames) {
Stats stats;
const int kNumFrames = 1000;
for (int i = 0; i < kNumFrames; ++i) {
FrameStatistic& frame_stat = stats.NewFrame(i);
EXPECT_EQ(i, frame_stat.frame_number);
FrameStatistic* frame_stat = stats.AddFrame();
EXPECT_EQ(i, frame_stat->frame_number);
}
EXPECT_EQ(kNumFrames, static_cast<int>(stats.stats_.size()));
EXPECT_EQ(kNumFrames, static_cast<int>(stats.size()));
stats.PrintSummary(); // should not crash
stats.PrintSummary(); // Should not crash.
}
} // namespace test