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

Log probing bitrate and cluster id as int32 in event log.

Browse Source 
Bug: webrtc:8111
Change-Id: I0eca0b443f27ece6d2473c5287faa84978eee0dd
Reviewed-on: https://webrtc-review.googlesource.com/73800
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23122}
This commit is contained in:
Bjorn Terelius
2018-05-02 15:54:59 +02:00
committed by Commit Bot
parent ee10ea8a41
commit 25f0c206df
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
logging/rtc_event_log/rtc_event_log.proto
View File

@ -109,7 +109,7 @@ message RtpPacket {
optional bytes header = 4;
// optional - The probe cluster id.
optional uint32 probe_cluster_id = 5;
optional int32 probe_cluster_id = 5;
// Do not add code to log user payload data without a privacy review!
}
@ -297,10 +297,10 @@ message AudioNetworkAdaptation {
message BweProbeCluster {
// required - The id of this probe cluster.
optional uint32 id = 1;
optional int32 id = 1;
// required - The bitrate in bps that this probe cluster is meant to probe.
optional uint64 bitrate_bps = 2;
optional int32 bitrate_bps = 2;
// required - The minimum number of packets used to probe the given bitrate.
optional uint32 min_packets = 3;
@ -311,7 +311,7 @@ message BweProbeCluster {
message BweProbeResult {
// required - The id of this probe cluster.
optional uint32 id = 1;
optional int32 id = 1;
enum ResultType {
SUCCESS = 0;
@ -324,7 +324,7 @@ message BweProbeResult {
optional ResultType result = 2;
// optional - but required if result == SUCCESS. The resulting bitrate in bps.
optional uint64 bitrate_bps = 3;
optional int32 bitrate_bps = 3;
}
message AlrState {

8
logging/rtc_event_log/rtc_event_log_parser_new.h
View File

@ -88,8 +88,8 @@ struct LoggedBweLossBasedUpdate {
struct LoggedBweProbeClusterCreatedEvent {
int64_t timestamp_us;
uint32_t id;
uint64_t bitrate_bps;
int32_t id;
int32_t bitrate_bps;
uint32_t min_packets;
uint32_t min_bytes;
int64_t log_time_us() const { return timestamp_us; }
@ -98,8 +98,8 @@ struct LoggedBweProbeClusterCreatedEvent {
struct LoggedBweProbeResultEvent {
int64_t timestamp_us;
uint32_t id;
rtc::Optional<uint64_t> bitrate_bps;
int32_t id;
rtc::Optional<int32_t> bitrate_bps;
rtc::Optional<ProbeFailureReason> failure_reason;
int64_t log_time_us() const { return timestamp_us; }
int64_t log_time_ms() const { return timestamp_us / 1000; }

10
logging/rtc_event_log/rtc_event_log_unittest_helper.cc
View File

@ -553,8 +553,8 @@ void RtcEventLogTestHelper::VerifyLogEndEvent(
void RtcEventLogTestHelper::VerifyBweProbeCluster(
const ParsedRtcEventLogNew& parsed_log,
size_t index,
uint32_t id,
uint32_t bitrate_bps,
int32_t id,
int32_t bitrate_bps,
uint32_t min_probes,
uint32_t min_bytes) {
ASSERT_LT(index, parsed_log.events_.size());
@ -578,8 +578,8 @@ void RtcEventLogTestHelper::VerifyBweProbeCluster(
void RtcEventLogTestHelper::VerifyProbeResultSuccess(
const ParsedRtcEventLogNew& parsed_log,
size_t index,
uint32_t id,
uint32_t bitrate_bps) {
int32_t id,
int32_t bitrate_bps) {
ASSERT_LT(index, parsed_log.events_.size());
const rtclog::Event& event = parsed_log.events_[index];
ASSERT_TRUE(IsValidBasicEvent(event));
@ -599,7 +599,7 @@ void RtcEventLogTestHelper::VerifyProbeResultSuccess(
void RtcEventLogTestHelper::VerifyProbeResultFailure(
const ParsedRtcEventLogNew& parsed_log,
size_t index,
uint32_t id,
int32_t id,
ProbeFailureReason failure_reason) {
ASSERT_LT(index, parsed_log.events_.size());
const rtclog::Event& event = parsed_log.events_[index];

10
logging/rtc_event_log/rtc_event_log_unittest_helper.h
View File

@ -72,19 +72,19 @@ class RtcEventLogTestHelper {
static void VerifyBweProbeCluster(const ParsedRtcEventLogNew& parsed_log,
size_t index,
uint32_t id,
uint32_t bitrate_bps,
int32_t id,
int32_t bitrate_bps,
uint32_t min_probes,
uint32_t min_bytes);
static void VerifyProbeResultSuccess(const ParsedRtcEventLogNew& parsed_log,
size_t index,
uint32_t id,
uint32_t bitrate_bps);
int32_t id,
int32_t bitrate_bps);
static void VerifyProbeResultFailure(const ParsedRtcEventLogNew& parsed_log,
size_t index,
uint32_t id,
int32_t id,
ProbeFailureReason failure_reason);
};