PacketBuffer no longer copy the bitstream data of incoming packets.

webrtc/modules/video_coding/video_packet_buffer_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 147 matching lines @@
   packet.timesNacked = 1;
   packet_buffer_->InsertPacket(packet);
 
   ASSERT_EQ(1UL, frames_from_callback_.size());
   RtpFrameObject* frame = frames_from_callback_.begin()->second.get();
   EXPECT_EQ(3, frame->times_nacked());
 }
 
 TEST_F(TestPacketBuffer, FrameSize) {
   const uint16_t seq_num = Rand();
-  uint8_t data[] = {1, 2, 3, 4, 5};
+  uint8_t* data1 = new uint8_t[5]();
+  uint8_t* data2 = new uint8_t[5]();
+  uint8_t* data3 = new uint8_t[5]();
+  uint8_t* data4 = new uint8_t[5]();
 
-  EXPECT_TRUE(Insert(seq_num, kKeyFrame, kFirst, kNotLast, 5, data));
-  EXPECT_TRUE(Insert(seq_num + 1, kKeyFrame, kNotFirst, kNotLast, 5, data));
-  EXPECT_TRUE(Insert(seq_num + 2, kKeyFrame, kNotFirst, kNotLast, 5, data));
-  EXPECT_TRUE(Insert(seq_num + 3, kKeyFrame, kNotFirst, kLast, 5, data));
+  EXPECT_TRUE(Insert(seq_num, kKeyFrame, kFirst, kNotLast, 5, data1));
+  EXPECT_TRUE(Insert(seq_num + 1, kKeyFrame, kNotFirst, kNotLast, 5, data2));
+  EXPECT_TRUE(Insert(seq_num + 2, kKeyFrame, kNotFirst, kNotLast, 5, data3));
+  EXPECT_TRUE(Insert(seq_num + 3, kKeyFrame, kNotFirst, kLast, 5, data4));
 
   ASSERT_EQ(1UL, frames_from_callback_.size());
   EXPECT_EQ(20UL, frames_from_callback_.begin()->second->size());
 }
 
 TEST_F(TestPacketBuffer, ExpandBuffer) {
   const uint16_t seq_num = Rand();
 
   for (int i = 0; i < kStartSize + 1; ++i) {
     EXPECT_TRUE(Insert(seq_num + i, kKeyFrame, kFirst, kLast));
@@ skipping 116 matching lines @@
 
   ASSERT_EQ(4UL, frames_from_callback_.size());
   CheckFrame(seq_num);
   CheckFrame(seq_num + 1);
   CheckFrame(seq_num + 2);
   CheckFrame(seq_num + 3);
 }
 
 TEST_F(TestPacketBuffer, GetBitstream) {
   // "many bitstream, such data" with null termination.
-  uint8_t many[] = {0x6d, 0x61, 0x6e, 0x79, 0x20};
-  uint8_t bitstream[] = {0x62, 0x69, 0x74, 0x73, 0x74, 0x72,
-                         0x65, 0x61, 0x6d, 0x2c, 0x20};
-  uint8_t such[] = {0x73, 0x75, 0x63, 0x68, 0x20};
-  uint8_t data[] = {0x64, 0x61, 0x74, 0x61, 0x0};
-  uint8_t
-      result[sizeof(many) + sizeof(bitstream) + sizeof(such) + sizeof(data)];
+  uint8_t many_data[] = {0x6d, 0x61, 0x6e, 0x79, 0x20};
+  uint8_t bitstream_data[] = {0x62, 0x69, 0x74, 0x73, 0x74, 0x72,
+                              0x65, 0x61, 0x6d, 0x2c, 0x20};
+  uint8_t such_data[] = {0x73, 0x75, 0x63, 0x68, 0x20};
+  uint8_t data_data[] = {0x64, 0x61, 0x74, 0x61, 0x0};
+
+  uint8_t* many = new uint8_t[sizeof(many_data)];
+  uint8_t* bitstream = new uint8_t[sizeof(bitstream_data)];
+  uint8_t* such = new uint8_t[sizeof(such_data)];
+  uint8_t* data = new uint8_t[sizeof(data_data)];
+
+  memcpy(many, many_data, sizeof(many_data));
+  memcpy(bitstream, bitstream_data, sizeof(bitstream_data));
+  memcpy(such, such_data, sizeof(such_data));
+  memcpy(data, data_data, sizeof(data_data));
+
+  uint8_t result[sizeof(many_data) + sizeof(bitstream_data) +
+                 sizeof(such_data) + sizeof(data_data)];
 
   const uint16_t seq_num = Rand();
 
-  EXPECT_TRUE(Insert(seq_num, kKeyFrame, kFirst, kNotLast, sizeof(many), many));
+  EXPECT_TRUE(
+      Insert(seq_num, kKeyFrame, kFirst, kNotLast, sizeof(many_data), many));
   EXPECT_TRUE(Insert(seq_num + 1, kDeltaFrame, kNotFirst, kNotLast,
-                     sizeof(bitstream), bitstream));
+                     sizeof(bitstream_data), bitstream));
   EXPECT_TRUE(Insert(seq_num + 2, kDeltaFrame, kNotFirst, kNotLast,
-                     sizeof(such), such));
-  EXPECT_TRUE(
-      Insert(seq_num + 3, kDeltaFrame, kNotFirst, kLast, sizeof(data), data));
+                     sizeof(such_data), such));
+  EXPECT_TRUE(Insert(seq_num + 3, kDeltaFrame, kNotFirst, kLast,
+                     sizeof(data_data), data));
 
   ASSERT_EQ(1UL, frames_from_callback_.size());
   CheckFrame(seq_num);
   EXPECT_TRUE(frames_from_callback_[seq_num]->GetBitstream(result));
   EXPECT_EQ(memcmp(result, "many bitstream, such data", sizeof(result)), 0);
 }
 
 TEST_F(TestPacketBuffer, GetBitstreamH264BufferPadding) {
   uint16_t seq_num = Rand();
-  uint8_t data[] = "some plain old data";
+  uint8_t data_data[] = "some plain old data";
+  uint8_t* data = new uint8_t[sizeof(data_data)];
+  memcpy(data, data_data, sizeof(data_data));
 
   // EncodedImage::kBufferPaddingBytesH264 is unknown at compile time.
-  uint8_t* result =
-      new uint8_t[sizeof(data) + EncodedImage::kBufferPaddingBytesH264];
+  std::unique_ptr<uint8_t[]> result(
+      new uint8_t[sizeof(data_data) + EncodedImage::kBufferPaddingBytesH264]);
 
   VCMPacket packet;
   packet.seqNum = seq_num;
   packet.codec = kVideoCodecH264;
   packet.insertStartCode = true;
   packet.video_header.codecHeader.H264.packetization_type = kH264SingleNalu;
   packet.dataPtr = data;
-  packet.sizeBytes = sizeof(data);
+  packet.sizeBytes = sizeof(data_data);
   packet.isFirstPacket = true;
   packet.markerBit = true;
   packet_buffer_->InsertPacket(packet);
 
   ASSERT_EQ(1UL, frames_from_callback_.size());
   EXPECT_EQ(frames_from_callback_[seq_num]->EncodedImage()._length,
-            sizeof(data));
+            sizeof(data_data));
   EXPECT_EQ(frames_from_callback_[seq_num]->EncodedImage()._size,
-            sizeof(data) + EncodedImage::kBufferPaddingBytesH264);
-  EXPECT_TRUE(frames_from_callback_[seq_num]->GetBitstream(result));
-  EXPECT_EQ(memcmp(result, data, sizeof(data)), 0);
-  delete[] result;
+            sizeof(data_data) + EncodedImage::kBufferPaddingBytesH264);
+  EXPECT_TRUE(frames_from_callback_[seq_num]->GetBitstream(result.get()));
+  EXPECT_EQ(memcmp(result.get(), data, sizeof(data_data)), 0);
 }
 
 TEST_F(TestPacketBuffer, FreeSlotsOnFrameDestruction) {
   const uint16_t seq_num = Rand();
 
   EXPECT_TRUE(Insert(seq_num, kKeyFrame, kFirst, kNotLast));
   EXPECT_TRUE(Insert(seq_num + 1, kDeltaFrame, kNotFirst, kNotLast));
   EXPECT_TRUE(Insert(seq_num + 2, kDeltaFrame, kNotFirst, kLast));
   EXPECT_EQ(1UL, frames_from_callback_.size());
   CheckFrame(seq_num);
@@ skipping 33 matching lines @@
 
   EXPECT_TRUE(Insert(seq_num, kKeyFrame, kFirst, kLast));
   ASSERT_EQ(1UL, frames_from_callback_.size());
 
   packet_buffer_->Clear();
   EXPECT_FALSE(frames_from_callback_.begin()->second->GetBitstream(nullptr));
 }
 
 }  // namespace video_coding
 }  // namespace webrtc