commit c060ce40bf3572427574da2ed23bab3c3bd1d9de
author Philipp Hancke <phancke@nvidia.com> Mon Mar 15 12:15:59 2021
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jun 30 10:28:46 2021
tree 8b0f6ce28444bdb5a2abe0cd879e592365a0d08d
parent 2ae4ed223adc91563759f09239cda92aee2f9f06

video_replay: use abseil uint32_t for ssrc and ssrc_rtx

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}

rtc_tools/video_replay.cc

diff --git a/rtc_tools/video_replay.cc b/rtc_tools/video_replay.cc
index b655a88..dc98e4e 100644
--- a/rtc_tools/video_replay.cc
+++ b/rtc_tools/video_replay.cc
@@ -74,20 +74,15 @@
           webrtc::test::CallTest::kRtxRedPayloadType,
           "RED over RTX payload type");
 
-// Flag for SSRC.
-const std::string& DefaultSsrc() {
-  static const std::string ssrc =
-      std::to_string(webrtc::test::CallTest::kVideoSendSsrcs[0]);
-  return ssrc;
-}
-ABSL_FLAG(std::string, ssrc, DefaultSsrc().c_str(), "Incoming SSRC");
-
-const std::string& DefaultSsrcRtx() {
-  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 SSRC and RTX SSRC.
+ABSL_FLAG(uint32_t,
+          ssrc,
+          webrtc::test::CallTest::kVideoSendSsrcs[0],
+          "Incoming SSRC");
+ABSL_FLAG(uint32_t,
+          ssrc_rtx,
+          webrtc::test::CallTest::kSendRtxSsrcs[0],
+          "Incoming RTX SSRC");
 
 // Flag for abs-send-time id.
 ABSL_FLAG(int, abs_send_time_id, -1, "RTP extension ID for abs-send-time");
@@ -137,10 +132,6 @@
   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) {
   return payload_type == -1 || ValidatePayloadType(payload_type);
 }
@@ -174,11 +165,11 @@
 }
 
 static uint32_t Ssrc() {
-  return rtc::StringToNumber<uint32_t>(absl::GetFlag(FLAGS_ssrc)).value();
+  return absl::GetFlag(FLAGS_ssrc);
 }
 
 static uint32_t SsrcRtx() {
-  return rtc::StringToNumber<uint32_t>(absl::GetFlag(FLAGS_ssrc_rtx)).value();
+  return absl::GetFlag(FLAGS_ssrc_rtx);
 }
 
 static int AbsSendTimeId() {
@@ -615,8 +606,6 @@
       ValidateOptionalPayloadType(absl::GetFlag(FLAGS_red_payload_type_rtx)));
   RTC_CHECK(
       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(
       ValidateRtpHeaderExtensionId(absl::GetFlag(FLAGS_abs_send_time_id)));
   RTC_CHECK(ValidateRtpHeaderExtensionId(