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

Run encode-only test if --decoder=null

Browse Source 
Bug: webrtc:42225151, b/337757868
Change-Id: I40da9d2b67f6757e2340a965e95fc1751c406a0a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/351041
Auto-Submit: Sergey Silkin <ssilkin@webrtc.org>
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Commit-Queue: Åsa Persson <asapersson@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42356}
This commit is contained in:
Sergey Silkin 2024-05-21 08:05:20 +00:00 committed by WebRTC LUCI CQ
parent 80627fb7f7
commit 44e63aaf0a
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
modules/video_coding/codecs/test/video_codec_test.cc
View File

@ -252,15 +252,14 @@ std::unique_ptr<VideoCodecStats> RunEncodeDecodeTest(
std::unique_ptr<VideoCodecStats> RunEncodeTest(
const Environment& env,
std::string codec_type,
std::string codec_impl,
std::string encoder_impl,
const VideoSourceSettings& source_settings,
const std::map<uint32_t, EncodingSettings>& encoding_settings) {
const SdpVideoFormat& sdp_video_format =
encoding_settings.begin()->second.sdp_video_format;
std::unique_ptr<VideoEncoderFactory> encoder_factory =
CreateEncoderFactory(codec_impl);
CreateEncoderFactory(encoder_impl);
if (!encoder_factory
->QueryCodecSupport(sdp_video_format,
/*scalability_mode=*/absl::nullopt)
@ -273,7 +272,7 @@ std::unique_ptr<VideoCodecStats> RunEncodeTest(
std::string output_path = TestOutputPath();
VideoCodecTester::EncoderSettings encoder_settings;
encoder_settings.pacing_settings.mode =
codec_impl == "builtin" ? PacingMode::kNoPacing : PacingMode::kRealTime;
encoder_impl == "builtin" ? PacingMode::kNoPacing : PacingMode::kRealTime;
if (absl::GetFlag(FLAGS_dump_encoder_input)) {
encoder_settings.encoder_input_base_path = output_path + "_enc_input";
}
@ -421,8 +420,8 @@ TEST_P(BitrateAdaptationTest, BitrateAdaptation) {
frame_settings.merge(frame_settings2);
std::unique_ptr<VideoCodecStats> stats = RunEncodeTest(
env, codec_type, codec_impl, source_settings, frame_settings);
std::unique_ptr<VideoCodecStats> stats =
RunEncodeTest(env, codec_impl, source_settings, frame_settings);
VideoCodecStats::Stream stream;
if (stats != nullptr) {
@ -510,8 +509,8 @@ TEST_P(FramerateAdaptationTest, FramerateAdaptation) {
frame_settings.merge(frame_settings2);
std::unique_ptr<VideoCodecStats> stats = RunEncodeTest(
env, codec_type, codec_impl, source_settings, frame_settings);
std::unique_ptr<VideoCodecStats> stats =
RunEncodeTest(env, codec_impl, source_settings, frame_settings);
VideoCodecStats::Stream stream;
if (stats != nullptr) {
@ -588,13 +587,20 @@ TEST(VideoCodecTest, DISABLED_EncodeDecode) {
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).
// Sync with changes in Stream::LogMetrics (see TODOs there).
std::unique_ptr<VideoCodecStats> stats = RunEncodeDecodeTest(
env, CodecNameToCodecImpl(absl::GetFlag(FLAGS_encoder)),
CodecNameToCodecImpl(absl::GetFlag(FLAGS_decoder)), source_settings,
frame_settings);
std::unique_ptr<VideoCodecStats> stats;
std::string decoder = absl::GetFlag(FLAGS_decoder);
if (decoder == "null") {
stats =
RunEncodeTest(env, CodecNameToCodecImpl(absl::GetFlag(FLAGS_encoder)),
source_settings, frame_settings);
} else {
// TODO(webrtc:14852): Pass encoder and decoder names directly, and update
// logged test name (implies lossing history in the chromeperf dashboard).
// Sync with changes in Stream::LogMetrics (see TODOs there).
stats = RunEncodeDecodeTest(
env, CodecNameToCodecImpl(absl::GetFlag(FLAGS_encoder)),
CodecNameToCodecImpl(decoder), source_settings, frame_settings);
}
ASSERT_NE(nullptr, stats);
// Log unsliced metrics.