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 codec_type, - uint32_t rtp_timestamp, - int64_t capture_time_ms, - rtc::ArrayView payload, - RTPVideoHeader video_header, - absl::optional 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 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 codec_type, - uint32_t rtp_timestamp, - const EncodedImage& encoded_image, - RTPVideoHeader video_header, - absl::optional 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 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 codec_type, - uint32_t rtp_timestamp, - int64_t capture_time_ms, - rtc::ArrayView payload, - RTPVideoHeader video_header, - absl::optional 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 codec_type, uint32_t rtp_timestamp, @@ -115,14 +105,6 @@ class RTPSenderVideo : public RTPVideoFrameSenderInterface { TimeDelta expected_retransmission_time, std::vector csrcs) override; - [[deprecated("bugs.webrtc.org/13757")]] bool SendEncodedImage( - int payload_type, - absl::optional codec_type, - uint32_t rtp_timestamp, - const EncodedImage& encoded_image, - RTPVideoHeader video_header, - absl::optional expected_retransmission_time_ms); - bool SendEncodedImage(int payload_type, absl::optional codec_type, uint32_t rtp_timestamp,