diff options
author | phoglund@webrtc.org <phoglund@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-05-14 09:25:01 +0000 |
---|---|---|
committer | phoglund@webrtc.org <phoglund@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-05-14 09:25:01 +0000 |
commit | efbf7377771c12ea8190787b18e0f39e84011eca (patch) | |
tree | e67156ea71b057b38b3117cc01f9ca207d46f10e | |
parent | d10d6e1f2ca710f9c1d443ed5715985e41efb8df (diff) | |
download | webrtc-efbf7377771c12ea8190787b18e0f39e84011eca.tar.gz |
Reformatted FEC tables.
BUG=
R=stefan@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1400004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4020 4adac7df-926f-26a2-2b94-8c16560cd09d
-rw-r--r-- | modules/rtp_rtcp/source/fec_test_helper.cc | 23 | ||||
-rw-r--r-- | modules/rtp_rtcp/source/fec_test_helper.h | 20 |
2 files changed, 23 insertions, 20 deletions
diff --git a/modules/rtp_rtcp/source/fec_test_helper.cc b/modules/rtp_rtcp/source/fec_test_helper.cc index 1fbadb8d..176954f9 100644 --- a/modules/rtp_rtcp/source/fec_test_helper.cc +++ b/modules/rtp_rtcp/source/fec_test_helper.cc @@ -8,25 +8,21 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/rtp_rtcp/source/fec_test_helper.h" +#include "webrtc/modules/rtp_rtcp/source/fec_test_helper.h" -#include "modules/rtp_rtcp/source/rtp_utility.h" +#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" namespace webrtc { FrameGenerator::FrameGenerator() - : num_packets_(0), - seq_num_(0), - timestamp_(0) {} + : num_packets_(0), seq_num_(0), timestamp_(0) {} void FrameGenerator::NewFrame(int num_packets) { num_packets_ = num_packets; timestamp_ += 3000; } -uint16_t FrameGenerator::NextSeqNum() { - return ++seq_num_; -} +uint16_t FrameGenerator::NextSeqNum() { return ++seq_num_; } RtpPacket* FrameGenerator::NextPacket(int offset, size_t length) { RtpPacket* rtp_packet = new RtpPacket; @@ -71,8 +67,7 @@ RtpPacket* FrameGenerator::BuildFecRedPacket(const Packet* packet) { red_packet->data[1] &= ~0x80; // Clear marker bit. const int kHeaderLength = red_packet->header.header.headerLength; SetRedHeader(red_packet, kFecPayloadType, kHeaderLength); - memcpy(red_packet->data + kHeaderLength + 1, packet->data, - packet->length); + memcpy(red_packet->data + kHeaderLength + 1, packet->data, packet->length); red_packet->length = kHeaderLength + 1 + packet->length; return red_packet; } @@ -80,7 +75,7 @@ RtpPacket* FrameGenerator::BuildFecRedPacket(const Packet* packet) { void FrameGenerator::SetRedHeader(Packet* red_packet, uint8_t payload_type, int header_length) const { // Replace pltype. - red_packet->data[1] &= 0x80; // Reset. + red_packet->data[1] &= 0x80; // Reset. red_packet->data[1] += kRedPayloadType; // Replace. // Add RED header, f-bit always 0. @@ -91,9 +86,9 @@ void FrameGenerator::BuildRtpHeader(uint8_t* data, const RTPHeader* header) { data[0] = 0x80; // Version 2. data[1] = header->payloadType; data[1] |= (header->markerBit ? kRtpMarkerBitMask : 0); - ModuleRTPUtility::AssignUWord16ToBuffer(data+2, header->sequenceNumber); - ModuleRTPUtility::AssignUWord32ToBuffer(data+4, header->timestamp); - ModuleRTPUtility::AssignUWord32ToBuffer(data+8, header->ssrc); + ModuleRTPUtility::AssignUWord16ToBuffer(data + 2, header->sequenceNumber); + ModuleRTPUtility::AssignUWord32ToBuffer(data + 4, header->timestamp); + ModuleRTPUtility::AssignUWord32ToBuffer(data + 8, header->ssrc); } } // namespace webrtc diff --git a/modules/rtp_rtcp/source/fec_test_helper.h b/modules/rtp_rtcp/source/fec_test_helper.h index 4a037c78..e3c3581b 100644 --- a/modules/rtp_rtcp/source/fec_test_helper.h +++ b/modules/rtp_rtcp/source/fec_test_helper.h @@ -11,15 +11,23 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_FEC_TEST_HELPER_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_FEC_TEST_HELPER_H_ -#include "modules/interface/module_common_types.h" -#include "modules/rtp_rtcp/source/forward_error_correction.h" +#include "webrtc/modules/interface/module_common_types.h" +#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" namespace webrtc { -enum { kRtpHeaderSize = 12 }; -enum { kFecPayloadType = 96 }; -enum { kRedPayloadType = 97 }; -enum { kVp8PayloadType = 120 }; +enum { + kRtpHeaderSize = 12 +}; +enum { + kFecPayloadType = 96 +}; +enum { + kRedPayloadType = 97 +}; +enum { + kVp8PayloadType = 120 +}; typedef ForwardErrorCorrection::Packet Packet; |