admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

video_replay: use abseil uint32_t for ssrc and ssrc_rtx

Browse Source 
simplifying the validation

BUG=webrtc:12575

Change-Id: I3f43347aec653ac0297523cda88f9101c57fe1c8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/211867
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34392}
This commit is contained in:
Philipp Hancke 2021-03-15 13:15:59 +01:00 committed by WebRTC LUCI CQ
parent 2ae4ed223a
commit c060ce40bf
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
rtc_tools/video_replay.cc
View File

@ -74,20 +74,15 @@ ABSL_FLAG(int,
webrtc::test::CallTest::kRtxRedPayloadType, webrtc::test::CallTest::kRtxRedPayloadType,
"RED over RTX payload type"); "RED over RTX payload type");
// Flag for SSRC. // Flag for SSRC and RTX SSRC.
const std::string& DefaultSsrc() { ABSL_FLAG(uint32_t,
static const std::string ssrc = ssrc,
std::to_string(webrtc::test::CallTest::kVideoSendSsrcs[0]); webrtc::test::CallTest::kVideoSendSsrcs[0],
return ssrc; "Incoming SSRC");
} ABSL_FLAG(uint32_t,
ABSL_FLAG(std::string, ssrc, DefaultSsrc().c_str(), "Incoming SSRC"); ssrc_rtx,
webrtc::test::CallTest::kSendRtxSsrcs[0],
const std::string& DefaultSsrcRtx() { "Incoming RTX SSRC");
static const std::string ssrc_rtx =
std::to_string(webrtc::test::CallTest::kSendRtxSsrcs[0]);
return ssrc_rtx;
}
ABSL_FLAG(std::string, ssrc_rtx, DefaultSsrcRtx().c_str(), "Incoming RTX SSRC");
// Flag for abs-send-time id. // Flag for abs-send-time id.
ABSL_FLAG(int, abs_send_time_id, -1, "RTP extension ID for abs-send-time"); ABSL_FLAG(int, abs_send_time_id, -1, "RTP extension ID for abs-send-time");
@ -137,10 +132,6 @@ static bool ValidatePayloadType(int32_t payload_type) {
return payload_type > 0 && payload_type <= 127; return payload_type > 0 && payload_type <= 127;
} }
static bool ValidateSsrc(const char* ssrc_string) {
return rtc::StringToNumber<uint32_t>(ssrc_string).has_value();
}
static bool ValidateOptionalPayloadType(int32_t payload_type) { static bool ValidateOptionalPayloadType(int32_t payload_type) {
return payload_type == -1 || ValidatePayloadType(payload_type); return payload_type == -1 || ValidatePayloadType(payload_type);
} }
@ -174,11 +165,11 @@ static int RedPayloadTypeRtx() {
} }
static uint32_t Ssrc() { static uint32_t Ssrc() {
return rtc::StringToNumber<uint32_t>(absl::GetFlag(FLAGS_ssrc)).value(); return absl::GetFlag(FLAGS_ssrc);
} }
static uint32_t SsrcRtx() { static uint32_t SsrcRtx() {
return rtc::StringToNumber<uint32_t>(absl::GetFlag(FLAGS_ssrc_rtx)).value(); return absl::GetFlag(FLAGS_ssrc_rtx);
} }
static int AbsSendTimeId() { static int AbsSendTimeId() {
@ -615,8 +606,6 @@ int main(int argc, char* argv[]) {
ValidateOptionalPayloadType(absl::GetFlag(FLAGS_red_payload_type_rtx))); ValidateOptionalPayloadType(absl::GetFlag(FLAGS_red_payload_type_rtx)));
RTC_CHECK( RTC_CHECK(
ValidateOptionalPayloadType(absl::GetFlag(FLAGS_ulpfec_payload_type))); ValidateOptionalPayloadType(absl::GetFlag(FLAGS_ulpfec_payload_type)));
RTC_CHECK(ValidateSsrc(absl::GetFlag(FLAGS_ssrc).c_str()));
RTC_CHECK(ValidateSsrc(absl::GetFlag(FLAGS_ssrc_rtx).c_str()));
RTC_CHECK( RTC_CHECK(
ValidateRtpHeaderExtensionId(absl::GetFlag(FLAGS_abs_send_time_id))); ValidateRtpHeaderExtensionId(absl::GetFlag(FLAGS_abs_send_time_id)));
RTC_CHECK(ValidateRtpHeaderExtensionId( RTC_CHECK(ValidateRtpHeaderExtensionId(