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
This commit is contained in:
@ -44,7 +44,7 @@ RtpPacket* FrameGenerator::NextPacket(int offset, size_t length) {
|
||||
|
||||
// Creates a new RtpPacket with the RED header added to the packet.
|
||||
RtpPacket* FrameGenerator::BuildMediaRedPacket(const RtpPacket* packet) {
|
||||
const int kHeaderLength = packet->header.header.headerLength;
|
||||
const size_t kHeaderLength = packet->header.header.headerLength;
|
||||
RtpPacket* red_packet = new RtpPacket;
|
||||
red_packet->header = packet->header;
|
||||
red_packet->length = packet->length + 1; // 1 byte RED header.
|
||||
@ -65,7 +65,7 @@ RtpPacket* FrameGenerator::BuildFecRedPacket(const Packet* packet) {
|
||||
++num_packets_;
|
||||
RtpPacket* red_packet = NextPacket(0, packet->length + 1);
|
||||
red_packet->data[1] &= ~0x80; // Clear marker bit.
|
||||
const int kHeaderLength = red_packet->header.header.headerLength;
|
||||
const size_t kHeaderLength = red_packet->header.header.headerLength;
|
||||
SetRedHeader(red_packet, kFecPayloadType, kHeaderLength);
|
||||
memcpy(red_packet->data + kHeaderLength + 1, packet->data, packet->length);
|
||||
red_packet->length = kHeaderLength + 1 + packet->length;
|
||||
@ -73,7 +73,7 @@ RtpPacket* FrameGenerator::BuildFecRedPacket(const Packet* packet) {
|
||||
}
|
||||
|
||||
void FrameGenerator::SetRedHeader(Packet* red_packet, uint8_t payload_type,
|
||||
int header_length) const {
|
||||
size_t header_length) const {
|
||||
// Replace pltype.
|
||||
red_packet->data[1] &= 0x80; // Reset.
|
||||
red_packet->data[1] += kRedPayloadType; // Replace.
|
||||
|
||||
Reference in New Issue
Block a user