zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renames RtcEventLogParseNew to RtcEventLogParser

Browse Source 
Bug: webrtc:10170
Change-Id: I9232c276229a64fa4d8321b6c996387fe130f68b
Reviewed-on: https://webrtc-review.googlesource.com/c/116064
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Reviewed-by: Minyue Li <minyue@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26128}
This commit is contained in:
Sebastian Jansson
2019-01-03 14:46:23 +01:00
committed by Commit Bot
parent a29b3a6f34
commit b290a6d767
14 changed files with 788 additions and 777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/audio_coding/neteq/tools/rtc_event_log_source.cc
View File

@ -24,10 +24,10 @@ namespace webrtc {
namespace test {
namespace {
bool ShouldSkipStream(ParsedRtcEventLogNew::MediaType media_type,
bool ShouldSkipStream(ParsedRtcEventLog::MediaType media_type,
uint32_t ssrc,
absl::optional<uint32_t> ssrc_filter) {
if (media_type != ParsedRtcEventLogNew::MediaType::AUDIO)
if (media_type != ParsedRtcEventLog::MediaType::AUDIO)
return true;
if (ssrc_filter.has_value() && ssrc != *ssrc_filter)
return true;
@ -65,7 +65,7 @@ RtcEventLogSource::RtcEventLogSource() : PacketSource() {}
bool RtcEventLogSource::OpenFile(const std::string& file_name,
absl::optional<uint32_t> ssrc_filter) {
ParsedRtcEventLogNew parsed_log;
ParsedRtcEventLog parsed_log;
if (!parsed_log.ParseFile(file_name))
return false;
@ -104,7 +104,7 @@ bool RtcEventLogSource::OpenFile(const std::string& file_name,
// This wouldn't be needed if we knew that there was at most one audio stream.
webrtc::RtcEventProcessor event_processor;
for (const auto& rtp_packets : parsed_log.incoming_rtp_packets_by_ssrc()) {
ParsedRtcEventLogNew::MediaType media_type =
ParsedRtcEventLog::MediaType media_type =
parsed_log.GetMediaType(rtp_packets.ssrc, webrtc::kIncomingPacket);
if (ShouldSkipStream(media_type, rtp_packets.ssrc, ssrc_filter)) {
continue;

2
modules/audio_coding/neteq/tools/rtc_event_log_source.h
View File

@ -16,7 +16,7 @@
#include <vector>
#include "absl/types/optional.h"
#include "logging/rtc_event_log/rtc_event_log_parser_new.h"
#include "logging/rtc_event_log/rtc_event_log_parser.h"
#include "modules/audio_coding/neteq/tools/packet_source.h"
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "rtc_base/constructormagic.h"