Update video_quality_analysis to align videos instead of using barcodes
This CL is a follow-up to the previous CL
https://webrtc-review.googlesource.com/c/src/+/94773 that added generic
logic for aligning videos. This will allow us to easily extend
video_quality_analysis with new sophisticated video quality metrics.
Also, we can use any kind of video that does not necessarily need to
contain bar codes. Removing the need to decode barcodes also leads to a
big speedup for the tests.
Bug: webrtc:9642
Change-Id: I74b0d630b3e1ed44781ad024115ded3143e28f50
Reviewed-on: https://webrtc-review.googlesource.com/94845
Reviewed-by: Paulina Hensman <phensman@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24423}diff --git a/rtc_tools/frame_analyzer/frame_analyzer.cc b/rtc_tools/frame_analyzer/frame_analyzer.cc
index f5a9c2b..443a868 100644
--- a/rtc_tools/frame_analyzer/frame_analyzer.cc
+++ b/rtc_tools/frame_analyzer/frame_analyzer.cc
@@ -16,6 +16,7 @@
#include <vector>
#include "rtc_tools/frame_analyzer/video_quality_analysis.h"
+#include "rtc_tools/frame_analyzer/video_temporal_aligner.h"
#include "rtc_tools/simple_command_line_parser.h"
#include "rtc_tools/y4m_file_reader.h"
#include "test/testsupport/perf_test.h"
@@ -24,12 +25,7 @@
* A command line tool running PSNR and SSIM on a reference video and a test
* video. The test video is a record of the reference video which can start at
* an arbitrary point. It is possible that there will be repeated frames or
- * skipped frames as well. In order to have a way to compare corresponding
- * frames from the two videos, two stats files should be provided. One for the
- * reference video and one for the test video. The stats file
- * is a text file assumed to be in the format:
- * frame_xxxx yyyy where xxxx is the frame number in and yyyy is the
- * corresponding barcode. The video files should be 1420 YUV videos.
+ * skipped frames as well. The video files should be 1420 Y4M videos.
* The tool prints the result to standard output in the Chromium perf format:
* RESULT <metric>:<label>= <values>
*
@@ -37,9 +33,7 @@
*
* Usage:
* frame_analyzer --label=<test_label> --reference_file=<name_of_file>
- * --test_file_ref=<name_of_file> --stats_file_test=<name_of_file>
- * --stats_file=<name_of_file> --width=<frame_width>
- * --height=<frame_height>
+ * --test_file_ref=<name_of_file>
*/
int main(int argc, char* argv[]) {
std::string program_name = argv[0];
@@ -47,24 +41,13 @@
"Compares the output video with the initially sent video."
"\nExample usage:\n" +
program_name +
- " --reference_file=ref.yuv --test_file=test.yuv --width=320 "
- "--height=240\n"
+ " --reference_file=ref.y4m --test_file=test.y4m\n"
"Command line flags:\n"
- " - width(int): The width of the reference and test files. Default: -1\n"
- " - height(int): The height of the reference and test files. "
- " Default: -1\n"
" - label(string): The label to use for the perf output."
" Default: MY_TEST\n"
- " - stats_file_ref(string): The path to the stats file that will be"
- " produced for the reference video file."
- " Default: stats_ref.txt\n"
- " - stats_file_test(string): The path to the stats file that will be"
- " produced for the test video file."
- " Default: stats_test.txt\n"
- " - reference_file(string): The reference YUV file to compare against."
- " Default: ref.yuv\n"
+ " Default: ref.y4m\n"
" - test_file(string): The test YUV file to run the analysis for."
- " Default: test_file.yuv\n"
+ " Default: test_file.y4m\n"
" - chartjson_result_file: Where to store perf result in chartjson"
" format. If not present, no perf result will be stored."
" Default: None\n";
@@ -75,13 +58,9 @@
parser.Init(argc, argv);
parser.SetUsageMessage(usage);
- parser.SetFlag("width", "-1");
- parser.SetFlag("height", "-1");
parser.SetFlag("label", "MY_TEST");
- parser.SetFlag("stats_file_ref", "stats_ref.txt");
- parser.SetFlag("stats_file_test", "stats_test.txt");
- parser.SetFlag("reference_file", "ref.yuv");
- parser.SetFlag("test_file", "test.yuv");
+ parser.SetFlag("reference_file", "ref.y4m");
+ parser.SetFlag("test_file", "test.y4m");
parser.SetFlag("chartjson_result_file", "");
parser.SetFlag("help", "false");
@@ -92,14 +71,6 @@
}
parser.PrintEnteredFlags();
- int width = strtol((parser.GetFlag("width")).c_str(), NULL, 10);
- int height = strtol((parser.GetFlag("height")).c_str(), NULL, 10);
-
- if (width <= 0 || height <= 0) {
- fprintf(stderr, "Error: width or height cannot be <= 0!\n");
- return -1;
- }
-
webrtc::test::ResultsContainer results;
rtc::scoped_refptr<webrtc::test::Y4mFile> reference_video =
@@ -112,12 +83,20 @@
return 0;
}
- webrtc::test::RunAnalysis(
- reference_video, test_video, parser.GetFlag("stats_file_ref").c_str(),
- parser.GetFlag("stats_file_test").c_str(), width, height, &results);
- webrtc::test::GetMaxRepeatedAndSkippedFrames(
- parser.GetFlag("stats_file_ref"), parser.GetFlag("stats_file_test"),
- &results);
+ const std::vector<size_t> matching_indices =
+ webrtc::test::FindMatchingFrameIndices(reference_video, test_video);
+
+ results.frames =
+ webrtc::test::RunAnalysis(reference_video, test_video, matching_indices);
+
+ const std::vector<webrtc::test::Cluster> clusters =
+ webrtc::test::CalculateFrameClusters(matching_indices);
+ results.max_repeated_frames = webrtc::test::GetMaxRepeatedFrames(clusters);
+ results.max_skipped_frames = webrtc::test::GetMaxSkippedFrames(clusters);
+ results.total_skipped_frames =
+ webrtc::test::GetTotalNumberOfSkippedFrames(clusters);
+ results.decode_errors_ref = 0;
+ results.decode_errors_test = 0;
webrtc::test::PrintAnalysisResults(parser.GetFlag("label"), &results);