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

Use default H264 SDP parameters

Browse Source 
We lost H264 [1] in https://webrtc-review.googlesource.com/c/src/+/327260 where we started using QueryCodecSupport which is sensetive to SDP parameters.

Use CBP3.1, packetization_mode=1 (singlecast NALU) as defaults.

[1] https://chromeperf.appspot.com/report?sid=1e12d661147889123ddeea4ef88a87bcdd38cf09cb23c13ee130770be695ac83&start_rev=41064&end_rev=41226

Bug: webrtc:14852, webrtc:15779
Change-Id: I69137ac847ae3a79238abcfe2a76dc2ba097a06d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/335081
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Sergey Silkin <ssilkin@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41576}
This commit is contained in:
Sergey Silkin 2024-01-19 14:07:20 +01:00 committed by WebRTC LUCI CQ
parent 7209548090
commit 37e9b378fd
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -210,6 +210,8 @@ std::unique_ptr<VideoCodecStats> RunEncodeDecodeTest(
RTC_LOG(LS_WARNING) << "No " << decoder_impl << " decoder for video format " RTC_LOG(LS_WARNING) << "No " << decoder_impl << " decoder for video format "
<< sdp_video_format.ToString() << sdp_video_format.ToString()
<< ". Trying built-in decoder."; << ". Trying built-in decoder.";
// TODO(ssilkin): No H264 support in ffmpeg on ARM. Consider trying HW
// decoder.
decoder_factory = CreateDecoderFactory("builtin"); decoder_factory = CreateDecoderFactory("builtin");
if (!decoder_factory if (!decoder_factory
->QueryCodecSupport(sdp_video_format, ->QueryCodecSupport(sdp_video_format,

1
test/BUILD.gn
View File

@ -1404,6 +1404,7 @@ rtc_library("video_codec_tester") {
"../media:media_constants", "../media:media_constants",
"../modules/video_coding:video_codec_interface", "../modules/video_coding:video_codec_interface",
"../modules/video_coding:video_coding_utility", "../modules/video_coding:video_coding_utility",
"../modules/video_coding:webrtc_h264",
"../modules/video_coding:webrtc_vp9_helpers", "../modules/video_coding:webrtc_vp9_helpers",
"../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",

20
test/video_codec_tester.cc
View File

@ -23,11 +23,13 @@
#include "api/video/video_bitrate_allocator.h" #include "api/video/video_bitrate_allocator.h"
#include "api/video/video_codec_type.h" #include "api/video/video_codec_type.h"
#include "api/video/video_frame.h" #include "api/video/video_frame.h"
#include "api/video_codecs/h264_profile_level_id.h"
#include "api/video_codecs/simulcast_stream.h" #include "api/video_codecs/simulcast_stream.h"
#include "api/video_codecs/video_decoder.h" #include "api/video_codecs/video_decoder.h"
#include "api/video_codecs/video_encoder.h" #include "api/video_codecs/video_encoder.h"
#include "media/base/media_constants.h" #include "media/base/media_constants.h"
#include "modules/video_coding/codecs/av1/av1_svc_config.h" #include "modules/video_coding/codecs/av1/av1_svc_config.h"
#include "modules/video_coding/codecs/h264/include/h264.h"
#include "modules/video_coding/codecs/vp9/svc_config.h" #include "modules/video_coding/codecs/vp9/svc_config.h"
#include "modules/video_coding/include/video_codec_interface.h" #include "modules/video_coding/include/video_codec_interface.h"
#include "modules/video_coding/include/video_error_codes.h" #include "modules/video_coding/include/video_error_codes.h"
@ -1448,14 +1450,24 @@ std::map<uint32_t, EncodingSettings> VideoCodecTester::CreateEncodingSettings(
} }
} }
SdpVideoFormat sdp_video_format = SdpVideoFormat(codec_type);
if (codec_type == "H264") {
const std::string packetization_mode =
"1"; // H264PacketizationMode::SingleNalUnit
sdp_video_format.parameters =
CreateH264Format(H264Profile::kProfileConstrainedBaseline,
H264Level::kLevel3_1, packetization_mode,
/*add_scalability_modes=*/false)
.parameters;
}
std::map<uint32_t, EncodingSettings> frames_settings; std::map<uint32_t, EncodingSettings> frames_settings;
uint32_t timestamp_rtp = first_timestamp_rtp; uint32_t timestamp_rtp = first_timestamp_rtp;
for (int frame_num = 0; frame_num < num_frames; ++frame_num) { for (int frame_num = 0; frame_num < num_frames; ++frame_num) {
frames_settings.emplace( frames_settings.emplace(
timestamp_rtp, timestamp_rtp, EncodingSettings{.sdp_video_format = sdp_video_format,
EncodingSettings{.sdp_video_format = SdpVideoFormat(codec_type), .scalability_mode = scalability_mode,
.scalability_mode = scalability_mode, .layers_settings = layers_settings});
.layers_settings = layers_settings});
timestamp_rtp += k90kHz / Frequency::MilliHertz(1000 * framerate_fps); timestamp_rtp += k90kHz / Frequency::MilliHertz(1000 * framerate_fps);
} }