Formatting ACM tests
Pure formatting of all files located in /webrtc/modules/audio_coding/main/test/
Smaller manual modifications done after using Eclipse formatting tool, like wrapping long lines (mostly comments).
BUG=issue1024
Review URL: https://webrtc-codereview.appspot.com/1342004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3946 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 b6bbf87..7b146b3 100644
--- a/webrtc/modules/audio_coding/main/test/RTPFile.h
+++ b/webrtc/modules/audio_coding/main/test/RTPFile.h
@@ -20,84 +20,97 @@
namespace webrtc {
-class RTPStream
-{
-public:
- virtual ~RTPStream(){}
+class RTPStream {
+ public:
+ virtual ~RTPStream() {
+ }
- 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;
+ 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 uint16_t Read(WebRtcRTPHeader* rtpInfo,
- uint8_t* payloadData,
- uint16_t payloadSize,
- uint32_t* offset) = 0;
- virtual bool EndOfFile() const = 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 bool EndOfFile() const = 0;
-protected:
- 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);
+ protected:
+ 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(uint8_t payloadType, uint32_t timeStamp,
- int16_t seqNo, const uint8_t* payloadData,
- uint16_t payloadSize, uint32_t frequency);
- ~RTPPacket();
- uint8_t payloadType;
- uint32_t timeStamp;
- int16_t seqNo;
- uint8_t* payloadData;
- uint16_t payloadSize;
- uint32_t frequency;
+class RTPPacket {
+ public:
+ RTPPacket(uint8_t payloadType, uint32_t timeStamp, int16_t seqNo,
+ const uint8_t* payloadData, uint16_t payloadSize,
+ uint32_t frequency);
+
+ ~RTPPacket();
+
+ uint8_t payloadType;
+ uint32_t timeStamp;
+ int16_t seqNo;
+ uint8_t* payloadData;
+ uint16_t payloadSize;
+ uint32_t frequency;
};
-class RTPBuffer : public RTPStream
-{
-public:
- RTPBuffer();
- ~RTPBuffer();
- 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;
- std::queue<RTPPacket *> _rtpQueue;
+class RTPBuffer : public RTPStream {
+ public:
+ RTPBuffer();
+
+ ~RTPBuffer();
+
+ 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;
+ std::queue<RTPPacket *> _rtpQueue;
};
-class RTPFile : public RTPStream
-{
-public:
- ~RTPFile(){}
- RTPFile() : _rtpFile(NULL),_rtpEOF(false) {}
- void Open(const char *outFilename, const char *mode);
- void Close();
- void WriteHeader();
- void ReadHeader();
- 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;
- bool _rtpEOF;
+class RTPFile : public RTPStream {
+ public:
+ ~RTPFile() {
+ }
+
+ RTPFile()
+ : _rtpFile(NULL),
+ _rtpEOF(false) {
+ }
+
+ void Open(const char *outFilename, const char *mode);
+
+ void Close();
+
+ void WriteHeader();
+
+ void ReadHeader();
+
+ 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;
+ bool _rtpEOF;
};
-} // namespace webrtc
+} // namespace webrtc
#endif