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

Respect decoder implementation

Browse Source 
This allows using different encoder and decoder implementations in a test. For example, to encode with SW encoder and to decode with HW decoder or vice versa.

Bug: webrtc:14852
Change-Id: Ic100cba2158fb6311b84a54a0831f2a0dcff9270
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/335300
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@{#41571}
This commit is contained in:
Sergey Silkin 2024-01-19 09:45:30 +00:00 committed by WebRTC LUCI CQ
parent 434f4cb44f
commit 3e623ef57d
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,7 +178,8 @@ std::string TestOutputPath() {
} // namespace } // namespace
std::unique_ptr<VideoCodecStats> RunEncodeDecodeTest( std::unique_ptr<VideoCodecStats> RunEncodeDecodeTest(
std::string codec_impl, std::string encoder_impl,
std::string decoder_impl,
const VideoInfo& video_info, const VideoInfo& video_info,
const std::map<uint32_t, EncodingSettings>& encoding_settings) { const std::map<uint32_t, EncodingSettings>& encoding_settings) {
VideoSourceSettings source_settings{ VideoSourceSettings source_settings{
@ -190,28 +191,32 @@ std::unique_ptr<VideoCodecStats> RunEncodeDecodeTest(
encoding_settings.begin()->second.sdp_video_format; encoding_settings.begin()->second.sdp_video_format;
std::unique_ptr<VideoEncoderFactory> encoder_factory = std::unique_ptr<VideoEncoderFactory> encoder_factory =
CreateEncoderFactory(codec_impl); CreateEncoderFactory(encoder_impl);
if (!encoder_factory if (!encoder_factory
->QueryCodecSupport(sdp_video_format, ->QueryCodecSupport(sdp_video_format,
/*scalability_mode=*/absl::nullopt) /*scalability_mode=*/absl::nullopt)
.is_supported) { .is_supported) {
RTC_LOG(LS_WARNING) << "No encoder for video format " RTC_LOG(LS_WARNING) << "No " << encoder_impl << " encoder for video format "
<< sdp_video_format.ToString(); << sdp_video_format.ToString();
return nullptr; return nullptr;
} }
std::unique_ptr<VideoDecoderFactory> decoder_factory = std::unique_ptr<VideoDecoderFactory> decoder_factory =
CreateDecoderFactory(codec_impl); CreateDecoderFactory(decoder_impl);
if (!decoder_factory if (!decoder_factory
->QueryCodecSupport(sdp_video_format, ->QueryCodecSupport(sdp_video_format,
/*reference_scaling=*/false) /*reference_scaling=*/false)
.is_supported) { .is_supported) {
RTC_LOG(LS_WARNING) << "No " << decoder_impl << " decoder for video format "
<< sdp_video_format.ToString()
<< ". Trying built-in decoder.";
decoder_factory = CreateDecoderFactory("builtin"); decoder_factory = CreateDecoderFactory("builtin");
if (!decoder_factory if (!decoder_factory
->QueryCodecSupport(sdp_video_format, ->QueryCodecSupport(sdp_video_format,
/*reference_scaling=*/false) /*reference_scaling=*/false)
.is_supported) { .is_supported) {
RTC_LOG(LS_WARNING) << "No decoder for video format " RTC_LOG(LS_WARNING) << "No " << decoder_impl
<< " decoder for video format "
<< sdp_video_format.ToString(); << sdp_video_format.ToString();
return nullptr; return nullptr;
} }
@ -221,7 +226,7 @@ std::unique_ptr<VideoCodecStats> RunEncodeDecodeTest(
VideoCodecTester::EncoderSettings encoder_settings; VideoCodecTester::EncoderSettings encoder_settings;
encoder_settings.pacing_settings.mode = 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)) { if (absl::GetFlag(FLAGS_dump_encoder_input)) {
encoder_settings.encoder_input_base_path = output_path + "_enc_input"; encoder_settings.encoder_input_base_path = output_path + "_enc_input";
} }
@ -231,7 +236,7 @@ std::unique_ptr<VideoCodecStats> RunEncodeDecodeTest(
VideoCodecTester::DecoderSettings decoder_settings; VideoCodecTester::DecoderSettings decoder_settings;
decoder_settings.pacing_settings.mode = decoder_settings.pacing_settings.mode =
codec_impl == "builtin" ? PacingMode::kNoPacing : PacingMode::kRealTime; decoder_impl == "builtin" ? PacingMode::kNoPacing : PacingMode::kRealTime;
if (absl::GetFlag(FLAGS_dump_decoder_input)) { if (absl::GetFlag(FLAGS_dump_decoder_input)) {
decoder_settings.decoder_input_base_path = output_path + "_dec_input"; decoder_settings.decoder_input_base_path = output_path + "_dec_input";
} }
@ -318,7 +323,7 @@ TEST_P(SpatialQualityTest, SpatialQuality) {
{bitrate_kbps}, framerate_fps, num_frames); {bitrate_kbps}, framerate_fps, num_frames);
std::unique_ptr<VideoCodecStats> stats = std::unique_ptr<VideoCodecStats> stats =
RunEncodeDecodeTest(codec_impl, video_info, frames_settings); RunEncodeDecodeTest(codec_impl, codec_impl, video_info, frames_settings);
VideoCodecStats::Stream stream; VideoCodecStats::Stream stream;
if (stats != nullptr) { if (stats != nullptr) {
@ -538,6 +543,7 @@ TEST(VideoCodecTest, DISABLED_EncodeDecode) {
// Sync with changes in Stream::LogMetrics (see TODOs there). // Sync with changes in Stream::LogMetrics (see TODOs there).
std::unique_ptr<VideoCodecStats> stats = RunEncodeDecodeTest( std::unique_ptr<VideoCodecStats> stats = RunEncodeDecodeTest(
CodecNameToCodecImpl(absl::GetFlag(FLAGS_encoder)), CodecNameToCodecImpl(absl::GetFlag(FLAGS_encoder)),
CodecNameToCodecImpl(absl::GetFlag(FLAGS_decoder)),
kRawVideos.at(absl::GetFlag(FLAGS_video_name)), frames_settings); kRawVideos.at(absl::GetFlag(FLAGS_video_name)), frames_settings);
ASSERT_NE(nullptr, stats); ASSERT_NE(nullptr, stats);