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

Validate rejected m-lines less strictly

Browse Source 
since their content typically is not processed further.

BUG=webrtc:142258

Change-Id: I5bcfb6c3a6f3a301acb497b83f8a4dbc3023c5db
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/317603
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Florent Castelli <orphis@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@microsoft.com>
Cr-Commit-Position: refs/heads/main@{#40649}
This commit is contained in:
Philipp Hancke 2023-08-25 12:42:36 +02:00 committed by WebRTC LUCI CQ
parent 2ea5f15a5a
commit 465bc0fd87
2 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pc/sdp_offer_answer.cc
View File

@ -417,14 +417,18 @@ RTCError ValidateBundledPayloadTypes(
for (const cricket::ContentGroup* bundle_group : bundle_groups) {
std::map<int, RtpCodecParameters> payload_to_codec_parameters;
for (const std::string& content_name : bundle_group->content_names()) {
const cricket::MediaContentDescription* media_description =
description.GetContentDescriptionByName(content_name);
if (!media_description) {
const ContentInfo* content_description =
description.GetContentByName(content_name);
if (!content_description) {
LOG_AND_RETURN_ERROR(RTCErrorType::INVALID_PARAMETER,
"A BUNDLE group contains a MID='" + content_name +
"' matching no m= section.");
}
if (!media_description->has_codecs()) {
const cricket::MediaContentDescription* media_description =
content_description->media_description();
RTC_DCHECK(media_description);
if (content_description->rejected || !media_description ||
!media_description->has_codecs()) {
continue;
}
const auto type = media_description->type();
@ -480,13 +484,21 @@ RTCError ValidateBundledRtpHeaderExtensions(
for (const cricket::ContentGroup* bundle_group : bundle_groups) {
std::map<int, RtpExtension> id_to_extension;
for (const std::string& content_name : bundle_group->content_names()) {
const cricket::MediaContentDescription* media_description =
description.GetContentDescriptionByName(content_name);
if (!media_description) {
const ContentInfo* content_description =
description.GetContentByName(content_name);
if (!content_description) {
LOG_AND_RETURN_ERROR(RTCErrorType::INVALID_PARAMETER,
"A BUNDLE group contains a MID='" + content_name +
"' matching no m= section.");
}
const cricket::MediaContentDescription* media_description =
content_description->media_description();
RTC_DCHECK(media_description);
if (content_description->rejected || !media_description ||
!media_description->has_codecs()) {
continue;
}
for (const auto& extension : media_description->rtp_header_extensions()) {
auto error =
FindDuplicateHeaderExtensionIds(extension, id_to_extension);
@ -502,7 +514,7 @@ RTCError ValidateBundledRtpHeaderExtensions(
RTCError ValidateRtpHeaderExtensionsForSpecSimulcast(
const cricket::SessionDescription& description) {
for (const ContentInfo& content : description.contents()) {
if (content.type != MediaProtocolType::kRtp) {
if (content.type != MediaProtocolType::kRtp || content.rejected) {
continue;
}
const auto media_description = content.media_description();

19
pc/sdp_offer_answer_unittest.cc
View File

@ -165,10 +165,22 @@ TEST_F(SdpOfferAnswerTest, BundleRejectsCodecCollisionsAudioVideo) {
ASSERT_NE(desc, nullptr);
RTCError error;
pc->SetRemoteDescription(std::move(desc), &error);
// There is no error yet but the metrics counter will increase.
EXPECT_TRUE(error.ok());
EXPECT_METRIC_EQ(
1, webrtc::metrics::NumEvents(
"WebRTC.PeerConnection.ValidBundledPayloadTypes", false));
// Tolerate codec collisions in rejected m-lines.
pc = CreatePeerConnection();
auto rejected_offer = CreateSessionDescription(
SdpType::kOffer,
absl::StrReplaceAll(sdp, {{"m=video 9 ", "m=video 0 "}}));
pc->SetRemoteDescription(std::move(rejected_offer), &error);
EXPECT_TRUE(error.ok());
EXPECT_METRIC_EQ(1,
webrtc::metrics::NumEvents(
"WebRTC.PeerConnection.ValidBundledPayloadTypes", true));
}
TEST_F(SdpOfferAnswerTest, BundleRejectsCodecCollisionsVideoFmtp) {
@ -598,6 +610,13 @@ TEST_F(SdpOfferAnswerTest, SimulcastAnswerWithNoRidsIsRejected) {
auto answer_with_extensions =
CreateSessionDescription(SdpType::kAnswer, sdp + extensions);
EXPECT_TRUE(pc->SetRemoteDescription(std::move(answer_with_extensions)));
// Tolerate the lack of mid/rid extensions in rejected m-lines.
EXPECT_TRUE(pc->CreateOfferAndSetAsLocal());
auto rejected_answer = CreateSessionDescription(
SdpType::kAnswer,
absl::StrReplaceAll(sdp, {{"m=video 9 ", "m=video 0 "}}));
EXPECT_TRUE(pc->SetRemoteDescription(std::move(rejected_answer)));
}
TEST_F(SdpOfferAnswerTest, ExpectAllSsrcsSpecifiedInSsrcGroupFid) {