zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Store RtpPacketReceived::arrival_time as Timestamp.

Browse Source 
Previously this value was rounded up to a millisecond value.
This change is complementary to another change:
https://webrtc-review.googlesource.com/c/src/+/216398

Bug: webrtc:12722
Change-Id: I0fd2baceb4608132615fb6ad241ec863e343edb1
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/217521
Commit-Queue: Tommi <tommi@webrtc.org>
Reviewed-by: Johannes Kron <kron@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33928}
This commit is contained in:
Tommi
2021-05-05 12:33:00 +02:00
committed by WebRTC LUCI CQ
parent 3f418ccf99
commit 2497a27b22
10 changed files with 43 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/rtp_rtcp/source/rtp_packet_received.cc
View File

@ -21,8 +21,10 @@
namespace webrtc {
RtpPacketReceived::RtpPacketReceived() = default;
RtpPacketReceived::RtpPacketReceived(const ExtensionManager* extensions)
: RtpPacket(extensions) {}
RtpPacketReceived::RtpPacketReceived(
const ExtensionManager* extensions,
webrtc::Timestamp arrival_time /*= webrtc::Timestamp::MinusInfinity()*/)
: RtpPacket(extensions), arrival_time_(arrival_time) {}
RtpPacketReceived::RtpPacketReceived(const RtpPacketReceived& packet) = default;
RtpPacketReceived::RtpPacketReceived(RtpPacketReceived&& packet) = default;

21
modules/rtp_rtcp/source/rtp_packet_received.h
View File

@ -14,10 +14,12 @@
#include <utility>
#include "absl/base/attributes.h"
#include "api/array_view.h"
#include "api/ref_counted_base.h"
#include "api/rtp_headers.h"
#include "api/scoped_refptr.h"
#include "api/units/timestamp.h"
#include "modules/rtp_rtcp/source/rtp_packet.h"
namespace webrtc {
@ -27,7 +29,9 @@ namespace webrtc {
class RtpPacketReceived : public RtpPacket {
public:
RtpPacketReceived();
explicit RtpPacketReceived(const ExtensionManager* extensions);
explicit RtpPacketReceived(
const ExtensionManager* extensions,
webrtc::Timestamp arrival_time = webrtc::Timestamp::MinusInfinity());
RtpPacketReceived(const RtpPacketReceived& packet);
RtpPacketReceived(RtpPacketReceived&& packet);
@ -42,8 +46,17 @@ class RtpPacketReceived : public RtpPacket {
// Time in local time base as close as it can to packet arrived on the
// network.
int64_t arrival_time_ms() const { return arrival_time_ms_; }
void set_arrival_time_ms(int64_t time) { arrival_time_ms_ = time; }
webrtc::Timestamp arrival_time() const { return arrival_time_; }
void set_arrival_time(webrtc::Timestamp time) { arrival_time_ = time; }
ABSL_DEPRECATED("Use arrival_time() instead")
int64_t arrival_time_ms() const {
return arrival_time_.IsMinusInfinity() ? -1 : arrival_time_.ms();
}
ABSL_DEPRECATED("Use set_arrival_time() instead")
void set_arrival_time_ms(int64_t time) {
arrival_time_ = webrtc::Timestamp::Millis(time);
}
// Flag if packet was recovered via RTX or FEC.
bool recovered() const { return recovered_; }
@ -64,7 +77,7 @@ class RtpPacketReceived : public RtpPacket {
}
private:
int64_t arrival_time_ms_ = 0;
webrtc::Timestamp arrival_time_ = Timestamp::MinusInfinity();
int payload_type_frequency_ = 0;
bool recovered_ = false;
rtc::scoped_refptr<rtc::RefCountedBase> additional_data_;