From b412efdb780c86e6530493afa403783d14985347 Mon Sep 17 00:00:00 2001 From: Philipp Hancke Date: Tue, 25 May 2021 09:03:19 +0200 Subject: [PATCH] payload type mapping: restrict lower range to <= 63 for consistency with the definition in IsRtcpPacket which takes into account a collision of H261 feedback for payload types 64 + 65: https://datatracker.ietf.org/doc/html/rfc5761#section-4 BUG=webrtc:12194 Change-Id: I2ebb0456ae2aff1b1735f26221c7c4ae79698ac9 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/220021 Reviewed-by: Harald Alvestrand Commit-Queue: Harald Alvestrand Cr-Commit-Position: refs/heads/master@{#34131} --- media/engine/webrtc_video_engine.cc | 6 +++--- pc/used_ids.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/media/engine/webrtc_video_engine.cc b/media/engine/webrtc_video_engine.cc index 0bf4f20639..4ca6c8f98d 100644 --- a/media/engine/webrtc_video_engine.cc +++ b/media/engine/webrtc_video_engine.cc @@ -136,7 +136,7 @@ std::vector GetPayloadTypesAndDefaultCodecs( // Due to interoperability issues with old Chrome/WebRTC versions only use // the lower range for new codecs. static const int kFirstDynamicPayloadTypeLowerRange = 35; - static const int kLastDynamicPayloadTypeLowerRange = 65; + static const int kLastDynamicPayloadTypeLowerRange = 63; static const int kFirstDynamicPayloadTypeUpperRange = 96; static const int kLastDynamicPayloadTypeUpperRange = 127; @@ -187,7 +187,7 @@ std::vector GetPayloadTypesAndDefaultCodecs( // TODO(https://bugs.chromium.org/p/webrtc/issues/detail?id=12248): // return an error. RTC_LOG(LS_ERROR) - << "Out of dynamic payload types [35,65], skipping the rest."; + << "Out of dynamic payload types [35,63], skipping the rest."; break; } @@ -213,7 +213,7 @@ std::vector GetPayloadTypesAndDefaultCodecs( // TODO(https://bugs.chromium.org/p/webrtc/issues/detail?id=12248): // return an error. RTC_LOG(LS_ERROR) - << "Out of dynamic payload types [35,65], skipping rtx."; + << "Out of dynamic payload types [35,63], skipping rtx."; break; } } diff --git a/pc/used_ids.h b/pc/used_ids.h index 5960197344..62b2faa018 100644 --- a/pc/used_ids.h +++ b/pc/used_ids.h @@ -108,7 +108,7 @@ class UsedPayloadTypes : public UsedIds { private: static const int kFirstDynamicPayloadTypeLowerRange = 35; - static const int kLastDynamicPayloadTypeLowerRange = 65; + static const int kLastDynamicPayloadTypeLowerRange = 63; static const int kFirstDynamicPayloadTypeUpperRange = 96; static const int kLastDynamicPayloadTypeUpperRange = 127;