2012-03-20 22:10:56 +00:00
|
|
|
/*
|
|
|
|
|
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
|
|
|
|
*
|
|
|
|
|
* Use of this source code is governed by a BSD-style license
|
|
|
|
|
* that can be found in the LICENSE file in the root of the source
|
|
|
|
|
* tree. An additional intellectual property rights grant can be found
|
|
|
|
|
* in the file PATENTS. All contributing project authors may
|
|
|
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
|
|
|
*/
|
|
|
|
|
|
2013-05-14 09:25:01 +00:00
|
|
|
#include "webrtc/modules/rtp_rtcp/source/fec_test_helper.h"
|
2012-03-20 22:10:56 +00:00
|
|
|
|
2015-03-17 16:42:49 +00:00
|
|
|
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
|
2013-05-14 09:25:01 +00:00
|
|
|
#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
|
2012-03-20 22:10:56 +00:00
|
|
|
|
|
|
|
|
namespace webrtc {
|
|
|
|
|
|
|
|
|
|
FrameGenerator::FrameGenerator()
|
2013-05-14 09:25:01 +00:00
|
|
|
: num_packets_(0), seq_num_(0), timestamp_(0) {}
|
2012-03-20 22:10:56 +00:00
|
|
|
|
|
|
|
|
void FrameGenerator::NewFrame(int num_packets) {
|
|
|
|
|
num_packets_ = num_packets;
|
|
|
|
|
timestamp_ += 3000;
|
|
|
|
|
}
|
|
|
|
|
|
2013-05-14 09:25:01 +00:00
|
|
|
uint16_t FrameGenerator::NextSeqNum() { return ++seq_num_; }
|
2012-03-20 22:10:56 +00:00
|
|
|
|
2016-02-19 16:02:15 +01:00
|
|
|
test::RawRtpPacket* FrameGenerator::NextPacket(int offset, size_t length) {
|
|
|
|
|
test::RawRtpPacket* rtp_packet = new test::RawRtpPacket;
|
2012-03-20 22:10:56 +00:00
|
|
|
for (size_t i = 0; i < length; ++i)
|
|
|
|
|
rtp_packet->data[i + kRtpHeaderSize] = offset + i;
|
|
|
|
|
rtp_packet->length = length + kRtpHeaderSize;
|
|
|
|
|
memset(&rtp_packet->header, 0, sizeof(WebRtcRTPHeader));
|
|
|
|
|
rtp_packet->header.frameType = kVideoFrameDelta;
|
|
|
|
|
rtp_packet->header.header.headerLength = kRtpHeaderSize;
|
|
|
|
|
rtp_packet->header.header.markerBit = (num_packets_ == 1);
|
|
|
|
|
rtp_packet->header.header.sequenceNumber = seq_num_;
|
|
|
|
|
rtp_packet->header.header.timestamp = timestamp_;
|
|
|
|
|
rtp_packet->header.header.payloadType = kVp8PayloadType;
|
2012-03-23 16:01:15 +00:00
|
|
|
BuildRtpHeader(rtp_packet->data, &rtp_packet->header.header);
|
2012-03-20 22:10:56 +00:00
|
|
|
++seq_num_;
|
|
|
|
|
--num_packets_;
|
|
|
|
|
return rtp_packet;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Creates a new RtpPacket with the RED header added to the packet.
|
2016-02-19 16:02:15 +01:00
|
|
|
test::RawRtpPacket* FrameGenerator::BuildMediaRedPacket(
|
|
|
|
|
const test::RawRtpPacket* packet) {
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
const size_t kHeaderLength = packet->header.header.headerLength;
|
2016-02-19 16:02:15 +01:00
|
|
|
test::RawRtpPacket* red_packet = new test::RawRtpPacket;
|
2012-03-20 22:10:56 +00:00
|
|
|
red_packet->header = packet->header;
|
|
|
|
|
red_packet->length = packet->length + 1; // 1 byte RED header.
|
|
|
|
|
memset(red_packet->data, 0, red_packet->length);
|
|
|
|
|
// Copy RTP header.
|
|
|
|
|
memcpy(red_packet->data, packet->data, kHeaderLength);
|
|
|
|
|
SetRedHeader(red_packet, red_packet->data[1] & 0x7f, kHeaderLength);
|
|
|
|
|
memcpy(red_packet->data + kHeaderLength + 1, packet->data + kHeaderLength,
|
|
|
|
|
packet->length - kHeaderLength);
|
|
|
|
|
return red_packet;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Creates a new RtpPacket with FEC payload and red header. Does this by
|
|
|
|
|
// creating a new fake media RtpPacket, clears the marker bit and adds a RED
|
|
|
|
|
// header. Finally replaces the payload with the content of |packet->data|.
|
2016-02-19 16:02:15 +01:00
|
|
|
test::RawRtpPacket* FrameGenerator::BuildFecRedPacket(
|
|
|
|
|
const ForwardErrorCorrection::Packet* packet) {
|
2012-03-20 22:10:56 +00:00
|
|
|
// Create a fake media packet to get a correct header. 1 byte RED header.
|
|
|
|
|
++num_packets_;
|
2016-02-19 16:02:15 +01:00
|
|
|
test::RawRtpPacket* red_packet = NextPacket(0, packet->length + 1);
|
2012-03-20 22:10:56 +00:00
|
|
|
red_packet->data[1] &= ~0x80; // Clear marker bit.
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
const size_t kHeaderLength = red_packet->header.header.headerLength;
|
2012-03-20 22:10:56 +00:00
|
|
|
SetRedHeader(red_packet, kFecPayloadType, kHeaderLength);
|
2013-05-14 09:25:01 +00:00
|
|
|
memcpy(red_packet->data + kHeaderLength + 1, packet->data, packet->length);
|
2012-03-20 22:10:56 +00:00
|
|
|
red_packet->length = kHeaderLength + 1 + packet->length;
|
|
|
|
|
return red_packet;
|
|
|
|
|
}
|
|
|
|
|
|
2016-02-19 16:02:15 +01:00
|
|
|
void FrameGenerator::SetRedHeader(ForwardErrorCorrection::Packet* red_packet,
|
|
|
|
|
uint8_t payload_type,
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
size_t header_length) const {
|
2012-03-20 22:10:56 +00:00
|
|
|
// Replace pltype.
|
2013-05-14 09:25:01 +00:00
|
|
|
red_packet->data[1] &= 0x80; // Reset.
|
2012-03-20 22:10:56 +00:00
|
|
|
red_packet->data[1] += kRedPayloadType; // Replace.
|
|
|
|
|
|
|
|
|
|
// Add RED header, f-bit always 0.
|
|
|
|
|
red_packet->data[header_length] = payload_type;
|
|
|
|
|
}
|
|
|
|
|
|
2012-03-23 16:01:15 +00:00
|
|
|
void FrameGenerator::BuildRtpHeader(uint8_t* data, const RTPHeader* header) {
|
2012-03-20 22:10:56 +00:00
|
|
|
data[0] = 0x80; // Version 2.
|
2012-03-23 16:01:15 +00:00
|
|
|
data[1] = header->payloadType;
|
|
|
|
|
data[1] |= (header->markerBit ? kRtpMarkerBitMask : 0);
|
2015-03-17 16:42:49 +00:00
|
|
|
ByteWriter<uint16_t>::WriteBigEndian(data + 2, header->sequenceNumber);
|
|
|
|
|
ByteWriter<uint32_t>::WriteBigEndian(data + 4, header->timestamp);
|
|
|
|
|
ByteWriter<uint32_t>::WriteBigEndian(data + 8, header->ssrc);
|
2012-03-20 22:10:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // namespace webrtc
|