commit 97ffbefdab24b95df09da679c96bb5188ef33cc1
author Danil Chapovalov <danilchap@webrtc.org> Fri Jan 24 16:04:35 2020 +0100
committer Commit Bot <commit-bot@chromium.org> Wed Jan 29 11:48:55 2020 +0000
tree 24305f878b144ee316b0f4566eb146e154119f8e
parent d7fade5738e7c7a73d7a75f503caba481307bdf5

Pass and store PacketBuffer::Packet by unique_ptr

to avoid expensive move of the Packet and prepare PacketBuffer
to return list of packets as a frame.

Bug: None
Change-Id: I19f0452c52238228bbe28284ebb197491eb2bf4e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/167063
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30404}

modules/video_coding/packet_buffer.h

diff --git a/modules/video_coding/packet_buffer.h b/modules/video_coding/packet_buffer.h
index 939168d..f78147c 100644
--- a/modules/video_coding/packet_buffer.h
+++ b/modules/video_coding/packet_buffer.h
@@ -41,9 +41,9 @@
            int64_t ntp_time_ms,
            int64_t receive_time_ms);
     Packet(const Packet&) = delete;
-    Packet(Packet&&) = default;
+    Packet(Packet&&) = delete;
     Packet& operator=(const Packet&) = delete;
-    Packet& operator=(Packet&&) = default;
+    Packet& operator=(Packet&&) = delete;
     ~Packet() = default;
 
     VideoCodecType codec() const { return video_header.codec; }
@@ -82,9 +82,8 @@
   PacketBuffer(Clock* clock, size_t start_buffer_size, size_t max_buffer_size);
   ~PacketBuffer();
 
-  // The PacketBuffer will always take ownership of the |packet.dataPtr| when
-  // this function is called.
-  InsertResult InsertPacket(Packet* packet) ABSL_MUST_USE_RESULT;
+  InsertResult InsertPacket(std::unique_ptr<Packet> packet)
+      ABSL_MUST_USE_RESULT;
   InsertResult InsertPadding(uint16_t seq_num) ABSL_MUST_USE_RESULT;
   void ClearTo(uint16_t seq_num);
   void Clear();
@@ -95,21 +94,21 @@
 
  private:
   struct StoredPacket {
-    uint16_t seq_num() const { return data.seq_num; }
+    uint16_t seq_num() const { return packet->seq_num; }
 
     // If this is the first packet of the frame.
-    bool frame_begin() const { return data.is_first_packet_in_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 data.is_last_packet_in_frame(); }
+    bool frame_end() const { return packet->is_last_packet_in_frame(); }
 
     // If this slot is currently used.
-    bool used = false;
+    bool used() const { return packet != nullptr; }
 
     // If all its previous packets have been inserted into the packet buffer.
     bool continuous = false;
 
-    Packet data;
+    std::unique_ptr<Packet> packet;
   };
 
   Clock* const clock_;