Let RtpFileSource use RtpFileReader

RtpFileSource used to implement it's own RTP dump file reader, but
with this change it simply uses RtpFileReader. One benefit is that
pcap files are now also supported.

All NetEq test tools that use RtpFileSource are updated.

BUG=2692
R=kwiberg@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/22839004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7367 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrik.lundin@webrtc.org
2014-10-02 08:19:38 +00:00
parent 348eac641e
commit 4b133da5fd
6 changed files with 45 additions and 99 deletions

View File

@ -24,7 +24,7 @@ class Packet;
// Interface class for an object delivering RTP packets to test applications.
class PacketSource {
public:
PacketSource() {}
PacketSource() : use_ssrc_filter_(false), ssrc_(0) {}
virtual ~PacketSource() {}
// Returns a pointer to the next packet. Returns NULL if the source is
@ -35,8 +35,16 @@ class PacketSource {
filter_.set(payload_type, true);
}
virtual void SelectSsrc(uint32_t ssrc) {
use_ssrc_filter_ = true;
ssrc_ = ssrc;
}
protected:
std::bitset<128> filter_; // Payload type is 7 bits in the RFC.
// If SSRC filtering discards all packet that do not match the SSRC.
bool use_ssrc_filter_; // True when SSRC filtering is active.
uint32_t ssrc_; // The selected SSRC. All other SSRCs will be discarded.
private:
DISALLOW_COPY_AND_ASSIGN(PacketSource);