Allocate extra buffer space in FrameObject in case of H264.

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 287 matching lines @@
   EXPECT_TRUE(Insert(seq_num + 3, kDeltaFrame, kFirst, kLast));
   EXPECT_TRUE(Insert(seq_num + 2, kDeltaFrame, kFirst, kLast));
 
   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, GetBitstreamFromFrame) {
+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)];
 
   const uint16_t seq_num = Rand();
 
   EXPECT_TRUE(Insert(seq_num, kKeyFrame, kFirst, kNotLast, sizeof(many), many));
   EXPECT_TRUE(Insert(seq_num + 1, kDeltaFrame, kNotFirst, kNotLast,
                      sizeof(bitstream), 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));
 
   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 doge[] =
+      "                Y.                      _         "
+      "                YiL                   .```.       "
+      "                Yii;                .; .;;`.      "
+      "                YY;ii._           .;`.;;;; :      "
+      "                iiYYYYYYiiiii;;;;i` ;;::;;;;      "
+      "            _.;YYYYYYiiiiiiYYYii  .;;.   ;;;      "
+      "         .YYYYYYYYYYiiYYYYYYYYYYYYii;`  ;;;;      "
+      "       .YYYYYYY$$YYiiYY$$$$iiiYYYYYY;.ii;`..      "
+      "      :YYY$!.  TYiiYY$$$$$YYYYYYYiiYYYYiYYii.     "
+      "      Y$MM$:   :YYYYYY$!'``'4YYYYYiiiYYYYiiYY.    "
+      "   `. :MM$$b.,dYY$$Yii' :'   :YYYYllYiiYYYiYY     "
+      "_.._ :`4MM$!YYYYYYYYYii,.__.diii$$YYYYYYYYYYY     "
+      ".,._ $b`P`     '4$$$$$iiiiiiii$$$$YY$$$$$$YiY;    "
+      "   `,.`$:       :$$$$$$$$$YYYYY$$$$$$$$$YYiiYYL   "
+      "    '`;$$.    .;PPb$`.,.``T$$YY$$$$YYYYYYiiiYYU:  "
+      "    ;$P$;;: ;;;;i$y$'!Y$$$b;$$$Y$YY$$YYYiiiYYiYY  "
+      "    $Fi$$ .. ``:iii.`-':YYYYY$$YY$$$$$YYYiiYiYYY  "
+      "    :Y$$rb ````  `_..;;i;YYY$YY$$$$$$$YYYYYYYiYY: "
+      "     :$$$$$i;;iiiiidYYYYYYYYYY$$$$$$YYYYYYYiiYYYY."
+      "      `$$$$$$$YYYYYYYYYYYYY$$$$$$YYYYYYYYiiiYYYYYY"
+      "      .i!$$$$$$YYYYYYYYY$$$$$$YYY$$YYiiiiiiYYYYYYY"
+      "     :YYiii$$$$$$$YYYYYYY$$$$YY$$$$YYiiiiiYYYYYYi'";

[stefan-webrtc, 2016/11/03 13:04:02]

While it's fun, maybe it's not worth spending 10 lines of code on? :)

+  uint8_t result[sizeof(doge) + EncodedImage::kBufferPaddingBytesH264];
+
+  VCMPacket packet;
+  packet.seqNum = seq_num;
+  packet.codec = kVideoCodecH264;
+  packet.insertStartCode = true;
+  packet.video_header.codecHeader.H264.packetization_type = kH264SingleNalu;
+  packet.dataPtr = doge;
+  packet.sizeBytes = sizeof(doge);
+  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(doge));
+  EXPECT_EQ(frames_from_callback_[seq_num]->EncodedImage()._size,
+            sizeof(doge) + EncodedImage::kBufferPaddingBytesH264);
+  EXPECT_TRUE(frames_from_callback_[seq_num]->GetBitstream(result));
+  EXPECT_EQ(memcmp(result, doge, sizeof(doge)), 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);
 
   frames_from_callback_.clear();
@@ skipping 31 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