From 63b01e19e9bd01de364f30d15b9e68a0b387138b Mon Sep 17 00:00:00 2001 From: Florent Castelli Date: Tue, 20 Apr 2021 15:02:50 +0200 Subject: [PATCH] Remove ReceiveDataParams::timestamp This field was only used in RTP Data Channels and isn't needed anymore. Bug: webrtc:6625 Change-Id: Ieaa7ae03ca3e90eb4ddec4d384f5a76cef1600cc Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/215687 Reviewed-by: Harald Alvestrand Commit-Queue: Florent Castelli Cr-Commit-Position: refs/heads/master@{#33791} --- media/base/media_channel.h | 2 -- media/sctp/usrsctp_transport.cc | 2 -- media/sctp/usrsctp_transport_unittest.cc | 4 ---- 3 files changed, 8 deletions(-) diff --git a/media/base/media_channel.h b/media/base/media_channel.h index fe83e85eca..8a67c2a6e5 100644 --- a/media/base/media_channel.h +++ b/media/base/media_channel.h @@ -904,8 +904,6 @@ struct ReceiveDataParams { DataMessageType type = DMT_TEXT; // A per-stream value incremented per packet in the stream. int seq_num = 0; - // A per-stream value monotonically increasing with time. - int timestamp = 0; }; struct SendDataParams { diff --git a/media/sctp/usrsctp_transport.cc b/media/sctp/usrsctp_transport.cc index 34f145d19f..fc226bf7ff 100644 --- a/media/sctp/usrsctp_transport.cc +++ b/media/sctp/usrsctp_transport.cc @@ -1318,8 +1318,6 @@ void UsrsctpTransport::OnDataOrNotificationFromSctp(const void* data, // Furthermore, it is increased per stream and not on the whole // association. params.seq_num = rcv.rcv_ssn; - // There is no timestamp field in the SCTP API - params.timestamp = 0; // Append the chunk's data to the message buffer partial_incoming_message_.AppendData(reinterpret_cast(data), diff --git a/media/sctp/usrsctp_transport_unittest.cc b/media/sctp/usrsctp_transport_unittest.cc index 2bb61830cb..f75cb4a25d 100644 --- a/media/sctp/usrsctp_transport_unittest.cc +++ b/media/sctp/usrsctp_transport_unittest.cc @@ -576,8 +576,6 @@ TEST_P(SctpTransportTestWithOrdered, SendData) { RTC_LOG(LS_VERBOSE) << "recv2.received=" << receiver2()->received() << ", recv2.last_params.sid=" << receiver2()->last_params().sid - << ", recv2.last_params.timestamp=" - << receiver2()->last_params().timestamp << ", recv2.last_params.seq_num=" << receiver2()->last_params().seq_num << ", recv2.last_data=" << receiver2()->last_data(); @@ -591,8 +589,6 @@ TEST_P(SctpTransportTestWithOrdered, SendData) { RTC_LOG(LS_VERBOSE) << "recv1.received=" << receiver1()->received() << ", recv1.last_params.sid=" << receiver1()->last_params().sid - << ", recv1.last_params.timestamp=" - << receiver1()->last_params().timestamp << ", recv1.last_params.seq_num=" << receiver1()->last_params().seq_num << ", recv1.last_data=" << receiver1()->last_data();