commit b412efdb780c86e6530493afa403783d14985347
author Philipp Hancke <philipp.hancke@googlemail.com> Tue May 25 07:03:19 2021
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed May 26 10:04:29 2021
tree 6970b2234e181a8cf7a4cb74d6bf483e377d214e
parent a9af50f151699282a394bf3be019c67cdf4adb69

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 <hta@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34131}

media/engine/webrtc_video_engine.cc

diff --git a/media/engine/webrtc_video_engine.cc b/media/engine/webrtc_video_engine.cc
index 0bf4f20..4ca6c8f 100644
--- a/media/engine/webrtc_video_engine.cc
+++ b/media/engine/webrtc_video_engine.cc
@@ -136,7 +136,7 @@
   // 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 @@
       // 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 @@
         // 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;
       }
     }

pc/used_ids.h

diff --git a/pc/used_ids.h b/pc/used_ids.h
index 5960197..62b2faa 100644
--- a/pc/used_ids.h
+++ b/pc/used_ids.h
@@ -108,7 +108,7 @@
 
  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;