From 141dfb036d5f2e02de5d74d1b4148c39d3690ade Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Thu, 31 Oct 2024 16:33:32 +0100 Subject: [PATCH] Remove webrtc::ToLogString as no longer needed These function were replaced with AbslStringify Bug: None Change-Id: Ia34b98ed4e0ed18bb52fe9370cff7a6f70caae6d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/364621 Commit-Queue: Harald Alvestrand Auto-Submit: Danil Chapovalov Reviewed-by: Harald Alvestrand Cr-Commit-Position: refs/heads/main@{#43346} --- api/units/data_rate.h | 3 --- api/units/data_size.h | 3 --- api/units/frequency.h | 3 --- api/units/time_delta.h | 3 --- api/units/timestamp.h | 3 --- video/video_receive_stream2.cc | 5 +++-- 6 files changed, 3 insertions(+), 17 deletions(-) diff --git a/api/units/data_rate.h b/api/units/data_rate.h index 341f74e338..8592416b0d 100644 --- a/api/units/data_rate.h +++ b/api/units/data_rate.h @@ -139,9 +139,6 @@ inline constexpr DataRate operator*(const Frequency frequency, } RTC_EXPORT std::string ToString(DataRate value); -inline std::string ToLogString(DataRate value) { - return ToString(value); -} template void AbslStringify(Sink& sink, DataRate value) { diff --git a/api/units/data_size.h b/api/units/data_size.h index 409df61daf..bbe8569b91 100644 --- a/api/units/data_size.h +++ b/api/units/data_size.h @@ -50,9 +50,6 @@ class DataSize final : public rtc_units_impl::RelativeUnit { }; RTC_EXPORT std::string ToString(DataSize value); -inline std::string ToLogString(DataSize value) { - return ToString(value); -} template void AbslStringify(Sink& sink, DataSize value) { diff --git a/api/units/frequency.h b/api/units/frequency.h index 225db55500..989015d26e 100644 --- a/api/units/frequency.h +++ b/api/units/frequency.h @@ -87,9 +87,6 @@ inline constexpr double operator*(TimeDelta time_delta, Frequency frequency) { } RTC_EXPORT std::string ToString(Frequency value); -inline std::string ToLogString(Frequency value) { - return ToString(value); -} template void AbslStringify(Sink& sink, Frequency value) { diff --git a/api/units/time_delta.h b/api/units/time_delta.h index c00b443014..fdc598070f 100644 --- a/api/units/time_delta.h +++ b/api/units/time_delta.h @@ -94,9 +94,6 @@ class TimeDelta final : public rtc_units_impl::RelativeUnit { }; RTC_EXPORT std::string ToString(TimeDelta value); -inline std::string ToLogString(TimeDelta value) { - return ToString(value); -} template void AbslStringify(Sink& sink, TimeDelta value) { diff --git a/api/units/timestamp.h b/api/units/timestamp.h index 177bea11af..7831bba2d0 100644 --- a/api/units/timestamp.h +++ b/api/units/timestamp.h @@ -123,9 +123,6 @@ class Timestamp final : public rtc_units_impl::UnitBase { }; RTC_EXPORT std::string ToString(Timestamp value); -inline std::string ToLogString(Timestamp value) { - return ToString(value); -} template void AbslStringify(Sink& sink, Timestamp value) { diff --git a/video/video_receive_stream2.cc b/video/video_receive_stream2.cc index 81ec56a211..1a63c4cb51 100644 --- a/video/video_receive_stream2.cc +++ b/video/video_receive_stream2.cc @@ -21,6 +21,7 @@ #include #include "absl/algorithm/container.h" +#include "absl/strings/str_cat.h" #include "api/array_view.h" #include "api/crypto/frame_decryptor_interface.h" #include "api/scoped_refptr.h" @@ -160,8 +161,8 @@ bool IsKeyFrameAndUnspecifiedResolution(const EncodedFrame& frame) { frame.EncodedImage()._encodedHeight == 0; } -std::string OptionalDelayToLogString(const std::optional opt) { - return opt.has_value() ? ToLogString(*opt) : ""; +std::string OptionalDelayToLogString(std::optional opt) { + return opt.has_value() ? absl::StrCat(*opt) : ""; } } // namespace