Reformat the WebRTC code base
Running clang-format with chromium's style guide. The goal is n-fold: * providing consistency and readability (that's what code guidelines are for) * preventing noise with presubmit checks and git cl format * building on the previous point: making it easier to automatically fix format issues * you name it Please consider using git-hyper-blame to ignore this commit. Bug: webrtc:9340 Change-Id: I694567c4cdf8cee2860958cfe82bfaf25848bb87 Reviewed-on: https://webrtc-review.googlesource.com/81185 Reviewed-by: Patrik Höglund <phoglund@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23660}
This commit is contained in:
@ -128,13 +128,13 @@ bool ParseArgsAndSetupEstimator(int argc,
|
||||
new webrtc::RemoteBitrateEstimatorAbsSendTime(observer, clock);
|
||||
*estimator_used = "AbsoluteSendTimeRemoteBitrateEstimator";
|
||||
break;
|
||||
}
|
||||
}
|
||||
case webrtc::kRtpExtensionTransmissionTimeOffset: {
|
||||
*estimator =
|
||||
new webrtc::RemoteBitrateEstimatorSingleStream(observer, clock);
|
||||
*estimator_used = "RemoteBitrateEstimator";
|
||||
break;
|
||||
}
|
||||
*estimator_used = "RemoteBitrateEstimator";
|
||||
break;
|
||||
}
|
||||
default:
|
||||
assert(false);
|
||||
}
|
||||
|
||||
@ -21,16 +21,15 @@ class RtpHeaderParser;
|
||||
namespace test {
|
||||
class RtpFileReader;
|
||||
}
|
||||
}
|
||||
} // namespace webrtc
|
||||
|
||||
bool ParseArgsAndSetupEstimator(
|
||||
int argc,
|
||||
char** argv,
|
||||
webrtc::Clock* clock,
|
||||
webrtc::RemoteBitrateObserver* observer,
|
||||
webrtc::test::RtpFileReader** rtp_reader,
|
||||
webrtc::RtpHeaderParser** parser,
|
||||
webrtc::RemoteBitrateEstimator** estimator,
|
||||
std::string* estimator_used);
|
||||
bool ParseArgsAndSetupEstimator(int argc,
|
||||
char** argv,
|
||||
webrtc::Clock* clock,
|
||||
webrtc::RemoteBitrateObserver* observer,
|
||||
webrtc::test::RtpFileReader** rtp_reader,
|
||||
webrtc::RtpHeaderParser** parser,
|
||||
webrtc::RemoteBitrateEstimator** estimator,
|
||||
std::string* estimator_used);
|
||||
|
||||
#endif // MODULES_REMOTE_BITRATE_ESTIMATOR_TOOLS_BWE_RTP_H_
|
||||
|
||||
@ -104,10 +104,8 @@ int main(int argc, char* argv[]) {
|
||||
printf("Parsed %d packets\nTime passed: %" PRId64 " ms\n", packet_counter,
|
||||
clock.TimeInMilliseconds());
|
||||
printf("Estimator used: %s\n", estimator_used.c_str());
|
||||
printf("Packets with absolute send time: %d\n",
|
||||
abs_send_time_count);
|
||||
printf("Packets with timestamp offset: %d\n",
|
||||
ts_offset_count);
|
||||
printf("Packets with absolute send time: %d\n", abs_send_time_count);
|
||||
printf("Packets with timestamp offset: %d\n", ts_offset_count);
|
||||
printf("Packets with no extension: %d\n",
|
||||
packet_counter - ts_offset_count - abs_send_time_count);
|
||||
return 0;
|
||||
|
||||
@ -29,7 +29,8 @@ int main(int argc, char* argv[]) {
|
||||
bool arrival_time_only = (argc >= 5 && strncmp(argv[4], "-t", 2) == 0);
|
||||
std::unique_ptr<webrtc::test::RtpFileReader> rtp_reader(reader);
|
||||
std::unique_ptr<webrtc::RtpHeaderParser> rtp_parser(parser);
|
||||
fprintf(stdout, "seqnum timestamp ts_offset abs_sendtime recvtime "
|
||||
fprintf(stdout,
|
||||
"seqnum timestamp ts_offset abs_sendtime recvtime "
|
||||
"markerbit ssrc size original_size\n");
|
||||
int packet_counter = 0;
|
||||
int non_zero_abs_send_time = 0;
|
||||
@ -47,24 +48,19 @@ int main(int argc, char* argv[]) {
|
||||
ss << static_cast<int64_t>(packet.time_ms) * 1000000;
|
||||
fprintf(stdout, "%s\n", ss.str().c_str());
|
||||
} else {
|
||||
fprintf(stdout,
|
||||
"%u %u %d %u %u %d %u %" PRIuS " %" PRIuS "\n",
|
||||
header.sequenceNumber,
|
||||
header.timestamp,
|
||||
fprintf(stdout, "%u %u %d %u %u %d %u %" PRIuS " %" PRIuS "\n",
|
||||
header.sequenceNumber, header.timestamp,
|
||||
header.extension.transmissionTimeOffset,
|
||||
header.extension.absoluteSendTime,
|
||||
packet.time_ms,
|
||||
header.markerBit,
|
||||
header.ssrc,
|
||||
packet.length,
|
||||
header.extension.absoluteSendTime, packet.time_ms,
|
||||
header.markerBit, header.ssrc, packet.length,
|
||||
packet.original_length);
|
||||
}
|
||||
++packet_counter;
|
||||
}
|
||||
fprintf(stderr, "Parsed %d packets\n", packet_counter);
|
||||
fprintf(stderr, "Packets with non-zero absolute send time: %d\n",
|
||||
non_zero_abs_send_time);
|
||||
non_zero_abs_send_time);
|
||||
fprintf(stderr, "Packets with non-zero timestamp offset: %d\n",
|
||||
non_zero_ts_offsets);
|
||||
non_zero_ts_offsets);
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user