From 8e95ea92b251d10ad55422ff5975fe3610710409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@webrtc.org>
Date: Mon, 10 Aug 2020 14:22:37 +0200
Subject: [PATCH] Add method RtpVideoStreamReceiver::AddReceiveCodec with
 explicit payload type

Bug: None
Change-Id: If1008c9053a27b1e0d79299555675e17511069f2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/181240
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31894}
---
 video/rtp_video_stream_receiver.cc | 9 +++++----
 video/rtp_video_stream_receiver.h  | 7 +++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/video/rtp_video_stream_receiver.cc b/video/rtp_video_stream_receiver.cc
index afe2d86d54..1b8828be2c 100644
--- a/video/rtp_video_stream_receiver.cc
+++ b/video/rtp_video_stream_receiver.cc
@@ -358,6 +358,7 @@ RtpVideoStreamReceiver::~RtpVideoStreamReceiver() {
 }
 
 void RtpVideoStreamReceiver::AddReceiveCodec(
+    uint8_t payload_type,
     const VideoCodec& video_codec,
     const std::map<std::string, std::string>& codec_params,
     bool raw_payload) {
@@ -366,10 +367,10 @@ void RtpVideoStreamReceiver::AddReceiveCodec(
     packet_buffer_.ForceSpsPpsIdrIsH264Keyframe();
   }
   payload_type_map_.emplace(
-      video_codec.plType,
-      raw_payload ? std::make_unique<VideoRtpDepacketizerRaw>()
-                  : CreateVideoRtpDepacketizer(video_codec.codecType));
-  pt_codec_params_.emplace(video_codec.plType, codec_params);
+      payload_type, raw_payload
+                        ? std::make_unique<VideoRtpDepacketizerRaw>()
+                        : CreateVideoRtpDepacketizer(video_codec.codecType));
+  pt_codec_params_.emplace(payload_type, codec_params);
 }
 
 absl::optional<Syncable::Info> RtpVideoStreamReceiver::GetSyncInfo() const {
diff --git a/video/rtp_video_stream_receiver.h b/video/rtp_video_stream_receiver.h
index fb5dd85e3d..07d19e6ed9 100644
--- a/video/rtp_video_stream_receiver.h
+++ b/video/rtp_video_stream_receiver.h
@@ -115,7 +115,14 @@ class RtpVideoStreamReceiver : public LossNotificationSender,
       rtc::scoped_refptr<FrameTransformerInterface> frame_transformer);
   ~RtpVideoStreamReceiver() override;
 
+  // TODO(nisse): Deprecated, to be deleted together with VideoCodec::plType.
   void AddReceiveCodec(const VideoCodec& video_codec,
+                       const std::map<std::string, std::string>& codec_params,
+                       bool raw_payload) {
+    AddReceiveCodec(video_codec.plType, video_codec, codec_params, raw_payload);
+  }
+  void AddReceiveCodec(uint8_t payload_type,
+                       const VideoCodec& video_codec,
                        const std::map<std::string, std::string>& codec_params,
                        bool raw_payload);