RtpPacketizer::NextPacket fills RtpPacket instead of payload.

webrtc/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc

Index: webrtc/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc
index ce3909535071bf17ff7bedaf5e9d02943000e698..026cf1ef70829a3b0764d0596bfdbf92852ecf8c 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc
@@ -12,6 +12,7 @@
 
 #include "webrtc/modules/rtp_rtcp/source/rtp_format_vp8.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.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"
@@ -22,6 +23,11 @@
 
 namespace webrtc {
 namespace {
+
+using ::testing::ElementsAreArray;
+using ::testing::make_tuple;
+
+constexpr RtpHeaderExtensionMap* kNoExtensions = nullptr;
 // Payload descriptor
 //       0 1 2 3 4 5 6 7
 //      +-+-+-+-+-+-+-+-+
@@ -432,6 +438,7 @@ TEST_F(RtpDepacketizerVp8Test, BasicHeader) {
   ASSERT_TRUE(depacketizer_->Parse(&payload, packet, sizeof(packet)));
   ExpectPacket(
       &payload, packet + kHeaderLength, sizeof(packet) - kHeaderLength);
+
   EXPECT_EQ(kVideoFrameDelta, payload.frame_type);
   EXPECT_EQ(kRtpVideoVp8, payload.type.Video.codec);
   VerifyBasicHeader(&payload.type, 0, 1, 4);
@@ -564,7 +571,7 @@ TEST_F(RtpDepacketizerVp8Test, TooShortHeader) {
 TEST_F(RtpDepacketizerVp8Test, TestWithPacketizer) {
   const uint8_t kHeaderLength = 5;
   uint8_t data[10] = {0};
-  uint8_t packet[20] = {0};
+  RtpPacketToSend packet(kNoExtensions);
   RTPVideoHeaderVP8 input_header;
   input_header.nonReference = true;
   input_header.pictureId = 300;
@@ -575,14 +582,16 @@ TEST_F(RtpDepacketizerVp8Test, TestWithPacketizer) {
   RtpPacketizerVp8 packetizer(input_header, 20);
   packetizer.SetPayloadData(data, 10, NULL);
   bool last;
-  size_t send_bytes;
-  ASSERT_TRUE(packetizer.NextPacket(packet, &send_bytes, &last));
-  ASSERT_TRUE(last);
-  RtpDepacketizer::ParsedPayload payload;
+  ASSERT_TRUE(packetizer.NextPacket(&packet, &last));
+  EXPECT_TRUE(last);
+  EXPECT_TRUE(packet.Marker());
 
-  ASSERT_TRUE(depacketizer_->Parse(&payload, packet, sizeof(packet)));
-  ExpectPacket(
-      &payload, packet + kHeaderLength, sizeof(packet) - kHeaderLength);
+  auto rtp_payload = packet.payload();
+  RtpDepacketizer::ParsedPayload payload;
+  ASSERT_TRUE(
+      depacketizer_->Parse(&payload, rtp_payload.data(), rtp_payload.size()));
+  auto vp8_payload = rtp_payload.subview(kHeaderLength);
+  ExpectPacket(&payload, vp8_payload.data(), vp8_payload.size());
   EXPECT_EQ(kVideoFrameKey, payload.frame_type);
   EXPECT_EQ(kRtpVideoVp8, payload.type.Video.codec);
   VerifyBasicHeader(&payload.type, 1, 1, 0);