| Index: webrtc/tools/frame_analyzer/frame_analyzer.cc
|
| diff --git a/webrtc/tools/frame_analyzer/frame_analyzer.cc b/webrtc/tools/frame_analyzer/frame_analyzer.cc
|
| index 80201093272112d48398610342bdd64fbb363b64..0a3be1939ec7eec33c09122b49a6260b8e7cdf71 100644
|
| --- a/webrtc/tools/frame_analyzer/frame_analyzer.cc
|
| +++ b/webrtc/tools/frame_analyzer/frame_analyzer.cc
|
| @@ -23,12 +23,11 @@
|
| * 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, a stats file should be provided. The stats file
|
| + * 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 the test video and yyyy is the
|
| - * corresponding frame number in the original video.
|
| - * The video files should be 1420 YUV videos.
|
| + * frame_xxxx yyyy where xxxx is the frame number in and yyyy is the
|
| + * corresponding barcode. The video files should be 1420 YUV videos.
|
| * The tool prints the result to standard output in the Chromium perf format:
|
| * RESULT <metric>:<label>= <values>
|
| *
|
| @@ -36,22 +35,30 @@
|
| *
|
| * Usage:
|
| * frame_analyzer --label=<test_label> --reference_file=<name_of_file>
|
| - * --test_file=<name_of_file> --stats_file=<name_of_file> --width=<frame_width>
|
| + * --test_file_ref=<name_of_file> --stats_file_test=<name_of_file>
|
| + * --stats_file=<name_of_file> --width=<frame_width>
|
| * --height=<frame_height>
|
| */
|
| int main(int argc, char** argv) {
|
| std::string program_name = argv[0];
|
| - std::string usage = "Compares the output video with the initially sent video."
|
| - "\nExample usage:\n" + program_name + " --stats_file=stats.txt "
|
| - "--reference_file=ref.yuv --test_file=test.yuv --width=320 --height=240\n"
|
| + std::string usage =
|
| + "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"
|
| "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(string): The full name of the file containing the stats"
|
| - " after decoding of the received YUV video. Default: stats.txt\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"
|
| " - test_file(string): The test YUV file to run the analysis for."
|
| @@ -66,7 +73,8 @@ int main(int argc, char** argv) {
|
| parser.SetFlag("width", "-1");
|
| parser.SetFlag("height", "-1");
|
| parser.SetFlag("label", "MY_TEST");
|
| - parser.SetFlag("stats_file", "stats.txt");
|
| + 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("help", "false");
|
| @@ -90,11 +98,13 @@ int main(int argc, char** argv) {
|
|
|
| webrtc::test::RunAnalysis(parser.GetFlag("reference_file").c_str(),
|
| parser.GetFlag("test_file").c_str(),
|
| - parser.GetFlag("stats_file").c_str(), width, height,
|
| - &results);
|
| + parser.GetFlag("stats_file_ref").c_str(),
|
| + parser.GetFlag("stats_file_test").c_str(), width,
|
| + height, &results);
|
|
|
| std::string label = parser.GetFlag("label");
|
| webrtc::test::PrintAnalysisResults(label, &results);
|
| - webrtc::test::PrintMaxRepeatedAndSkippedFrames(label,
|
| - parser.GetFlag("stats_file"));
|
| + webrtc::test::PrintMaxRepeatedAndSkippedFrames(
|
| + label, parser.GetFlag("stats_file_ref"),
|
| + parser.GetFlag("stats_file_test"));
|
| }
|
|
|