From 4591fbd09f9cb6e83433c49a12dd8524c2806502 Mon Sep 17 00:00:00 2001 From: "pkasting@chromium.org" Date: Thu, 20 Nov 2014 22:28:14 +0000 Subject: 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 --- webrtc/common_types.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'webrtc/common_types.h') diff --git a/webrtc/common_types.h b/webrtc/common_types.h index 0b4af26e6a..aa6f319928 100644 --- a/webrtc/common_types.h +++ b/webrtc/common_types.h @@ -56,7 +56,7 @@ class Config; class InStream { public: - virtual int Read(void *buf,int len) = 0; + virtual int Read(void *buf, size_t len) = 0; virtual int Rewind() {return -1;} virtual ~InStream() {} protected: @@ -66,7 +66,7 @@ protected: class OutStream { public: - virtual bool Write(const void *buf,int len) = 0; + virtual bool Write(const void *buf, size_t len) = 0; virtual int Rewind() {return -1;} virtual ~OutStream() {} protected: @@ -166,8 +166,8 @@ enum FrameType class Transport { public: - virtual int SendPacket(int channel, const void *data, int len) = 0; - virtual int SendRTCPPacket(int channel, const void *data, int len) = 0; + virtual int SendPacket(int channel, const void *data, size_t len) = 0; + virtual int SendRTCPPacket(int channel, const void *data, size_t len) = 0; protected: virtual ~Transport() {} @@ -240,9 +240,9 @@ struct StreamDataCounters { fec_packets(0) {} // TODO(pbos): Rename bytes -> media_bytes. - uint32_t bytes; // Payload bytes, excluding RTP headers and padding. - uint32_t header_bytes; // Number of bytes used by RTP headers. - uint32_t padding_bytes; // Number of padding bytes. + size_t bytes; // Payload bytes, excluding RTP headers and padding. + size_t header_bytes; // Number of bytes used by RTP headers. + size_t padding_bytes; // Number of padding bytes. uint32_t packets; // Number of packets. uint32_t retransmitted_packets; // Number of retransmitted packets. uint32_t fec_packets; // Number of redundancy packets. @@ -828,8 +828,8 @@ struct RTPHeader { uint32_t ssrc; uint8_t numCSRCs; uint32_t arrOfCSRCs[kRtpCsrcSize]; - uint8_t paddingLength; - uint16_t headerLength; + size_t paddingLength; + size_t headerLength; int payload_type_frequency; RTPHeaderExtension extension; }; -- cgit v1.2.3