RtpPacketizer::NextPacket fills RtpPacket instead of payload.

webrtc/modules/rtp_rtcp/source/rtp_format_vp9.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.
  */
 
 #include "webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h"
 
 #include <assert.h>
 #include <string.h>
 
 #include <cmath>
 
 #include "webrtc/base/bitbuffer.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
+#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h"
 
 #define RETURN_FALSE_ON_ERROR(x) \
   if (!(x)) {                    \
     return false;                \
   }
 
 namespace webrtc {
 namespace {
 // Length of VP9 payload descriptors' fixed part.
 const size_t kFixedPayloadDescriptorBytes = 1;
@@ skipping 507 matching lines @@
         packets_.pop();
       return;
     }
     QueuePacket(bytes_processed, packet_bytes, bytes_processed == 0,
                 rem_bytes == packet_bytes, &packets_);
     bytes_processed += packet_bytes;
   }
   assert(bytes_processed == payload_size_);
 }
 
-bool RtpPacketizerVp9::NextPacket(uint8_t* buffer,
-                                  size_t* bytes_to_send,
-                                  bool* last_packet) {
+bool RtpPacketizerVp9::NextPacket(RtpPacketToSend* packet, bool* last_packet) {
+  RTC_DCHECK(packet);
+  RTC_DCHECK(last_packet);
   if (packets_.empty()) {
     return false;
   }
   PacketInfo packet_info = packets_.front();
   packets_.pop();
 
-  if (!WriteHeaderAndPayload(packet_info, buffer, bytes_to_send)) {
+  if (!WriteHeaderAndPayload(packet_info, packet)) {
     return false;
   }
-  *last_packet =
-      packets_.empty() && (hdr_.spatial_idx == kNoSpatialIdx ||
-                           hdr_.spatial_idx == hdr_.num_spatial_layers - 1);
+  *last_packet = packets_.empty();
+  packet->SetMarker(packets_.empty() &&
+                    (hdr_.spatial_idx == kNoSpatialIdx ||
+                     hdr_.spatial_idx == hdr_.num_spatial_layers - 1));
   return true;
 }
 
 // VP9 format:
 //
 // Payload descriptor for F = 1 (flexible mode)
 //       0 1 2 3 4 5 6 7
 //      +-+-+-+-+-+-+-+-+
 //      |I|P|L|F|B|E|V|-| (REQUIRED)
 //      +-+-+-+-+-+-+-+-+
@@ skipping 20 matching lines @@
 //      +-+-+-+-+-+-+-+-+
 // L:   |  T  |U|  S  |D| (CONDITIONALLY RECOMMENDED)
 //      +-+-+-+-+-+-+-+-+
 //      |   TL0PICIDX   | (CONDITIONALLY REQUIRED)
 //      +-+-+-+-+-+-+-+-+
 // V:   | SS            |
 //      | ..            |
 //      +-+-+-+-+-+-+-+-+
 
 bool RtpPacketizerVp9::WriteHeaderAndPayload(const PacketInfo& packet_info,
-                                             uint8_t* buffer,
-                                             size_t* bytes_to_send) const {
+                                             RtpPacketToSend* packet) const {
+  uint8_t* buffer = packet->AllocatePayload(max_payload_length_);
+  RTC_DCHECK(buffer);
   size_t header_length;
   if (!WriteHeader(packet_info, buffer, &header_length))
     return false;
 
   // Copy payload data.
   memcpy(&buffer[header_length],
          &payload_[packet_info.payload_start_pos], packet_info.size);
 
-  *bytes_to_send = header_length + packet_info.size;
+  packet->SetPayloadSize(header_length + packet_info.size);
   return true;
 }
 
 bool RtpPacketizerVp9::WriteHeader(const PacketInfo& packet_info,
                                    uint8_t* buffer,
                                    size_t* header_length) const {
   // Required payload descriptor byte.
   bool i_bit = PictureIdPresent(hdr_);
   bool p_bit = hdr_.inter_pic_predicted;
   bool l_bit = LayerInfoPresent(hdr_);
@@ skipping 110 matching lines @@
   if (parsed_payload->payload_length == 0) {
     LOG(LS_ERROR) << "Failed parsing VP9 payload data.";
     return false;
   }
   parsed_payload->payload =
       payload + payload_length - parsed_payload->payload_length;
 
   return true;
 }
 }  // namespace webrtc