RtpPacketizer::NextPacket fills RtpPacket instead of payload.

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.
  */
 
 #include <memory>
 #include <vector>
 
 #include "webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h"
+#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 namespace {
 void VerifyHeader(const RTPVideoHeaderVP9& expected,
                   const RTPVideoHeaderVP9& actual) {
   EXPECT_EQ(expected.inter_layer_predicted, actual.inter_layer_predicted);
   EXPECT_EQ(expected.inter_pic_predicted, actual.inter_pic_predicted);
@@ skipping 91 matching lines @@
 //   L:   |  T  |U|  S  |D| (CONDITIONALLY RECOMMENDED)
 //        +-+-+-+-+-+-+-+-+
 //        |   TL0PICIDX   | (CONDITIONALLY REQUIRED)
 //        +-+-+-+-+-+-+-+-+
 //   V:   | SS            |
 //        | ..            |
 //        +-+-+-+-+-+-+-+-+
 
 class RtpPacketizerVp9Test : public ::testing::Test {
  protected:
-  RtpPacketizerVp9Test() {}
+  static constexpr RtpPacketToSend::ExtensionManager* kNoExtensions = nullptr;
+  static constexpr size_t kMaxPacketSize = 1200;
+
+  RtpPacketizerVp9Test() : packet_(kNoExtensions, kMaxPacketSize) {}
   virtual void SetUp() {
     expected_.InitRTPVideoHeaderVP9();
   }
 
-  std::unique_ptr<uint8_t[]> packet_;
+  RtpPacketToSend packet_;
   std::unique_ptr<uint8_t[]> payload_;
   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_->SetPayloadData(payload_.get(), payload_size_, NULL);
-
-    const int kMaxPayloadDescriptorLength = 100;
-    packet_.reset(new uint8_t[payload_size_ + kMaxPayloadDescriptorLength]);
   }
 
   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);
-    size_t length = 0;
     bool last = false;
     if (expected_num_packets == 0) {
-      EXPECT_FALSE(packetizer_->NextPacket(packet_.get(), &length, &last));
+      EXPECT_FALSE(packetizer_->NextPacket(&packet_, &last));
       return;
     }
     for (size_t i = 0; i < expected_num_packets; ++i) {
-      EXPECT_TRUE(packetizer_->NextPacket(packet_.get(), &length, &last));
-      EXPECT_EQ(expected_sizes[i], length);
+      EXPECT_TRUE(packetizer_->NextPacket(&packet_, &last));
+      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;
-      ParseAndCheckPacket(packet_.get(), hdr, expected_hdr_sizes[i], length);
-      CheckPayload(packet_.get(), expected_hdr_sizes[i], length, last);
+      ParseAndCheckPacket(rtp_payload.data(), hdr, expected_hdr_sizes[i],
+                          rtp_payload.size());
+      CheckPayload(rtp_payload.data(), expected_hdr_sizes[i],
+                   rtp_payload.size(), last);
     }
     EXPECT_TRUE(last);
   }
 };
 
 TEST_F(RtpPacketizerVp9Test, TestEqualSizedMode_OnePacket) {
   const size_t kFrameSize = 25;
   const size_t kPacketSize = 26;
   Init(kFrameSize, kPacketSize);
 
@@ skipping 234 matching lines @@
   // N_G:3
   // T:0, U:1, R:0
   // T:1, U:1, R:3 | P_DIFF[1][0]:5 | P_DIFF[1][1]:6 | P_DIFF[1][2]:7
   // T:2, U:0, R:2 | P_DIFF[2][0]:8 | P_DIFF[2][0]:9
   const size_t kExpectedHdrSizes[] = {19};
   const size_t kExpectedSizes[] = {40};
   const size_t kExpectedNum = GTEST_ARRAY_SIZE_(kExpectedSizes);
   CreateParseAndCheckPackets(kExpectedHdrSizes, kExpectedSizes, kExpectedNum);
 }
 
+TEST_F(RtpPacketizerVp9Test, TestOnlyHighestSpatialLayerSetMarker) {
+  const size_t kFrameSize = 10;
+  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);
+  packetizer0.SetPayloadData(kFrame, sizeof(kFrame), kNoFragmentation);
+  ASSERT_TRUE(packetizer0.NextPacket(&packet, &last));
+  EXPECT_FALSE(last);
+  EXPECT_FALSE(packet.Marker());
+  ASSERT_TRUE(packetizer0.NextPacket(&packet, &last));
+  EXPECT_TRUE(last);
+  EXPECT_FALSE(packet.Marker());
+
+  vp9_header.spatial_idx = 1;
+  RtpPacketizerVp9 packetizer1(vp9_header, kPacketSize);
+  packetizer1.SetPayloadData(kFrame, sizeof(kFrame), kNoFragmentation);
+  ASSERT_TRUE(packetizer1.NextPacket(&packet, &last));
+  EXPECT_FALSE(last);
+  EXPECT_FALSE(packet.Marker());
+  ASSERT_TRUE(packetizer1.NextPacket(&packet, &last));
+  EXPECT_TRUE(last);
+  EXPECT_FALSE(packet.Marker());
+
+  vp9_header.spatial_idx = 2;
+  RtpPacketizerVp9 packetizer2(vp9_header, kPacketSize);
+  packetizer2.SetPayloadData(kFrame, sizeof(kFrame), kNoFragmentation);
+  ASSERT_TRUE(packetizer2.NextPacket(&packet, &last));
+  EXPECT_FALSE(last);
+  EXPECT_FALSE(packet.Marker());
+  ASSERT_TRUE(packetizer2.NextPacket(&packet, &last));
+  EXPECT_TRUE(last);
+  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;
   expected_.temporal_idx = 0;
   Init(kFrameSize, kPacketSize);
   EXPECT_EQ(kProtectedPacket, packetizer_->GetProtectionType());
@@ skipping 240 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