Fix packetization logic to leave space for extensions in the last packet

webrtc/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc

 /*
  *  Copyright (c) 2015 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 126 matching lines @@
   size_t payload_size_;
   size_t payload_pos_;
   RTPVideoHeaderVP9 expected_;
   std::unique_ptr<RtpPacketizerVp9> packetizer_;
 
   void Init(size_t payload_size, size_t packet_size) {
     payload_.reset(new uint8_t[payload_size]);
     memset(payload_.get(), 7, payload_size);
     payload_size_ = payload_size;
     payload_pos_ = 0;
-    packetizer_.reset(new RtpPacketizerVp9(expected_, packet_size));
+    packetizer_.reset(new RtpPacketizerVp9(expected_, packet_size, 0));
     packetizer_->SetPayloadData(payload_.get(), payload_size_, NULL);
   }
 
   void CheckPayload(const uint8_t* packet,
                     size_t start_pos,
                     size_t end_pos,
                     bool last) {
     for (size_t i = start_pos; i < end_pos; ++i) {
       EXPECT_EQ(packet[i], payload_[payload_pos_++]);
     }
     EXPECT_EQ(last, payload_pos_ == payload_size_);
   }
 
   void CreateParseAndCheckPackets(const size_t* expected_hdr_sizes,
                                   const size_t* expected_sizes,
                                   size_t expected_num_packets) {
     ASSERT_TRUE(packetizer_.get() != NULL);
-    bool last = false;
     if (expected_num_packets == 0) {
-      EXPECT_FALSE(packetizer_->NextPacket(&packet_, &last));
+      EXPECT_FALSE(packetizer_->NextPacket(&packet_));
       return;
     }
+    EXPECT_EQ(expected_num_packets, packetizer_->TotalPackets());
     for (size_t i = 0; i < expected_num_packets; ++i) {
-      EXPECT_TRUE(packetizer_->NextPacket(&packet_, &last));
+      EXPECT_TRUE(packetizer_->NextPacket(&packet_));
       auto rtp_payload = packet_.payload();
       EXPECT_EQ(expected_sizes[i], rtp_payload.size());
       RTPVideoHeaderVP9 hdr = expected_;
       hdr.beginning_of_frame = (i == 0);
-      hdr.end_of_frame = last;
+      hdr.end_of_frame = (i + 1) == expected_num_packets;
       ParseAndCheckPacket(rtp_payload.data(), hdr, expected_hdr_sizes[i],
                           rtp_payload.size());
       CheckPayload(rtp_payload.data(), expected_hdr_sizes[i],
-                   rtp_payload.size(), last);
+                   rtp_payload.size(), (i + 1) == expected_num_packets);
     }
-    EXPECT_TRUE(last);
   }
 };
 
 TEST_F(RtpPacketizerVp9Test, TestEqualSizedMode_OnePacket) {
   const size_t kFrameSize = 25;
   const size_t kPacketSize = 26;
   Init(kFrameSize, kPacketSize);
 
   // One packet:
   // I:0, P:0, L:0, F:0, B:1, E:1, V:0  (1hdr + 25 payload)
@@ skipping 244 matching lines @@
   const size_t kPacketSize = 9;  // 2 packet per frame.
   const uint8_t kFrame[kFrameSize] = {7};
   const RTPFragmentationHeader* kNoFragmentation = nullptr;
 
   RTPVideoHeaderVP9 vp9_header;
   vp9_header.InitRTPVideoHeaderVP9();
   vp9_header.flexible_mode = true;
   vp9_header.num_spatial_layers = 3;
 
   RtpPacketToSend packet(kNoExtensions);
-  bool last;
 
   vp9_header.spatial_idx = 0;
-  RtpPacketizerVp9 packetizer0(vp9_header, kPacketSize);
+  RtpPacketizerVp9 packetizer0(vp9_header, kPacketSize, 0);
   packetizer0.SetPayloadData(kFrame, sizeof(kFrame), kNoFragmentation);
-  ASSERT_TRUE(packetizer0.NextPacket(&packet, &last));
-  EXPECT_FALSE(last);
+  EXPECT_EQ(packetizer0.TotalPackets(), 2u);
+  ASSERT_TRUE(packetizer0.NextPacket(&packet));
   EXPECT_FALSE(packet.Marker());
-  ASSERT_TRUE(packetizer0.NextPacket(&packet, &last));
-  EXPECT_TRUE(last);
+  ASSERT_TRUE(packetizer0.NextPacket(&packet));
   EXPECT_FALSE(packet.Marker());
 
   vp9_header.spatial_idx = 1;
-  RtpPacketizerVp9 packetizer1(vp9_header, kPacketSize);
+  RtpPacketizerVp9 packetizer1(vp9_header, kPacketSize, 0);
   packetizer1.SetPayloadData(kFrame, sizeof(kFrame), kNoFragmentation);
-  ASSERT_TRUE(packetizer1.NextPacket(&packet, &last));
-  EXPECT_FALSE(last);
+  EXPECT_EQ(packetizer1.TotalPackets(), 2u);
+  ASSERT_TRUE(packetizer1.NextPacket(&packet));
   EXPECT_FALSE(packet.Marker());
-  ASSERT_TRUE(packetizer1.NextPacket(&packet, &last));
-  EXPECT_TRUE(last);
+  ASSERT_TRUE(packetizer1.NextPacket(&packet));
   EXPECT_FALSE(packet.Marker());
 
   vp9_header.spatial_idx = 2;
-  RtpPacketizerVp9 packetizer2(vp9_header, kPacketSize);
+  RtpPacketizerVp9 packetizer2(vp9_header, kPacketSize, 0);
   packetizer2.SetPayloadData(kFrame, sizeof(kFrame), kNoFragmentation);
-  ASSERT_TRUE(packetizer2.NextPacket(&packet, &last));
-  EXPECT_FALSE(last);
+  EXPECT_EQ(packetizer2.TotalPackets(), 2u);
+  ASSERT_TRUE(packetizer2.NextPacket(&packet));
   EXPECT_FALSE(packet.Marker());
-  ASSERT_TRUE(packetizer2.NextPacket(&packet, &last));
-  EXPECT_TRUE(last);
+  ASSERT_TRUE(packetizer2.NextPacket(&packet));
   EXPECT_TRUE(packet.Marker());
 }
 
 TEST_F(RtpPacketizerVp9Test, TestBaseLayerProtectionAndStorageType) {
   const size_t kFrameSize = 10;
   const size_t kPacketSize = 12;
 
   // I:0, P:0, L:1, F:1, B:1, E:1, V:0 (2hdr + 10 payload)
   // L:   T:0, U:0, S:0, D:0
   expected_.flexible_mode = true;
@@ skipping 243 matching lines @@
 }
 
 TEST_F(RtpDepacketizerVp9Test, ParseFailsForTooShortBufferToFitPayload) {
   const uint8_t kHeaderLength = 1;
   uint8_t packet[kHeaderLength] = {0};
   RtpDepacketizer::ParsedPayload parsed;
   EXPECT_FALSE(depacketizer_->Parse(&parsed, packet, sizeof(packet)));
 }
 
 }  // namespace webrtc