Fix memory leak in video_coding::PacketBuffer::InsertPacket.

webrtc/modules/video_coding/rtp_frame_reference_finder_unittest.cc

 /*
  *  Copyright (c) 2016 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.
  */
 
@@ skipping 15 matching lines @@
 
 class FakePacketBuffer : public PacketBuffer {
  public:
   FakePacketBuffer() : PacketBuffer(nullptr, 0, 0, nullptr) {}
 
   VCMPacket* GetPacket(uint16_t seq_num) override {
     auto packet_it = packets_.find(seq_num);
     return packet_it == packets_.end() ? nullptr : &packet_it->second;
   }
 
-  bool InsertPacket(const VCMPacket& packet) override {
-    packets_[packet.seqNum] = packet;
+  bool InsertPacket(VCMPacket* packet) override {
+    packets_[packet->seqNum] = *packet;
     return true;
   }
 
   bool GetBitstream(const RtpFrameObject& frame,
                     uint8_t* destination) override {
     return true;
   }
 
   void ReturnFrame(RtpFrameObject* frame) override {
     packets_.erase(frame->first_seq_num());
@@ skipping 28 matching lines @@
         std::make_pair(std::make_pair(pid, sidx), std::move(frame)));
   }
 
   void InsertGeneric(uint16_t seq_num_start,
                      uint16_t seq_num_end,
                      bool keyframe) {
     VCMPacket packet;
     packet.codec = kVideoCodecGeneric;
     packet.seqNum = seq_num_start;
     packet.frameType = keyframe ? kVideoFrameKey : kVideoFrameDelta;
-    ref_packet_buffer_->InsertPacket(packet);
+    ref_packet_buffer_->InsertPacket(&packet);
 
     packet.seqNum = seq_num_end;
     packet.markerBit = true;
-    ref_packet_buffer_->InsertPacket(packet);
+    ref_packet_buffer_->InsertPacket(&packet);
 
     std::unique_ptr<RtpFrameObject> frame(new RtpFrameObject(
         ref_packet_buffer_, seq_num_start, seq_num_end, 0, 0, 0));
     reference_finder_->ManageFrame(std::move(frame));
   }
 
   void InsertVp8(uint16_t seq_num_start,
                  uint16_t seq_num_end,
                  bool keyframe,
                  int32_t pid = kNoPictureId,
                  uint8_t tid = kNoTemporalIdx,
                  int32_t tl0 = kNoTl0PicIdx,
                  bool sync = false) {
     VCMPacket packet;
     packet.codec = kVideoCodecVP8;
     packet.seqNum = seq_num_start;
     packet.markerBit = (seq_num_start == seq_num_end);
     packet.frameType = keyframe ? kVideoFrameKey : kVideoFrameDelta;
     packet.video_header.codecHeader.VP8.pictureId = pid % (1 << 15);
     packet.video_header.codecHeader.VP8.temporalIdx = tid;
     packet.video_header.codecHeader.VP8.tl0PicIdx = tl0;
     packet.video_header.codecHeader.VP8.layerSync = sync;
-    ref_packet_buffer_->InsertPacket(packet);
+    ref_packet_buffer_->InsertPacket(&packet);
 
     if (seq_num_start != seq_num_end) {
       packet.seqNum = seq_num_end;
       packet.markerBit = true;
-      ref_packet_buffer_->InsertPacket(packet);
+      ref_packet_buffer_->InsertPacket(&packet);
     }
 
     std::unique_ptr<RtpFrameObject> frame(new RtpFrameObject(
         ref_packet_buffer_, seq_num_start, seq_num_end, 0, 0, 0));
     reference_finder_->ManageFrame(std::move(frame));
   }
 
   void InsertVp9Gof(uint16_t seq_num_start,
                     uint16_t seq_num_end,
                     bool keyframe,
@@ skipping 12 matching lines @@
     packet.video_header.codecHeader.VP9.flexible_mode = false;
     packet.video_header.codecHeader.VP9.picture_id = pid % (1 << 15);
     packet.video_header.codecHeader.VP9.temporal_idx = tid;
     packet.video_header.codecHeader.VP9.spatial_idx = sid;
     packet.video_header.codecHeader.VP9.tl0_pic_idx = tl0;
     packet.video_header.codecHeader.VP9.temporal_up_switch = up_switch;
     if (ss != nullptr) {
       packet.video_header.codecHeader.VP9.ss_data_available = true;
       packet.video_header.codecHeader.VP9.gof = *ss;
     }
-    ref_packet_buffer_->InsertPacket(packet);
+    ref_packet_buffer_->InsertPacket(&packet);
 
     if (seq_num_start != seq_num_end) {
       packet.markerBit = true;
       packet.video_header.codecHeader.VP9.ss_data_available = false;
       packet.seqNum = seq_num_end;
-      ref_packet_buffer_->InsertPacket(packet);
+      ref_packet_buffer_->InsertPacket(&packet);
     }
 
     std::unique_ptr<RtpFrameObject> frame(new RtpFrameObject(
         ref_packet_buffer_, seq_num_start, seq_num_end, 0, 0, 0));
     reference_finder_->ManageFrame(std::move(frame));
   }
 
   void InsertVp9Flex(uint16_t seq_num_start,
                      uint16_t seq_num_end,
                      bool keyframe,
@@ skipping 11 matching lines @@
     packet.frameType = keyframe ? kVideoFrameKey : kVideoFrameDelta;
     packet.video_header.codecHeader.VP9.inter_layer_predicted = inter;
     packet.video_header.codecHeader.VP9.flexible_mode = true;
     packet.video_header.codecHeader.VP9.picture_id = pid % (1 << 15);
     packet.video_header.codecHeader.VP9.temporal_idx = tid;
     packet.video_header.codecHeader.VP9.spatial_idx = sid;
     packet.video_header.codecHeader.VP9.tl0_pic_idx = tl0;
     packet.video_header.codecHeader.VP9.num_ref_pics = refs.size();
     for (size_t i = 0; i < refs.size(); ++i)
       packet.video_header.codecHeader.VP9.pid_diff[i] = refs[i];
-    ref_packet_buffer_->InsertPacket(packet);
+    ref_packet_buffer_->InsertPacket(&packet);
 
     if (seq_num_start != seq_num_end) {
       packet.seqNum = seq_num_end;
       packet.markerBit = true;
-      ref_packet_buffer_->InsertPacket(packet);
+      ref_packet_buffer_->InsertPacket(&packet);
     }
 
     std::unique_ptr<RtpFrameObject> frame(new RtpFrameObject(
         ref_packet_buffer_, seq_num_start, seq_num_end, 0, 0, 0));
     reference_finder_->ManageFrame(std::move(frame));
   }
 
   // Check if a frame with picture id |pid| and spatial index |sidx| has been
   // delivered from the packet buffer, and if so, if it has the references
   // specified by |refs|.
@@ skipping 1058 matching lines @@
   packet.video_header.codecHeader.VP9.flexible_mode = false;
   packet.video_header.codecHeader.VP9.picture_id = 1;
   packet.video_header.codecHeader.VP9.temporal_idx = 0;
   packet.video_header.codecHeader.VP9.spatial_idx = 0;
   packet.video_header.codecHeader.VP9.tl0_pic_idx = 0;
   packet.video_header.codecHeader.VP9.temporal_up_switch = true;
   packet.video_header.codecHeader.VP9.ss_data_available = true;
   packet.video_header.codecHeader.VP9.gof = ss;
 
   {
-    ref_packet_buffer_->InsertPacket(packet);
+    ref_packet_buffer_->InsertPacket(&packet);
     std::unique_ptr<RtpFrameObject> frame(
         new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
     reference_finder_->ManageFrame(std::move(frame));
   }
 
   // Timestamp goes forward but pid goes backwards.
   packet.timestamp = 1;
   packet.video_header.codecHeader.VP9.picture_id = 0;
 
   {
-    ref_packet_buffer_->InsertPacket(packet);
+    ref_packet_buffer_->InsertPacket(&packet);
     std::unique_ptr<RtpFrameObject> frame(
         new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
     reference_finder_->ManageFrame(std::move(frame));
   }
 
   packet.timestamp = 2;
   packet.video_header.codecHeader.VP9.picture_id = 5000;
 
   {
-    ref_packet_buffer_->InsertPacket(packet);
+    ref_packet_buffer_->InsertPacket(&packet);
     std::unique_ptr<RtpFrameObject> frame(
         new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
     reference_finder_->ManageFrame(std::move(frame));
   }
 
   ASSERT_EQ(3UL, frames_from_callback_.size());
   CheckReferencesVp9(1, 0);
   CheckReferencesVp9(129, 0);
   CheckReferencesVp9(257, 0);
 }
@@ skipping 11 matching lines @@
   packet.markerBit = true;
   packet.video_header.codecHeader.VP9.flexible_mode = false;
   packet.video_header.codecHeader.VP9.picture_id = 0;
   packet.video_header.codecHeader.VP9.temporal_idx = 0;
   packet.video_header.codecHeader.VP9.spatial_idx = 0;
   packet.video_header.codecHeader.VP9.tl0_pic_idx = 1;
   packet.video_header.codecHeader.VP9.temporal_up_switch = true;
   packet.video_header.codecHeader.VP9.ss_data_available = true;
   packet.video_header.codecHeader.VP9.gof = ss;
   {
-    ref_packet_buffer_->InsertPacket(packet);
+    ref_packet_buffer_->InsertPacket(&packet);
     std::unique_ptr<RtpFrameObject> frame(
         new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
     reference_finder_->ManageFrame(std::move(frame));
   }
 
   packet.timestamp = 1;
   packet.video_header.codecHeader.VP9.picture_id = 1;
   packet.video_header.codecHeader.VP9.tl0_pic_idx = 0;
   {
-    ref_packet_buffer_->InsertPacket(packet);
+    ref_packet_buffer_->InsertPacket(&packet);
     std::unique_ptr<RtpFrameObject> frame(
         new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
     reference_finder_->ManageFrame(std::move(frame));
   }
 
   packet.timestamp = 2;
   packet.frameType = kVideoFrameDelta;
   packet.video_header.codecHeader.VP9.picture_id = 2;
   packet.video_header.codecHeader.VP9.tl0_pic_idx = 2;
   {
-    ref_packet_buffer_->InsertPacket(packet);
+    ref_packet_buffer_->InsertPacket(&packet);
     std::unique_ptr<RtpFrameObject> frame(
         new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
     reference_finder_->ManageFrame(std::move(frame));
   }
 
   packet.timestamp = 3;
   packet.frameType = kVideoFrameKey;
   packet.video_header.codecHeader.VP9.ss_data_available = true;
   packet.video_header.codecHeader.VP9.picture_id = 3;
   packet.video_header.codecHeader.VP9.tl0_pic_idx = 129;
   {
-    ref_packet_buffer_->InsertPacket(packet);
+    ref_packet_buffer_->InsertPacket(&packet);
     std::unique_ptr<RtpFrameObject> frame(
         new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
     reference_finder_->ManageFrame(std::move(frame));
   }
 
   ASSERT_EQ(4UL, frames_from_callback_.size());
   CheckReferencesVp9(0, 0);
   CheckReferencesVp9(128, 0);
   CheckReferencesVp9(129, 0, 128);
   CheckReferencesVp9(257, 0);
@@ skipping 12 matching lines @@
   packet.markerBit = true;
   packet.video_header.codecHeader.VP9.flexible_mode = false;
   packet.video_header.codecHeader.VP9.picture_id = 1;
   packet.video_header.codecHeader.VP9.temporal_idx = 0;
   packet.video_header.codecHeader.VP9.spatial_idx = 0;
   packet.video_header.codecHeader.VP9.tl0_pic_idx = 1;
   packet.video_header.codecHeader.VP9.temporal_up_switch = true;
   packet.video_header.codecHeader.VP9.ss_data_available = true;
   packet.video_header.codecHeader.VP9.gof = ss;
   {
-    ref_packet_buffer_->InsertPacket(packet);
+    ref_packet_buffer_->InsertPacket(&packet);
     std::unique_ptr<RtpFrameObject> frame(
         new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
     reference_finder_->ManageFrame(std::move(frame));
   }
 
   packet.timestamp = 1;
   packet.video_header.codecHeader.VP9.picture_id = 2;
   packet.video_header.codecHeader.VP9.tl0_pic_idx = 2;
   {
-    ref_packet_buffer_->InsertPacket(packet);
+    ref_packet_buffer_->InsertPacket(&packet);
     std::unique_ptr<RtpFrameObject> frame(
         new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
     reference_finder_->ManageFrame(std::move(frame));
   }
 
   packet.timestamp = 2;
   packet.video_header.codecHeader.VP9.picture_id = 3;
   packet.video_header.codecHeader.VP9.tl0_pic_idx = 2;
   {
-    ref_packet_buffer_->InsertPacket(packet);
+    ref_packet_buffer_->InsertPacket(&packet);
     std::unique_ptr<RtpFrameObject> frame(
         new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
     reference_finder_->ManageFrame(std::move(frame));
   }
 
   packet.timestamp = 2;
   packet.video_header.codecHeader.VP9.picture_id = 4;
   packet.video_header.codecHeader.VP9.tl0_pic_idx = 1;
   {
-    ref_packet_buffer_->InsertPacket(packet);
+    ref_packet_buffer_->InsertPacket(&packet);
     std::unique_ptr<RtpFrameObject> frame(
         new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
     reference_finder_->ManageFrame(std::move(frame));
   }
 
   ASSERT_EQ(4UL, frames_from_callback_.size());
   CheckReferencesVp9(1, 0);
   CheckReferencesVp9(2, 0);
   CheckReferencesVp9(3, 0);
   CheckReferencesVp9(131, 0);
@@ skipping 12 matching lines @@
   packet.markerBit = true;
   packet.video_header.codecHeader.VP9.flexible_mode = false;
   packet.video_header.codecHeader.VP9.picture_id = 1;
   packet.video_header.codecHeader.VP9.temporal_idx = 0;
   packet.video_header.codecHeader.VP9.spatial_idx = 0;
   packet.video_header.codecHeader.VP9.tl0_pic_idx = 1;
   packet.video_header.codecHeader.VP9.temporal_up_switch = true;
   packet.video_header.codecHeader.VP9.ss_data_available = true;
   packet.video_header.codecHeader.VP9.gof = ss;
   {
-    ref_packet_buffer_->InsertPacket(packet);
+    ref_packet_buffer_->InsertPacket(&packet);
     std::unique_ptr<RtpFrameObject> frame(
         new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
     reference_finder_->ManageFrame(std::move(frame));
   }
 
   packet.timestamp = 1;
   packet.video_header.codecHeader.VP9.picture_id = 0;
   packet.video_header.codecHeader.VP9.tl0_pic_idx = 2;
   {
-    ref_packet_buffer_->InsertPacket(packet);
+    ref_packet_buffer_->InsertPacket(&packet);
     std::unique_ptr<RtpFrameObject> frame(
         new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
     reference_finder_->ManageFrame(std::move(frame));
   }
 
   packet.timestamp = 0;
   packet.video_header.codecHeader.VP9.picture_id = 3;
   packet.video_header.codecHeader.VP9.tl0_pic_idx = 2;
   {
-    ref_packet_buffer_->InsertPacket(packet);
+    ref_packet_buffer_->InsertPacket(&packet);
     std::unique_ptr<RtpFrameObject> frame(
         new RtpFrameObject(ref_packet_buffer_, 0, 0, 0, 0, 0));
     reference_finder_->ManageFrame(std::move(frame));
   }
 
   ASSERT_EQ(2UL, frames_from_callback_.size());
   CheckReferencesVp9(1, 0);
   CheckReferencesVp9(129, 0);
 }
 
 }  // namespace video_coding
 }  // namespace webrtc