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

In PacketBuffer simplify stored buffer.

Browse Source 
Bug: None
Change-Id: Iddcde9d2ab25d2fb7091c9ed8104138293fd9dee
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168044
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30844}
This commit is contained in:
Danil Chapovalov
2020-03-20 12:30:31 +01:00
committed by Commit Bot
parent ff0451117e
commit f4306ebfea
2 changed files with 52 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
modules/video_coding/packet_buffer.h
View File

@ -55,6 +55,9 @@ class PacketBuffer {
return video_header.is_last_packet_in_frame;
}
// If all its previous packets have been inserted into the packet buffer.
// Set and used internally by the PacketBuffer.
bool continuous = false;
bool marker_bit = false;
uint8_t payload_type = 0;
uint16_t seq_num = 0;
@ -90,24 +93,6 @@ class PacketBuffer {
absl::optional<int64_t> LastReceivedKeyframePacketMs() const;
private:
struct StoredPacket {
uint16_t seq_num() const { return packet->seq_num; }
// If this is the first packet of the frame.
bool frame_begin() const { return packet->is_first_packet_in_frame(); }
// If this is the last packet of the frame.
bool frame_end() const { return packet->is_last_packet_in_frame(); }
// If this slot is currently used.
bool used() const { return packet != nullptr; }
// If all its previous packets have been inserted into the packet buffer.
bool continuous = false;
std::unique_ptr<Packet> packet;
};
Clock* const clock_;
// Tries to expand the buffer.
@ -141,7 +126,7 @@ class PacketBuffer {
// Buffer that holds the the inserted packets and information needed to
// determine continuity between them.
std::vector<StoredPacket> buffer_ RTC_GUARDED_BY(crit_);
std::vector<std::unique_ptr<Packet>> buffer_ RTC_GUARDED_BY(crit_);
// Timestamp of the last received packet/keyframe packet.
absl::optional<int64_t> last_received_packet_ms_ RTC_GUARDED_BY(crit_);