mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-14 06:10:40 +01:00

This is a reland of 6328d7cbbc
Original change's description:
> Rework rtp packet history
>
> This CL rewrites the history from the ground up, but keeps the logic
> (mostly) intact. It does however lay the groundwork for adding a new
> mode where TransportFeedback messages can be used to remove packets
> from the history as we know the remote end has received them.
>
> This should both reduce memory usage and make the payload based padding
> a little more likely to be useful.
>
> My tests show a reduction of ca 500-800kB reduction in memory usage per
> rtp module. So with simulcast and/or fec this will increase. Lossy
> links and long RTT will use more memory.
>
> I've also slightly update the interface to make usage with/without
> pacer less unintuitive, and avoid making a copy of the entire RTP
> packet just to find the ssrc and sequence number to put into the pacer.
>
> The more aggressive culling is not enabled by default. I will
> wire that up in a follow-up CL, as there's some interface refactoring
> required.
>
> Bug: webrtc:8975
> Change-Id: I0c1bb528f32eeed0fb276b4ae77ae3235656980f
> Reviewed-on: https://webrtc-review.googlesource.com/59441
> Commit-Queue: Erik Språng <sprang@webrtc.org>
> Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#22347}
Bug: webrtc:8975
Change-Id: I162cb9a1eccddf567bdda7285f8296dc2f005503
Reviewed-on: https://webrtc-review.googlesource.com/60900
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Erik Språng <sprang@webrtc.org>
Cr-Original-Commit-Position: refs/heads/master@{#22356}
Reviewed-on: https://webrtc-review.googlesource.com/61661
Cr-Commit-Position: refs/heads/master@{#22438}
148 lines
5.6 KiB
C++
148 lines
5.6 KiB
C++
/*
|
|
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef MODULES_RTP_RTCP_SOURCE_RTP_PACKET_HISTORY_H_
|
|
#define MODULES_RTP_RTCP_SOURCE_RTP_PACKET_HISTORY_H_
|
|
|
|
#include <map>
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
|
|
#include "rtc_base/constructormagic.h"
|
|
#include "rtc_base/criticalsection.h"
|
|
#include "rtc_base/thread_annotations.h"
|
|
#include "typedefs.h" // NOLINT(build/include)
|
|
|
|
namespace webrtc {
|
|
|
|
class Clock;
|
|
class RtpPacketToSend;
|
|
|
|
class RtpPacketHistory {
|
|
public:
|
|
enum class StorageMode {
|
|
kDisabled, // Don't store any packets.
|
|
kStore, // Store and keep at least |number_to_store| packets.
|
|
kStoreAndCull // Store up to |number_to_store| packets, but try to remove
|
|
// packets as they time out or as signaled as received.
|
|
};
|
|
|
|
// Snapshot indicating the state of a packet in the history.
|
|
struct PacketState {
|
|
PacketState();
|
|
PacketState(const PacketState&);
|
|
~PacketState();
|
|
|
|
uint16_t rtp_sequence_number = 0;
|
|
rtc::Optional<int64_t> send_time_ms;
|
|
int64_t capture_time_ms = 0;
|
|
uint32_t ssrc = 0;
|
|
size_t payload_size = 0;
|
|
// Number of times RE-transmitted, ie not including the first transmission.
|
|
size_t times_retransmitted = 0;
|
|
};
|
|
|
|
// Maximum number of packets we ever allow in the history.
|
|
static constexpr size_t kMaxCapacity = 9600;
|
|
// Don't remove packets within max(1000ms, 3x RTT).
|
|
static constexpr int64_t kMinPacketDurationMs = 1000;
|
|
static constexpr int kMinPacketDurationRtt = 3;
|
|
// With kStoreAndCull, always remove packets after 3x max(1000ms, 3x rtt).
|
|
static constexpr int kPacketCullingDelayFactor = 3;
|
|
|
|
explicit RtpPacketHistory(Clock* clock);
|
|
~RtpPacketHistory();
|
|
|
|
// Set/get storage mode. Note that setting the state will clear the history,
|
|
// even if setting the same state as is currently used.
|
|
void SetStorePacketsStatus(StorageMode mode, size_t number_to_store);
|
|
StorageMode GetStorageMode() const;
|
|
|
|
// Set RTT, used to avoid premature retransmission and to prevent over-writing
|
|
// a packet in the history before we are reasonably sure it has been received.
|
|
void SetRtt(int64_t rtt_ms);
|
|
|
|
// If |send_time| is set, packet was sent without using pacer, so state will
|
|
// be set accordingly.
|
|
void PutRtpPacket(std::unique_ptr<RtpPacketToSend> packet,
|
|
StorageType type,
|
|
rtc::Optional<int64_t> send_time_ms);
|
|
|
|
// Gets stored RTP packet corresponding to the input |sequence number|.
|
|
// Returns nullptr if packet is not found. If |verify_rtt| is true, doesn't
|
|
// return packet that was (re)sent too recently.
|
|
std::unique_ptr<RtpPacketToSend> GetPacketAndSetSendTime(
|
|
uint16_t sequence_number,
|
|
bool verify_rtt);
|
|
|
|
// Similar to GetPacketAndSetSendTime(), but only returns a snapshot of the
|
|
// current state for packet, and never updates internal state.
|
|
rtc::Optional<PacketState> GetPacketState(uint16_t sequence_number,
|
|
bool verify_rtt) const;
|
|
|
|
// Get the packet (if any) from the history, with size closest to
|
|
// |packet_size|. The exact size of the packet is not guaranteed.
|
|
std::unique_ptr<RtpPacketToSend> GetBestFittingPacket(
|
|
size_t packet_size) const;
|
|
|
|
private:
|
|
struct StoredPacket {
|
|
StoredPacket();
|
|
StoredPacket(StoredPacket&&);
|
|
StoredPacket& operator=(StoredPacket&&);
|
|
~StoredPacket();
|
|
|
|
// The time of last transmission, including retransmissions.
|
|
rtc::Optional<int64_t> send_time_ms;
|
|
|
|
// Number of times RE-transmitted, ie excluding the first transmission.
|
|
size_t times_retransmitted = 0;
|
|
|
|
// Storing a packet with |storage_type| = kDontRetransmit indicates this is
|
|
// only used as temporary storage until sent by the pacer sender.
|
|
StorageType storage_type = kDontRetransmit;
|
|
|
|
// The actual packet.
|
|
std::unique_ptr<RtpPacketToSend> packet;
|
|
};
|
|
|
|
using StoredPacketIterator = std::map<uint16_t, StoredPacket>::iterator;
|
|
|
|
// Helper method used by GetPacketAndSetSendTime() and GetPacketState() to
|
|
// check if packet has too recently been sent.
|
|
bool VerifyRtt(const StoredPacket& packet, int64_t now_ms) const
|
|
RTC_EXCLUSIVE_LOCKS_REQUIRED(lock_);
|
|
void Reset() RTC_EXCLUSIVE_LOCKS_REQUIRED(lock_);
|
|
void CullOldPackets(int64_t now_ms) RTC_EXCLUSIVE_LOCKS_REQUIRED(lock_);
|
|
// Removes the packet from the history, and context/mapping that has been
|
|
// stored. Returns the RTP packet instance contained within the StoredPacket.
|
|
std::unique_ptr<RtpPacketToSend> RemovePacket(StoredPacketIterator packet)
|
|
RTC_EXCLUSIVE_LOCKS_REQUIRED(lock_);
|
|
static PacketState StoredPacketToPacketState(
|
|
const StoredPacket& stored_packet);
|
|
|
|
Clock* const clock_;
|
|
rtc::CriticalSection lock_;
|
|
size_t number_to_store_ RTC_GUARDED_BY(lock_);
|
|
StorageMode mode_ RTC_GUARDED_BY(lock_);
|
|
int64_t rtt_ms_ RTC_GUARDED_BY(lock_);
|
|
|
|
// Map from rtp sequence numbers to stored packet.
|
|
std::map<uint16_t, StoredPacket> packet_history_ RTC_GUARDED_BY(lock_);
|
|
|
|
// The earliest packet in the history. This might not be the lowest sequence
|
|
// number, in case there is a wraparound.
|
|
rtc::Optional<uint16_t> start_seqno_ RTC_GUARDED_BY(lock_);
|
|
|
|
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RtpPacketHistory);
|
|
};
|
|
} // namespace webrtc
|
|
#endif // MODULES_RTP_RTCP_SOURCE_RTP_PACKET_HISTORY_H_
|