commit 075e7fdd00c4ef52a12cc8da6989b39e018d5851
author Niels Möller <nisse@webrtc.org> Tue Mar 12 12:29:22 2019 +0100
committer Commit Bot <commit-bot@chromium.org> Tue Mar 12 15:18:41 2019 +0000
tree 45b5484f11fa6c3636e967158405bbbcb563ed92
parent c4b391a257ebf85448e58e73a96eb267635b6d6a

Delete VCMPacket constructor with WebRtcRTPHeader

Bug: webrtc:10397
Change-Id: I8f51616d6953af6b2d3bdfdf46b748b2a78702ea
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/127240
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27079}

modules/video_coding/jitter_buffer_unittest.cc

diff --git a/modules/video_coding/jitter_buffer_unittest.cc b/modules/video_coding/jitter_buffer_unittest.cc
index 2863efb..68a4b84 100644
--- a/modules/video_coding/jitter_buffer_unittest.cc
+++ b/modules/video_coding/jitter_buffer_unittest.cc
@@ -240,15 +240,15 @@
         i += 3;
       }
     }
-    WebRtcRTPHeader rtpHeader;
-    memset(&rtpHeader, 0, sizeof(rtpHeader));
-    rtpHeader.header.sequenceNumber = seq_num_;
-    rtpHeader.header.timestamp = timestamp_;
-    rtpHeader.header.markerBit = true;
-    rtpHeader.frameType = kVideoFrameDelta;
-    rtpHeader.video_header().codec = kVideoCodecGeneric;
-    rtpHeader.video_header().is_first_packet_in_frame = true;
-    packet_.reset(new VCMPacket(data_, size_, rtpHeader));
+    RTPHeader rtp_header;
+    RTPVideoHeader video_header;
+    rtp_header.sequenceNumber = seq_num_;
+    rtp_header.timestamp = timestamp_;
+    rtp_header.markerBit = true;
+    video_header.codec = kVideoCodecGeneric;
+    video_header.is_first_packet_in_frame = true;
+    packet_.reset(new VCMPacket(data_, size_, rtp_header, video_header,
+                                kVideoFrameDelta, /*ntp_time_ms=*/0));
   }
 
   VCMEncodedFrame* DecodeCompleteFrame() {
@@ -763,13 +763,14 @@
 
   // Add in the padding. These are empty packets (data length is 0) with no
   // marker bit and matching the timestamp of Frame B.
-  WebRtcRTPHeader rtpHeader;
-  memset(&rtpHeader, 0, sizeof(rtpHeader));
-  rtpHeader.header.sequenceNumber = seq_num_ + 2;
-  rtpHeader.header.timestamp = timestamp_ + (33 * 90);
-  rtpHeader.header.markerBit = false;
-  rtpHeader.video_header().codec = kVideoCodecGeneric;
-  VCMPacket empty_packet(data_, 0, rtpHeader);
+  RTPHeader rtp_header;
+  RTPVideoHeader video_header;
+  rtp_header.sequenceNumber = seq_num_ + 2;
+  rtp_header.timestamp = timestamp_ + (33 * 90);
+  rtp_header.markerBit = false;
+  video_header.codec = kVideoCodecGeneric;
+  VCMPacket empty_packet(data_, 0, rtp_header, video_header,
+                         VideoFrameType::kEmptyFrame, /*ntp_time_ms=*/0);
   EXPECT_EQ(kOldPacket,
             jitter_buffer_->InsertPacket(empty_packet, &retransmitted));
   empty_packet.seqNum += 1;