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

payload type mapping: restrict lower range to <= 63

Browse Source 
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 <hta@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34131}
This commit is contained in:
Philipp Hancke 2021-05-25 09:03:19 +02:00 committed by WebRTC LUCI CQ
parent a9af50f151
commit b412efdb78
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
media/engine/webrtc_video_engine.cc
View File

@ -136,7 +136,7 @@ std::vector<VideoCodec> 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<VideoCodec> 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<VideoCodec> 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;
}
}

2
pc/used_ids.h
View File

@ -108,7 +108,7 @@ class UsedPayloadTypes : public UsedIds<Codec> {
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;