Rename RtpFileReader::Packet to RtpPacket and move out of RtpFileReader
This is in preparation for creating a new class RtpFileWriter which
will use the same RtpPacket struct.
R=pbos@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/33429004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7749 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/test/rtp_file_reader.h b/webrtc/test/rtp_file_reader.h
index 095ce76..f309380 100644
--- a/webrtc/test/rtp_file_reader.h
+++ b/webrtc/test/rtp_file_reader.h
@@ -16,6 +16,20 @@
namespace webrtc {
namespace test {
+
+struct RtpPacket {
+ // Accommodate for 50 ms packets of 32 kHz PCM16 samples (3200 bytes) plus
+ // some overhead.
+ static const size_t kMaxPacketBufferSize = 3500;
+ uint8_t data[kMaxPacketBufferSize];
+ size_t length;
+ // The length the packet had on wire. Will be different from |length| when
+ // reading a header-only RTP dump.
+ size_t original_length;
+
+ uint32_t time_ms;
+};
+
class RtpFileReader {
public:
enum FileFormat {
@@ -23,24 +37,11 @@
kRtpDump,
};
- struct Packet {
- // Accommodate for 50 ms packets of 32 kHz PCM16 samples (3200 bytes) plus
- // some overhead.
- static const size_t kMaxPacketBufferSize = 3500;
- uint8_t data[kMaxPacketBufferSize];
- size_t length;
- // The length the packet had on wire. Will be different from |length| when
- // reading a header-only RTP dump.
- size_t original_length;
-
- uint32_t time_ms;
- };
-
virtual ~RtpFileReader() {}
static RtpFileReader* Create(FileFormat format,
const std::string& filename);
- virtual bool NextPacket(Packet* packet) = 0;
+ virtual bool NextPacket(RtpPacket* packet) = 0;
};
} // namespace test
} // namespace webrtc
