RtcEventLogSource no longer uses deprecated parsing functions.

Also remove header extension map from NetEqEventLogInput and RtcEventLogSource.

Bug: webrtc:8111
Change-Id: Ic9be7b03e32ab8aa12284596e21e53b6763f483a
Reviewed-on: https://webrtc-review.googlesource.com/c/102622
Commit-Queue: Björn Terelius <terelius@webrtc.org>
Reviewed-by: Minyue Li <minyue@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25122}
This commit is contained in:
Bjorn Terelius
2018-10-11 16:51:23 +02:00
committed by Commit Bot
parent 499bc6c5d0
commit 5350d1cafd
15 changed files with 150 additions and 120 deletions

View File

@ -26,8 +26,9 @@
namespace webrtc {
namespace test {
RtpFileSource* RtpFileSource::Create(const std::string& file_name) {
RtpFileSource* source = new RtpFileSource();
RtpFileSource* RtpFileSource::Create(const std::string& file_name,
absl::optional<uint32_t> ssrc_filter) {
RtpFileSource* source = new RtpFileSource(ssrc_filter);
RTC_CHECK(source->OpenFile(file_name));
return source;
}
@ -72,7 +73,7 @@ std::unique_ptr<Packet> RtpFileSource::NextPacket() {
continue;
}
if (filter_.test(packet->header().payloadType) ||
(use_ssrc_filter_ && packet->header().ssrc != ssrc_)) {
(ssrc_filter_ && packet->header().ssrc != *ssrc_filter_)) {
// This payload type should be filtered out. Continue to the next packet.
continue;
}
@ -80,8 +81,10 @@ std::unique_ptr<Packet> RtpFileSource::NextPacket() {
}
}
RtpFileSource::RtpFileSource()
: PacketSource(), parser_(RtpHeaderParser::Create()) {}
RtpFileSource::RtpFileSource(absl::optional<uint32_t> ssrc_filter)
: PacketSource(),
parser_(RtpHeaderParser::Create()),
ssrc_filter_(ssrc_filter) {}
bool RtpFileSource::OpenFile(const std::string& file_name) {
rtp_reader_.reset(RtpFileReader::Create(RtpFileReader::kRtpDump, file_name));