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
diff --git a/webrtc/modules/audio_coding/main/test/RTPFile.h b/webrtc/modules/audio_coding/main/test/RTPFile.h
index 460553b..9a2d43a 100644
--- a/webrtc/modules/audio_coding/main/test/RTPFile.h
+++ b/webrtc/modules/audio_coding/main/test/RTPFile.h
@@ -28,12 +28,12 @@
virtual void Write(const uint8_t payloadType, const uint32_t timeStamp,
const int16_t seqNo, const uint8_t* payloadData,
- const uint16_t payloadSize, uint32_t frequency) = 0;
+ const size_t payloadSize, uint32_t frequency) = 0;
// Returns the packet's payload size. Zero should be treated as an
// end-of-stream (in the case that EndOfFile() is true) or an error.
- virtual uint16_t Read(WebRtcRTPHeader* rtpInfo, uint8_t* payloadData,
- uint16_t payloadSize, uint32_t* offset) = 0;
+ virtual size_t Read(WebRtcRTPHeader* rtpInfo, uint8_t* payloadData,
+ size_t payloadSize, uint32_t* offset) = 0;
virtual bool EndOfFile() const = 0;
protected:
@@ -46,7 +46,7 @@
class RTPPacket {
public:
RTPPacket(uint8_t payloadType, uint32_t timeStamp, int16_t seqNo,
- const uint8_t* payloadData, uint16_t payloadSize,
+ const uint8_t* payloadData, size_t payloadSize,
uint32_t frequency);
~RTPPacket();
@@ -55,7 +55,7 @@
uint32_t timeStamp;
int16_t seqNo;
uint8_t* payloadData;
- uint16_t payloadSize;
+ size_t payloadSize;
uint32_t frequency;
};
@@ -67,10 +67,10 @@
virtual void Write(const uint8_t payloadType, const uint32_t timeStamp,
const int16_t seqNo, const uint8_t* payloadData,
- const uint16_t payloadSize, uint32_t frequency) OVERRIDE;
+ const size_t payloadSize, uint32_t frequency) OVERRIDE;
- virtual uint16_t Read(WebRtcRTPHeader* rtpInfo, uint8_t* payloadData,
- uint16_t payloadSize, uint32_t* offset) OVERRIDE;
+ virtual size_t Read(WebRtcRTPHeader* rtpInfo, uint8_t* payloadData,
+ size_t payloadSize, uint32_t* offset) OVERRIDE;
virtual bool EndOfFile() const OVERRIDE;
@@ -99,10 +99,10 @@
virtual void Write(const uint8_t payloadType, const uint32_t timeStamp,
const int16_t seqNo, const uint8_t* payloadData,
- const uint16_t payloadSize, uint32_t frequency) OVERRIDE;
+ const size_t payloadSize, uint32_t frequency) OVERRIDE;
- virtual uint16_t Read(WebRtcRTPHeader* rtpInfo, uint8_t* payloadData,
- uint16_t payloadSize, uint32_t* offset) OVERRIDE;
+ virtual size_t Read(WebRtcRTPHeader* rtpInfo, uint8_t* payloadData,
+ size_t payloadSize, uint32_t* offset) OVERRIDE;
virtual bool EndOfFile() const OVERRIDE {
return _rtpEOF;