mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add key_interval command line argument to codec test

Browse source 
Bug: webrtc:42225151, b/337757868
Change-Id: I5b085bdb334cb6cfb304424a466fc119196d14d4
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/350200
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Sergey Silkin <ssilkin@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42267}
This commit is contained in:
Sergey Silkin 2024-05-08 08:38:30 +00:00 committed by WebRTC LUCI CQ
parent 8b243eae30
commit dbdf36c437
3 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
modules/video_coding/codecs/test/video_codec_test.cc
View file

@ -66,6 +66,10 @@ ABSL_FLAG(absl::optional<double>,
"Encode target frame rate of the top temporal layer in fps.");
ABSL_FLAG(bool, screencast, false, "Enable screen encoding mode.");
ABSL_FLAG(bool, frame_drop, true, "Enable frame dropping.");
ABSL_FLAG(int,
key_interval,
std::numeric_limits<int>::max(),
"Keyframe interval in frames.");
ABSL_FLAG(int, num_frames, 300, "Number of frames to encode and/or decode.");
ABSL_FLAG(std::string, field_trials, "", "Field trials to apply.");
ABSL_FLAG(std::string, test_name, "", "Test name.");
@ -562,21 +566,27 @@ TEST(VideoCodecTest, DISABLED_EncodeDecode) {
return DataRate::KilobitsPerSec(std::stoi(str));
});
Frequency framerate = Frequency::Hertz<double>(
absl::GetFlag(FLAGS_framerate_fps)
.value_or(absl::GetFlag(FLAGS_input_framerate_fps)));
EncodingSettings encoding_settings = VideoCodecTester::CreateEncodingSettings(
CodecNameToCodecType(absl::GetFlag(FLAGS_encoder)),
absl::GetFlag(FLAGS_scalability_mode),
absl::GetFlag(FLAGS_width).value_or(absl::GetFlag(FLAGS_input_width)),
absl::GetFlag(FLAGS_height).value_or(absl::GetFlag(FLAGS_input_height)),
{bitrate},
Frequency::Hertz<double>(
absl::GetFlag(FLAGS_framerate_fps)
.value_or(absl::GetFlag(FLAGS_input_framerate_fps))),
absl::GetFlag(FLAGS_screencast), absl::GetFlag(FLAGS_frame_drop));
{bitrate}, framerate, absl::GetFlag(FLAGS_screencast),
absl::GetFlag(FLAGS_frame_drop));
std::map<uint32_t, EncodingSettings> frame_settings =
VideoCodecTester::CreateFrameSettings(encoding_settings,
absl::GetFlag(FLAGS_num_frames),
/*timestamp_rtp=*/90000);
int num_frames = absl::GetFlag(FLAGS_num_frames);
int key_interval = absl::GetFlag(FLAGS_key_interval);
uint32_t timestamp_rtp = 90000;
std::map<uint32_t, EncodingSettings> frame_settings;
for (int frame_num = 0; frame_num < num_frames; ++frame_num) {
encoding_settings.keyframe = (frame_num % (key_interval + 1) == 0);
frame_settings.emplace(timestamp_rtp, encoding_settings);
timestamp_rtp += k90kHz / framerate;
}
// TODO(webrtc:14852): Pass encoder and decoder names directly, and update
// logged test name (implies lossing history in the chromeperf dashboard).

5
test/video_codec_tester.cc
View file

@ -953,7 +953,10 @@ class Encoder : public EncodedImageCallback {
}
last_encoding_settings_ = encoding_settings;
int error = encoder_->Encode(input_frame, /*frame_types=*/nullptr);
std::vector<VideoFrameType> frame_types = {
encoding_settings.keyframe ? VideoFrameType::kVideoFrameKey
: VideoFrameType::kVideoFrameDelta};
int error = encoder_->Encode(input_frame, &frame_types);
if (error != 0) {
RTC_LOG(LS_WARNING)
<< "Encode failed with error code " << error

1
test/video_codec_tester.h
View file

@ -53,6 +53,7 @@ class VideoCodecTester {
ScalabilityMode scalability_mode = ScalabilityMode::kL1T1;
VideoCodecMode content_type = VideoCodecMode::kRealtimeVideo;
bool frame_drop = true;
bool keyframe = false;
struct LayerSettings {
Resolution resolution;