admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[rtc_tools/video_encoder] Support Y4M file input

Browse Source 
This CL adds `Y4mFrameGenerator` to support Y4M file input.

Bug: webrtc:15210
Change-Id: If21e40a609b3c6f980a413fb183cd4dfb5123aab
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/311520
Commit-Queue: Jianhui J Dai <jianhui.j.dai@intel.com>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40460}
This commit is contained in:
Jianhui Dai 2023-07-13 17:16:37 +08:00 committed by WebRTC LUCI CQ
parent efec6e28a5
commit 4d752ec647
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rtc_tools/BUILD.gn
View File

@ -444,6 +444,7 @@ if (!build_with_chromium) {
"//modules/video_coding/codecs/av1:av1_svc_config", "//modules/video_coding/codecs/av1:av1_svc_config",
"//modules/video_coding/svc:scalability_mode_util", "//modules/video_coding/svc:scalability_mode_util",
"//rtc_base:logging", "//rtc_base:logging",
"//test:y4m_frame_generator",
"//third_party/abseil-cpp/absl/flags:flag", "//third_party/abseil-cpp/absl/flags:flag",
"//third_party/abseil-cpp/absl/flags:parse", "//third_party/abseil-cpp/absl/flags:parse",
"//third_party/abseil-cpp/absl/flags:usage", "//third_party/abseil-cpp/absl/flags:usage",

36
rtc_tools/video_encoder/video_encoder.cc
View File

@ -21,6 +21,7 @@
#include "modules/video_coding/svc/scalability_mode_util.h" #include "modules/video_coding/svc/scalability_mode_util.h"
#include "rtc_base/logging.h" #include "rtc_base/logging.h"
#include "rtc_tools/video_encoder/encoded_image_file_writer.h" #include "rtc_tools/video_encoder/encoded_image_file_writer.h"
#include "test/testsupport/y4m_frame_generator.h"
ABSL_FLAG(std::string, ABSL_FLAG(std::string,
video_codec, video_codec,
@ -39,6 +40,11 @@ ABSL_FLAG(uint32_t,
ABSL_FLAG(uint32_t, width, 1280, "Specify width of video encoder"); ABSL_FLAG(uint32_t, width, 1280, "Specify width of video encoder");
ABSL_FLAG(uint32_t, height, 720, "Specify height of video encoder"); ABSL_FLAG(uint32_t, height, 720, "Specify height of video encoder");
ABSL_FLAG(std::string,
y4m_input_file,
"",
"Specify y4m input file of Y4mFrameGenerator");
ABSL_FLAG(std::string, ABSL_FLAG(std::string,
ivf_input_file, ivf_input_file,
"", "",
@ -346,9 +352,9 @@ class TestVideoEncoderFactoryWrapper final {
// A video encode tool supports to specify video codec, scalability mode, // A video encode tool supports to specify video codec, scalability mode,
// resolution, frame rate, bitrate, key frame interval and maximum number of // resolution, frame rate, bitrate, key frame interval and maximum number of
// frames. The video encoder supports multiple `FrameGeneratorInterface` // frames. The video encoder supports multiple `FrameGeneratorInterface`
// implementations: `SquareFrameGenerator`, `SlideFrameGenerator` and // implementations: `SquareFrameGenerator`, `SlideFrameGenerator`,
// `IvfFileFrameGenerator`. All the encoded bitstreams are wrote into ivf output // `Y4mFrameGenerator` and `IvfFileFrameGenerator`. All the encoded bitstreams
// files. // are wrote into ivf output files.
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
absl::SetProgramUsageMessage( absl::SetProgramUsageMessage(
"A video encode tool.\n" "A video encode tool.\n"
@ -364,6 +370,9 @@ int main(int argc, char* argv[]) {
"--frame_rate_fps=30 " "--frame_rate_fps=30 "
"--bitrate_kbps=500\n" "--bitrate_kbps=500\n"
"\n" "\n"
"./video_encoder --y4m_input_file=input.y4m --video_codec=av1 "
"--scalability_mode=L1T3\n"
"\n"
"./video_encoder --ivf_input_file=input.ivf --video_codec=av1 " "./video_encoder --ivf_input_file=input.ivf --video_codec=av1 "
"--scalability_mode=L1T3\n"); "--scalability_mode=L1T3\n");
absl::ParseCommandLine(argc, argv); absl::ParseCommandLine(argc, argv);
@ -388,6 +397,7 @@ int main(int argc, char* argv[]) {
uint32_t raw_frame_generator = absl::GetFlag(FLAGS_raw_frame_generator); uint32_t raw_frame_generator = absl::GetFlag(FLAGS_raw_frame_generator);
const std::string y4m_input_file = absl::GetFlag(FLAGS_y4m_input_file);
const std::string ivf_input_file = absl::GetFlag(FLAGS_ivf_input_file); const std::string ivf_input_file = absl::GetFlag(FLAGS_ivf_input_file);
const uint32_t frame_rate_fps = absl::GetFlag(FLAGS_frame_rate_fps); const uint32_t frame_rate_fps = absl::GetFlag(FLAGS_frame_rate_fps);
@ -426,8 +436,26 @@ int main(int argc, char* argv[]) {
} }
// Create `FrameGeneratorInterface`. // Create `FrameGeneratorInterface`.
if (!y4m_input_file.empty() && !ivf_input_file.empty()) {
RTC_LOG(LS_ERROR)
<< "Can not specify both '--y4m_input_file' and '--ivf_input_file'";
return EXIT_FAILURE;
}
std::unique_ptr<webrtc::test::FrameGeneratorInterface> frame_buffer_generator; std::unique_ptr<webrtc::test::FrameGeneratorInterface> frame_buffer_generator;
if (!ivf_input_file.empty()) { if (!y4m_input_file.empty()) {
// Use `Y4mFrameGenerator` if specify `--y4m_input_file`.
frame_buffer_generator = std::make_unique<webrtc::test::Y4mFrameGenerator>(
y4m_input_file, webrtc::test::Y4mFrameGenerator::RepeatMode::kLoop);
webrtc::test::FrameGeneratorInterface::Resolution resolution =
frame_buffer_generator->GetResolution();
if (resolution.width != width || resolution.height != height) {
frame_buffer_generator->ChangeResolution(width, height);
}
RTC_LOG(LS_INFO) << "Create Y4mFrameGenerator: " << width << "x" << height;
} else if (!ivf_input_file.empty()) {
// Use `IvfFileFrameGenerator` if specify `--ivf_input_file`. // Use `IvfFileFrameGenerator` if specify `--ivf_input_file`.
frame_buffer_generator = frame_buffer_generator =
webrtc::test::CreateFromIvfFileFrameGenerator(ivf_input_file); webrtc::test::CreateFromIvfFileFrameGenerator(ivf_input_file);