blob: 09b70568a9760d9bdb7da90858e05656b0aeef84 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
From: Andreas Pehrson <apehrson@mozilla.com>
Date: Wed, 10 May 2023 18:06:00 +0000
Subject: Bug 1831824 - libwebrtc: In PacketSequencer set timestamps of rtx
padding packets when there is no last packet. r=webrtc-reviewers,dbaker
Prior to this patch timestamps are not adjusted when they are 0, and they are 0
when the packet sequencer has not yet seen a media packet. Code and comments in
PacketSequencer and RTPSender::GeneratePadding make it clear that rtx padding
packets are allowed prior to seeing a media packet, and therefore the 0
timestamp case has to be handled.
For rtx the padding packets do not need to have the same timestamp as any media
packets, like plain padding packets do -- because they can only be part of a media
frame, so a media packet has to be known.
With this patch both rtp timestamps and capture timestamps are set to current
time when sequencing rtx padding packets without having seen a media packet.
This fixes a DCHECK failure in TransmissionOffset::Write.
Differential Revision: https://phabricator.services.mozilla.com/D177306
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/b0339fd77c82c4c54e5aacaeef66d739b1643827
---
modules/rtp_rtcp/source/packet_sequencer.cc | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/modules/rtp_rtcp/source/packet_sequencer.cc b/modules/rtp_rtcp/source/packet_sequencer.cc
index 55edd768a8..acc2e87aa3 100644
--- a/modules/rtp_rtcp/source/packet_sequencer.cc
+++ b/modules/rtp_rtcp/source/packet_sequencer.cc
@@ -118,8 +118,18 @@ void PacketSequencer::PopulatePaddingFields(RtpPacketToSend& packet) {
return;
}
- packet.SetTimestamp(last_rtp_timestamp_);
- packet.set_capture_time(Timestamp::Millis(last_capture_time_ms_));
+ if (last_timestamp_time_ms_ > 0) {
+ RTC_DCHECK_GT(last_rtp_timestamp_, 0);
+ RTC_DCHECK_GT(last_capture_time_ms_, 0);
+ packet.SetTimestamp(last_rtp_timestamp_);
+ packet.set_capture_time(Timestamp::Millis(last_capture_time_ms_));
+ } else {
+ // No media packet has been sent yet so timestamps are not known. Set them
+ // now as they will be needed when serializing the packet later on.
+ auto now = clock_->CurrentTime();
+ packet.SetTimestamp(now.ms() * kTimestampTicksPerMs);
+ packet.set_capture_time(now);
+ }
// Only change the timestamp of padding packets sent over RTX.
// Padding only packets over RTP has to be sent as part of a media
--
2.34.1
|
