From ac412a4ee3b2e70cbaea418c7b9a03473cd42fa2 Mon Sep 17 00:00:00 2001
From: Danil Chapovalov <danilchap@webrtc.org>
Date: Mon, 24 Jul 2023 13:05:37 +0200
Subject: [PATCH] In RTPSenderVideo delete deprecated variants of functions to
 send video frame
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: webrtc:13757
Change-Id: I0bef9cc17e599382cc2265d61a2a538f2534356f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/312860
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40472}
---
 modules/rtp_rtcp/source/rtp_sender_video.cc | 33 ---------------------
 modules/rtp_rtcp/source/rtp_sender_video.h  | 24 ++-------------
 2 files changed, 3 insertions(+), 54 deletions(-)

diff --git a/modules/rtp_rtcp/source/rtp_sender_video.cc b/modules/rtp_rtcp/source/rtp_sender_video.cc
index dc37475df0..41aff1869a 100644
--- a/modules/rtp_rtcp/source/rtp_sender_video.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_video.cc
@@ -452,24 +452,6 @@ void RTPSenderVideo::AddRtpHeaderExtensions(const RTPVideoHeader& video_header,
   }
 }
 
-bool RTPSenderVideo::SendVideo(
-    int payload_type,
-    absl::optional<VideoCodecType> codec_type,
-    uint32_t rtp_timestamp,
-    int64_t capture_time_ms,
-    rtc::ArrayView<const uint8_t> payload,
-    RTPVideoHeader video_header,
-    absl::optional<int64_t> expected_retransmission_time_ms) {
-  return SendVideo(payload_type, codec_type, rtp_timestamp,
-                   capture_time_ms > 0 ? Timestamp::Millis(capture_time_ms)
-                                       : Timestamp::MinusInfinity(),
-                   payload, payload.size(), video_header,
-                   expected_retransmission_time_ms.has_value()
-                       ? TimeDelta::Millis(*expected_retransmission_time_ms)
-                       : TimeDelta::PlusInfinity(),
-                   /*csrcs=*/{});
-}
-
 bool RTPSenderVideo::SendVideo(int payload_type,
                                absl::optional<VideoCodecType> codec_type,
                                uint32_t rtp_timestamp,
@@ -765,21 +747,6 @@ bool RTPSenderVideo::SendVideo(int payload_type,
   return true;
 }
 
-bool RTPSenderVideo::SendEncodedImage(
-    int payload_type,
-    absl::optional<VideoCodecType> codec_type,
-    uint32_t rtp_timestamp,
-    const EncodedImage& encoded_image,
-    RTPVideoHeader video_header,
-    absl::optional<int64_t> expected_retransmission_time_ms) {
-  return SendEncodedImage(
-      payload_type, codec_type, rtp_timestamp, encoded_image,
-      std::move(video_header),
-      expected_retransmission_time_ms.has_value()
-          ? TimeDelta::Millis(*expected_retransmission_time_ms)
-          : TimeDelta::PlusInfinity());
-}
-
 bool RTPSenderVideo::SendEncodedImage(int payload_type,
                                       absl::optional<VideoCodecType> codec_type,
                                       uint32_t rtp_timestamp,
diff --git a/modules/rtp_rtcp/source/rtp_sender_video.h b/modules/rtp_rtcp/source/rtp_sender_video.h
index 80ad6165d0..a9edc2d712 100644
--- a/modules/rtp_rtcp/source/rtp_sender_video.h
+++ b/modules/rtp_rtcp/source/rtp_sender_video.h
@@ -90,21 +90,11 @@ class RTPSenderVideo : public RTPVideoFrameSenderInterface {
 
   virtual ~RTPSenderVideo();
 
-  // expected_retransmission_time_ms.has_value() -> retransmission allowed.
-  // `capture_time_ms` and `clock::CurrentTime` should be using the same epoch.
-  // Calls to this method are assumed to be externally serialized.
-  [[deprecated("bugs.webrtc.org/13757")]] bool SendVideo(
-      int payload_type,
-      absl::optional<VideoCodecType> codec_type,
-      uint32_t rtp_timestamp,
-      int64_t capture_time_ms,
-      rtc::ArrayView<const uint8_t> payload,
-      RTPVideoHeader video_header,
-      absl::optional<int64_t> expected_retransmission_time_ms);
-
-  // expected_retransmission_time.IsFinite() -> retransmission allowed.
+  // `capture_time` and `clock::CurrentTime` should be using the same epoch.
+  // `expected_retransmission_time.IsFinite()` -> retransmission allowed.
   // `encoder_output_size` is the size of the video frame as it came out of the
   // video encoder, excluding any additional overhead.
+  // Calls to this method are assumed to be externally serialized.
   bool SendVideo(int payload_type,
                  absl::optional<VideoCodecType> codec_type,
                  uint32_t rtp_timestamp,
@@ -115,14 +105,6 @@ class RTPSenderVideo : public RTPVideoFrameSenderInterface {
                  TimeDelta expected_retransmission_time,
                  std::vector<uint32_t> csrcs) override;
 
-  [[deprecated("bugs.webrtc.org/13757")]] bool SendEncodedImage(
-      int payload_type,
-      absl::optional<VideoCodecType> codec_type,
-      uint32_t rtp_timestamp,
-      const EncodedImage& encoded_image,
-      RTPVideoHeader video_header,
-      absl::optional<int64_t> expected_retransmission_time_ms);
-
   bool SendEncodedImage(int payload_type,
                         absl::optional<VideoCodecType> codec_type,
                         uint32_t rtp_timestamp,