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

webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h

Index: webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h b/webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h
index 118166fbf3089bd9b507f0145e20ab49034373a0..6461a4ba3631ef67dc94f52c457f75d70a337763 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h
+++ b/webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h
@@ -27,7 +27,9 @@ class RtpPacketizerGeneric : public RtpPacketizer {
  public:
   // Initialize with payload from encoder.
   // The payload_data must be exactly one encoded generic frame.
-  RtpPacketizerGeneric(FrameType frametype, size_t max_payload_len);
+  RtpPacketizerGeneric(FrameType frametype,
+                       size_t max_payload_len,
+                       size_t last_packet_extension_len);
 
   virtual ~RtpPacketizerGeneric();
 
@@ -37,10 +39,12 @@ class RtpPacketizerGeneric : public RtpPacketizer {
 
   // Get the next payload with generic payload header.
   // Write payload and set marker bit of the |packet|.
-  // The parameter |last_packet| is true for the last packet of the frame, false
-  // otherwise (i.e., call the function again to get the next packet).
   // Returns true on success, false otherwise.
-  bool NextPacket(RtpPacketToSend* packet, bool* last_packet) override;
+  bool NextPacket(RtpPacketToSend* packet) override;
+
+  // Returns total number of packets to be generated.
+  // Valid only before first NextPacket call.
+  size_t TotalPackets() override;
 
   ProtectionType GetProtectionType() override;
 
@@ -52,9 +56,12 @@ class RtpPacketizerGeneric : public RtpPacketizer {
   const uint8_t* payload_data_;
   size_t payload_size_;
   const size_t max_payload_len_;
+  const size_t last_packet_extension_len_;
   FrameType frame_type_;
-  size_t payload_length_;
+  size_t payload_per_packet_;
   uint8_t generic_header_;
+  size_t num_packets_;
+  size_t smaller_packets_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(RtpPacketizerGeneric);
 };