zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete use of WebRtcRTPHeader from FEC test code

Browse Source 
Tbr: srte@webrtc.org # comment change in modules/remote_bitrate_estimator/
Bug: webrtc:10397
Change-Id: Ic30e724c18c8812810ac7a608b7065d56a7676e8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/126941
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27069}
This commit is contained in:
Niels Möller
2019-03-12 09:54:30 +01:00
committed by Commit Bot
parent 2eb54a4188
commit 70a83949b7
5 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
modules/rtp_rtcp/source/fec_test_helper.cc
View File

@ -123,14 +123,13 @@ std::unique_ptr<AugmentedPacket> AugmentedPacketGenerator::NextPacket(
for (size_t i = 0; i < length; ++i)
packet->data[i + kRtpHeaderSize] = offset + i;
packet->length = length + kRtpHeaderSize;
packet->header.frameType = kVideoFrameDelta;
packet->header.header.headerLength = kRtpHeaderSize;
packet->header.header.markerBit = (num_packets_ == 1);
packet->header.header.payloadType = kVp8PayloadType;
packet->header.header.sequenceNumber = seq_num_;
packet->header.header.timestamp = timestamp_;
packet->header.header.ssrc = ssrc_;
WriteRtpHeader(packet->header.header, packet->data);
packet->header.headerLength = kRtpHeaderSize;
packet->header.markerBit = (num_packets_ == 1);
packet->header.payloadType = kVp8PayloadType;
packet->header.sequenceNumber = seq_num_;
packet->header.timestamp = timestamp_;
packet->header.ssrc = ssrc_;
WriteRtpHeader(packet->header, packet->data);
++seq_num_;
--num_packets_;
@ -183,7 +182,7 @@ std::unique_ptr<AugmentedPacket> UlpfecPacketGenerator::BuildMediaRedPacket(
const AugmentedPacket& packet) {
std::unique_ptr<AugmentedPacket> red_packet(new AugmentedPacket());
const size_t kHeaderLength = packet.header.header.headerLength;
const size_t kHeaderLength = packet.header.headerLength;
red_packet->header = packet.header;
red_packet->length = packet.length + 1; // 1 byte RED header.
// Copy RTP header.
@ -203,7 +202,7 @@ std::unique_ptr<AugmentedPacket> UlpfecPacketGenerator::BuildUlpfecRedPacket(
NextPacket(0, packet.length + 1);
red_packet->data[1] &= ~0x80; // Clear marker bit.
const size_t kHeaderLength = red_packet->header.header.headerLength;
const size_t kHeaderLength = red_packet->header.headerLength;
SetRedHeader(kFecPayloadType, kHeaderLength, red_packet.get());
memcpy(red_packet->data + kHeaderLength + 1, packet.data, packet.length);
red_packet->length = kHeaderLength + 1 + packet.length;