New VCMPacket constructor without WebRtcRTPHeader argument

Bug: None
Change-Id: I84898d3c1ce71d907bb91e560223a31384534a39
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/123231
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26996}
diff --git a/modules/video_coding/packet.cc b/modules/video_coding/packet.cc
index c69746e..b50e975 100644
--- a/modules/video_coding/packet.cc
+++ b/modules/video_coding/packet.cc
@@ -35,19 +35,32 @@
 VCMPacket::VCMPacket(const uint8_t* ptr,
                      const size_t size,
                      const WebRtcRTPHeader& rtpHeader)
-    : payloadType(rtpHeader.header.payloadType),
-      timestamp(rtpHeader.header.timestamp),
-      ntp_time_ms_(rtpHeader.ntp_time_ms),
-      seqNum(rtpHeader.header.sequenceNumber),
+    : VCMPacket(ptr,
+                size,
+                rtpHeader.header,
+                rtpHeader.video_header(),
+                rtpHeader.frameType,
+                rtpHeader.ntp_time_ms) {}
+
+VCMPacket::VCMPacket(const uint8_t* ptr,
+                     size_t size,
+                     const RTPHeader& rtp_header,
+                     const RTPVideoHeader& videoHeader,
+                     FrameType frame_type,
+                     int64_t ntp_time_ms)
+    : payloadType(rtp_header.payloadType),
+      timestamp(rtp_header.timestamp),
+      ntp_time_ms_(ntp_time_ms),
+      seqNum(rtp_header.sequenceNumber),
       dataPtr(ptr),
       sizeBytes(size),
-      markerBit(rtpHeader.header.markerBit),
+      markerBit(rtp_header.markerBit),
       timesNacked(-1),
-      frameType(rtpHeader.frameType),
+      frameType(frame_type),
       completeNALU(kNaluIncomplete),
-      insertStartCode(rtpHeader.video_header().codec == kVideoCodecH264 &&
-                      rtpHeader.video_header().is_first_packet_in_frame),
-      video_header(rtpHeader.video_header()) {
+      insertStartCode(videoHeader.codec == kVideoCodecH264 &&
+                      videoHeader.is_first_packet_in_frame),
+      video_header(videoHeader) {
   if (is_first_packet_in_frame() && markerBit) {
     completeNALU = kNaluComplete;
   } else if (is_first_packet_in_frame()) {