WebRtc_Word32 => int32_t etc. in audio_coding/
BUG=314 Review URL: https://webrtc-codereview.appspot.com/1271006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3789 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
@ -25,38 +25,38 @@ class RTPStream
|
||||
public:
|
||||
virtual ~RTPStream(){}
|
||||
|
||||
virtual void Write(const WebRtc_UWord8 payloadType, const WebRtc_UWord32 timeStamp,
|
||||
const WebRtc_Word16 seqNo, const WebRtc_UWord8* payloadData,
|
||||
const WebRtc_UWord16 payloadSize, WebRtc_UWord32 frequency) = 0;
|
||||
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;
|
||||
|
||||
// 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 WebRtc_UWord16 Read(WebRtcRTPHeader* rtpInfo,
|
||||
WebRtc_UWord8* payloadData,
|
||||
WebRtc_UWord16 payloadSize,
|
||||
WebRtc_UWord32* offset) = 0;
|
||||
virtual uint16_t Read(WebRtcRTPHeader* rtpInfo,
|
||||
uint8_t* payloadData,
|
||||
uint16_t payloadSize,
|
||||
uint32_t* offset) = 0;
|
||||
virtual bool EndOfFile() const = 0;
|
||||
|
||||
protected:
|
||||
void MakeRTPheader(WebRtc_UWord8* rtpHeader,
|
||||
WebRtc_UWord8 payloadType, WebRtc_Word16 seqNo,
|
||||
WebRtc_UWord32 timeStamp, WebRtc_UWord32 ssrc);
|
||||
void ParseRTPHeader(WebRtcRTPHeader* rtpInfo, const WebRtc_UWord8* rtpHeader);
|
||||
void MakeRTPheader(uint8_t* rtpHeader,
|
||||
uint8_t payloadType, int16_t seqNo,
|
||||
uint32_t timeStamp, uint32_t ssrc);
|
||||
void ParseRTPHeader(WebRtcRTPHeader* rtpInfo, const uint8_t* rtpHeader);
|
||||
};
|
||||
|
||||
class RTPPacket
|
||||
{
|
||||
public:
|
||||
RTPPacket(WebRtc_UWord8 payloadType, WebRtc_UWord32 timeStamp,
|
||||
WebRtc_Word16 seqNo, const WebRtc_UWord8* payloadData,
|
||||
WebRtc_UWord16 payloadSize, WebRtc_UWord32 frequency);
|
||||
RTPPacket(uint8_t payloadType, uint32_t timeStamp,
|
||||
int16_t seqNo, const uint8_t* payloadData,
|
||||
uint16_t payloadSize, uint32_t frequency);
|
||||
~RTPPacket();
|
||||
WebRtc_UWord8 payloadType;
|
||||
WebRtc_UWord32 timeStamp;
|
||||
WebRtc_Word16 seqNo;
|
||||
WebRtc_UWord8* payloadData;
|
||||
WebRtc_UWord16 payloadSize;
|
||||
WebRtc_UWord32 frequency;
|
||||
uint8_t payloadType;
|
||||
uint32_t timeStamp;
|
||||
int16_t seqNo;
|
||||
uint8_t* payloadData;
|
||||
uint16_t payloadSize;
|
||||
uint32_t frequency;
|
||||
};
|
||||
|
||||
class RTPBuffer : public RTPStream
|
||||
@ -64,13 +64,13 @@ class RTPBuffer : public RTPStream
|
||||
public:
|
||||
RTPBuffer();
|
||||
~RTPBuffer();
|
||||
void Write(const WebRtc_UWord8 payloadType, const WebRtc_UWord32 timeStamp,
|
||||
const WebRtc_Word16 seqNo, const WebRtc_UWord8* payloadData,
|
||||
const WebRtc_UWord16 payloadSize, WebRtc_UWord32 frequency);
|
||||
WebRtc_UWord16 Read(WebRtcRTPHeader* rtpInfo,
|
||||
WebRtc_UWord8* payloadData,
|
||||
WebRtc_UWord16 payloadSize,
|
||||
WebRtc_UWord32* offset);
|
||||
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);
|
||||
uint16_t Read(WebRtcRTPHeader* rtpInfo,
|
||||
uint8_t* payloadData,
|
||||
uint16_t payloadSize,
|
||||
uint32_t* offset);
|
||||
virtual bool EndOfFile() const;
|
||||
private:
|
||||
RWLockWrapper* _queueRWLock;
|
||||
@ -86,13 +86,13 @@ public:
|
||||
void Close();
|
||||
void WriteHeader();
|
||||
void ReadHeader();
|
||||
void Write(const WebRtc_UWord8 payloadType, const WebRtc_UWord32 timeStamp,
|
||||
const WebRtc_Word16 seqNo, const WebRtc_UWord8* payloadData,
|
||||
const WebRtc_UWord16 payloadSize, WebRtc_UWord32 frequency);
|
||||
WebRtc_UWord16 Read(WebRtcRTPHeader* rtpInfo,
|
||||
WebRtc_UWord8* payloadData,
|
||||
WebRtc_UWord16 payloadSize,
|
||||
WebRtc_UWord32* offset);
|
||||
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);
|
||||
uint16_t Read(WebRtcRTPHeader* rtpInfo,
|
||||
uint8_t* payloadData,
|
||||
uint16_t payloadSize,
|
||||
uint32_t* offset);
|
||||
bool EndOfFile() const { return _rtpEOF; }
|
||||
private:
|
||||
FILE* _rtpFile;
|
||||
|
||||
Reference in New Issue
Block a user