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

In RTPSenderVideo delete deprecated variants of functions to send video frame

Browse Source 
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}
This commit is contained in:
Danil Chapovalov 2023-07-24 13:05:37 +02:00 committed by WebRTC LUCI CQ
parent 7b42f35bcc
commit ac412a4ee3
2 changed files with 3 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
modules/rtp_rtcp/source/rtp_sender_video.cc
View File

@ -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,

24
modules/rtp_rtcp/source/rtp_sender_video.h
View File

@ -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,