Change vcm::VideoReceiver::IncomingPacket to not use WebRtcRTPHeader
Bug: webrtc:10397
Change-Id: Id549516faab1b1047ef52dd8229a73eeb48c5fe2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/134162
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27761}
diff --git a/modules/video_coding/video_receiver.cc b/modules/video_coding/video_receiver.cc
index 797f9c1..8f9e849 100644
--- a/modules/video_coding/video_receiver.cc
+++ b/modules/video_coding/video_receiver.cc
@@ -323,11 +323,12 @@
// Incoming packet from network parsed and ready for decode, non blocking.
int32_t VideoReceiver::IncomingPacket(const uint8_t* incomingPayload,
size_t payloadLength,
- const WebRtcRTPHeader& rtpInfo) {
+ const RTPHeader& rtp_header,
+ const RTPVideoHeader& video_header) {
RTC_DCHECK_RUN_ON(&module_thread_checker_);
- if (rtpInfo.frameType == VideoFrameType::kVideoFrameKey) {
+ if (video_header.frame_type == VideoFrameType::kVideoFrameKey) {
TRACE_EVENT1("webrtc", "VCM::PacketKeyFrame", "seqnum",
- rtpInfo.header.sequenceNumber);
+ rtp_header.sequenceNumber);
}
if (incomingPayload == nullptr) {
// The jitter buffer doesn't handle non-zero payload lengths for packets
@@ -335,8 +336,9 @@
// TODO(holmer): We should fix this in the jitter buffer.
payloadLength = 0;
}
- const VCMPacket packet(incomingPayload, payloadLength, rtpInfo.header,
- rtpInfo.video_header(), rtpInfo.ntp_time_ms);
+ // Callers don't provide any ntp time.
+ const VCMPacket packet(incomingPayload, payloadLength, rtp_header,
+ video_header, /*ntp_time_ms=*/0);
int32_t ret = _receiver.InsertPacket(packet);
// TODO(holmer): Investigate if this somehow should use the key frame