From 0ebd67f89d68599179914f445c8ad31967b49933 Mon Sep 17 00:00:00 2001 From: Evan Shrubsole Date: Wed, 19 Feb 2025 10:06:32 +0000 Subject: [PATCH] Move string_builder.h to webrtc namespace Bug: webrtc:42232595 Change-Id: Iad12b11767c3bbaddcf0e87357e8e6037608defb Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/377740 Reviewed-by: Harald Alvestrand Commit-Queue: Evan Shrubsole Cr-Commit-Position: refs/heads/main@{#43926} --- api/audio/audio_device_defines.h | 2 +- api/audio/audio_processing.cc | 2 +- api/neteq/neteq.cc | 2 +- api/rtp_parameters.cc | 2 +- api/test/metrics/stdout_metrics_exporter.cc | 4 +- api/test/pclf/media_configuration.cc | 12 ++-- api/test/videocodec_test_stats.cc | 4 +- api/units/data_rate.cc | 2 +- api/units/data_size.cc | 2 +- api/units/frequency.cc | 2 +- api/units/time_delta.cc | 2 +- api/units/timestamp.cc | 2 +- api/video/color_space.cc | 2 +- api/video/video_adaptation_counters.cc | 2 +- api/video/video_bitrate_allocation.cc | 2 +- api/video/video_timing.cc | 2 +- .../libaom_av1_encoder_factory.cc | 4 +- api/video_codecs/sdp_video_format.cc | 2 +- api/video_codecs/video_codec.cc | 2 +- api/video_codecs/video_decoder.cc | 2 +- api/video_codecs/video_encoder.cc | 2 +- audio/audio_receive_stream.cc | 4 +- audio/channel_receive.cc | 2 +- audio/channel_send.cc | 2 +- audio/utility/channel_mixer_unittest.cc | 2 +- .../utility/channel_mixing_matrix_unittest.cc | 2 +- .../resource_adaptation_processor.cc | 12 ++-- call/adaptation/video_source_restrictions.cc | 2 +- call/audio_send_stream.cc | 6 +- call/call.cc | 2 +- call/flexfec_receive_stream_impl.cc | 2 +- call/rtp_config.cc | 12 ++-- call/rtp_demuxer.cc | 4 +- call/video_receive_stream.cc | 8 +-- call/video_send_stream.cc | 6 +- common_audio/resampler/resampler_unittest.cc | 8 +-- .../signal_processing_unittest.cc | 2 +- media/engine/simulcast_encoder_adapter.cc | 2 +- media/sctp/dcsctp_transport.cc | 2 +- .../neteq/buffer_level_filter_unittest.cc | 2 +- .../neteq/dtmf_tone_generator_unittest.cc | 4 +- .../neteq/neteq_stereo_unittest.cc | 2 +- modules/audio_coding/neteq/neteq_unittest.cc | 8 +-- .../neteq/test/neteq_decoding_test.cc | 2 +- .../audio_coding/neteq/tools/neteq_input.cc | 2 +- .../audio_coding/neteq/tools/neteq_rtpplay.cc | 4 +- .../neteq/tools/neteq_stats_getter.cc | 2 +- modules/audio_coding/test/Channel.cc | 2 +- modules/audio_coding/test/EncodeDecodeTest.cc | 2 +- modules/audio_coding/test/PacketLossTest.cc | 2 +- modules/audio_coding/test/TestAllCodecs.cc | 2 +- modules/audio_coding/test/TestRedFec.cc | 2 +- modules/audio_coding/test/TestStereo.cc | 2 +- modules/audio_coding/test/TestVADDTX.cc | 2 +- .../audio_mixer/audio_mixer_impl_unittest.cc | 2 +- modules/audio_mixer/audio_mixer_test.cc | 2 +- .../audio_mixer/frame_combiner_unittest.cc | 4 +- .../aec3/adaptive_fir_filter_unittest.cc | 2 +- .../aec3/alignment_mixer_unittest.cc | 2 +- .../aec3/block_delay_buffer_unittest.cc | 2 +- .../aec3/block_framer_unittest.cc | 2 +- .../aec3/block_processor_unittest.cc | 2 +- .../coarse_filter_update_gain_unittest.cc | 4 +- .../aec3/decimator_unittest.cc | 2 +- .../aec3/echo_canceller3_unittest.cc | 4 +- .../echo_path_delay_estimator_unittest.cc | 2 +- .../aec3/echo_remover_unittest.cc | 4 +- .../aec3/erl_estimator_unittest.cc | 2 +- .../aec3/frame_blocker_unittest.cc | 2 +- .../aec3/matched_filter_unittest.cc | 2 +- .../refined_filter_update_gain_unittest.cc | 4 +- .../aec3/render_delay_buffer_unittest.cc | 2 +- .../aec3/render_delay_controller_unittest.cc | 4 +- .../aec3/render_signal_analyzer_unittest.cc | 2 +- .../aec3/subtractor_unittest.cc | 2 +- .../agc/agc_manager_direct_unittest.cc | 4 +- modules/audio_processing/agc2/cpu_features.cc | 2 +- .../agc2/input_volume_stats_reporter.cc | 6 +- .../input_volume_stats_reporter_unittest.cc | 18 ++--- .../agc2/interpolated_gain_curve.cc | 8 +-- .../rnn_vad/pitch_search_internal_unittest.cc | 2 +- .../audio_processing_unittest.cc | 6 +- .../ns/noise_suppressor_unittest.cc | 2 +- .../test/audio_processing_simulator.cc | 2 +- .../test/echo_canceller3_config_json.cc | 2 +- .../test/fake_recording_device_unittest.cc | 4 +- .../goog_cc/loss_based_bwe_v2_test.cc | 4 +- .../tools/rtp_to_text.cc | 2 +- .../source/rtcp_packet/sdes_unittest.cc | 2 +- modules/rtp_rtcp/source/rtp_packet.cc | 2 +- .../video_coding/codecs/av1/av1_svc_config.cc | 2 +- .../codecs/test/video_codec_test.cc | 11 ++- .../test/videocodec_test_fixture_impl.cc | 6 +- .../codecs/vp9/libvpx_vp9_encoder.cc | 2 +- .../svc/scalability_structure_unittest.cc | 2 +- .../utility/vp9_uncompressed_header_parser.cc | 2 +- net/dcsctp/packet/chunk/chunk.cc | 4 +- net/dcsctp/packet/chunk/data_chunk.cc | 2 +- net/dcsctp/packet/chunk/forward_tsn_chunk.cc | 2 +- net/dcsctp/packet/chunk/idata_chunk.cc | 2 +- net/dcsctp/packet/chunk/iforward_tsn_chunk.cc | 2 +- net/dcsctp/packet/chunk/sack_chunk.cc | 7 +- net/dcsctp/packet/error_cause/error_cause.cc | 4 +- .../invalid_stream_identifier_cause.cc | 2 +- .../missing_mandatory_parameter_cause.cc | 2 +- .../packet/error_cause/no_user_data_cause.cc | 2 +- .../error_cause/protocol_violation_cause.cc | 2 +- .../error_cause/stale_cookie_error_cause.cc | 2 +- .../unrecognized_chunk_type_cause.cc | 2 +- .../error_cause/user_initiated_abort_cause.cc | 2 +- .../add_incoming_streams_request_parameter.cc | 2 +- .../add_outgoing_streams_request_parameter.cc | 2 +- .../parameter/heartbeat_info_parameter.cc | 2 +- .../incoming_ssn_reset_request_parameter.cc | 2 +- .../outgoing_ssn_reset_request_parameter.cc | 2 +- .../reconfiguration_response_parameter.cc | 2 +- .../ssn_tsn_reset_request_parameter.cc | 2 +- .../parameter/state_cookie_parameter.cc | 2 +- .../supported_extensions_parameter.cc | 2 +- ...ero_checksum_acceptable_chunk_parameter.cc | 2 +- .../public/text_pcap_packet_observer.cc | 2 +- net/dcsctp/rx/reassembly_queue.cc | 4 +- net/dcsctp/socket/dcsctp_socket.cc | 4 +- .../socket/dcsctp_socket_network_test.cc | 2 +- net/dcsctp/socket/stream_reset_handler.cc | 15 ++-- .../socket/transmission_control_block.cc | 2 +- net/dcsctp/tx/rr_send_queue.cc | 2 +- net/dcsctp/tx/stream_scheduler.cc | 2 +- pc/data_channel_integrationtest.cc | 4 +- pc/peer_connection_ice_unittest.cc | 4 +- pc/rtc_stats_collector.cc | 20 +++--- pc/sdp_offer_answer.cc | 12 ++-- pc/simulcast_sdp_serializer.cc | 16 ++--- pc/webrtc_sdp.cc | 72 +++++++++---------- pc/webrtc_sdp.h | 6 +- rtc_base/logging.cc | 6 +- rtc_base/logging.h | 4 +- rtc_base/network.cc | 4 +- rtc_base/network_route.h | 2 +- rtc_base/openssl_adapter.cc | 2 +- rtc_base/socket_address.cc | 6 +- rtc_base/ssl_identity.cc | 2 +- rtc_base/strings/audio_format_to_string.cc | 6 +- rtc_base/strings/str_join.h | 4 +- rtc_base/strings/string_builder.cc | 4 +- rtc_base/strings/string_builder.h | 9 ++- rtc_base/strings/string_builder_unittest.cc | 36 +++++----- .../data_channel_benchmark.cc | 2 +- rtc_tools/frame_analyzer/frame_analyzer.cc | 2 +- .../rtc_event_log_visualizer/analyzer.cc | 4 +- .../analyzer_common.cc | 4 +- rtc_tools/unpack_aecdump/unpack.cc | 14 ++-- .../encoded_image_file_writer.cc | 2 +- rtc_tools/video_encoder/video_encoder.cc | 4 +- .../native_api/stacktrace/stacktrace.cc | 2 +- .../src/jni/android_network_monitor.cc | 2 +- stats/attribute.cc | 4 +- stats/rtc_stats.cc | 2 +- stats/rtc_stats_report.cc | 2 +- test/network/network_emulation_manager.cc | 2 +- .../video/default_video_quality_analyzer.cc | 2 +- ...quality_analyzer_frames_comparator_test.cc | 2 +- ...uality_analyzer_internal_shared_objects.cc | 2 +- ...t_video_quality_analyzer_shared_objects.cc | 9 ++- ...lt_video_quality_analyzer_shared_objects.h | 5 +- .../default_video_quality_analyzer_test.cc | 2 +- test/pc/e2e/peer_connection_quality_test.cc | 2 +- test/pc/e2e/sdp/sdp_changer.cc | 4 +- ..._based_network_quality_metrics_reporter.cc | 4 +- test/scenario/column_printer.cc | 6 +- test/scenario/column_printer.h | 6 +- test/testsupport/file_utils.cc | 4 +- test/testsupport/file_utils_override.cc | 2 +- test/testsupport/perf_test.cc | 10 +-- .../testsupport/perf_test_histogram_writer.cc | 2 +- test/video_codec_tester.cc | 4 +- .../video_stream_encoder_resource_manager.cc | 2 +- video/config/video_encoder_config.cc | 4 +- video/end_to_end_tests/stats_tests.cc | 2 +- video/frame_dumping_encoder.cc | 2 +- video/receive_statistics_proxy.cc | 2 +- video/rtp_video_stream_receiver2.cc | 2 +- video/send_statistics_proxy.cc | 2 +- video/stats_counter.cc | 2 +- video/video_quality_observer2.cc | 2 +- video/video_quality_test.cc | 6 +- video/video_receive_stream2.cc | 2 +- video/video_send_stream_tests.cc | 2 +- video/video_stream_encoder.cc | 2 +- video/video_stream_encoder_unittest.cc | 2 +- 190 files changed, 386 insertions(+), 392 deletions(-) diff --git a/api/audio/audio_device_defines.h b/api/audio/audio_device_defines.h index 476c2910dd..63eca2a422 100644 --- a/api/audio/audio_device_defines.h +++ b/api/audio/audio_device_defines.h @@ -154,7 +154,7 @@ class AudioParameters { } std::string ToString() const { char ss_buf[1024]; - rtc::SimpleStringBuilder ss(ss_buf); + SimpleStringBuilder ss(ss_buf); ss << "AudioParameters: "; ss << "sample_rate=" << sample_rate() << ", channels=" << channels(); ss << ", frames_per_buffer=" << frames_per_buffer(); diff --git a/api/audio/audio_processing.cc b/api/audio/audio_processing.cc index 52023a5447..1f866e00eb 100644 --- a/api/audio/audio_processing.cc +++ b/api/audio/audio_processing.cc @@ -128,7 +128,7 @@ operator==(const AudioProcessing::Config::CaptureLevelAdjustment:: std::string AudioProcessing::Config::ToString() const { char buf[2048]; - rtc::SimpleStringBuilder builder(buf); + SimpleStringBuilder builder(buf); builder << "AudioProcessing::Config{ " "pipeline: { " "maximum_internal_processing_rate: " diff --git a/api/neteq/neteq.cc b/api/neteq/neteq.cc index d237def23a..5ab7d73379 100644 --- a/api/neteq/neteq.cc +++ b/api/neteq/neteq.cc @@ -23,7 +23,7 @@ NetEq::Config& NetEq::Config::operator=(Config&&) = default; std::string NetEq::Config::ToString() const { char buf[1024]; - rtc::SimpleStringBuilder ss(buf); + SimpleStringBuilder ss(buf); ss << "sample_rate_hz=" << sample_rate_hz << ", max_packets_in_buffer=" << max_packets_in_buffer << ", min_delay_ms=" << min_delay_ms << ", enable_fast_accelerate=" diff --git a/api/rtp_parameters.cc b/api/rtp_parameters.cc index 178aeb8b66..dd5744218f 100644 --- a/api/rtp_parameters.cc +++ b/api/rtp_parameters.cc @@ -128,7 +128,7 @@ RtpParameters::~RtpParameters() = default; std::string RtpExtension::ToString() const { char buf[256]; - rtc::SimpleStringBuilder sb(buf); + SimpleStringBuilder sb(buf); sb << "{uri: " << uri; sb << ", id: " << id; if (encrypt) { diff --git a/api/test/metrics/stdout_metrics_exporter.cc b/api/test/metrics/stdout_metrics_exporter.cc index 16ea7d14fe..d27fda38e4 100644 --- a/api/test/metrics/stdout_metrics_exporter.cc +++ b/api/test/metrics/stdout_metrics_exporter.cc @@ -30,7 +30,7 @@ int64_t IntegralPart(double value) { void AppendWithPrecision(double value, int digits_after_comma, - rtc::StringBuilder& out) { + StringBuilder& out) { int64_t multiplier = std::lround(std::pow(10, digits_after_comma)); int64_t integral_part = IntegralPart(value); double decimal_part = std::abs(value) - integral_part; @@ -78,7 +78,7 @@ bool StdoutMetricsExporter::Export(rtc::ArrayView metrics) { } void StdoutMetricsExporter::PrintMetric(const Metric& metric) { - rtc::StringBuilder value_stream; + StringBuilder value_stream; value_stream << metric.test_case << " / " << metric.name << "= {mean="; if (metric.stats.mean.has_value()) { AppendWithPrecision(*metric.stats.mean, 8, value_stream); diff --git a/api/test/pclf/media_configuration.cc b/api/test/pclf/media_configuration.cc index 245a9f53f5..7843642bfa 100644 --- a/api/test/pclf/media_configuration.cc +++ b/api/test/pclf/media_configuration.cc @@ -44,7 +44,7 @@ absl::string_view SpecToString(VideoResolution::Spec spec) { } void AppendResolution(const VideoResolution& resolution, - rtc::StringBuilder& builder) { + StringBuilder& builder) { builder << "_" << resolution.width() << "x" << resolution.height() << "_" << resolution.fps(); } @@ -95,7 +95,7 @@ bool VideoResolution::IsRegular() const { return spec_ == Spec::kNone; } std::string VideoResolution::ToString() const { - rtc::StringBuilder out; + StringBuilder out; out << "{ width=" << width_ << ", height=" << height_ << ", fps=" << fps_ << ", spec=" << SpecToString(spec_) << " }"; return out.Release(); @@ -162,7 +162,7 @@ VideoDumpOptions::Y4mVideoFrameWriterFactory( std::string VideoDumpOptions::GetInputDumpFileName( absl::string_view stream_label, const VideoResolution& resolution) const { - rtc::StringBuilder file_name; + StringBuilder file_name; file_name << stream_label; AppendResolution(resolution, file_name); return test::JoinFilename(output_directory_, file_name.Release()); @@ -181,7 +181,7 @@ std::string VideoDumpOptions::GetOutputDumpFileName( absl::string_view stream_label, absl::string_view receiver, const VideoResolution& resolution) const { - rtc::StringBuilder file_name; + StringBuilder file_name; file_name << stream_label << "_" << receiver; AppendResolution(resolution, file_name); return test::JoinFilename(output_directory_, file_name.Release()); @@ -199,7 +199,7 @@ std::optional VideoDumpOptions::GetOutputFrameIdsDumpFileName( } std::string VideoDumpOptions::ToString() const { - rtc::StringBuilder out; + StringBuilder out; out << "{ output_directory_=" << output_directory_ << ", sampling_modulo_=" << sampling_modulo_ << ", export_frame_ids_=" << export_frame_ids_ << " }"; @@ -298,7 +298,7 @@ std::vector VideoSubscription::GetSubscribedPeers() const { } std::string VideoSubscription::ToString() const { - rtc::StringBuilder out; + StringBuilder out; out << "{ default_resolution_=["; if (default_resolution_.has_value()) { out << default_resolution_->ToString(); diff --git a/api/test/videocodec_test_stats.cc b/api/test/videocodec_test_stats.cc index d71ebd231f..5f0b8dccd0 100644 --- a/api/test/videocodec_test_stats.cc +++ b/api/test/videocodec_test_stats.cc @@ -27,7 +27,7 @@ VideoCodecTestStats::FrameStatistics::FrameStatistics(size_t frame_number, spatial_idx(spatial_idx) {} std::string VideoCodecTestStats::FrameStatistics::ToString() const { - rtc::StringBuilder ss; + StringBuilder ss; for (const auto& entry : ToMap()) { if (ss.size() > 0) { ss << " "; @@ -66,7 +66,7 @@ std::map VideoCodecTestStats::FrameStatistics::ToMap() std::string VideoCodecTestStats::VideoStatistics::ToString( std::string prefix) const { - rtc::StringBuilder ss; + StringBuilder ss; for (const auto& entry : ToMap()) { if (ss.size() > 0) { ss << "\n"; diff --git a/api/units/data_rate.cc b/api/units/data_rate.cc index c1ad9b399c..7f99a172ed 100644 --- a/api/units/data_rate.cc +++ b/api/units/data_rate.cc @@ -19,7 +19,7 @@ namespace webrtc { std::string ToString(DataRate value) { char buf[64]; - rtc::SimpleStringBuilder sb(buf); + SimpleStringBuilder sb(buf); if (value.IsPlusInfinity()) { sb << "+inf bps"; } else if (value.IsMinusInfinity()) { diff --git a/api/units/data_size.cc b/api/units/data_size.cc index 3d2cc6efc4..abe4906c92 100644 --- a/api/units/data_size.cc +++ b/api/units/data_size.cc @@ -19,7 +19,7 @@ namespace webrtc { std::string ToString(DataSize value) { char buf[64]; - rtc::SimpleStringBuilder sb(buf); + SimpleStringBuilder sb(buf); if (value.IsPlusInfinity()) { sb << "+inf bytes"; } else if (value.IsMinusInfinity()) { diff --git a/api/units/frequency.cc b/api/units/frequency.cc index 3bf31185c2..ca4b52e34c 100644 --- a/api/units/frequency.cc +++ b/api/units/frequency.cc @@ -17,7 +17,7 @@ namespace webrtc { std::string ToString(Frequency value) { char buf[64]; - rtc::SimpleStringBuilder sb(buf); + SimpleStringBuilder sb(buf); if (value.IsPlusInfinity()) { sb << "+inf Hz"; } else if (value.IsMinusInfinity()) { diff --git a/api/units/time_delta.cc b/api/units/time_delta.cc index 0788a9cde6..efd5a2a518 100644 --- a/api/units/time_delta.cc +++ b/api/units/time_delta.cc @@ -19,7 +19,7 @@ namespace webrtc { std::string ToString(TimeDelta value) { char buf[64]; - rtc::SimpleStringBuilder sb(buf); + SimpleStringBuilder sb(buf); if (value.IsPlusInfinity()) { sb << "+inf ms"; } else if (value.IsMinusInfinity()) { diff --git a/api/units/timestamp.cc b/api/units/timestamp.cc index 9c42a50f4c..38b0d1157d 100644 --- a/api/units/timestamp.cc +++ b/api/units/timestamp.cc @@ -18,7 +18,7 @@ namespace webrtc { std::string ToString(Timestamp value) { char buf[64]; - rtc::SimpleStringBuilder sb(buf); + SimpleStringBuilder sb(buf); if (value.IsPlusInfinity()) { sb << "+inf ms"; } else if (value.IsMinusInfinity()) { diff --git a/api/video/color_space.cc b/api/video/color_space.cc index 99648a34da..776cd1205c 100644 --- a/api/video/color_space.cc +++ b/api/video/color_space.cc @@ -139,7 +139,7 @@ const HdrMetadata* ColorSpace::hdr_metadata() const { std::string ColorSpace::AsString() const { char buf[1024]; - rtc::SimpleStringBuilder ss(buf); + SimpleStringBuilder ss(buf); ss << "{primaries:"; switch (primaries_) { PRINT_ENUM_CASE(PrimaryID, kBT709) diff --git a/api/video/video_adaptation_counters.cc b/api/video/video_adaptation_counters.cc index a548c02aff..4594b87142 100644 --- a/api/video/video_adaptation_counters.cc +++ b/api/video/video_adaptation_counters.cc @@ -35,7 +35,7 @@ VideoAdaptationCounters VideoAdaptationCounters::operator+( } std::string VideoAdaptationCounters::ToString() const { - rtc::StringBuilder ss; + StringBuilder ss; ss << "{ res=" << resolution_adaptations << " fps=" << fps_adaptations << " }"; return ss.Release(); diff --git a/api/video/video_bitrate_allocation.cc b/api/video/video_bitrate_allocation.cc index 889dbd07e1..3cd3fda129 100644 --- a/api/video/video_bitrate_allocation.cc +++ b/api/video/video_bitrate_allocation.cc @@ -147,7 +147,7 @@ std::string VideoBitrateAllocation::ToString() const { // Max string length in practice is 260, but let's have some overhead and // round up to nearest power of two. char string_buf[512]; - rtc::SimpleStringBuilder ssb(string_buf); + SimpleStringBuilder ssb(string_buf); ssb << "VideoBitrateAllocation ["; uint32_t spatial_cumulator = 0; diff --git a/api/video/video_timing.cc b/api/video/video_timing.cc index 8e9e9f0e36..ad164f1d9b 100644 --- a/api/video/video_timing.cc +++ b/api/video/video_timing.cc @@ -89,7 +89,7 @@ std::string TimingFrameInfo::ToString() const { } char buf[1024]; - rtc::SimpleStringBuilder sb(buf); + SimpleStringBuilder sb(buf); sb << rtp_timestamp << ',' << capture_time_ms << ',' << encode_start_ms << ',' << encode_finish_ms << ',' << packetization_finish_ms << ',' diff --git a/api/video_codecs/libaom_av1_encoder_factory.cc b/api/video_codecs/libaom_av1_encoder_factory.cc index c1b5a9292b..d1aee592d2 100644 --- a/api/video_codecs/libaom_av1_encoder_factory.cc +++ b/api/video_codecs/libaom_av1_encoder_factory.cc @@ -515,7 +515,7 @@ aom_svc_ref_frame_config_t GetSvcRefFrameConfig( } char buf[256]; - rtc::SimpleStringBuilder sb(buf); + SimpleStringBuilder sb(buf); sb << " spatial_id=" << settings.spatial_id; sb << " ref_idx=[ "; for (auto r : ref_frame_config.ref_idx) { @@ -618,7 +618,7 @@ aom_svc_params_t GetSvcParams( } char buf[512]; - rtc::SimpleStringBuilder sb(buf); + SimpleStringBuilder sb(buf); sb << "GetSvcParams" << " layer bitrates kbps"; for (int s = 0; s < svc_params.number_spatial_layers; ++s) { sb << " S" << s << "=[ "; diff --git a/api/video_codecs/sdp_video_format.cc b/api/video_codecs/sdp_video_format.cc index 2b28ffa2a4..50d457d737 100644 --- a/api/video_codecs/sdp_video_format.cc +++ b/api/video_codecs/sdp_video_format.cc @@ -160,7 +160,7 @@ SdpVideoFormat& SdpVideoFormat::operator=(SdpVideoFormat&&) = default; SdpVideoFormat::~SdpVideoFormat() = default; std::string SdpVideoFormat::ToString() const { - rtc::StringBuilder builder; + StringBuilder builder; builder << "Codec name: " << name << ", parameters: {"; for (const auto& kv : parameters) { builder << " " << kv.first << "=" << kv.second; diff --git a/api/video_codecs/video_codec.cc b/api/video_codecs/video_codec.cc index 8ee5b1fdcd..a7cf9f172c 100644 --- a/api/video_codecs/video_codec.cc +++ b/api/video_codecs/video_codec.cc @@ -79,7 +79,7 @@ VideoCodec::VideoCodec() std::string VideoCodec::ToString() const { char string_buf[2048]; - rtc::SimpleStringBuilder ss(string_buf); + SimpleStringBuilder ss(string_buf); ss << "VideoCodec {" << "type: " << CodecTypeToPayloadString(codecType) << ", mode: " diff --git a/api/video_codecs/video_decoder.cc b/api/video_codecs/video_decoder.cc index c6074b677e..84f365289c 100644 --- a/api/video_codecs/video_decoder.cc +++ b/api/video_codecs/video_decoder.cc @@ -44,7 +44,7 @@ const char* VideoDecoder::ImplementationName() const { std::string VideoDecoder::DecoderInfo::ToString() const { char string_buf[2048]; - rtc::SimpleStringBuilder oss(string_buf); + SimpleStringBuilder oss(string_buf); oss << "DecoderInfo { " << "prefers_late_decoding = " << "implementation_name = '" diff --git a/api/video_codecs/video_encoder.cc b/api/video_codecs/video_encoder.cc index 5fa7df65b6..40726431bd 100644 --- a/api/video_codecs/video_encoder.cc +++ b/api/video_codecs/video_encoder.cc @@ -120,7 +120,7 @@ VideoEncoder::EncoderInfo::EncoderInfo(const EncoderInfo&) = default; VideoEncoder::EncoderInfo::~EncoderInfo() = default; std::string VideoEncoder::EncoderInfo::ToString() const { - rtc::StringBuilder oss; + StringBuilder oss; oss << "EncoderInfo { " "ScalingSettings { "; if (scaling_settings.thresholds) { diff --git a/audio/audio_receive_stream.cc b/audio/audio_receive_stream.cc index 1d798217cb..e701992146 100644 --- a/audio/audio_receive_stream.cc +++ b/audio/audio_receive_stream.cc @@ -49,7 +49,7 @@ namespace webrtc { std::string AudioReceiveStreamInterface::Config::Rtp::ToString() const { char ss_buf[1024]; - rtc::SimpleStringBuilder ss(ss_buf); + SimpleStringBuilder ss(ss_buf); ss << "{remote_ssrc: " << remote_ssrc; ss << ", local_ssrc: " << local_ssrc; ss << ", nack: " << nack.ToString(); @@ -63,7 +63,7 @@ std::string AudioReceiveStreamInterface::Config::Rtp::ToString() const { std::string AudioReceiveStreamInterface::Config::ToString() const { char ss_buf[1024]; - rtc::SimpleStringBuilder ss(ss_buf); + SimpleStringBuilder ss(ss_buf); ss << "{rtp: " << rtp.ToString(); ss << ", rtcp_send_transport: " << (rtcp_send_transport ? "(Transport)" : "null"); diff --git a/audio/channel_receive.cc b/audio/channel_receive.cc index 6f8e951efe..efeeef2ceb 100644 --- a/audio/channel_receive.cc +++ b/audio/channel_receive.cc @@ -749,7 +749,7 @@ void ChannelReceive::ReceivePacket(const uint8_t* packet, // Asynchronously transform the received payload. After the payload is // transformed, the delegate will call OnReceivedPayloadData to handle it. char buf[1024]; - rtc::SimpleStringBuilder mime_type(buf); + SimpleStringBuilder mime_type(buf); auto it = payload_type_map_.find(header.payloadType); mime_type << MediaTypeToString(cricket::MEDIA_TYPE_AUDIO) << "/" << (it != payload_type_map_.end() ? it->second.name diff --git a/audio/channel_send.cc b/audio/channel_send.cc index d65f321285..7b000341cc 100644 --- a/audio/channel_send.cc +++ b/audio/channel_send.cc @@ -384,7 +384,7 @@ int32_t ChannelSend::SendData(AudioFrameType frameType, // Asynchronously transform the payload before sending it. After the payload // is transformed, the delegate will call SendRtpAudio to send it. char buf[1024]; - rtc::SimpleStringBuilder mime_type(buf); + SimpleStringBuilder mime_type(buf); mime_type << MediaTypeToString(cricket::MEDIA_TYPE_AUDIO) << "/" << encoder_format_.name; frame_transformer_delegate_->Transform( diff --git a/audio/utility/channel_mixer_unittest.cc b/audio/utility/channel_mixer_unittest.cc index 94cb1ac7e3..7aa3810936 100644 --- a/audio/utility/channel_mixer_unittest.cc +++ b/audio/utility/channel_mixer_unittest.cc @@ -163,7 +163,7 @@ TEST_F(ChannelMixerTest, ConstructAllPossibleLayouts) { continue; } - rtc::StringBuilder ss; + StringBuilder ss; ss << "Input Layout: " << input_layout << ", Output Layout: " << output_layout; SCOPED_TRACE(ss.str()); diff --git a/audio/utility/channel_mixing_matrix_unittest.cc b/audio/utility/channel_mixing_matrix_unittest.cc index fc4ceb7090..d7a7f3f038 100644 --- a/audio/utility/channel_mixing_matrix_unittest.cc +++ b/audio/utility/channel_mixing_matrix_unittest.cc @@ -43,7 +43,7 @@ TEST(ChannelMixingMatrixTest, ConstructAllPossibleLayouts) { continue; } - rtc::StringBuilder ss; + StringBuilder ss; ss << "Input Layout: " << input_layout << ", Output Layout: " << output_layout; SCOPED_TRACE(ss.str()); diff --git a/call/adaptation/resource_adaptation_processor.cc b/call/adaptation/resource_adaptation_processor.cc index 4d46ddec52..e4f4e2aa64 100644 --- a/call/adaptation/resource_adaptation_processor.cc +++ b/call/adaptation/resource_adaptation_processor.cc @@ -230,7 +230,7 @@ ResourceAdaptationProcessor::OnResourceUnderuse( // How can this stream be adapted up? Adaptation adaptation = stream_adapter_->GetAdaptationUp(); if (adaptation.status() != Adaptation::Status::kValid) { - rtc::StringBuilder message; + StringBuilder message; message << "Not adapting up because VideoStreamAdapter returned " << Adaptation::StatusToString(adaptation.status()); return MitigationResultAndLogMessage(MitigationResult::kRejectedByAdapter, @@ -251,7 +251,7 @@ ResourceAdaptationProcessor::OnResourceUnderuse( // adaptation. if (absl::c_find(most_limited_resources, reason_resource) == most_limited_resources.end()) { - rtc::StringBuilder message; + StringBuilder message; message << "Resource \"" << reason_resource->Name() << "\" was not the most limited resource."; return MitigationResultAndLogMessage( @@ -263,7 +263,7 @@ ResourceAdaptationProcessor::OnResourceUnderuse( // before the adaptation is applied. UpdateResourceLimitations(reason_resource, adaptation.restrictions(), adaptation.counters()); - rtc::StringBuilder message; + StringBuilder message; message << "Resource \"" << reason_resource->Name() << "\" was not the only most limited resource."; return MitigationResultAndLogMessage( @@ -272,7 +272,7 @@ ResourceAdaptationProcessor::OnResourceUnderuse( } // Apply adaptation. stream_adapter_->ApplyAdaptation(adaptation, reason_resource); - rtc::StringBuilder message; + StringBuilder message; message << "Adapted up successfully. Unfiltered adaptations: " << stream_adapter_->adaptation_counters().ToString(); return MitigationResultAndLogMessage(MitigationResult::kAdaptationApplied, @@ -293,7 +293,7 @@ ResourceAdaptationProcessor::OnResourceOveruse( restrictions.counters); } if (adaptation.status() != Adaptation::Status::kValid) { - rtc::StringBuilder message; + StringBuilder message; message << "Not adapting down because VideoStreamAdapter returned " << Adaptation::StatusToString(adaptation.status()); return MitigationResultAndLogMessage(MitigationResult::kRejectedByAdapter, @@ -303,7 +303,7 @@ ResourceAdaptationProcessor::OnResourceOveruse( UpdateResourceLimitations(reason_resource, adaptation.restrictions(), adaptation.counters()); stream_adapter_->ApplyAdaptation(adaptation, reason_resource); - rtc::StringBuilder message; + StringBuilder message; message << "Adapted down successfully. Unfiltered adaptations: " << stream_adapter_->adaptation_counters().ToString(); return MitigationResultAndLogMessage(MitigationResult::kAdaptationApplied, diff --git a/call/adaptation/video_source_restrictions.cc b/call/adaptation/video_source_restrictions.cc index 8ca40d4124..ed791cda30 100644 --- a/call/adaptation/video_source_restrictions.cc +++ b/call/adaptation/video_source_restrictions.cc @@ -39,7 +39,7 @@ VideoSourceRestrictions::VideoSourceRestrictions( } std::string VideoSourceRestrictions::ToString() const { - rtc::StringBuilder ss; + StringBuilder ss; ss << "{"; if (max_frame_rate_) ss << " max_fps=" << max_frame_rate_.value(); diff --git a/call/audio_send_stream.cc b/call/audio_send_stream.cc index f58a24b50d..e72db1be6b 100644 --- a/call/audio_send_stream.cc +++ b/call/audio_send_stream.cc @@ -31,7 +31,7 @@ AudioSendStream::Config::Config(Transport* send_transport) AudioSendStream::Config::~Config() = default; std::string AudioSendStream::Config::ToString() const { - rtc::StringBuilder ss; + StringBuilder ss; ss << "{rtp: " << rtp.ToString(); ss << ", rtcp_report_interval_ms: " << rtcp_report_interval_ms; ss << ", send_transport: " << (send_transport ? "(Transport)" : "null"); @@ -52,7 +52,7 @@ AudioSendStream::Config::Rtp::~Rtp() = default; std::string AudioSendStream::Config::Rtp::ToString() const { char buf[1024]; - rtc::SimpleStringBuilder ss(buf); + SimpleStringBuilder ss(buf); ss << "{ssrc: " << ssrc; if (!rid.empty()) { ss << ", rid: " << rid; @@ -82,7 +82,7 @@ AudioSendStream::Config::SendCodecSpec::~SendCodecSpec() = default; std::string AudioSendStream::Config::SendCodecSpec::ToString() const { char buf[1024]; - rtc::SimpleStringBuilder ss(buf); + SimpleStringBuilder ss(buf); ss << "{nack_enabled: " << (nack_enabled ? "true" : "false"); ss << ", enable_non_sender_rtt: " << (enable_non_sender_rtt ? "true" : "false"); diff --git a/call/call.cc b/call/call.cc index 894e977262..8dd70a5aee 100644 --- a/call/call.cc +++ b/call/call.cc @@ -516,7 +516,7 @@ class Call final : public webrtc::Call, std::string Call::Stats::ToString(int64_t time_ms) const { char buf[1024]; - rtc::SimpleStringBuilder ss(buf); + SimpleStringBuilder ss(buf); ss << "Call stats: " << time_ms << ", {"; ss << "send_bw_bps: " << send_bandwidth_bps << ", "; ss << "recv_bw_bps: " << recv_bandwidth_bps << ", "; diff --git a/call/flexfec_receive_stream_impl.cc b/call/flexfec_receive_stream_impl.cc index bb4122a83f..2158e5775b 100644 --- a/call/flexfec_receive_stream_impl.cc +++ b/call/flexfec_receive_stream_impl.cc @@ -31,7 +31,7 @@ namespace webrtc { std::string FlexfecReceiveStream::Config::ToString() const { char buf[1024]; - rtc::SimpleStringBuilder ss(buf); + SimpleStringBuilder ss(buf); ss << "{payload_type: " << payload_type; ss << ", remote_ssrc: " << rtp.remote_ssrc; ss << ", local_ssrc: " << rtp.local_ssrc; diff --git a/call/rtp_config.cc b/call/rtp_config.cc index 02cc0f40b1..453607f3bc 100644 --- a/call/rtp_config.cc +++ b/call/rtp_config.cc @@ -48,7 +48,7 @@ std::string LntfConfig::ToString() const { std::string NackConfig::ToString() const { char buf[1024]; - rtc::SimpleStringBuilder ss(buf); + SimpleStringBuilder ss(buf); ss << "{rtp_history_ms: " << rtp_history_ms; ss << '}'; return ss.str(); @@ -56,7 +56,7 @@ std::string NackConfig::ToString() const { std::string UlpfecConfig::ToString() const { char buf[1024]; - rtc::SimpleStringBuilder ss(buf); + SimpleStringBuilder ss(buf); ss << "{ulpfec_payload_type: " << ulpfec_payload_type; ss << ", red_payload_type: " << red_payload_type; ss << ", red_rtx_payload_type: " << red_rtx_payload_type; @@ -72,7 +72,7 @@ bool UlpfecConfig::operator==(const UlpfecConfig& other) const { std::string RtpStreamConfig::ToString() const { char buf[1024]; - rtc::SimpleStringBuilder ss(buf); + SimpleStringBuilder ss(buf); ss << "{ssrc: " << ssrc; ss << ", rid: " << rid; ss << ", payload_name: " << payload_name; @@ -87,7 +87,7 @@ std::string RtpStreamConfig::ToString() const { std::string RtpStreamConfig::Rtx::ToString() const { char buf[1024]; - rtc::SimpleStringBuilder ss(buf); + SimpleStringBuilder ss(buf); ss << "{ssrc: " << ssrc; ss << ", payload_type: " << payload_type; ss << '}'; @@ -104,7 +104,7 @@ RtpConfig::Flexfec::~Flexfec() = default; std::string RtpConfig::ToString() const { char buf[2 * 1024]; - rtc::SimpleStringBuilder ss(buf); + SimpleStringBuilder ss(buf); ss << "{ssrcs: ["; for (size_t i = 0; i < ssrcs.size(); ++i) { ss << ssrcs[i]; @@ -168,7 +168,7 @@ RtpConfig::Rtx::~Rtx() = default; std::string RtpConfig::Rtx::ToString() const { char buf[1024]; - rtc::SimpleStringBuilder ss(buf); + SimpleStringBuilder ss(buf); ss << "{ssrcs: ["; for (size_t i = 0; i < ssrcs.size(); ++i) { ss << ssrcs[i]; diff --git a/call/rtp_demuxer.cc b/call/rtp_demuxer.cc index 5dce864e7a..b27661aced 100644 --- a/call/rtp_demuxer.cc +++ b/call/rtp_demuxer.cc @@ -70,7 +70,7 @@ bool RtpDemuxerCriteria::operator!=(const RtpDemuxerCriteria& other) const { } std::string RtpDemuxerCriteria::ToString() const { - rtc::StringBuilder sb; + StringBuilder sb; sb << "{mid: " << (mid_.empty() ? "" : mid_) << ", rsid: " << (rsid_.empty() ? "" : rsid_) << ", ssrcs: ["; @@ -90,7 +90,7 @@ std::string RtpDemuxerCriteria::ToString() const { // static std::string RtpDemuxer::DescribePacket(const RtpPacketReceived& packet) { - rtc::StringBuilder sb; + StringBuilder sb; sb << "PT=" << packet.PayloadType() << " SSRC=" << packet.Ssrc(); std::string mid; if (packet.GetExtension(&mid)) { diff --git a/call/video_receive_stream.cc b/call/video_receive_stream.cc index c03b053113..3bfb35297f 100644 --- a/call/video_receive_stream.cc +++ b/call/video_receive_stream.cc @@ -37,7 +37,7 @@ bool VideoReceiveStreamInterface::Decoder::operator==( std::string VideoReceiveStreamInterface::Decoder::ToString() const { char buf[1024]; - rtc::SimpleStringBuilder ss(buf); + SimpleStringBuilder ss(buf); ss << "{payload_type: " << payload_type; ss << ", payload_name: " << video_format.name; ss << ", codec_params: {"; @@ -60,7 +60,7 @@ VideoReceiveStreamInterface::Stats::~Stats() = default; std::string VideoReceiveStreamInterface::Stats::ToString( int64_t time_ms) const { char buf[2048]; - rtc::SimpleStringBuilder ss(buf); + SimpleStringBuilder ss(buf); ss << "VideoReceiveStreamInterface stats: " << time_ms << ", {ssrc: " << ssrc << ", "; ss << "total_bps: " << total_bitrate_bps << ", "; @@ -120,7 +120,7 @@ VideoReceiveStreamInterface::Config::Config::~Config() = default; std::string VideoReceiveStreamInterface::Config::ToString() const { char buf[4 * 1024]; - rtc::SimpleStringBuilder ss(buf); + SimpleStringBuilder ss(buf); ss << "{decoders: ["; for (size_t i = 0; i < decoders.size(); ++i) { ss << decoders[i].ToString(); @@ -144,7 +144,7 @@ VideoReceiveStreamInterface::Config::Rtp::~Rtp() = default; std::string VideoReceiveStreamInterface::Config::Rtp::ToString() const { char buf[2 * 1024]; - rtc::SimpleStringBuilder ss(buf); + SimpleStringBuilder ss(buf); ss << "{remote_ssrc: " << remote_ssrc; ss << ", local_ssrc: " << local_ssrc; ss << ", rtcp_mode: " diff --git a/call/video_send_stream.cc b/call/video_send_stream.cc index 5f8694cfd1..79a911c828 100644 --- a/call/video_send_stream.cc +++ b/call/video_send_stream.cc @@ -43,7 +43,7 @@ VideoSendStream::StreamStats::~StreamStats() = default; std::string VideoSendStream::StreamStats::ToString() const { char buf[1024]; - rtc::SimpleStringBuilder ss(buf); + SimpleStringBuilder ss(buf); ss << "type: " << StreamTypeToString(type); if (referenced_media_ssrc.has_value()) ss << " (for: " << referenced_media_ssrc.value() << ")"; @@ -72,7 +72,7 @@ VideoSendStream::Stats::~Stats() = default; std::string VideoSendStream::Stats::ToString(int64_t time_ms) const { char buf[2048]; - rtc::SimpleStringBuilder ss(buf); + SimpleStringBuilder ss(buf); ss << "VideoSendStream stats: " << time_ms << ", {"; ss << "input_fps: " << StringFormat("%.1f", input_frame_rate) << ", "; ss << "encode_fps: " << encode_frame_rate << ", "; @@ -114,7 +114,7 @@ VideoSendStream::Config::Config::~Config() = default; std::string VideoSendStream::Config::ToString() const { char buf[2 * 1024]; - rtc::SimpleStringBuilder ss(buf); + SimpleStringBuilder ss(buf); ss << "{encoder_settings: { experiment_cpu_load_estimator: " << (encoder_settings.experiment_cpu_load_estimator ? "on" : "off") << "}}"; ss << ", rtp: " << rtp.ToString(); diff --git a/common_audio/resampler/resampler_unittest.cc b/common_audio/resampler/resampler_unittest.cc index 1b90d3e30b..407e29be0c 100644 --- a/common_audio/resampler/resampler_unittest.cc +++ b/common_audio/resampler/resampler_unittest.cc @@ -66,7 +66,7 @@ void ResamplerTest::TearDown() {} void ResamplerTest::ResetIfNeededAndPush(int in_rate, int out_rate, int num_channels) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Input rate: " << in_rate << ", output rate: " << out_rate << ", channel count: " << num_channels; SCOPED_TRACE(ss.str()); @@ -92,7 +92,7 @@ TEST_F(ResamplerTest, Reset) { for (size_t i = 0; i < kRatesSize; ++i) { for (size_t j = 0; j < kRatesSize; ++j) { for (size_t k = 0; k < kNumChannelsSize; ++k) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Input rate: " << kRates[i] << ", output rate: " << kRates[j] << ", channels: " << kNumChannels[k]; SCOPED_TRACE(ss.str()); @@ -111,7 +111,7 @@ TEST_F(ResamplerTest, Mono) { const int kChannels = 1; for (size_t i = 0; i < kRatesSize; ++i) { for (size_t j = 0; j < kRatesSize; ++j) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Input rate: " << kRates[i] << ", output rate: " << kRates[j]; SCOPED_TRACE(ss.str()); @@ -133,7 +133,7 @@ TEST_F(ResamplerTest, Stereo) { const int kChannels = 2; for (size_t i = 0; i < kRatesSize; ++i) { for (size_t j = 0; j < kRatesSize; ++j) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Input rate: " << kRates[i] << ", output rate: " << kRates[j]; SCOPED_TRACE(ss.str()); diff --git a/common_audio/signal_processing/signal_processing_unittest.cc b/common_audio/signal_processing/signal_processing_unittest.cc index 855b9808d1..d667d2d9d3 100644 --- a/common_audio/signal_processing/signal_processing_unittest.cc +++ b/common_audio/signal_processing/signal_processing_unittest.cc @@ -128,7 +128,7 @@ TEST(SplTest, AddSubSatW32) { INT32_MIN, std::min(INT32_MAX, static_cast(a) + b)); const int64_t diff = std::max( INT32_MIN, std::min(INT32_MAX, static_cast(a) - b)); - rtc::StringBuilder ss; + webrtc::StringBuilder ss; ss << a << " +/- " << b << ": sum " << sum << ", diff " << diff; SCOPED_TRACE(ss.str()); EXPECT_EQ(sum, WebRtcSpl_AddSatW32(a, b)); diff --git a/media/engine/simulcast_encoder_adapter.cc b/media/engine/simulcast_encoder_adapter.cc index f0d7bf9fd1..51022c359a 100644 --- a/media/engine/simulcast_encoder_adapter.cc +++ b/media/engine/simulcast_encoder_adapter.cc @@ -1005,7 +1005,7 @@ VideoEncoder::EncoderInfo SimulcastEncoderAdapter::GetEncoderInfo() const { } if (!encoder_names.empty()) { - rtc::StringBuilder implementation_name_builder(" ("); + StringBuilder implementation_name_builder(" ("); implementation_name_builder << StrJoin(encoder_names, ", "); implementation_name_builder << ")"; encoder_info.implementation_name += implementation_name_builder.Release(); diff --git a/media/sctp/dcsctp_transport.cc b/media/sctp/dcsctp_transport.cc index f33bf82d21..3422b313ba 100644 --- a/media/sctp/dcsctp_transport.cc +++ b/media/sctp/dcsctp_transport.cc @@ -158,7 +158,7 @@ DcSctpTransport::DcSctpTransport( }) { RTC_DCHECK_RUN_ON(network_thread_); static std::atomic instance_count = 0; - rtc::StringBuilder sb; + StringBuilder sb; sb << debug_name_ << instance_count++; debug_name_ = sb.Release(); ConnectTransportSignals(); diff --git a/modules/audio_coding/neteq/buffer_level_filter_unittest.cc b/modules/audio_coding/neteq/buffer_level_filter_unittest.cc index 6773e96f58..28452d6b62 100644 --- a/modules/audio_coding/neteq/buffer_level_filter_unittest.cc +++ b/modules/audio_coding/neteq/buffer_level_filter_unittest.cc @@ -31,7 +31,7 @@ TEST(BufferLevelFilter, ConvergenceTest) { for (int value = 100; value <= 200; value += 10) { filter.Reset(); filter.SetTargetBufferLevel(20); // Makes filter coefficient 251/256. - rtc::StringBuilder ss; + StringBuilder ss; ss << "times = " << times << ", value = " << value; SCOPED_TRACE(ss.str()); // Print out the parameter values on failure. for (int i = 0; i < times; ++i) { diff --git a/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc b/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc index e843706dd3..989fe05a11 100644 --- a/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc +++ b/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc @@ -34,7 +34,7 @@ class DtmfToneGeneratorTest : public ::testing::Test { AudioMultiVector signal(channels); for (int event = 0; event <= 15; ++event) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Checking event " << event << " at sample rate " << fs_hz; SCOPED_TRACE(ss.str()); const int kAttenuation = 0; @@ -73,7 +73,7 @@ class DtmfToneGeneratorTest : public ::testing::Test { EXPECT_EQ(kNumSamples, tone_gen_.Generate(kNumSamples, &ref_signal)); // Test every 5 steps (to save time). for (int attenuation = 1; attenuation <= 63; attenuation += 5) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Checking event " << event << " at sample rate " << fs_hz; ss << "; attenuation " << attenuation; SCOPED_TRACE(ss.str()); diff --git a/modules/audio_coding/neteq/neteq_stereo_unittest.cc b/modules/audio_coding/neteq/neteq_stereo_unittest.cc index a7c9d99c6f..22e7b1d80d 100644 --- a/modules/audio_coding/neteq/neteq_stereo_unittest.cc +++ b/modules/audio_coding/neteq/neteq_stereo_unittest.cc @@ -198,7 +198,7 @@ class NetEqStereoTest : public ::testing::TestWithParam { EXPECT_EQ(num_channels_, output_multi_channel_.num_channels_); EXPECT_EQ(output_size_samples_, output_multi_channel_.samples_per_channel_); - rtc::StringBuilder ss; + StringBuilder ss; ss << "Lap number " << k << "."; SCOPED_TRACE(ss.str()); // Print out the parameter values on failure. // Compare mono and multi-channel. diff --git a/modules/audio_coding/neteq/neteq_unittest.cc b/modules/audio_coding/neteq/neteq_unittest.cc index 0d204d9e23..5557151e5f 100644 --- a/modules/audio_coding/neteq/neteq_unittest.cc +++ b/modules/audio_coding/neteq/neteq_unittest.cc @@ -261,7 +261,7 @@ TEST_F(NetEqDecodingTest, MAYBE_DecoderError) { static const int kExpectedOutputLength = 160; // 10 ms at 16 kHz sample rate. const int16_t* const_out_frame_data = out_frame_.data(); for (int i = 0; i < kExpectedOutputLength; ++i) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "i = " << i; SCOPED_TRACE(ss.str()); // Print out the parameter values on failure. EXPECT_EQ(0, const_out_frame_data[i]); @@ -283,7 +283,7 @@ TEST_F(NetEqDecodingTest, GetAudioBeforeInsertPacket) { kInitSampleRateHz / 100; // 10 ms at initial sample rate. const int16_t* const_out_frame_data = out_frame_.data(); for (int i = 0; i < kExpectedOutputLength; ++i) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "i = " << i; SCOPED_TRACE(ss.str()); // Print out the parameter values on failure. EXPECT_EQ(0, const_out_frame_data[i]); @@ -799,7 +799,7 @@ TEST_F(NetEqDecodingTestTwoInstances, CompareMutedStateOnOff) { AudioFrame out_frame1, out_frame2; bool muted; for (int i = 0; i < 1000; ++i) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "i = " << i; SCOPED_TRACE(ss.str()); // Print out the loop iterator on failure. EXPECT_EQ(0, neteq_->GetAudio(&out_frame1, &muted)); @@ -825,7 +825,7 @@ TEST_F(NetEqDecodingTestTwoInstances, CompareMutedStateOnOff) { int counter = 0; while (out_frame1.speech_type_ != AudioFrame::kNormalSpeech) { ASSERT_LT(counter++, 1000) << "Test timed out"; - rtc::StringBuilder ss; + StringBuilder ss; ss << "counter = " << counter; SCOPED_TRACE(ss.str()); // Print out the loop iterator on failure. EXPECT_EQ(0, neteq_->GetAudio(&out_frame1, &muted)); diff --git a/modules/audio_coding/neteq/test/neteq_decoding_test.cc b/modules/audio_coding/neteq/test/neteq_decoding_test.cc index 56d2895c7e..50bfd4ba9b 100644 --- a/modules/audio_coding/neteq/test/neteq_decoding_test.cc +++ b/modules/audio_coding/neteq/test/neteq_decoding_test.cc @@ -154,7 +154,7 @@ void NetEqDecodingTest::DecodeAndCompare( uint64_t last_concealed_samples = 0; uint64_t last_total_samples_received = 0; while (packet_) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Lap number " << i++ << " in DecodeAndCompare while loop"; SCOPED_TRACE(ss.str()); // Print out the parameter values on failure. ASSERT_NO_FATAL_FAILURE(Process()); diff --git a/modules/audio_coding/neteq/tools/neteq_input.cc b/modules/audio_coding/neteq/tools/neteq_input.cc index 2bcc59bfb0..707ce1b4c8 100644 --- a/modules/audio_coding/neteq/tools/neteq_input.cc +++ b/modules/audio_coding/neteq/tools/neteq_input.cc @@ -19,7 +19,7 @@ NetEqInput::PacketData::PacketData() = default; NetEqInput::PacketData::~PacketData() = default; std::string NetEqInput::PacketData::ToString() const { - rtc::StringBuilder ss; + StringBuilder ss; ss << "{" "time_ms: " << static_cast(time_ms) diff --git a/modules/audio_coding/neteq/tools/neteq_rtpplay.cc b/modules/audio_coding/neteq/tools/neteq_rtpplay.cc index eb7075737b..a05e1b360e 100644 --- a/modules/audio_coding/neteq/tools/neteq_rtpplay.cc +++ b/modules/audio_coding/neteq/tools/neteq_rtpplay.cc @@ -285,13 +285,13 @@ std::optional CreateOptionalOutputFileName( } if (!basename.empty()) { // Override the automatic assignment. - rtc::StringBuilder sb(basename); + webrtc::StringBuilder sb(basename); sb << suffix; return sb.str(); } if (!output_audio_filename.empty()) { // Automatically assign name. - rtc::StringBuilder sb(output_audio_filename); + webrtc::StringBuilder sb(output_audio_filename); sb << suffix; return sb.str(); } diff --git a/modules/audio_coding/neteq/tools/neteq_stats_getter.cc b/modules/audio_coding/neteq/tools/neteq_stats_getter.cc index 6738e494f6..dc421f7454 100644 --- a/modules/audio_coding/neteq/tools/neteq_stats_getter.cc +++ b/modules/audio_coding/neteq/tools/neteq_stats_getter.cc @@ -23,7 +23,7 @@ namespace test { std::string NetEqStatsGetter::ConcealmentEvent::ToString() const { char ss_buf[256]; - rtc::SimpleStringBuilder ss(ss_buf); + SimpleStringBuilder ss(ss_buf); ss << "ConcealmentEvent duration_ms:" << duration_ms << " event_number:" << concealment_event_number << " time_from_previous_event_end_ms:" << time_from_previous_event_end_ms; diff --git a/modules/audio_coding/test/Channel.cc b/modules/audio_coding/test/Channel.cc index 3879bde167..c5521fc047 100644 --- a/modules/audio_coding/test/Channel.cc +++ b/modules/audio_coding/test/Channel.cc @@ -219,7 +219,7 @@ Channel::Channel(int16_t chID) } if (chID >= 0) { _saveBitStream = true; - rtc::StringBuilder ss; + StringBuilder ss; ss.AppendFormat("bitStream_%d.dat", chID); _bitStreamFile = fopen(ss.str().c_str(), "wb"); } else { diff --git a/modules/audio_coding/test/EncodeDecodeTest.cc b/modules/audio_coding/test/EncodeDecodeTest.cc index 42ea935643..03b90d744c 100644 --- a/modules/audio_coding/test/EncodeDecodeTest.cc +++ b/modules/audio_coding/test/EncodeDecodeTest.cc @@ -136,7 +136,7 @@ void Receiver::Setup(NetEq* neteq, int playSampFreq; std::string file_name; - rtc::StringBuilder file_stream; + StringBuilder file_stream; file_stream << webrtc::test::OutputPath() << out_file_name << file_num << ".pcm"; file_name = file_stream.str(); diff --git a/modules/audio_coding/test/PacketLossTest.cc b/modules/audio_coding/test/PacketLossTest.cc index de29ce5f01..a6c393ac6d 100644 --- a/modules/audio_coding/test/PacketLossTest.cc +++ b/modules/audio_coding/test/PacketLossTest.cc @@ -41,7 +41,7 @@ void ReceiverWithPacketLoss::Setup(NetEq* neteq, loss_rate_ = loss_rate; burst_length_ = burst_length; burst_lost_counter_ = burst_length_; // To prevent first packet gets lost. - rtc::StringBuilder ss; + StringBuilder ss; ss << out_file_name << "_" << loss_rate_ << "_" << burst_length_ << "_"; Receiver::Setup(neteq, rtpStream, ss.str(), channels, file_num); } diff --git a/modules/audio_coding/test/TestAllCodecs.cc b/modules/audio_coding/test/TestAllCodecs.cc index 0c56e6da7d..0771238e0e 100644 --- a/modules/audio_coding/test/TestAllCodecs.cc +++ b/modules/audio_coding/test/TestAllCodecs.cc @@ -373,7 +373,7 @@ void TestAllCodecs::Run(TestPack* channel) { void TestAllCodecs::OpenOutFile(int test_number) { std::string filename = webrtc::test::OutputPath(); - rtc::StringBuilder test_number_str; + StringBuilder test_number_str; test_number_str << test_number; filename += "testallcodecs_out_"; filename += test_number_str.str(); diff --git a/modules/audio_coding/test/TestRedFec.cc b/modules/audio_coding/test/TestRedFec.cc index 9a5b543a0f..1900c905fc 100644 --- a/modules/audio_coding/test/TestRedFec.cc +++ b/modules/audio_coding/test/TestRedFec.cc @@ -192,7 +192,7 @@ void TestRedFec::Run() { void TestRedFec::OpenOutFile(int16_t test_number) { std::string file_name; - rtc::StringBuilder file_stream; + StringBuilder file_stream; file_stream << webrtc::test::OutputPath(); file_stream << "TestRedFec_outFile_"; file_stream << test_number << ".pcm"; diff --git a/modules/audio_coding/test/TestStereo.cc b/modules/audio_coding/test/TestStereo.cc index 1b294764c0..24e3ee707a 100644 --- a/modules/audio_coding/test/TestStereo.cc +++ b/modules/audio_coding/test/TestStereo.cc @@ -603,7 +603,7 @@ void TestStereo::Run(TestPackStereo* channel, void TestStereo::OpenOutFile(int16_t test_number) { std::string file_name; - rtc::StringBuilder file_stream; + StringBuilder file_stream; file_stream << webrtc::test::OutputPath() << "teststereo_out_" << test_number << ".pcm"; file_name = file_stream.str(); diff --git a/modules/audio_coding/test/TestVADDTX.cc b/modules/audio_coding/test/TestVADDTX.cc index 3be24d6ac2..d03f1aed49 100644 --- a/modules/audio_coding/test/TestVADDTX.cc +++ b/modules/audio_coding/test/TestVADDTX.cc @@ -205,7 +205,7 @@ void TestWebRtcVadDtx::Test(bool new_outfile, bool expect_dtx_enabled) { if (new_outfile) { output_file_num_++; } - rtc::StringBuilder out_filename; + StringBuilder out_filename; out_filename << webrtc::test::OutputPath() << "testWebRtcVadDtx_outFile_" << output_file_num_ << ".pcm"; Run(webrtc::test::ResourcePath("audio_coding/testfile32kHz", "pcm"), 32000, 1, diff --git a/modules/audio_mixer/audio_mixer_impl_unittest.cc b/modules/audio_mixer/audio_mixer_impl_unittest.cc index 2b8a6209d0..f5116351a7 100644 --- a/modules/audio_mixer/audio_mixer_impl_unittest.cc +++ b/modules/audio_mixer/audio_mixer_impl_unittest.cc @@ -61,7 +61,7 @@ void ResetFrame(AudioFrame* frame) { std::string ProduceDebugText(int sample_rate_hz, int number_of_channels, int number_of_sources) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Sample rate: " << sample_rate_hz << " "; ss << "Number of channels: " << number_of_channels << " "; ss << "Number of sources: " << number_of_sources; diff --git a/modules/audio_mixer/audio_mixer_test.cc b/modules/audio_mixer/audio_mixer_test.cc index 3ee28a7937..245d9c5f86 100644 --- a/modules/audio_mixer/audio_mixer_test.cc +++ b/modules/audio_mixer/audio_mixer_test.cc @@ -78,7 +78,7 @@ class FilePlayingSource : public AudioMixer::Source { bool FileHasEnded() const { return file_has_ended_; } std::string ToString() const { - rtc::StringBuilder ss; + StringBuilder ss; ss << "{rate: " << sample_rate_hz_ << ", channels: " << number_of_channels_ << ", samples_tot: " << wav_reader_->num_samples() << "}"; return ss.Release(); diff --git a/modules/audio_mixer/frame_combiner_unittest.cc b/modules/audio_mixer/frame_combiner_unittest.cc index 4218f4e68a..15556cd7ce 100644 --- a/modules/audio_mixer/frame_combiner_unittest.cc +++ b/modules/audio_mixer/frame_combiner_unittest.cc @@ -48,7 +48,7 @@ struct FrameCombinerConfig { std::string ProduceDebugText(int sample_rate_hz, int number_of_channels, int number_of_sources) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Sample rate: " << sample_rate_hz << " ,"; ss << "number of channels: " << number_of_channels << " ,"; ss << "number of sources: " << number_of_sources; @@ -56,7 +56,7 @@ std::string ProduceDebugText(int sample_rate_hz, } std::string ProduceDebugText(const FrameCombinerConfig& config) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Sample rate: " << config.sample_rate_hz << " ,"; ss << "number of channels: " << config.number_of_channels << " ,"; ss << "limiter active: " << (config.use_limiter ? "on" : "off") << " ,"; diff --git a/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc b/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc index 7ea72b384e..bc631b1ce8 100644 --- a/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc +++ b/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc @@ -44,7 +44,7 @@ namespace aec3 { namespace { std::string ProduceDebugText(size_t num_render_channels, size_t delay) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "delay: " << delay << ", "; ss << "num_render_channels:" << num_render_channels; return ss.Release(); diff --git a/modules/audio_processing/aec3/alignment_mixer_unittest.cc b/modules/audio_processing/aec3/alignment_mixer_unittest.cc index eaf6dcb235..ef2abee9ff 100644 --- a/modules/audio_processing/aec3/alignment_mixer_unittest.cc +++ b/modules/audio_processing/aec3/alignment_mixer_unittest.cc @@ -28,7 +28,7 @@ std::string ProduceDebugText(bool initial_silence, bool prefer_first_two_channels, int num_channels, int strongest_ch) { - rtc::StringBuilder ss; + StringBuilder ss; ss << ", Initial silence: " << initial_silence; ss << ", Huge activity threshold: " << huge_activity_threshold; ss << ", Prefer first two channels: " << prefer_first_two_channels; diff --git a/modules/audio_processing/aec3/block_delay_buffer_unittest.cc b/modules/audio_processing/aec3/block_delay_buffer_unittest.cc index 011ab49651..f12508485d 100644 --- a/modules/audio_processing/aec3/block_delay_buffer_unittest.cc +++ b/modules/audio_processing/aec3/block_delay_buffer_unittest.cc @@ -39,7 +39,7 @@ void PopulateInputFrame(size_t frame_length, std::string ProduceDebugText(int sample_rate_hz, size_t delay) { char log_stream_buffer[8 * 1024]; - rtc::SimpleStringBuilder ss(log_stream_buffer); + SimpleStringBuilder ss(log_stream_buffer); ss << "Sample rate: " << sample_rate_hz; ss << ", Delay: " << delay; return ss.str(); diff --git a/modules/audio_processing/aec3/block_framer_unittest.cc b/modules/audio_processing/aec3/block_framer_unittest.cc index 9439623f72..a86a69021d 100644 --- a/modules/audio_processing/aec3/block_framer_unittest.cc +++ b/modules/audio_processing/aec3/block_framer_unittest.cc @@ -188,7 +188,7 @@ void RunWronglyInsertOrderTest(int sample_rate_hz, #endif std::string ProduceDebugText(int sample_rate_hz, size_t num_channels) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Sample rate: " << sample_rate_hz; ss << ", number of channels: " << num_channels; return ss.Release(); diff --git a/modules/audio_processing/aec3/block_processor_unittest.cc b/modules/audio_processing/aec3/block_processor_unittest.cc index d01a3bd14b..b2630bf5e1 100644 --- a/modules/audio_processing/aec3/block_processor_unittest.cc +++ b/modules/audio_processing/aec3/block_processor_unittest.cc @@ -104,7 +104,7 @@ void RunCaptureNumBandsVerificationTest(const Environment& env, #endif std::string ProduceDebugText(int sample_rate_hz) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Sample rate: " << sample_rate_hz; return ss.Release(); } diff --git a/modules/audio_processing/aec3/coarse_filter_update_gain_unittest.cc b/modules/audio_processing/aec3/coarse_filter_update_gain_unittest.cc index 55b79bb812..0a54c9d5b4 100644 --- a/modules/audio_processing/aec3/coarse_filter_update_gain_unittest.cc +++ b/modules/audio_processing/aec3/coarse_filter_update_gain_unittest.cc @@ -118,13 +118,13 @@ void RunFilterUpdateTest(int num_blocks_to_process, } std::string ProduceDebugText(int filter_length_blocks) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Length: " << filter_length_blocks; return ss.Release(); } std::string ProduceDebugText(size_t delay, int filter_length_blocks) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Delay: " << delay << ", "; ss << ProduceDebugText(filter_length_blocks); return ss.Release(); diff --git a/modules/audio_processing/aec3/decimator_unittest.cc b/modules/audio_processing/aec3/decimator_unittest.cc index e6f5ea0403..e2400ac01f 100644 --- a/modules/audio_processing/aec3/decimator_unittest.cc +++ b/modules/audio_processing/aec3/decimator_unittest.cc @@ -29,7 +29,7 @@ namespace webrtc { namespace { std::string ProduceDebugText(int sample_rate_hz) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Sample rate: " << sample_rate_hz; return ss.Release(); } diff --git a/modules/audio_processing/aec3/echo_canceller3_unittest.cc b/modules/audio_processing/aec3/echo_canceller3_unittest.cc index 29a2962604..b8fc9fa9ac 100644 --- a/modules/audio_processing/aec3/echo_canceller3_unittest.cc +++ b/modules/audio_processing/aec3/echo_canceller3_unittest.cc @@ -176,13 +176,13 @@ class RenderTransportVerificationProcessor : public BlockProcessor { }; std::string ProduceDebugText(int sample_rate_hz) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Sample rate: " << sample_rate_hz; return ss.Release(); } std::string ProduceDebugText(int sample_rate_hz, int variant) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Sample rate: " << sample_rate_hz << ", variant: " << variant; return ss.Release(); } diff --git a/modules/audio_processing/aec3/echo_path_delay_estimator_unittest.cc b/modules/audio_processing/aec3/echo_path_delay_estimator_unittest.cc index 4b8fdc9716..8a105041e0 100644 --- a/modules/audio_processing/aec3/echo_path_delay_estimator_unittest.cc +++ b/modules/audio_processing/aec3/echo_path_delay_estimator_unittest.cc @@ -26,7 +26,7 @@ namespace webrtc { namespace { std::string ProduceDebugText(size_t delay, size_t down_sampling_factor) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Delay: " << delay; ss << ", Down sampling factor: " << down_sampling_factor; return ss.Release(); diff --git a/modules/audio_processing/aec3/echo_remover_unittest.cc b/modules/audio_processing/aec3/echo_remover_unittest.cc index 0ed342e67a..fb2eb78d2b 100644 --- a/modules/audio_processing/aec3/echo_remover_unittest.cc +++ b/modules/audio_processing/aec3/echo_remover_unittest.cc @@ -29,13 +29,13 @@ namespace webrtc { namespace { std::string ProduceDebugText(int sample_rate_hz) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Sample rate: " << sample_rate_hz; return ss.Release(); } std::string ProduceDebugText(int sample_rate_hz, int delay) { - rtc::StringBuilder ss(ProduceDebugText(sample_rate_hz)); + StringBuilder ss(ProduceDebugText(sample_rate_hz)); ss << ", Delay: " << delay; return ss.Release(); } diff --git a/modules/audio_processing/aec3/erl_estimator_unittest.cc b/modules/audio_processing/aec3/erl_estimator_unittest.cc index 79e5465e3c..4bb07c3ccc 100644 --- a/modules/audio_processing/aec3/erl_estimator_unittest.cc +++ b/modules/audio_processing/aec3/erl_estimator_unittest.cc @@ -18,7 +18,7 @@ namespace webrtc { namespace { std::string ProduceDebugText(size_t num_render_channels, size_t num_capture_channels) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Render channels: " << num_render_channels; ss << ", Capture channels: " << num_capture_channels; return ss.Release(); diff --git a/modules/audio_processing/aec3/frame_blocker_unittest.cc b/modules/audio_processing/aec3/frame_blocker_unittest.cc index 92e393023a..69c3fe3c92 100644 --- a/modules/audio_processing/aec3/frame_blocker_unittest.cc +++ b/modules/audio_processing/aec3/frame_blocker_unittest.cc @@ -260,7 +260,7 @@ void RunWrongExtractOrderTest(int sample_rate_hz, #endif std::string ProduceDebugText(int sample_rate_hz, size_t num_channels) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Sample rate: " << sample_rate_hz; ss << ", number of channels: " << num_channels; return ss.Release(); diff --git a/modules/audio_processing/aec3/matched_filter_unittest.cc b/modules/audio_processing/aec3/matched_filter_unittest.cc index 299fa5e7c6..5abdcb47e4 100644 --- a/modules/audio_processing/aec3/matched_filter_unittest.cc +++ b/modules/audio_processing/aec3/matched_filter_unittest.cc @@ -35,7 +35,7 @@ namespace aec3 { namespace { std::string ProduceDebugText(size_t delay, size_t down_sampling_factor) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Delay: " << delay; ss << ", Down sampling factor: " << down_sampling_factor; return ss.Release(); diff --git a/modules/audio_processing/aec3/refined_filter_update_gain_unittest.cc b/modules/audio_processing/aec3/refined_filter_update_gain_unittest.cc index e770a7e1a4..43f3f0bf20 100644 --- a/modules/audio_processing/aec3/refined_filter_update_gain_unittest.cc +++ b/modules/audio_processing/aec3/refined_filter_update_gain_unittest.cc @@ -219,13 +219,13 @@ void RunFilterUpdateTest(const Environment& env, } std::string ProduceDebugText(int filter_length_blocks) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Length: " << filter_length_blocks; return ss.Release(); } std::string ProduceDebugText(size_t delay, int filter_length_blocks) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Delay: " << delay << ", "; ss << ProduceDebugText(filter_length_blocks); return ss.Release(); diff --git a/modules/audio_processing/aec3/render_delay_buffer_unittest.cc b/modules/audio_processing/aec3/render_delay_buffer_unittest.cc index d51e06a1ac..e46a69abf0 100644 --- a/modules/audio_processing/aec3/render_delay_buffer_unittest.cc +++ b/modules/audio_processing/aec3/render_delay_buffer_unittest.cc @@ -25,7 +25,7 @@ namespace webrtc { namespace { std::string ProduceDebugText(int sample_rate_hz) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Sample rate: " << sample_rate_hz; return ss.Release(); } diff --git a/modules/audio_processing/aec3/render_delay_controller_unittest.cc b/modules/audio_processing/aec3/render_delay_controller_unittest.cc index adb5344cb4..a3c308e39c 100644 --- a/modules/audio_processing/aec3/render_delay_controller_unittest.cc +++ b/modules/audio_processing/aec3/render_delay_controller_unittest.cc @@ -29,7 +29,7 @@ namespace webrtc { namespace { std::string ProduceDebugText(int sample_rate_hz) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Sample rate: " << sample_rate_hz; return ss.Release(); } @@ -38,7 +38,7 @@ std::string ProduceDebugText(int sample_rate_hz, size_t delay, size_t num_render_channels, size_t num_capture_channels) { - rtc::StringBuilder ss; + StringBuilder ss; ss << ProduceDebugText(sample_rate_hz) << ", Delay: " << delay << ", Num render channels: " << num_render_channels << ", Num capture channels: " << num_capture_channels; diff --git a/modules/audio_processing/aec3/render_signal_analyzer_unittest.cc b/modules/audio_processing/aec3/render_signal_analyzer_unittest.cc index ca428ba1b7..e51be2faac 100644 --- a/modules/audio_processing/aec3/render_signal_analyzer_unittest.cc +++ b/modules/audio_processing/aec3/render_signal_analyzer_unittest.cc @@ -107,7 +107,7 @@ void RunNarrowBandDetectionTest(size_t num_channels) { } std::string ProduceDebugText(size_t num_channels) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "number of channels: " << num_channels; return ss.Release(); } diff --git a/modules/audio_processing/aec3/subtractor_unittest.cc b/modules/audio_processing/aec3/subtractor_unittest.cc index 8ec3ba7b71..d3852917e5 100644 --- a/modules/audio_processing/aec3/subtractor_unittest.cc +++ b/modules/audio_processing/aec3/subtractor_unittest.cc @@ -179,7 +179,7 @@ std::string ProduceDebugText(size_t num_render_channels, size_t num_capture_channels, size_t delay, int filter_length_blocks) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "delay: " << delay << ", "; ss << "filter_length_blocks:" << filter_length_blocks << ", "; ss << "num_render_channels:" << num_render_channels << ", "; diff --git a/modules/audio_processing/agc/agc_manager_direct_unittest.cc b/modules/audio_processing/agc/agc_manager_direct_unittest.cc index d5b87bdde4..f9bb53a087 100644 --- a/modules/audio_processing/agc/agc_manager_direct_unittest.cc +++ b/modules/audio_processing/agc/agc_manager_direct_unittest.cc @@ -152,7 +152,7 @@ constexpr char kMinMicLevelFieldTrial[] = std::string GetAgcMinMicLevelExperimentFieldTrial(const std::string& value) { char field_trial_buffer[64]; - rtc::SimpleStringBuilder builder(field_trial_buffer); + SimpleStringBuilder builder(field_trial_buffer); builder << kMinMicLevelFieldTrial << "/" << value << "/"; return builder.str(); } @@ -163,7 +163,7 @@ std::string GetAgcMinMicLevelExperimentFieldTrialEnabled( RTC_DCHECK_GE(enabled_value, 0); RTC_DCHECK_LE(enabled_value, 255); char field_trial_buffer[64]; - rtc::SimpleStringBuilder builder(field_trial_buffer); + SimpleStringBuilder builder(field_trial_buffer); builder << kMinMicLevelFieldTrial << "/Enabled-" << enabled_value << suffix << "/"; return builder.str(); diff --git a/modules/audio_processing/agc2/cpu_features.cc b/modules/audio_processing/agc2/cpu_features.cc index cced7614bc..aa5a57834f 100644 --- a/modules/audio_processing/agc2/cpu_features.cc +++ b/modules/audio_processing/agc2/cpu_features.cc @@ -18,7 +18,7 @@ namespace webrtc { std::string AvailableCpuFeatures::ToString() const { char buf[64]; - rtc::SimpleStringBuilder builder(buf); + SimpleStringBuilder builder(buf); bool first = true; if (sse2) { builder << (first ? "SSE2" : "_SSE2"); diff --git a/modules/audio_processing/agc2/input_volume_stats_reporter.cc b/modules/audio_processing/agc2/input_volume_stats_reporter.cc index 05624b1f92..a0f33a7311 100644 --- a/modules/audio_processing/agc2/input_volume_stats_reporter.cc +++ b/modules/audio_processing/agc2/input_volume_stats_reporter.cc @@ -52,7 +52,7 @@ constexpr absl::string_view MetricNamePrefix( metrics::Histogram* CreateVolumeHistogram(InputVolumeType input_volume_type) { char buffer[64]; - rtc::SimpleStringBuilder builder(buffer); + SimpleStringBuilder builder(buffer); builder << MetricNamePrefix(input_volume_type) << "OnChange"; return metrics::HistogramFactoryGetCountsLinear(/*name=*/builder.str(), /*min=*/1, @@ -63,7 +63,7 @@ metrics::Histogram* CreateVolumeHistogram(InputVolumeType input_volume_type) { metrics::Histogram* CreateRateHistogram(InputVolumeType input_volume_type, absl::string_view name) { char buffer[64]; - rtc::SimpleStringBuilder builder(buffer); + SimpleStringBuilder builder(buffer); builder << MetricNamePrefix(input_volume_type) << name; return metrics::HistogramFactoryGetCountsLinear(/*name=*/builder.str(), /*min=*/1, @@ -74,7 +74,7 @@ metrics::Histogram* CreateRateHistogram(InputVolumeType input_volume_type, metrics::Histogram* CreateAverageHistogram(InputVolumeType input_volume_type, absl::string_view name) { char buffer[64]; - rtc::SimpleStringBuilder builder(buffer); + SimpleStringBuilder builder(buffer); builder << MetricNamePrefix(input_volume_type) << name; return metrics::HistogramFactoryGetCountsLinear(/*name=*/builder.str(), /*min=*/1, diff --git a/modules/audio_processing/agc2/input_volume_stats_reporter_unittest.cc b/modules/audio_processing/agc2/input_volume_stats_reporter_unittest.cc index e762c1fb59..5db063d53d 100644 --- a/modules/audio_processing/agc2/input_volume_stats_reporter_unittest.cc +++ b/modules/audio_processing/agc2/input_volume_stats_reporter_unittest.cc @@ -32,37 +32,33 @@ class InputVolumeStatsReporterTest protected: InputVolumeType InputVolumeType() const { return GetParam(); } std::string VolumeLabel() const { - return (rtc::StringBuilder(kLabelPrefix) << VolumeTypeLabel() << "OnChange") + return (StringBuilder(kLabelPrefix) << VolumeTypeLabel() << "OnChange") .str(); } std::string DecreaseRateLabel() const { - return (rtc::StringBuilder(kLabelPrefix) - << VolumeTypeLabel() << "DecreaseRate") + return (StringBuilder(kLabelPrefix) << VolumeTypeLabel() << "DecreaseRate") .str(); } std::string DecreaseAverageLabel() const { - return (rtc::StringBuilder(kLabelPrefix) + return (StringBuilder(kLabelPrefix) << VolumeTypeLabel() << "DecreaseAverage") .str(); } std::string IncreaseRateLabel() const { - return (rtc::StringBuilder(kLabelPrefix) - << VolumeTypeLabel() << "IncreaseRate") + return (StringBuilder(kLabelPrefix) << VolumeTypeLabel() << "IncreaseRate") .str(); } std::string IncreaseAverageLabel() const { - return (rtc::StringBuilder(kLabelPrefix) + return (StringBuilder(kLabelPrefix) << VolumeTypeLabel() << "IncreaseAverage") .str(); } std::string UpdateRateLabel() const { - return (rtc::StringBuilder(kLabelPrefix) - << VolumeTypeLabel() << "UpdateRate") + return (StringBuilder(kLabelPrefix) << VolumeTypeLabel() << "UpdateRate") .str(); } std::string UpdateAverageLabel() const { - return (rtc::StringBuilder(kLabelPrefix) - << VolumeTypeLabel() << "UpdateAverage") + return (StringBuilder(kLabelPrefix) << VolumeTypeLabel() << "UpdateAverage") .str(); } diff --git a/modules/audio_processing/agc2/interpolated_gain_curve.cc b/modules/audio_processing/agc2/interpolated_gain_curve.cc index bb6e038514..d7651dddd7 100644 --- a/modules/audio_processing/agc2/interpolated_gain_curve.cc +++ b/modules/audio_processing/agc2/interpolated_gain_curve.cc @@ -34,16 +34,16 @@ InterpolatedGainCurve::InterpolatedGainCurve( ApmDataDumper* apm_data_dumper, absl::string_view histogram_name_prefix) : region_logger_( - (rtc::StringBuilder("WebRTC.Audio.") + (StringBuilder("WebRTC.Audio.") << histogram_name_prefix << ".FixedDigitalGainCurveRegion.Identity") .str(), - (rtc::StringBuilder("WebRTC.Audio.") + (StringBuilder("WebRTC.Audio.") << histogram_name_prefix << ".FixedDigitalGainCurveRegion.Knee") .str(), - (rtc::StringBuilder("WebRTC.Audio.") + (StringBuilder("WebRTC.Audio.") << histogram_name_prefix << ".FixedDigitalGainCurveRegion.Limiter") .str(), - (rtc::StringBuilder("WebRTC.Audio.") + (StringBuilder("WebRTC.Audio.") << histogram_name_prefix << ".FixedDigitalGainCurveRegion.Saturation") .str()), diff --git a/modules/audio_processing/agc2/rnn_vad/pitch_search_internal_unittest.cc b/modules/audio_processing/agc2/rnn_vad/pitch_search_internal_unittest.cc index 2a6e68f157..ad8d9a9328 100644 --- a/modules/audio_processing/agc2/rnn_vad/pitch_search_internal_unittest.cc +++ b/modules/audio_processing/agc2/rnn_vad/pitch_search_internal_unittest.cc @@ -33,7 +33,7 @@ constexpr float kTestPitchStrengthHigh = 0.75f; template std::string PrintTestIndexAndCpuFeatures( const ::testing::TestParamInfo& info) { - rtc::StringBuilder builder; + StringBuilder builder; builder << info.index << "_" << info.param.cpu_features.ToString(); return builder.str(); } diff --git a/modules/audio_processing/audio_processing_unittest.cc b/modules/audio_processing/audio_processing_unittest.cc index 3e65ab29a5..c83a7dba17 100644 --- a/modules/audio_processing/audio_processing_unittest.cc +++ b/modules/audio_processing/audio_processing_unittest.cc @@ -172,7 +172,7 @@ void OpenFileAndWriteMessage(absl::string_view filename, } std::string ResourceFilePath(absl::string_view name, int sample_rate_hz) { - rtc::StringBuilder ss; + StringBuilder ss; // Resource files are all stereo. ss << name << sample_rate_hz / 1000 << "_stereo"; return test::ResourcePath(ss.str(), "pcm"); @@ -193,7 +193,7 @@ std::string OutputFilePath(absl::string_view name, size_t num_reverse_input_channels, size_t num_reverse_output_channels, StreamDirection file_direction) { - rtc::StringBuilder ss; + StringBuilder ss; ss << name << "_i" << num_input_channels << "_" << input_rate / 1000 << "_ir" << num_reverse_input_channels << "_" << reverse_input_rate / 1000 << "_"; if (num_output_channels == 1) { @@ -2341,7 +2341,7 @@ std::string ProduceDebugText(int render_input_sample_rate_hz, size_t render_output_num_channels, size_t capture_input_num_channels, size_t capture_output_num_channels) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Sample rates:" "\n Render input: " << render_input_sample_rate_hz diff --git a/modules/audio_processing/ns/noise_suppressor_unittest.cc b/modules/audio_processing/ns/noise_suppressor_unittest.cc index 8927b6b67f..8a07769fa7 100644 --- a/modules/audio_processing/ns/noise_suppressor_unittest.cc +++ b/modules/audio_processing/ns/noise_suppressor_unittest.cc @@ -26,7 +26,7 @@ namespace { std::string ProduceDebugText(int sample_rate_hz, size_t num_channels, NsConfig::SuppressionLevel level) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Sample rate: " << sample_rate_hz << ", num_channels: " << num_channels << ", level: " << static_cast(level); return ss.Release(); diff --git a/modules/audio_processing/test/audio_processing_simulator.cc b/modules/audio_processing/test/audio_processing_simulator.cc index fcd09d4dd9..87b60cafce 100644 --- a/modules/audio_processing/test/audio_processing_simulator.cc +++ b/modules/audio_processing/test/audio_processing_simulator.cc @@ -42,7 +42,7 @@ namespace { std::string GetIndexedOutputWavFilename(absl::string_view wav_name, int counter) { - rtc::StringBuilder ss; + StringBuilder ss; ss << wav_name.substr(0, wav_name.size() - 4) << "_" << counter << wav_name.substr(wav_name.size() - 4); return ss.Release(); diff --git a/modules/audio_processing/test/echo_canceller3_config_json.cc b/modules/audio_processing/test/echo_canceller3_config_json.cc index d05e2841f0..d3e3bc5250 100644 --- a/modules/audio_processing/test/echo_canceller3_config_json.cc +++ b/modules/audio_processing/test/echo_canceller3_config_json.cc @@ -430,7 +430,7 @@ void Aec3ConfigFromJsonString(absl::string_view json_string, } std::string Aec3ConfigToJsonString(const EchoCanceller3Config& config) { - rtc::StringBuilder ost; + StringBuilder ost; ost << "{"; ost << "\"aec3\": {"; ost << "\"buffering\": {"; diff --git a/modules/audio_processing/test/fake_recording_device_unittest.cc b/modules/audio_processing/test/fake_recording_device_unittest.cc index 2ac8b1dc48..9da2903a01 100644 --- a/modules/audio_processing/test/fake_recording_device_unittest.cc +++ b/modules/audio_processing/test/fake_recording_device_unittest.cc @@ -98,13 +98,13 @@ void CheckSameSign(const ChannelBuffer* src, } std::string FakeRecordingDeviceKindToString(int fake_rec_device_kind) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "fake recording device: " << fake_rec_device_kind; return ss.Release(); } std::string AnalogLevelToString(int level) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "analog level: " << level; return ss.Release(); } diff --git a/modules/congestion_controller/goog_cc/loss_based_bwe_v2_test.cc b/modules/congestion_controller/goog_cc/loss_based_bwe_v2_test.cc index a84999b1d5..f900473db8 100644 --- a/modules/congestion_controller/goog_cc/loss_based_bwe_v2_test.cc +++ b/modules/congestion_controller/goog_cc/loss_based_bwe_v2_test.cc @@ -38,7 +38,7 @@ class LossBasedBweV2Test : public ::testing::TestWithParam { protected: std::string Config(bool enabled, bool valid) { char buffer[1024]; - rtc::SimpleStringBuilder config_string(buffer); + SimpleStringBuilder config_string(buffer); config_string << "WebRTC-Bwe-LossBasedBweV2/"; @@ -79,7 +79,7 @@ class LossBasedBweV2Test : public ::testing::TestWithParam { std::string ShortObservationConfig(std::string custom_config) { char buffer[1024]; - rtc::SimpleStringBuilder config_string(buffer); + SimpleStringBuilder config_string(buffer); config_string << "WebRTC-Bwe-LossBasedBweV2/" "MinNumObservations:1,ObservationWindowSize:2,"; diff --git a/modules/remote_bitrate_estimator/tools/rtp_to_text.cc b/modules/remote_bitrate_estimator/tools/rtp_to_text.cc index e8dc59f740..3d056ea122 100644 --- a/modules/remote_bitrate_estimator/tools/rtp_to_text.cc +++ b/modules/remote_bitrate_estimator/tools/rtp_to_text.cc @@ -47,7 +47,7 @@ int main(int argc, char* argv[]) { toffset != 0) ++non_zero_ts_offsets; if (arrival_time_only) { - rtc::StringBuilder ss; + webrtc::StringBuilder ss; ss << static_cast(packet.time_ms) * 1000000; fprintf(stdout, "%s\n", ss.str().c_str()); } else { diff --git a/modules/rtp_rtcp/source/rtcp_packet/sdes_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/sdes_unittest.cc index 15a39efe87..4a458741a5 100644 --- a/modules/rtp_rtcp/source/rtcp_packet/sdes_unittest.cc +++ b/modules/rtp_rtcp/source/rtcp_packet/sdes_unittest.cc @@ -75,7 +75,7 @@ TEST(RtcpPacketSdesTest, CreateWithTooManyChunks) { Sdes sdes; for (size_t i = 0; i < kMaxChunks; ++i) { uint32_t ssrc = kSenderSsrc + i; - rtc::StringBuilder oss; + StringBuilder oss; oss << "cname" << i; EXPECT_TRUE(sdes.AddCName(ssrc, oss.str())); } diff --git a/modules/rtp_rtcp/source/rtp_packet.cc b/modules/rtp_rtcp/source/rtp_packet.cc index 19372880b2..fb9c3d677b 100644 --- a/modules/rtp_rtcp/source/rtp_packet.cc +++ b/modules/rtp_rtcp/source/rtp_packet.cc @@ -693,7 +693,7 @@ bool RtpPacket::RemoveExtension(ExtensionType type) { } std::string RtpPacket::ToString() const { - rtc::StringBuilder result; + StringBuilder result; result << "{payload_type=" << payload_type_ << ", marker=" << marker_ << ", sequence_number=" << sequence_number_ << ", padding_size=" << padding_size_ << ", timestamp=" << timestamp_ diff --git a/modules/video_coding/codecs/av1/av1_svc_config.cc b/modules/video_coding/codecs/av1/av1_svc_config.cc index 59b79dc0d7..5d7679ea16 100644 --- a/modules/video_coding/codecs/av1/av1_svc_config.cc +++ b/modules/video_coding/codecs/av1/av1_svc_config.cc @@ -42,7 +42,7 @@ int GetLimitedNumSpatialLayers(int width, int height) { std::optional BuildScalabilityMode(int num_temporal_layers, int num_spatial_layers) { char name[20]; - rtc::SimpleStringBuilder ss(name); + SimpleStringBuilder ss(name); ss << "L" << num_spatial_layers << "T" << num_temporal_layers; if (num_spatial_layers > 1) { ss << "_KEY"; diff --git a/modules/video_coding/codecs/test/video_codec_test.cc b/modules/video_coding/codecs/test/video_codec_test.cc index 48d6becf57..2c8f562af5 100644 --- a/modules/video_coding/codecs/test/video_codec_test.cc +++ b/modules/video_coding/codecs/test/video_codec_test.cc @@ -172,7 +172,7 @@ std::string TestName() { std::string TestOutputPath() { std::string output_path = - (rtc::StringBuilder() << OutputPath() << TestName()).str(); + (StringBuilder() << OutputPath() << TestName()).str(); std::string output_dir = DirName(output_path); bool result = CreateDir(output_dir); RTC_CHECK(result) << "Cannot create " << output_dir; @@ -618,7 +618,7 @@ TEST(VideoCodecTest, DISABLED_EncodeDecode) { for (int sidx = 0; sidx < num_spatial_layers; ++sidx) { for (int tidx = 0; tidx < num_temporal_layers; ++tidx) { std::string metric_name_prefix = - (rtc::StringBuilder() << "s" << sidx << "t" << tidx << "_").str(); + (StringBuilder() << "s" << sidx << "t" << tidx << "_").str(); stream = stats->Aggregate( {.layer_id = {{.spatial_idx = sidx, .temporal_idx = tidx}}}); stream.LogMetrics(GetGlobalMetricsLogger(), TestName(), @@ -628,10 +628,9 @@ TEST(VideoCodecTest, DISABLED_EncodeDecode) { } if (absl::GetFlag(FLAGS_write_csv)) { - stats->LogMetrics( - (rtc::StringBuilder() << TestOutputPath() << ".csv").str(), - stats->Slice(Filter{}, /*merge=*/false), /*metadata=*/ - {{"test_name", TestName()}}); + stats->LogMetrics((StringBuilder() << TestOutputPath() << ".csv").str(), + stats->Slice(Filter{}, /*merge=*/false), /*metadata=*/ + {{"test_name", TestName()}}); } } diff --git a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc index 414f22d56f..dadb1d0646 100644 --- a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc +++ b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc @@ -120,7 +120,7 @@ void ConfigureSvc(VideoCodec* codec_settings) { std::string CodecSpecificToString(const VideoCodec& codec) { char buf[1024]; - rtc::SimpleStringBuilder ss(buf); + SimpleStringBuilder ss(buf); switch (codec.codecType) { case kVideoCodecVP8: ss << "\nnum_temporal_layers: " @@ -309,7 +309,7 @@ size_t VideoCodecTestFixtureImpl::Config::NumberOfSimulcastStreams() const { std::string VideoCodecTestFixtureImpl::Config::ToString() const { std::string codec_type = CodecTypeToPayloadString(codec_settings.codecType); - rtc::StringBuilder ss; + StringBuilder ss; ss << "test_name: " << test_name; ss << "\nfilename: " << filename; ss << "\nnum_frames: " << num_frames; @@ -563,7 +563,7 @@ void VideoCodecTestFixtureImpl::AnalyzeAllFrames( // For perf dashboard. char modifier_buf[256]; - rtc::SimpleStringBuilder modifier(modifier_buf); + SimpleStringBuilder modifier(modifier_buf); modifier << "_r" << rate_profile_idx << "_sl" << layer_stat.spatial_idx; auto PrintResultHelper = [&modifier, this]( diff --git a/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc b/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc index e8b2bb68a0..b5c985be28 100644 --- a/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc +++ b/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc @@ -128,7 +128,7 @@ std::unique_ptr CreateVp9ScalabilityStructure( } char name[20]; - rtc::SimpleStringBuilder ss(name); + SimpleStringBuilder ss(name); if (codec.mode == VideoCodecMode::kScreensharing) { // TODO(bugs.webrtc.org/11999): Compose names of the structures when they // are implemented. diff --git a/modules/video_coding/svc/scalability_structure_unittest.cc b/modules/video_coding/svc/scalability_structure_unittest.cc index 9c350ed0d6..70ae45a69d 100644 --- a/modules/video_coding/svc/scalability_structure_unittest.cc +++ b/modules/video_coding/svc/scalability_structure_unittest.cc @@ -45,7 +45,7 @@ using ::testing::TestWithParam; using ::testing::Values; std::string FrameDependencyTemplateToString(const FrameDependencyTemplate& t) { - rtc::StringBuilder sb; + StringBuilder sb; sb << "S" << t.spatial_id << "T" << t.temporal_id; sb << ": dtis = "; for (const auto dtis : t.decode_target_indications) { diff --git a/modules/video_coding/utility/vp9_uncompressed_header_parser.cc b/modules/video_coding/utility/vp9_uncompressed_header_parser.cc index 66117b66bf..ecb52be129 100644 --- a/modules/video_coding/utility/vp9_uncompressed_header_parser.cc +++ b/modules/video_coding/utility/vp9_uncompressed_header_parser.cc @@ -252,7 +252,7 @@ const Vp9InterpolationFilter kLiteralToType[4] = { std::string Vp9UncompressedHeader::ToString() const { char buf[1024]; - rtc::SimpleStringBuilder oss(buf); + SimpleStringBuilder oss(buf); oss << "Vp9UncompressedHeader { " << "profile = " << profile; diff --git a/net/dcsctp/packet/chunk/chunk.cc b/net/dcsctp/packet/chunk/chunk.cc index b2059b45cd..d761eceba4 100644 --- a/net/dcsctp/packet/chunk/chunk.cc +++ b/net/dcsctp/packet/chunk/chunk.cc @@ -40,7 +40,7 @@ namespace dcsctp { template bool ParseAndPrint(uint8_t chunk_type, rtc::ArrayView data, - rtc::StringBuilder& sb) { + webrtc::StringBuilder& sb) { if (chunk_type == Chunk::kType) { std::optional c = Chunk::Parse(data); if (c.has_value()) { @@ -54,7 +54,7 @@ bool ParseAndPrint(uint8_t chunk_type, } std::string DebugConvertChunkToString(rtc::ArrayView data) { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; if (data.empty()) { sb << "Failed to parse chunk due to empty data"; diff --git a/net/dcsctp/packet/chunk/data_chunk.cc b/net/dcsctp/packet/chunk/data_chunk.cc index 92a988d5a0..302db50230 100644 --- a/net/dcsctp/packet/chunk/data_chunk.cc +++ b/net/dcsctp/packet/chunk/data_chunk.cc @@ -86,7 +86,7 @@ void DataChunk::SerializeTo(std::vector& out) const { } std::string DataChunk::ToString() const { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; sb << "DATA, type=" << (options().is_unordered ? "unordered" : "ordered") << "::" << (*options().is_beginning && *options().is_end ? "complete" diff --git a/net/dcsctp/packet/chunk/forward_tsn_chunk.cc b/net/dcsctp/packet/chunk/forward_tsn_chunk.cc index 758f2ea78b..0809525d0b 100644 --- a/net/dcsctp/packet/chunk/forward_tsn_chunk.cc +++ b/net/dcsctp/packet/chunk/forward_tsn_chunk.cc @@ -85,7 +85,7 @@ void ForwardTsnChunk::SerializeTo(std::vector& out) const { } std::string ForwardTsnChunk::ToString() const { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; sb << "FORWARD-TSN, new_cumulative_tsn=" << *new_cumulative_tsn(); for (const auto& skipped : skipped_streams()) { sb << ", skip " << skipped.stream_id.value() << ":" << *skipped.ssn; diff --git a/net/dcsctp/packet/chunk/idata_chunk.cc b/net/dcsctp/packet/chunk/idata_chunk.cc index b6d3b3e1cd..512391d665 100644 --- a/net/dcsctp/packet/chunk/idata_chunk.cc +++ b/net/dcsctp/packet/chunk/idata_chunk.cc @@ -89,7 +89,7 @@ void IDataChunk::SerializeTo(std::vector& out) const { } std::string IDataChunk::ToString() const { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; sb << "I-DATA, type=" << (options().is_unordered ? "unordered" : "ordered") << "::" << (*options().is_beginning && *options().is_end ? "complete" diff --git a/net/dcsctp/packet/chunk/iforward_tsn_chunk.cc b/net/dcsctp/packet/chunk/iforward_tsn_chunk.cc index cc83b3b585..c67ecfff11 100644 --- a/net/dcsctp/packet/chunk/iforward_tsn_chunk.cc +++ b/net/dcsctp/packet/chunk/iforward_tsn_chunk.cc @@ -96,7 +96,7 @@ void IForwardTsnChunk::SerializeTo(std::vector& out) const { } std::string IForwardTsnChunk::ToString() const { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; sb << "I-FORWARD-TSN, new_cumulative_tsn=" << *new_cumulative_tsn(); return sb.Release(); } diff --git a/net/dcsctp/packet/chunk/sack_chunk.cc b/net/dcsctp/packet/chunk/sack_chunk.cc index 408faf4b09..7af42acd6c 100644 --- a/net/dcsctp/packet/chunk/sack_chunk.cc +++ b/net/dcsctp/packet/chunk/sack_chunk.cc @@ -135,7 +135,7 @@ void SackChunk::SerializeTo(std::vector& out) const { } std::string SackChunk::ToString() const { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; sb << "SACK, cum_ack_tsn=" << *cumulative_tsn_ack() << ", a_rwnd=" << a_rwnd(); for (const GapAckBlock& gap : gap_ack_blocks_) { @@ -145,8 +145,9 @@ std::string SackChunk::ToString() const { } if (!duplicate_tsns_.empty()) { sb << ", dup_tsns=" - << webrtc::StrJoin(duplicate_tsns(), ",", - [](rtc::StringBuilder& sb, TSN tsn) { sb << *tsn; }); + << webrtc::StrJoin( + duplicate_tsns(), ",", + [](webrtc::StringBuilder& sb, TSN tsn) { sb << *tsn; }); } return sb.Release(); diff --git a/net/dcsctp/packet/error_cause/error_cause.cc b/net/dcsctp/packet/error_cause/error_cause.cc index c28675ac01..291cc51776 100644 --- a/net/dcsctp/packet/error_cause/error_cause.cc +++ b/net/dcsctp/packet/error_cause/error_cause.cc @@ -38,7 +38,7 @@ namespace dcsctp { template -bool ParseAndPrint(ParameterDescriptor descriptor, rtc::StringBuilder& sb) { +bool ParseAndPrint(ParameterDescriptor descriptor, webrtc::StringBuilder& sb) { if (descriptor.type == ErrorCause::kType) { std::optional p = ErrorCause::Parse(descriptor.data); if (p.has_value()) { @@ -52,7 +52,7 @@ bool ParseAndPrint(ParameterDescriptor descriptor, rtc::StringBuilder& sb) { } std::string ErrorCausesToString(const Parameters& parameters) { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; std::vector descriptors = parameters.descriptors(); for (size_t i = 0; i < descriptors.size(); ++i) { diff --git a/net/dcsctp/packet/error_cause/invalid_stream_identifier_cause.cc b/net/dcsctp/packet/error_cause/invalid_stream_identifier_cause.cc index 9979b0ca51..63a84451b1 100644 --- a/net/dcsctp/packet/error_cause/invalid_stream_identifier_cause.cc +++ b/net/dcsctp/packet/error_cause/invalid_stream_identifier_cause.cc @@ -52,7 +52,7 @@ void InvalidStreamIdentifierCause::SerializeTo( } std::string InvalidStreamIdentifierCause::ToString() const { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; sb << "Invalid Stream Identifier, stream_id=" << *stream_id_; return sb.Release(); } diff --git a/net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.cc b/net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.cc index e4a8b2d3f1..163ace94e4 100644 --- a/net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.cc +++ b/net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.cc @@ -81,7 +81,7 @@ void MissingMandatoryParameterCause::SerializeTo( } std::string MissingMandatoryParameterCause::ToString() const { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; sb << "Missing Mandatory Parameter, missing_parameter_types=" << webrtc::StrJoin(missing_parameter_types_, ","); return sb.Release(); diff --git a/net/dcsctp/packet/error_cause/no_user_data_cause.cc b/net/dcsctp/packet/error_cause/no_user_data_cause.cc index 3555e30da3..17c33fa4dc 100644 --- a/net/dcsctp/packet/error_cause/no_user_data_cause.cc +++ b/net/dcsctp/packet/error_cause/no_user_data_cause.cc @@ -50,7 +50,7 @@ void NoUserDataCause::SerializeTo(std::vector& out) const { } std::string NoUserDataCause::ToString() const { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; sb << "No User Data, tsn=" << *tsn_; return sb.Release(); } diff --git a/net/dcsctp/packet/error_cause/protocol_violation_cause.cc b/net/dcsctp/packet/error_cause/protocol_violation_cause.cc index 00360cc382..04d07bb7cd 100644 --- a/net/dcsctp/packet/error_cause/protocol_violation_cause.cc +++ b/net/dcsctp/packet/error_cause/protocol_violation_cause.cc @@ -56,7 +56,7 @@ void ProtocolViolationCause::SerializeTo(std::vector& out) const { } std::string ProtocolViolationCause::ToString() const { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; sb << "Protocol Violation, additional_information=" << additional_information_; return sb.Release(); diff --git a/net/dcsctp/packet/error_cause/stale_cookie_error_cause.cc b/net/dcsctp/packet/error_cause/stale_cookie_error_cause.cc index 3bd6f2cb7e..df77d5ee10 100644 --- a/net/dcsctp/packet/error_cause/stale_cookie_error_cause.cc +++ b/net/dcsctp/packet/error_cause/stale_cookie_error_cause.cc @@ -49,7 +49,7 @@ void StaleCookieErrorCause::SerializeTo(std::vector& out) const { } std::string StaleCookieErrorCause::ToString() const { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; sb << "Stale Cookie Error, staleness_us=" << staleness_us_; return sb.Release(); } diff --git a/net/dcsctp/packet/error_cause/unrecognized_chunk_type_cause.cc b/net/dcsctp/packet/error_cause/unrecognized_chunk_type_cause.cc index 2b64dfd1cd..4b6aa9784e 100644 --- a/net/dcsctp/packet/error_cause/unrecognized_chunk_type_cause.cc +++ b/net/dcsctp/packet/error_cause/unrecognized_chunk_type_cause.cc @@ -51,7 +51,7 @@ void UnrecognizedChunkTypeCause::SerializeTo(std::vector& out) const { } std::string UnrecognizedChunkTypeCause::ToString() const { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; sb << "Unrecognized Chunk Type, chunk_type="; if (!unrecognized_chunk_.empty()) { sb << static_cast(unrecognized_chunk_[0]); diff --git a/net/dcsctp/packet/error_cause/user_initiated_abort_cause.cc b/net/dcsctp/packet/error_cause/user_initiated_abort_cause.cc index e4cd267348..95f53fabae 100644 --- a/net/dcsctp/packet/error_cause/user_initiated_abort_cause.cc +++ b/net/dcsctp/packet/error_cause/user_initiated_abort_cause.cc @@ -59,7 +59,7 @@ void UserInitiatedAbortCause::SerializeTo(std::vector& out) const { } std::string UserInitiatedAbortCause::ToString() const { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; sb << "User-Initiated Abort, reason=" << upper_layer_abort_reason_; return sb.Release(); } diff --git a/net/dcsctp/packet/parameter/add_incoming_streams_request_parameter.cc b/net/dcsctp/packet/parameter/add_incoming_streams_request_parameter.cc index e8d82b54e2..a59184a703 100644 --- a/net/dcsctp/packet/parameter/add_incoming_streams_request_parameter.cc +++ b/net/dcsctp/packet/parameter/add_incoming_streams_request_parameter.cc @@ -59,7 +59,7 @@ void AddIncomingStreamsRequestParameter::SerializeTo( } std::string AddIncomingStreamsRequestParameter::ToString() const { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; sb << "Add Incoming Streams Request, req_seq_nbr=" << *request_sequence_number(); return sb.Release(); diff --git a/net/dcsctp/packet/parameter/add_outgoing_streams_request_parameter.cc b/net/dcsctp/packet/parameter/add_outgoing_streams_request_parameter.cc index 1a8f4f903a..814de76064 100644 --- a/net/dcsctp/packet/parameter/add_outgoing_streams_request_parameter.cc +++ b/net/dcsctp/packet/parameter/add_outgoing_streams_request_parameter.cc @@ -58,7 +58,7 @@ void AddOutgoingStreamsRequestParameter::SerializeTo( } std::string AddOutgoingStreamsRequestParameter::ToString() const { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; sb << "Add Outgoing Streams Request, req_seq_nbr=" << *request_sequence_number(); return sb.Release(); diff --git a/net/dcsctp/packet/parameter/heartbeat_info_parameter.cc b/net/dcsctp/packet/parameter/heartbeat_info_parameter.cc index 5435c0720f..a70c8142a4 100644 --- a/net/dcsctp/packet/parameter/heartbeat_info_parameter.cc +++ b/net/dcsctp/packet/parameter/heartbeat_info_parameter.cc @@ -52,7 +52,7 @@ void HeartbeatInfoParameter::SerializeTo(std::vector& out) const { } std::string HeartbeatInfoParameter::ToString() const { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; sb << "Heartbeat Info parameter (info_length=" << info_.size() << ")"; return sb.Release(); } diff --git a/net/dcsctp/packet/parameter/incoming_ssn_reset_request_parameter.cc b/net/dcsctp/packet/parameter/incoming_ssn_reset_request_parameter.cc index 3935f8e886..3a1e07ca07 100644 --- a/net/dcsctp/packet/parameter/incoming_ssn_reset_request_parameter.cc +++ b/net/dcsctp/packet/parameter/incoming_ssn_reset_request_parameter.cc @@ -80,7 +80,7 @@ void IncomingSSNResetRequestParameter::SerializeTo( } std::string IncomingSSNResetRequestParameter::ToString() const { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; sb << "Incoming SSN Reset Request, req_seq_nbr=" << *request_sequence_number(); return sb.Release(); diff --git a/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.cc b/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.cc index a1391bddf8..7b6f24876f 100644 --- a/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.cc +++ b/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.cc @@ -91,7 +91,7 @@ void OutgoingSSNResetRequestParameter::SerializeTo( } std::string OutgoingSSNResetRequestParameter::ToString() const { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; sb << "Outgoing SSN Reset Request, req_seq_nbr=" << *request_sequence_number() << ", resp_seq_nbr=" << *response_sequence_number() << ", sender_last_asg_tsn=" << *sender_last_assigned_tsn(); diff --git a/net/dcsctp/packet/parameter/reconfiguration_response_parameter.cc b/net/dcsctp/packet/parameter/reconfiguration_response_parameter.cc index eed1e02f85..0346692826 100644 --- a/net/dcsctp/packet/parameter/reconfiguration_response_parameter.cc +++ b/net/dcsctp/packet/parameter/reconfiguration_response_parameter.cc @@ -144,7 +144,7 @@ void ReconfigurationResponseParameter::SerializeTo( } std::string ReconfigurationResponseParameter::ToString() const { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; sb << "Re-configuration Response, resp_seq_nbr=" << *response_sequence_number(); return sb.Release(); diff --git a/net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter.cc b/net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter.cc index 1e37ea755b..62e8e3ebab 100644 --- a/net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter.cc +++ b/net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter.cc @@ -52,7 +52,7 @@ void SSNTSNResetRequestParameter::SerializeTo(std::vector& out) const { } std::string SSNTSNResetRequestParameter::ToString() const { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; sb << "SSN/TSN Reset Request, req_seq_nbr=" << *request_sequence_number(); return sb.Release(); } diff --git a/net/dcsctp/packet/parameter/state_cookie_parameter.cc b/net/dcsctp/packet/parameter/state_cookie_parameter.cc index be4b6a5fe4..ac0fc4c931 100644 --- a/net/dcsctp/packet/parameter/state_cookie_parameter.cc +++ b/net/dcsctp/packet/parameter/state_cookie_parameter.cc @@ -43,7 +43,7 @@ void StateCookieParameter::SerializeTo(std::vector& out) const { } std::string StateCookieParameter::ToString() const { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; sb << "State Cookie parameter (cookie_length=" << data_.size() << ")"; return sb.Release(); } diff --git a/net/dcsctp/packet/parameter/supported_extensions_parameter.cc b/net/dcsctp/packet/parameter/supported_extensions_parameter.cc index a21819f937..174dd69122 100644 --- a/net/dcsctp/packet/parameter/supported_extensions_parameter.cc +++ b/net/dcsctp/packet/parameter/supported_extensions_parameter.cc @@ -58,7 +58,7 @@ void SupportedExtensionsParameter::SerializeTo( } std::string SupportedExtensionsParameter::ToString() const { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; sb << "Supported Extensions (" << webrtc::StrJoin(chunk_types_, ", ") << ")"; return sb.Release(); } diff --git a/net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter.cc b/net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter.cc index 04b74122c3..6fbfe7f9f0 100644 --- a/net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter.cc +++ b/net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter.cc @@ -51,7 +51,7 @@ void ZeroChecksumAcceptableChunkParameter::SerializeTo( } std::string ZeroChecksumAcceptableChunkParameter::ToString() const { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; sb << "Zero Checksum Acceptable (" << *error_detection_method_ << ")"; return sb.Release(); } diff --git a/net/dcsctp/public/text_pcap_packet_observer.cc b/net/dcsctp/public/text_pcap_packet_observer.cc index 2b13060190..35a80db983 100644 --- a/net/dcsctp/public/text_pcap_packet_observer.cc +++ b/net/dcsctp/public/text_pcap_packet_observer.cc @@ -33,7 +33,7 @@ void TextPcapPacketObserver::PrintPacket( absl::string_view socket_name, dcsctp::TimeMs now, rtc::ArrayView payload) { - rtc::StringBuilder s; + webrtc::StringBuilder s; s << "\n" << prefix; int64_t remaining = *now % (24 * 60 * 60 * 1000); int hours = remaining / (60 * 60 * 1000); diff --git a/net/dcsctp/rx/reassembly_queue.cc b/net/dcsctp/rx/reassembly_queue.cc index 9f22e10c17..5bd0b03c81 100644 --- a/net/dcsctp/rx/reassembly_queue.cc +++ b/net/dcsctp/rx/reassembly_queue.cc @@ -116,7 +116,7 @@ void ReassemblyQueue::ResetStreamsAndLeaveDeferredReset( rtc::ArrayView stream_ids) { RTC_DLOG(LS_VERBOSE) << log_prefix_ << "Resetting streams: [" << webrtc::StrJoin(stream_ids, ",", - [](rtc::StringBuilder& sb, + [](webrtc::StringBuilder& sb, StreamID sid) { sb << *sid; }) << "]"; @@ -170,7 +170,7 @@ void ReassemblyQueue::AddReassembledMessage( RTC_DLOG(LS_VERBOSE) << log_prefix_ << "Assembled message from TSN=[" << webrtc::StrJoin( tsns, ",", - [](rtc::StringBuilder& sb, UnwrappedTSN tsn) { + [](webrtc::StringBuilder& sb, UnwrappedTSN tsn) { sb << *tsn.Wrap(); }) << "], message; stream_id=" << *message.stream_id() diff --git a/net/dcsctp/socket/dcsctp_socket.cc b/net/dcsctp/socket/dcsctp_socket.cc index 6580b7e414..7b4b762813 100644 --- a/net/dcsctp/socket/dcsctp_socket.cc +++ b/net/dcsctp/socket/dcsctp_socket.cc @@ -906,7 +906,7 @@ bool DcSctpSocket::HandleUnrecognizedChunk( RTC_DLOG(LS_VERBOSE) << log_prefix() << "Received unknown chunk: " << static_cast(descriptor.type); if (report_as_error) { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; sb << "Received unknown chunk of type: " << static_cast(descriptor.type) << " with report-error bit set"; callbacks_.OnError(ErrorKind::kParseFailed, sb.str()); @@ -1037,7 +1037,7 @@ bool DcSctpSocket::ValidateHasTCB() { } void DcSctpSocket::ReportFailedToParseChunk(int chunk_type) { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; sb << "Failed to parse chunk of type: " << chunk_type; callbacks_.OnError(ErrorKind::kParseFailed, sb.str()); } diff --git a/net/dcsctp/socket/dcsctp_socket_network_test.cc b/net/dcsctp/socket/dcsctp_socket_network_test.cc index 0ac8282c96..c22a938de4 100644 --- a/net/dcsctp/socket/dcsctp_socket_network_test.cc +++ b/net/dcsctp/socket/dcsctp_socket_network_test.cc @@ -304,7 +304,7 @@ class SctpActor : public DcSctpSocketCallbacks { private: std::string log_prefix() const { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; sb << log_prefix_; sb << rtc::TimeMillis(); sb << ": "; diff --git a/net/dcsctp/socket/stream_reset_handler.cc b/net/dcsctp/socket/stream_reset_handler.cc index d4365273e9..86dff0c48e 100644 --- a/net/dcsctp/socket/stream_reset_handler.cc +++ b/net/dcsctp/socket/stream_reset_handler.cc @@ -262,9 +262,8 @@ void StreamResetHandler::HandleResponse(const ParameterDescriptor& descriptor) { << log_prefix_ << "Reset stream success, req_seq_nbr=" << *current_request_->req_seq_nbr() << ", streams=" << webrtc::StrJoin(current_request_->streams(), ",", - [](rtc::StringBuilder& sb, StreamID stream_id) { - sb << *stream_id; - }); + [](webrtc::StringBuilder& sb, + StreamID stream_id) { sb << *stream_id; }); ctx_->callbacks().OnStreamsResetPerformed(current_request_->streams()); current_request_ = std::nullopt; retransmission_queue_->CommitResetStreams(); @@ -274,9 +273,8 @@ void StreamResetHandler::HandleResponse(const ParameterDescriptor& descriptor) { << log_prefix_ << "Reset stream still pending, req_seq_nbr=" << *current_request_->req_seq_nbr() << ", streams=" << webrtc::StrJoin(current_request_->streams(), ",", - [](rtc::StringBuilder& sb, StreamID stream_id) { - sb << *stream_id; - }); + [](webrtc::StringBuilder& sb, + StreamID stream_id) { sb << *stream_id; }); // Force this request to be sent again, but with new req_seq_nbr. current_request_->PrepareRetransmission(); reconfig_timer_->set_duration(ctx_->current_rto()); @@ -291,9 +289,8 @@ void StreamResetHandler::HandleResponse(const ParameterDescriptor& descriptor) { << ", req_seq_nbr=" << *current_request_->req_seq_nbr() << ", streams=" << webrtc::StrJoin(current_request_->streams(), ",", - [](rtc::StringBuilder& sb, StreamID stream_id) { - sb << *stream_id; - }); + [](webrtc::StringBuilder& sb, + StreamID stream_id) { sb << *stream_id; }); ctx_->callbacks().OnStreamsResetFailed(current_request_->streams(), ToString(resp->result())); current_request_ = std::nullopt; diff --git a/net/dcsctp/socket/transmission_control_block.cc b/net/dcsctp/socket/transmission_control_block.cc index 3ee6110e2f..29f958be8d 100644 --- a/net/dcsctp/socket/transmission_control_block.cc +++ b/net/dcsctp/socket/transmission_control_block.cc @@ -278,7 +278,7 @@ void TransmissionControlBlock::SendBufferedPackets(SctpPacket::Builder& builder, } std::string TransmissionControlBlock::ToString() const { - rtc::StringBuilder sb; + webrtc::StringBuilder sb; sb.AppendFormat( "verification_tag=%08x, last_cumulative_ack=%u, capabilities=", diff --git a/net/dcsctp/tx/rr_send_queue.cc b/net/dcsctp/tx/rr_send_queue.cc index 378d6e9713..16212a4b12 100644 --- a/net/dcsctp/tx/rr_send_queue.cc +++ b/net/dcsctp/tx/rr_send_queue.cc @@ -82,7 +82,7 @@ bool RRSendQueue::IsConsistent() const { } } if (expected_active_streams != actual_active_streams) { - auto fn = [&](rtc::StringBuilder& sb, const auto& p) { sb << *p; }; + auto fn = [&](webrtc::StringBuilder& sb, const auto& p) { sb << *p; }; RTC_DLOG(LS_ERROR) << "Active streams mismatch, is=[" << webrtc::StrJoin(actual_active_streams, ",", fn) << "], expected=[" diff --git a/net/dcsctp/tx/stream_scheduler.cc b/net/dcsctp/tx/stream_scheduler.cc index a0412e4fee..ef3c52c560 100644 --- a/net/dcsctp/tx/stream_scheduler.cc +++ b/net/dcsctp/tx/stream_scheduler.cc @@ -44,7 +44,7 @@ std::optional StreamScheduler::Produce( << ", active=" << webrtc::StrJoin( active_streams_, ", ", - [&](rtc::StringBuilder& sb, const auto& p) { + [&](webrtc::StringBuilder& sb, const auto& p) { sb << *p->stream_id() << "@" << *p->next_finish_time(); }); diff --git a/pc/data_channel_integrationtest.cc b/pc/data_channel_integrationtest.cc index 043a7c3e31..05386d7b66 100644 --- a/pc/data_channel_integrationtest.cc +++ b/pc/data_channel_integrationtest.cc @@ -701,7 +701,7 @@ TEST_P(DataChannelIntegrationTest, StressTestOpenCloseChannelNoDelay) { RTC_LOG(LS_INFO) << "Iteration " << (repeats + 1) << "/" << kIterations; for (size_t i = 0; i < kChannelCount; ++i) { - rtc::StringBuilder sb; + StringBuilder sb; sb << "channel-" << channel_id++; caller()->CreateDataChannel(sb.Release(), &init); } @@ -788,7 +788,7 @@ TEST_P(DataChannelIntegrationTest, StressTestOpenCloseChannelWithDelay) { RTC_LOG(LS_INFO) << "Iteration " << (repeats + 1) << "/" << kIterations; for (size_t i = 0; i < kChannelCount; ++i) { - rtc::StringBuilder sb; + StringBuilder sb; sb << "channel-" << channel_id++; caller()->CreateDataChannel(sb.Release(), &init); } diff --git a/pc/peer_connection_ice_unittest.cc b/pc/peer_connection_ice_unittest.cc index 0453b8abbc..cf7297cdb6 100644 --- a/pc/peer_connection_ice_unittest.cc +++ b/pc/peer_connection_ice_unittest.cc @@ -333,7 +333,7 @@ class PeerConnectionIceTest const char* b_expr, const cricket::Candidate& a, const cricket::Candidate& b) { - rtc::StringBuilder failure_info; + StringBuilder failure_info; if (a.component() != b.component()) { failure_info << "\ncomponent: " << a.component() << " != " << b.component(); } @@ -692,7 +692,7 @@ TEST_P(PeerConnectionIceTest, VerifyUfragPwdLength) { const char* candidates_expr, const SocketAddress& address, const std::vector candidates) { - rtc::StringBuilder candidate_hosts; + StringBuilder candidate_hosts; for (const auto* candidate : candidates) { const auto& candidate_ip = candidate->candidate().address().ipaddr(); if (candidate_ip == address.ipaddr()) { diff --git a/pc/rtc_stats_collector.cc b/pc/rtc_stats_collector.cc index 6ff5dabbd6..1091462b64 100644 --- a/pc/rtc_stats_collector.cc +++ b/pc/rtc_stats_collector.cc @@ -85,12 +85,12 @@ std::string RTCCodecStatsIDFromTransportAndCodecParameters( const std::string& transport_id, const RtpCodecParameters& codec_params) { char buf[1024]; - rtc::SimpleStringBuilder sb(buf); + SimpleStringBuilder sb(buf); sb << 'C' << direction << transport_id << '_' << codec_params.payload_type; // TODO(https://crbug.com/webrtc/14420): If we stop supporting different FMTP // lines for the same PT and transport, which should be illegal SDP, then we // wouldn't need `fmtp` to be part of the ID here. - rtc::StringBuilder fmtp; + StringBuilder fmtp; if (WriteFmtpParameters(codec_params.parameters, &fmtp)) { sb << '_' << fmtp.Release(); } @@ -100,7 +100,7 @@ std::string RTCCodecStatsIDFromTransportAndCodecParameters( std::string RTCIceCandidatePairStatsIDFromConnectionInfo( const cricket::ConnectionInfo& info) { char buf[4096]; - rtc::SimpleStringBuilder sb(buf); + SimpleStringBuilder sb(buf); sb << "CP" << info.local_candidate.id() << "_" << info.remote_candidate.id(); return sb.str(); } @@ -109,7 +109,7 @@ std::string RTCTransportStatsIDFromTransportChannel( const std::string& transport_name, int channel_component) { char buf[1024]; - rtc::SimpleStringBuilder sb(buf); + SimpleStringBuilder sb(buf); sb << 'T' << transport_name << channel_component; return sb.str(); } @@ -118,7 +118,7 @@ std::string RTCInboundRtpStreamStatsIDFromSSRC(const std::string& transport_id, cricket::MediaType media_type, uint32_t ssrc) { char buf[1024]; - rtc::SimpleStringBuilder sb(buf); + SimpleStringBuilder sb(buf); sb << 'I' << transport_id << (media_type == cricket::MEDIA_TYPE_AUDIO ? 'A' : 'V') << ssrc; return sb.str(); @@ -128,7 +128,7 @@ std::string RTCOutboundRtpStreamStatsIDFromSSRC(const std::string& transport_id, cricket::MediaType media_type, uint32_t ssrc) { char buf[1024]; - rtc::SimpleStringBuilder sb(buf); + SimpleStringBuilder sb(buf); sb << 'O' << transport_id << (media_type == cricket::MEDIA_TYPE_AUDIO ? 'A' : 'V') << ssrc; return sb.str(); @@ -138,7 +138,7 @@ std::string RTCRemoteInboundRtpStreamStatsIdFromSourceSsrc( cricket::MediaType media_type, uint32_t source_ssrc) { char buf[1024]; - rtc::SimpleStringBuilder sb(buf); + SimpleStringBuilder sb(buf); sb << "RI" << (media_type == cricket::MEDIA_TYPE_AUDIO ? 'A' : 'V') << source_ssrc; return sb.str(); @@ -148,7 +148,7 @@ std::string RTCRemoteOutboundRTPStreamStatsIDFromSSRC( cricket::MediaType media_type, uint32_t source_ssrc) { char buf[1024]; - rtc::SimpleStringBuilder sb(buf); + SimpleStringBuilder sb(buf); sb << "RO" << (media_type == cricket::MEDIA_TYPE_AUDIO ? 'A' : 'V') << source_ssrc; return sb.str(); @@ -158,7 +158,7 @@ std::string RTCMediaSourceStatsIDFromKindAndAttachment( cricket::MediaType media_type, int attachment_id) { char buf[1024]; - rtc::SimpleStringBuilder sb(buf); + SimpleStringBuilder sb(buf); sb << 'S' << (media_type == cricket::MEDIA_TYPE_AUDIO ? 'A' : 'V') << attachment_id; return sb.str(); @@ -370,7 +370,7 @@ std::string GetCodecIdAndMaybeCreateCodecStats( codec_stats->channels = *codec_params.num_channels; } - rtc::StringBuilder fmtp; + StringBuilder fmtp; if (WriteFmtpParameters(codec_params.parameters, &fmtp)) { codec_stats->sdp_fmtp_line = fmtp.Release(); } diff --git a/pc/sdp_offer_answer.cc b/pc/sdp_offer_answer.cc index 629b4a5429..34ae4e0f36 100644 --- a/pc/sdp_offer_answer.cc +++ b/pc/sdp_offer_answer.cc @@ -205,7 +205,7 @@ bool CheckForRemoteIceRestart(const SessionDescriptionInterface* old_desc, std::string GetSetDescriptionErrorMessage(cricket::ContentSource source, SdpType type, const RTCError& error) { - rtc::StringBuilder oss; + StringBuilder oss; oss << "Failed to set " << (source == cricket::CS_LOCAL ? "local" : "remote") << " " << SdpTypeToString(type) << " sdp: "; RTC_DCHECK(!absl::StartsWith(error.message(), oss.str())) << error.message(); @@ -3218,7 +3218,7 @@ RTCError SdpOfferAnswerHandler::Rollback(SdpType desc_type) { state != PeerConnectionInterface::kHaveRemoteOffer) { LOG_AND_RETURN_ERROR( RTCErrorType::INVALID_STATE, - (rtc::StringBuilder("Called in wrong signalingState: ") + (StringBuilder("Called in wrong signalingState: ") << (PeerConnectionInterface::AsString(signaling_state()))) .Release()); } @@ -3683,7 +3683,7 @@ RTCError SdpOfferAnswerHandler::ValidateSessionDescription( (source == cricket::CS_REMOTE && !ExpectSetRemoteDescription(type))) { LOG_AND_RETURN_ERROR( RTCErrorType::INVALID_STATE, - (rtc::StringBuilder("Called in wrong state: ") + (StringBuilder("Called in wrong state: ") << PeerConnectionInterface::AsString(signaling_state())) .Release()); } @@ -4103,7 +4103,7 @@ RTCError SdpOfferAnswerHandler::UpdateDataChannelTransport( RTC_LOG(LS_INFO) << "Rejected data channel transport with mid=" << content.mid(); - rtc::StringBuilder sb; + StringBuilder sb; sb << "Rejected data channel transport with mid=" << content.mid(); RTCError error(RTCErrorType::OPERATION_ERROR_WITH_DATA, sb.Release()); error.set_error_detail(RTCErrorDetailType::DATA_CHANNEL_FAILURE); @@ -4658,7 +4658,7 @@ const char* SdpOfferAnswerHandler::SessionErrorToString( std::string SdpOfferAnswerHandler::GetSessionErrorMsg() { RTC_DCHECK_RUN_ON(signaling_thread()); - rtc::StringBuilder desc; + StringBuilder desc; desc << kSessionError << SessionErrorToString(session_error()) << ". "; desc << kSessionErrorDesc << session_error_desc() << "."; return desc.Release(); @@ -5152,7 +5152,7 @@ void SdpOfferAnswerHandler::RemoveUnusedChannels( error.set_error_detail(RTCErrorDetailType::DATA_CHANNEL_FAILURE); pc_->DestroyDataChannelTransport(error); } else if (data_info->rejected) { - rtc::StringBuilder sb; + StringBuilder sb; sb << "Rejected data channel with mid=" << data_info->mid() << "."; RTCError error(RTCErrorType::OPERATION_ERROR_WITH_DATA, sb.Release()); diff --git a/pc/simulcast_sdp_serializer.cc b/pc/simulcast_sdp_serializer.cc index 750a2d007f..dbcb2155ed 100644 --- a/pc/simulcast_sdp_serializer.cc +++ b/pc/simulcast_sdp_serializer.cc @@ -59,8 +59,8 @@ RTCError ParseError(absl::string_view message) { // These methods serialize simulcast according to the specification: // https://tools.ietf.org/html/draft-ietf-mmusic-sdp-simulcast-13#section-5.1 -rtc::StringBuilder& operator<<(rtc::StringBuilder& builder, - const SimulcastLayer& simulcast_layer) { +StringBuilder& operator<<(StringBuilder& builder, + const SimulcastLayer& simulcast_layer) { if (simulcast_layer.is_paused) { builder << kSimulcastPausedStream; } @@ -68,8 +68,8 @@ rtc::StringBuilder& operator<<(rtc::StringBuilder& builder, return builder; } -rtc::StringBuilder& operator<<( - rtc::StringBuilder& builder, +StringBuilder& operator<<( + StringBuilder& builder, const std::vector& layer_alternatives) { bool first = true; for (const SimulcastLayer& rid : layer_alternatives) { @@ -82,8 +82,8 @@ rtc::StringBuilder& operator<<( return builder; } -rtc::StringBuilder& operator<<(rtc::StringBuilder& builder, - const SimulcastLayerList& simulcast_layers) { +StringBuilder& operator<<(StringBuilder& builder, + const SimulcastLayerList& simulcast_layers) { bool first = true; for (const auto& alternatives : simulcast_layers) { if (!first) { @@ -183,7 +183,7 @@ webrtc::RTCError ParseRidPayloadList(const std::string& payload_list, std::string SimulcastSdpSerializer::SerializeSimulcastDescription( const cricket::SimulcastDescription& simulcast) const { - rtc::StringBuilder sb; + StringBuilder sb; std::string delimiter; if (!simulcast.send_layers().empty()) { @@ -271,7 +271,7 @@ std::string SimulcastSdpSerializer::SerializeRidDescription( RTC_DCHECK(rid_description.direction == RidDirection::kSend || rid_description.direction == RidDirection::kReceive); - rtc::StringBuilder builder; + StringBuilder builder; builder << rid_description.rid << kDelimiterSpace << (rid_description.direction == RidDirection::kSend ? kSendDirection diff --git a/pc/webrtc_sdp.cc b/pc/webrtc_sdp.cc index f40574298a..9422813f0a 100644 --- a/pc/webrtc_sdp.cc +++ b/pc/webrtc_sdp.cc @@ -443,7 +443,7 @@ static bool ParseFailed(std::string description, SdpParseError* error) { static bool ParseFailedExpectFieldNum(absl::string_view line, int expected_fields, SdpParseError* error) { - rtc::StringBuilder description; + StringBuilder description; description << "Expects " << expected_fields << " fields."; return ParseFailed(line, description.Release(), error); } @@ -453,7 +453,7 @@ static bool ParseFailedExpectFieldNum(absl::string_view line, static bool ParseFailedExpectMinFieldNum(absl::string_view line, int expected_min_fields, SdpParseError* error) { - rtc::StringBuilder description; + StringBuilder description; description << "Expects at least " << expected_min_fields << " fields."; return ParseFailed(line, description.Release(), error); } @@ -463,7 +463,7 @@ static bool ParseFailedExpectMinFieldNum(absl::string_view line, static bool ParseFailedGetValue(absl::string_view line, absl::string_view attribute, SdpParseError* error) { - rtc::StringBuilder description; + StringBuilder description; description << "Failed to get the value of attribute: " << attribute; return ParseFailed(line, description.Release(), error); } @@ -477,7 +477,7 @@ static bool ParseFailedExpectLine(absl::string_view message, const char line_type, absl::string_view line_value, SdpParseError* error) { - rtc::StringBuilder description; + StringBuilder description; description << "Expect line: " << std::string(1, line_type) << "=" << line_value; return ParseFailed(message, line_start, description.Release(), error); @@ -536,13 +536,13 @@ static std::optional GetLine(absl::string_view message, // Init `os` to "`type`=`value`". static void InitLine(const char type, absl::string_view value, - rtc::StringBuilder* os) { + StringBuilder* os) { os->Clear(); *os << std::string(1, type) << kSdpDelimiterEqual << value; } // Init `os` to "a=`attribute`". -static void InitAttrLine(absl::string_view attribute, rtc::StringBuilder* os) { +static void InitAttrLine(absl::string_view attribute, StringBuilder* os) { InitLine(kLineTypeAttributes, attribute, os); } @@ -550,7 +550,7 @@ static void InitAttrLine(absl::string_view attribute, rtc::StringBuilder* os) { static void AddAttributeLine(absl::string_view attribute, int value, std::string* message) { - rtc::StringBuilder os; + StringBuilder os; InitAttrLine(attribute, &os); os << kSdpDelimiterColon << value; AddLine(os.str(), message); @@ -600,7 +600,7 @@ static bool AddSsrcLine(uint32_t ssrc_id, std::string* message) { // RFC 5576 // a=ssrc: : - rtc::StringBuilder os; + StringBuilder os; InitAttrLine(kAttributeSsrc, &os); os << kSdpDelimiterColon << ssrc_id << kSdpDelimiterSpace << attribute << kSdpDelimiterColon << value; @@ -635,7 +635,7 @@ static bool GetSingleTokenValue(absl::string_view message, return false; } if (!absl::c_all_of(absl::string_view(*value), IsTokenChar)) { - rtc::StringBuilder description; + StringBuilder description; description << "Illegal character found in the value of " << attribute; return ParseFailed(message, description.Release(), error); } @@ -654,7 +654,7 @@ static bool GetValueFromString(absl::string_view line, T* t, SdpParseError* error) { if (!rtc::FromString(s, t)) { - rtc::StringBuilder description; + StringBuilder description; description << "Invalid value: " << s << "."; return ParseFailed(line, description.Release(), error); } @@ -815,7 +815,7 @@ static std::string GetRtcpLine(const std::vector& candidates) { // RFC 3605 // rtcp-attribute = "a=rtcp:" port [nettype space addrtype space // connection-address] CRLF - rtc::StringBuilder os; + StringBuilder os; InitAttrLine(kAttributeRtcp, &os); os << kSdpDelimiterColon << rtcp_port << " " << kConnectionNettype << " " << addr_type << " " << rtcp_ip; @@ -854,7 +854,7 @@ std::string SdpSerialize(const JsepSessionDescription& jdesc) { // RFC 4566 // o= // - rtc::StringBuilder os; + StringBuilder os; InitLine(kLineTypeOrigin, kSessionOriginUsername, &os); const std::string& session_id = jdesc.session_id().empty() ? kSessionOriginSessionId : jdesc.session_id(); @@ -1055,7 +1055,7 @@ bool ParseCandidate(absl::string_view message, &attribute_candidate, &candidate_value) || attribute_candidate != kAttributeCandidate) { if (is_raw) { - rtc::StringBuilder description; + StringBuilder description; description << "Expect line: " << kAttributeCandidate << ":" ""; @@ -1323,11 +1323,11 @@ bool ParseExtmap(absl::string_view line, static void BuildSctpContentAttributes( std::string* message, const cricket::SctpDataContentDescription* data_desc) { - rtc::StringBuilder os; + StringBuilder os; if (data_desc->use_sctpmap()) { // draft-ietf-mmusic-sctp-sdp-04 // a=sctpmap:sctpmap-number protocol [streams] - rtc::StringBuilder os; + StringBuilder os; InitAttrLine(kAttributeSctpmap, &os); os << kSdpDelimiterColon << data_desc->port() << kSdpDelimiterSpace << kDefaultSctpmapProtocol << kSdpDelimiterSpace @@ -1351,7 +1351,7 @@ void BuildIceUfragPwd(const TransportInfo* transport_info, std::string* message) { RTC_DCHECK(transport_info); - rtc::StringBuilder os; + StringBuilder os; // RFC 5245 // ice-pwd-att = "ice-pwd" ":" password // ice-ufrag-att = "ice-ufrag" ":" ufrag @@ -1373,7 +1373,7 @@ void BuildDtlsFingerprintSetup(const TransportInfo* transport_info, std::string* message) { RTC_DCHECK(transport_info); - rtc::StringBuilder os; + StringBuilder os; // RFC 4572 // fingerprint-attribute = // "fingerprint" ":" hash-func SP fingerprint @@ -1406,7 +1406,7 @@ void BuildMediaLine(const cricket::MediaType media_type, const ContentInfo* content_info, const MediaContentDescription* media_desc, std::string* message) { - rtc::StringBuilder os; + StringBuilder os; // RFC 4566 // m= @@ -1482,7 +1482,7 @@ void BuildMediaDescription(const ContentInfo* content_info, if (!content_info) { return; } - rtc::StringBuilder os; + StringBuilder os; const MediaContentDescription* media_desc = content_info->media_description(); RTC_DCHECK(media_desc); @@ -1571,7 +1571,7 @@ void BuildRtpContentAttributes(const MediaContentDescription* media_desc, int msid_signaling, std::string* message) { SimulcastSdpSerializer serializer; - rtc::StringBuilder os; + StringBuilder os; // RFC 8285 // a=extmap-allow-mixed // The attribute MUST be either on session level or media level. We support @@ -1737,7 +1737,7 @@ void BuildRtpContentAttributes(const MediaContentDescription* media_desc, void BuildRtpHeaderExtensions(const RtpHeaderExtensions& extensions, std::string* message) { - rtc::StringBuilder os; + StringBuilder os; // RFC 8285 // a=extmap:["/"] @@ -1754,7 +1754,7 @@ void BuildRtpHeaderExtensions(const RtpHeaderExtensions& extensions, } } -void WriteFmtpHeader(int payload_type, rtc::StringBuilder* os) { +void WriteFmtpHeader(int payload_type, StringBuilder* os) { // fmtp header: a=fmtp:`payload_type` // Add a=fmtp InitAttrLine(kAttributeFmtp, os); @@ -1762,7 +1762,7 @@ void WriteFmtpHeader(int payload_type, rtc::StringBuilder* os) { *os << kSdpDelimiterColon << payload_type; } -void WritePacketizationHeader(int payload_type, rtc::StringBuilder* os) { +void WritePacketizationHeader(int payload_type, StringBuilder* os) { // packetization header: a=packetization:`payload_type` // Add a=packetization InitAttrLine(kAttributePacketization, os); @@ -1770,7 +1770,7 @@ void WritePacketizationHeader(int payload_type, rtc::StringBuilder* os) { *os << kSdpDelimiterColon << payload_type; } -void WriteRtcpFbHeader(int payload_type, rtc::StringBuilder* os) { +void WriteRtcpFbHeader(int payload_type, StringBuilder* os) { // rtcp-fb header: a=rtcp-fb:`payload_type` // /> // Add a=rtcp-fb @@ -1786,7 +1786,7 @@ void WriteRtcpFbHeader(int payload_type, rtc::StringBuilder* os) { void WriteFmtpParameter(absl::string_view parameter_name, absl::string_view parameter_value, - rtc::StringBuilder* os) { + StringBuilder* os) { if (parameter_name.empty()) { // RFC 2198 and RFC 4733 don't use key-value pairs. *os << parameter_value; @@ -1805,7 +1805,7 @@ bool IsFmtpParam(absl::string_view name) { } bool WriteFmtpParameters(const webrtc::CodecParameterMap& parameters, - rtc::StringBuilder* os) { + StringBuilder* os) { bool empty = true; const char* delimiter = ""; // No delimiter before first parameter. for (const auto& entry : parameters) { @@ -1825,7 +1825,7 @@ bool WriteFmtpParameters(const webrtc::CodecParameterMap& parameters, } void AddFmtpLine(const cricket::Codec& codec, std::string* message) { - rtc::StringBuilder os; + StringBuilder os; WriteFmtpHeader(codec.id, &os); os << kSdpDelimiterSpace; // Create FMTP line and check that it's nonempty. @@ -1839,7 +1839,7 @@ void AddPacketizationLine(const cricket::Codec& codec, std::string* message) { if (!codec.packetization) { return; } - rtc::StringBuilder os; + StringBuilder os; WritePacketizationHeader(codec.id, &os); os << " " << *codec.packetization; AddLine(os.str(), message); @@ -1847,7 +1847,7 @@ void AddPacketizationLine(const cricket::Codec& codec, std::string* message) { void AddRtcpFbLines(const cricket::Codec& codec, std::string* message) { for (const cricket::FeedbackParam& param : codec.feedback_params.params()) { - rtc::StringBuilder os; + StringBuilder os; WriteRtcpFbHeader(codec.id, &os); os << " " << param.id(); if (!param.param().empty()) { @@ -1884,7 +1884,7 @@ void BuildRtpmap(const MediaContentDescription* media_desc, std::string* message) { RTC_DCHECK(message != NULL); RTC_DCHECK(media_desc != NULL); - rtc::StringBuilder os; + StringBuilder os; if (media_type == cricket::MEDIA_TYPE_VIDEO) { for (const cricket::Codec& codec : media_desc->codecs()) { // RFC 4566 @@ -1949,7 +1949,7 @@ void BuildRtpmap(const MediaContentDescription* media_desc, } if (media_desc->rtcp_fb_ack_ccfb()) { // RFC 8888 section 6 - rtc::StringBuilder os; + StringBuilder os; InitAttrLine(kAttributeRtcpFb, &os); os << kSdpDelimiterColon; os << "* ack ccfb"; @@ -1960,7 +1960,7 @@ void BuildRtpmap(const MediaContentDescription* media_desc, void BuildCandidate(const std::vector& candidates, bool include_ufrag, std::string* message) { - rtc::StringBuilder os; + StringBuilder os; for (const Candidate& candidate : candidates) { // RFC 5245 @@ -2032,7 +2032,7 @@ void BuildCandidate(const std::vector& candidates, void BuildIceOptions(const std::vector& transport_options, std::string* message) { if (!transport_options.empty()) { - rtc::StringBuilder os; + StringBuilder os; InitAttrLine(kAttributeIceOption, &os); os << kSdpDelimiterColon << transport_options[0]; for (size_t i = 1; i < transport_options.size(); ++i) { @@ -3487,7 +3487,7 @@ bool ParseSsrcAttribute(absl::string_view line, std::string value; if (!rtc::tokenize_first(field2, kSdpDelimiterColonChar, &attribute, &value)) { - rtc::StringBuilder description; + StringBuilder description; description << "Failed to get the ssrc attribute value from " << field2 << ". Expected format :."; return ParseFailed(line, description.Release(), error); @@ -3647,7 +3647,7 @@ bool ParseRtpmapAttribute(absl::string_view line, if (!existing_codec.name.empty() && payload_type == existing_codec.id && (!absl::EqualsIgnoreCase(encoding_name, existing_codec.name) || clock_rate != existing_codec.clockrate)) { - rtc::StringBuilder description; + StringBuilder description; description << "Duplicate " << (payload_type < kFirstDynamicPayloadTypeLowerRange @@ -3679,7 +3679,7 @@ bool ParseRtpmapAttribute(absl::string_view line, // channels. if (!existing_codec.name.empty() && payload_type == existing_codec.id && (!absl::EqualsIgnoreCase(encoding_name, existing_codec.name))) { - rtc::StringBuilder description; + StringBuilder description; description << "Duplicate " << (payload_type < kFirstDynamicPayloadTypeLowerRange diff --git a/pc/webrtc_sdp.h b/pc/webrtc_sdp.h index a67a9b4a07..87ecd65a1b 100644 --- a/pc/webrtc_sdp.h +++ b/pc/webrtc_sdp.h @@ -35,10 +35,6 @@ namespace cricket { class Candidate; } // namespace cricket -namespace rtc { -class StringBuilder; -} // namespace rtc - namespace webrtc { class IceCandidateInterface; class JsepIceCandidate; @@ -110,7 +106,7 @@ RTC_EXPORT bool ParseCandidate(absl::string_view message, // IsFmtpParam(). Returns true if the set of FMTP parameters is nonempty, false // otherwise. bool WriteFmtpParameters(const webrtc::CodecParameterMap& parameters, - rtc::StringBuilder* os); + StringBuilder* os); // Parses a string into an FMTP parameter set, in key-value format. bool ParseFmtpParameterSet(absl::string_view line_params, diff --git a/rtc_base/logging.cc b/rtc_base/logging.cc index f0461f79e9..83dd1bc99f 100644 --- a/rtc_base/logging.cc +++ b/rtc_base/logging.cc @@ -86,7 +86,7 @@ webrtc::Mutex& GetLoggingLock() { } // namespace std::string LogLineRef::DefaultLogLine() const { - rtc::StringBuilder log_output; + webrtc::StringBuilder log_output; if (timestamp_ != webrtc::Timestamp::MinusInfinity()) { // TODO(kwiberg): Switch to absl::StrFormat, if binary size is ok. char timestamp[50]; // Maximum string length of an int64_t is 20. @@ -162,7 +162,7 @@ LogMessage::LogMessage(const char* file, if (err_ctx != ERRCTX_NONE) { char tmp_buf[1024]; - SimpleStringBuilder tmp(tmp_buf); + webrtc::SimpleStringBuilder tmp(tmp_buf); tmp.AppendFormat("[0x%08X]", err); switch (err_ctx) { case ERRCTX_ERRNO: @@ -226,7 +226,7 @@ void LogMessage::AddTag([[maybe_unused]] const char* tag) { #endif } -rtc::StringBuilder& LogMessage::stream() { +webrtc::StringBuilder& LogMessage::stream() { return print_stream_; } diff --git a/rtc_base/logging.h b/rtc_base/logging.h index 8131102944..5f3f200899 100644 --- a/rtc_base/logging.h +++ b/rtc_base/logging.h @@ -468,7 +468,7 @@ class LogMessage { LogMessage& operator=(const LogMessage&) = delete; void AddTag(const char* tag); - rtc::StringBuilder& stream(); + webrtc::StringBuilder& stream(); // Returns the time at which this function was called for the first time. // The time will be used as the logging start time. // If this is not called externally, the LogMessage ctor also calls it, in @@ -610,7 +610,7 @@ class LogMessage { #endif // RTC_LOG_ENABLED() // The stringbuilder that buffers the formatted message before output - rtc::StringBuilder print_stream_; + webrtc::StringBuilder print_stream_; }; ////////////////////////////////////////////////////////////////////// diff --git a/rtc_base/network.cc b/rtc_base/network.cc index cc6565b307..87d8bf1885 100644 --- a/rtc_base/network.cc +++ b/rtc_base/network.cc @@ -224,7 +224,7 @@ bool CompareNetworks(const std::unique_ptr& a, std::string MakeNetworkKey(absl::string_view name, const IPAddress& prefix, int prefix_length) { - rtc::StringBuilder ost; + webrtc::StringBuilder ost; ost << name << "%" << prefix.ToString() << "/" << prefix_length; return ost.Release(); } @@ -1251,7 +1251,7 @@ Network::GuessAdapterFromNetworkCost(int network_cost) { } std::string Network::ToString() const { - rtc::StringBuilder ss; + webrtc::StringBuilder ss; // Print out the first space-terminated token of the network desc, plus // the IP address. ss << "Net[" << description_.substr(0, description_.find(' ')) << ":" diff --git a/rtc_base/network_route.h b/rtc_base/network_route.h index 3f678e3455..a223c0c996 100644 --- a/rtc_base/network_route.h +++ b/rtc_base/network_route.h @@ -75,7 +75,7 @@ struct NetworkRoute { int packet_overhead = 0; RTC_NO_INLINE inline std::string DebugString() const { - rtc::StringBuilder oss; + webrtc::StringBuilder oss; oss << "[ connected: " << connected << " local: [ " << local.adapter_id() << "/" << local.network_id() << " " << AdapterTypeToString(local.adapter_type()) diff --git a/rtc_base/openssl_adapter.cc b/rtc_base/openssl_adapter.cc index 006222d790..4ded812ea5 100644 --- a/rtc_base/openssl_adapter.cc +++ b/rtc_base/openssl_adapter.cc @@ -783,7 +783,7 @@ void OpenSSLAdapter::SSLInfoCallback(const SSL* ssl, int where, int ret) { break; } char buf[1024]; - rtc::SimpleStringBuilder ss(buf); + webrtc::SimpleStringBuilder ss(buf); ss << SSL_state_string_long(ssl); if (ret == 0) { RTC_LOG(LS_ERROR) << "Error during " << ss.str() << "\n"; diff --git a/rtc_base/socket_address.cc b/rtc_base/socket_address.cc index 7164a780d1..43baaa3a49 100644 --- a/rtc_base/socket_address.cc +++ b/rtc_base/socket_address.cc @@ -160,14 +160,14 @@ std::string SocketAddress::PortAsString() const { std::string SocketAddress::ToString() const { char buf[1024]; - rtc::SimpleStringBuilder sb(buf); + webrtc::SimpleStringBuilder sb(buf); sb << HostAsURIString() << ":" << port(); return sb.str(); } std::string SocketAddress::ToSensitiveString() const { char buf[1024]; - rtc::SimpleStringBuilder sb(buf); + webrtc::SimpleStringBuilder sb(buf); sb << HostAsSensitiveURIString() << ":" << port(); return sb.str(); } @@ -177,7 +177,7 @@ std::string SocketAddress::ToSensitiveNameAndAddressString() const { return ToSensitiveString(); } char buf[1024]; - rtc::SimpleStringBuilder sb(buf); + webrtc::SimpleStringBuilder sb(buf); sb << HostAsSensitiveURIString() << ":" << port(); sb << " ("; if (ip_.family() == AF_INET6) { diff --git a/rtc_base/ssl_identity.cc b/rtc_base/ssl_identity.cc index 785c17a3fc..363dd4acdf 100644 --- a/rtc_base/ssl_identity.cc +++ b/rtc_base/ssl_identity.cc @@ -193,7 +193,7 @@ bool SSLIdentity::PemToDer(absl::string_view pem_type, std::string SSLIdentity::DerToPem(absl::string_view pem_type, const unsigned char* data, size_t length) { - rtc::StringBuilder result; + webrtc::StringBuilder result; result << "-----BEGIN " << pem_type << "-----\n"; std::string b64_encoded; diff --git a/rtc_base/strings/audio_format_to_string.cc b/rtc_base/strings/audio_format_to_string.cc index 7e91c3b49d..1ba2a0824c 100644 --- a/rtc_base/strings/audio_format_to_string.cc +++ b/rtc_base/strings/audio_format_to_string.cc @@ -17,7 +17,7 @@ namespace rtc { std::string ToString(const webrtc::SdpAudioFormat& saf) { char sb_buf[1024]; - rtc::SimpleStringBuilder sb(sb_buf); + webrtc::SimpleStringBuilder sb(sb_buf); sb << "{name: " << saf.name; sb << ", clockrate_hz: " << saf.clockrate_hz; sb << ", num_channels: " << saf.num_channels; @@ -32,7 +32,7 @@ std::string ToString(const webrtc::SdpAudioFormat& saf) { } std::string ToString(const webrtc::AudioCodecInfo& aci) { char sb_buf[1024]; - rtc::SimpleStringBuilder sb(sb_buf); + webrtc::SimpleStringBuilder sb(sb_buf); sb << "{sample_rate_hz: " << aci.sample_rate_hz; sb << ", num_channels: " << aci.num_channels; sb << ", default_bitrate_bps: " << aci.default_bitrate_bps; @@ -45,7 +45,7 @@ std::string ToString(const webrtc::AudioCodecInfo& aci) { } std::string ToString(const webrtc::AudioCodecSpec& acs) { char sb_buf[1024]; - rtc::SimpleStringBuilder sb(sb_buf); + webrtc::SimpleStringBuilder sb(sb_buf); sb << "{format: " << ToString(acs.format); sb << ", info: " << ToString(acs.info); sb << "}"; diff --git a/rtc_base/strings/str_join.h b/rtc_base/strings/str_join.h index 762e63ae2a..779cded4b0 100644 --- a/rtc_base/strings/str_join.h +++ b/rtc_base/strings/str_join.h @@ -19,7 +19,7 @@ namespace webrtc { template std::string StrJoin(const Range& seq, absl::string_view delimiter) { - rtc::StringBuilder sb; + StringBuilder sb; int idx = 0; for (const typename Range::value_type& elem : seq) { @@ -37,7 +37,7 @@ template std::string StrJoin(const Range& seq, absl::string_view delimiter, const Functor& fn) { - rtc::StringBuilder sb; + StringBuilder sb; int idx = 0; for (const typename Range::value_type& elem : seq) { diff --git a/rtc_base/strings/string_builder.cc b/rtc_base/strings/string_builder.cc index a419b0b3cc..86e71efab3 100644 --- a/rtc_base/strings/string_builder.cc +++ b/rtc_base/strings/string_builder.cc @@ -19,7 +19,7 @@ #include "rtc_base/checks.h" #include "rtc_base/numerics/safe_minmax.h" -namespace rtc { +namespace webrtc { SimpleStringBuilder::SimpleStringBuilder(rtc::ArrayView buffer) : buffer_(buffer) { @@ -131,4 +131,4 @@ StringBuilder& StringBuilder::AppendFormat(const char* fmt, ...) { return *this; } -} // namespace rtc +} // namespace webrtc diff --git a/rtc_base/strings/string_builder.h b/rtc_base/strings/string_builder.h index 00986371d3..92b6e92609 100644 --- a/rtc_base/strings/string_builder.h +++ b/rtc_base/strings/string_builder.h @@ -19,7 +19,7 @@ #include "api/array_view.h" #include "rtc_base/string_encode.h" -namespace rtc { +namespace webrtc { // This is a minimalistic string builder class meant to cover the most cases of // when you might otherwise be tempted to use a stringstream (discouraged for @@ -165,6 +165,13 @@ class StringBuilder { std::string str_; }; +} // namespace webrtc + +// Re-export symbols from the webrtc namespace for backwards compatibility. +// TODO(bugs.webrtc.org/4222596): Remove once all references are updated. +namespace rtc { +using ::webrtc::SimpleStringBuilder; +using ::webrtc::StringBuilder; } // namespace rtc #endif // RTC_BASE_STRINGS_STRING_BUILDER_H_ diff --git a/rtc_base/strings/string_builder_unittest.cc b/rtc_base/strings/string_builder_unittest.cc index 99dfd86292..44c6c4b633 100644 --- a/rtc_base/strings/string_builder_unittest.cc +++ b/rtc_base/strings/string_builder_unittest.cc @@ -16,11 +16,11 @@ #include "test/gmock.h" #include "test/gtest.h" -namespace rtc { +namespace webrtc { TEST(SimpleStringBuilder, Limit) { char sb_buf[10]; - SimpleStringBuilder sb(sb_buf); + webrtc::SimpleStringBuilder sb(sb_buf); EXPECT_EQ(0u, strlen(sb.str())); // Test that for a SSB with a buffer size of 10, that we can write 9 chars @@ -31,7 +31,7 @@ TEST(SimpleStringBuilder, Limit) { TEST(SimpleStringBuilder, NumbersAndChars) { char sb_buf[100]; - SimpleStringBuilder sb(sb_buf); + webrtc::SimpleStringBuilder sb(sb_buf); sb << 1 << ':' << 2.1 << ":" << 2.2f << ':' << 78187493520ll << ':' << 78187493520ul; EXPECT_EQ(0, strcmp(sb.str(), "1:2.1:2.2:78187493520:78187493520")); @@ -39,7 +39,7 @@ TEST(SimpleStringBuilder, NumbersAndChars) { TEST(SimpleStringBuilder, Format) { char sb_buf[100]; - SimpleStringBuilder sb(sb_buf); + webrtc::SimpleStringBuilder sb(sb_buf); sb << "Here we go - "; sb.AppendFormat("This is a hex formatted value: 0x%08llx", 3735928559ULL); EXPECT_EQ(0, @@ -49,7 +49,7 @@ TEST(SimpleStringBuilder, Format) { TEST(SimpleStringBuilder, StdString) { char sb_buf[100]; - SimpleStringBuilder sb(sb_buf); + webrtc::SimpleStringBuilder sb(sb_buf); std::string str = "does this work?"; sb << str; EXPECT_EQ(str, sb.str()); @@ -61,7 +61,7 @@ TEST(SimpleStringBuilder, StdString) { TEST(SimpleStringBuilderDeathTest, BufferOverrunConstCharP) { char sb_buf[4]; - SimpleStringBuilder sb(sb_buf); + webrtc::SimpleStringBuilder sb(sb_buf); const char* const msg = "This is just too much"; #if RTC_DCHECK_IS_ON EXPECT_DEATH(sb << msg, ""); @@ -73,7 +73,7 @@ TEST(SimpleStringBuilderDeathTest, BufferOverrunConstCharP) { TEST(SimpleStringBuilderDeathTest, BufferOverrunStdString) { char sb_buf[4]; - SimpleStringBuilder sb(sb_buf); + webrtc::SimpleStringBuilder sb(sb_buf); sb << 12; const std::string msg = "Aw, come on!"; #if RTC_DCHECK_IS_ON @@ -86,7 +86,7 @@ TEST(SimpleStringBuilderDeathTest, BufferOverrunStdString) { TEST(SimpleStringBuilderDeathTest, BufferOverrunInt) { char sb_buf[4]; - SimpleStringBuilder sb(sb_buf); + webrtc::SimpleStringBuilder sb(sb_buf); constexpr int num = -12345; #if RTC_DCHECK_IS_ON EXPECT_DEATH(sb << num, ""); @@ -102,7 +102,7 @@ TEST(SimpleStringBuilderDeathTest, BufferOverrunInt) { TEST(SimpleStringBuilderDeathTest, BufferOverrunDouble) { char sb_buf[5]; - SimpleStringBuilder sb(sb_buf); + webrtc::SimpleStringBuilder sb(sb_buf); constexpr double num = 123.456; #if RTC_DCHECK_IS_ON EXPECT_DEATH(sb << num, ""); @@ -115,7 +115,7 @@ TEST(SimpleStringBuilderDeathTest, BufferOverrunDouble) { TEST(SimpleStringBuilderDeathTest, BufferOverrunConstCharPAlreadyFull) { char sb_buf[4]; - SimpleStringBuilder sb(sb_buf); + webrtc::SimpleStringBuilder sb(sb_buf); sb << 123; const char* const msg = "This is just too much"; #if RTC_DCHECK_IS_ON @@ -128,7 +128,7 @@ TEST(SimpleStringBuilderDeathTest, BufferOverrunConstCharPAlreadyFull) { TEST(SimpleStringBuilderDeathTest, BufferOverrunIntAlreadyFull) { char sb_buf[4]; - SimpleStringBuilder sb(sb_buf); + webrtc::SimpleStringBuilder sb(sb_buf); sb << "xyz"; constexpr int num = -12345; #if RTC_DCHECK_IS_ON @@ -145,7 +145,7 @@ TEST(SimpleStringBuilderDeathTest, BufferOverrunIntAlreadyFull) { // StringBuilder. TEST(StringBuilder, Limit) { - StringBuilder sb; + webrtc::StringBuilder sb; EXPECT_EQ(0u, sb.str().size()); sb << "012345678"; @@ -153,7 +153,7 @@ TEST(StringBuilder, Limit) { } TEST(StringBuilder, NumbersAndChars) { - StringBuilder sb; + webrtc::StringBuilder sb; sb << 1 << ":" << 2.1 << ":" << 2.2f << ":" << 78187493520ll << ":" << 78187493520ul; EXPECT_THAT(sb.str(), @@ -161,21 +161,21 @@ TEST(StringBuilder, NumbersAndChars) { } TEST(StringBuilder, Format) { - StringBuilder sb; + webrtc::StringBuilder sb; sb << "Here we go - "; sb.AppendFormat("This is a hex formatted value: 0x%08llx", 3735928559ULL); EXPECT_EQ(sb.str(), "Here we go - This is a hex formatted value: 0xdeadbeef"); } TEST(StringBuilder, StdString) { - StringBuilder sb; + webrtc::StringBuilder sb; std::string str = "does this work?"; sb << str; EXPECT_EQ(str, sb.str()); } TEST(StringBuilder, Release) { - StringBuilder sb; + webrtc::StringBuilder sb; std::string str = "This string has to be of a moderate length, or we might " "run into problems with small object optimizations."; @@ -190,7 +190,7 @@ TEST(StringBuilder, Release) { } TEST(StringBuilder, Reset) { - StringBuilder sb("abc"); + webrtc::StringBuilder sb("abc"); sb << "def"; EXPECT_EQ("abcdef", sb.str()); sb.Clear(); @@ -199,4 +199,4 @@ TEST(StringBuilder, Reset) { EXPECT_EQ("123!", sb.str()); } -} // namespace rtc +} // namespace webrtc diff --git a/rtc_tools/data_channel_benchmark/data_channel_benchmark.cc b/rtc_tools/data_channel_benchmark/data_channel_benchmark.cc index fa0b6ca9c4..306cd9186a 100644 --- a/rtc_tools/data_channel_benchmark/data_channel_benchmark.cc +++ b/rtc_tools/data_channel_benchmark/data_channel_benchmark.cc @@ -52,7 +52,7 @@ struct SetupMessage { std::string ToString() { char buffer[64]; - rtc::SimpleStringBuilder sb(buffer); + webrtc::SimpleStringBuilder sb(buffer); sb << packet_size << "," << transfer_size; return sb.str(); diff --git a/rtc_tools/frame_analyzer/frame_analyzer.cc b/rtc_tools/frame_analyzer/frame_analyzer.cc index 501a6142a8..2f4bcb3022 100644 --- a/rtc_tools/frame_analyzer/frame_analyzer.cc +++ b/rtc_tools/frame_analyzer/frame_analyzer.cc @@ -136,7 +136,7 @@ int main(int argc, char* argv[]) { CalculateColorTransformationMatrix(aligned_reference_video, test_video); char buf[256]; - rtc::SimpleStringBuilder string_builder(buf); + webrtc::SimpleStringBuilder string_builder(buf); for (int i = 0; i < 3; ++i) { string_builder << "\n"; for (int j = 0; j < 4; ++j) diff --git a/rtc_tools/rtc_event_log_visualizer/analyzer.cc b/rtc_tools/rtc_event_log_visualizer/analyzer.cc index b626043a18..1313109f53 100644 --- a/rtc_tools/rtc_event_log_visualizer/analyzer.cc +++ b/rtc_tools/rtc_event_log_visualizer/analyzer.cc @@ -84,7 +84,7 @@ namespace webrtc { namespace { std::string SsrcToString(uint32_t ssrc) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "SSRC " << ssrc; return ss.Release(); } @@ -332,7 +332,7 @@ std::string GetCandidatePairLogDescriptionAsString( // represents a pair of a local server-reflexive candidate on a WiFi network // and a remote relay candidate using TCP as the relay protocol on a cell // network, when the candidate pair communicates over UDP using IPv4. - rtc::StringBuilder ss; + StringBuilder ss; ss << GetIceCandidateTypeAsString(config.local_candidate_type); if (config.local_candidate_type == IceCandidateType::kRelay) { diff --git a/rtc_tools/rtc_event_log_visualizer/analyzer_common.cc b/rtc_tools/rtc_event_log_visualizer/analyzer_common.cc index be635fb48c..c1cf7dc6b7 100644 --- a/rtc_tools/rtc_event_log_visualizer/analyzer_common.cc +++ b/rtc_tools/rtc_event_log_visualizer/analyzer_common.cc @@ -59,7 +59,7 @@ std::string GetStreamName(const ParsedRtcEventLog& parsed_log, PacketDirection direction, uint32_t ssrc) { char buffer[200]; - rtc::SimpleStringBuilder name(buffer); + SimpleStringBuilder name(buffer); if (IsAudioSsrc(parsed_log, direction, ssrc)) { name << "Audio "; } else if (IsVideoSsrc(parsed_log, direction, ssrc)) { @@ -80,7 +80,7 @@ std::string GetStreamName(const ParsedRtcEventLog& parsed_log, std::string GetLayerName(LayerDescription layer) { char buffer[100]; - rtc::SimpleStringBuilder name(buffer); + SimpleStringBuilder name(buffer); name << "SSRC " << layer.ssrc << " sl " << layer.spatial_layer << ", tl " << layer.temporal_layer; return name.str(); diff --git a/rtc_tools/unpack_aecdump/unpack.cc b/rtc_tools/unpack_aecdump/unpack.cc index 800e84c207..7c973e9932 100644 --- a/rtc_tools/unpack_aecdump/unpack.cc +++ b/rtc_tools/unpack_aecdump/unpack.cc @@ -215,7 +215,7 @@ class RuntimeSettingWriter { void WriteEvent(const Event& event, int frame_count) { RTC_DCHECK(is_exporter_for_(event)); if (file_ == nullptr) { - rtc::StringBuilder file_name; + StringBuilder file_name; file_name << setting_name_ << frame_offset_ << ".txt"; file_ = OpenFile(file_name.str(), "wb"); } @@ -292,7 +292,7 @@ std::vector RuntimeSettingWriters() { } std::string GetWavFileIndex(int init_index, int frame_count) { - rtc::StringBuilder suffix; + StringBuilder suffix; if (absl::GetFlag(FLAGS_use_init_suffix)) { suffix << "_" << init_index; } else { @@ -334,7 +334,7 @@ int do_main(int argc, char* argv[]) { std::unique_ptr input_raw_file; std::unique_ptr output_raw_file; - rtc::StringBuilder callorder_raw_name; + StringBuilder callorder_raw_name; callorder_raw_name << absl::GetFlag(FLAGS_callorder_file) << ".char"; FILE* callorder_char_file = WritingCallOrderFile() ? OpenFile(callorder_raw_name.str(), "wb") @@ -574,21 +574,21 @@ int do_main(int argc, char* argv[]) { // their sample rate or number of channels. std::string suffix = GetWavFileIndex(init_count, frame_count); - rtc::StringBuilder reverse_name; + StringBuilder reverse_name; reverse_name << absl::GetFlag(FLAGS_reverse_file) << suffix << ".wav"; reverse_wav_file.reset(new WavWriter( reverse_name.str(), reverse_sample_rate, num_reverse_channels)); - rtc::StringBuilder input_name; + StringBuilder input_name; input_name << absl::GetFlag(FLAGS_input_file) << suffix << ".wav"; input_wav_file.reset(new WavWriter(input_name.str(), input_sample_rate, num_input_channels)); - rtc::StringBuilder output_name; + StringBuilder output_name; output_name << absl::GetFlag(FLAGS_output_file) << suffix << ".wav"; output_wav_file.reset(new WavWriter( output_name.str(), output_sample_rate, num_output_channels)); if (WritingCallOrderFile()) { - rtc::StringBuilder callorder_name; + StringBuilder callorder_name; callorder_name << absl::GetFlag(FLAGS_callorder_file) << suffix << ".char"; callorder_char_file = OpenFile(callorder_name.str(), "wb"); diff --git a/rtc_tools/video_encoder/encoded_image_file_writer.cc b/rtc_tools/video_encoder/encoded_image_file_writer.cc index e495ca31b9..66207ddaa7 100644 --- a/rtc_tools/video_encoder/encoded_image_file_writer.cc +++ b/rtc_tools/video_encoder/encoded_image_file_writer.cc @@ -36,7 +36,7 @@ EncodedImageFileWriter::EncodedImageFileWriter( for (int i = 0; i < spatial_layers_; ++i) { for (int j = 0; j < temporal_layers_; ++j) { char buffer[256]; - rtc::SimpleStringBuilder name(buffer); + SimpleStringBuilder name(buffer); name << "output-" << codec_string << "-" << ScalabilityModeToString(*scalability_mode) << "-L" << i << "T" << j << ".ivf"; diff --git a/rtc_tools/video_encoder/video_encoder.cc b/rtc_tools/video_encoder/video_encoder.cc index fc627f8bde..2549a3851b 100644 --- a/rtc_tools/video_encoder/video_encoder.cc +++ b/rtc_tools/video_encoder/video_encoder.cc @@ -89,7 +89,7 @@ namespace { std::string ToString(const EncodedImage& encoded_image) { char buffer[1024]; - rtc::SimpleStringBuilder ss(buffer); + SimpleStringBuilder ss(buffer); ss << VideoFrameTypeToString(encoded_image._frameType) << ", size=" << encoded_image.size() << ", qp=" << encoded_image.qp_ @@ -113,7 +113,7 @@ std::string ToString(const EncodedImage& encoded_image) { [[maybe_unused]] std::string ToString( const CodecSpecificInfo& codec_specific_info) { char buffer[1024]; - rtc::SimpleStringBuilder ss(buffer); + SimpleStringBuilder ss(buffer); ss << CodecTypeToPayloadString(codec_specific_info.codecType); diff --git a/sdk/android/native_api/stacktrace/stacktrace.cc b/sdk/android/native_api/stacktrace/stacktrace.cc index 94b9b7b717..175391a0b2 100644 --- a/sdk/android/native_api/stacktrace/stacktrace.cc +++ b/sdk/android/native_api/stacktrace/stacktrace.cc @@ -266,7 +266,7 @@ std::vector GetStackTrace() { std::string StackTraceToString( const std::vector& stack_trace) { - rtc::StringBuilder string_builder; + StringBuilder string_builder; for (size_t i = 0; i < stack_trace.size(); ++i) { const StackTraceElement& stack_trace_element = stack_trace[i]; diff --git a/sdk/android/src/jni/android_network_monitor.cc b/sdk/android/src/jni/android_network_monitor.cc index 787345bcff..f5144fe62b 100644 --- a/sdk/android/src/jni/android_network_monitor.cc +++ b/sdk/android/src/jni/android_network_monitor.cc @@ -216,7 +216,7 @@ NetworkInformation& NetworkInformation::operator=(NetworkInformation&&) = default; std::string NetworkInformation::ToString() const { - rtc::StringBuilder ss; + StringBuilder ss; ss << "NetInfo[name " << interface_name << "; handle " << handle << "; type " << type; if (type == NETWORK_VPN) { diff --git a/stats/attribute.cc b/stats/attribute.cc index 52cdbc2bff..a6dd6309e4 100644 --- a/stats/attribute.cc +++ b/stats/attribute.cc @@ -63,7 +63,7 @@ struct VisitToString { // Vector attributes. template std::string operator()(const std::optional>* attribute) { - rtc::StringBuilder sb; + StringBuilder sb; sb << "["; const char* separator = ""; constexpr bool element_is_string = std::is_same::value; @@ -85,7 +85,7 @@ struct VisitToString { template std::string operator()( const std::optional>* attribute) { - rtc::StringBuilder sb; + StringBuilder sb; sb << "{"; const char* separator = ""; constexpr bool element_is_string = std::is_same::value; diff --git a/stats/rtc_stats.cc b/stats/rtc_stats.cc index e7d72ee3a3..abf85023ea 100644 --- a/stats/rtc_stats.cc +++ b/stats/rtc_stats.cc @@ -40,7 +40,7 @@ bool RTCStats::operator!=(const RTCStats& other) const { } std::string RTCStats::ToJson() const { - rtc::StringBuilder sb; + StringBuilder sb; sb << "{\"type\":\"" << type() << "\"," "\"id\":\"" diff --git a/stats/rtc_stats_report.cc b/stats/rtc_stats_report.cc index 404549135b..42d0a5b313 100644 --- a/stats/rtc_stats_report.cc +++ b/stats/rtc_stats_report.cc @@ -118,7 +118,7 @@ std::string RTCStatsReport::ToJson() const { if (begin() == end()) { return ""; } - rtc::StringBuilder sb; + StringBuilder sb; sb << "["; const char* separator = ""; for (ConstIterator it = begin(); it != end(); ++it) { diff --git a/test/network/network_emulation_manager.cc b/test/network/network_emulation_manager.cc index f520310db9..4531a874d8 100644 --- a/test/network/network_emulation_manager.cc +++ b/test/network/network_emulation_manager.cc @@ -385,7 +385,7 @@ EmulatedTURNServerInterface* NetworkEmulationManagerImpl::CreateTURNServer( auto* client = CreateEndpoint(config.client_config); auto* peer = CreateEndpoint(config.client_config); char buf[128]; - rtc::SimpleStringBuilder str(buf); + SimpleStringBuilder str(buf); str.AppendFormat("turn_server_%u", static_cast(turn_servers_.size())); auto turn = std::make_unique( diff --git a/test/pc/e2e/analyzer/video/default_video_quality_analyzer.cc b/test/pc/e2e/analyzer/video/default_video_quality_analyzer.cc index a325334371..451ab489c5 100644 --- a/test/pc/e2e/analyzer/video/default_video_quality_analyzer.cc +++ b/test/pc/e2e/analyzer/video/default_video_quality_analyzer.cc @@ -1322,7 +1322,7 @@ std::string DefaultVideoQualityAnalyzer::ToMetricName( // TODO(titovartem): remove this special case. return stream_label; } - rtc::StringBuilder out; + StringBuilder out; out << stream_label << "_" << peers_->name(key.sender) << "_" << peers_->name(key.receiver); return out.str(); diff --git a/test/pc/e2e/analyzer/video/default_video_quality_analyzer_frames_comparator_test.cc b/test/pc/e2e/analyzer/video/default_video_quality_analyzer_frames_comparator_test.cc index ca39eb7d02..571c3c602f 100644 --- a/test/pc/e2e/analyzer/video/default_video_quality_analyzer_frames_comparator_test.cc +++ b/test/pc/e2e/analyzer/video/default_video_quality_analyzer_frames_comparator_test.cc @@ -132,7 +132,7 @@ void AssertFirstMetadataHasField(const SamplesStatsCounter& counter, } std::string ToString(const SamplesStatsCounter& counter) { - rtc::StringBuilder out; + StringBuilder out; for (const StatsSample& s : counter.GetTimedSamples()) { out << "{ time_ms=" << s.time.ms() << "; value=" << s.value << "}, "; } diff --git a/test/pc/e2e/analyzer/video/default_video_quality_analyzer_internal_shared_objects.cc b/test/pc/e2e/analyzer/video/default_video_quality_analyzer_internal_shared_objects.cc index 49e0f42bba..4689729f3e 100644 --- a/test/pc/e2e/analyzer/video/default_video_quality_analyzer_internal_shared_objects.cc +++ b/test/pc/e2e/analyzer/video/default_video_quality_analyzer_internal_shared_objects.cc @@ -15,7 +15,7 @@ namespace webrtc { std::string InternalStatsKey::ToString() const { - rtc::StringBuilder out; + StringBuilder out; out << "stream=" << stream << "_sender=" << sender << "_receiver=" << receiver; return out.str(); diff --git a/test/pc/e2e/analyzer/video/default_video_quality_analyzer_shared_objects.cc b/test/pc/e2e/analyzer/video/default_video_quality_analyzer_shared_objects.cc index 7915df3f3e..70345dd6bc 100644 --- a/test/pc/e2e/analyzer/video/default_video_quality_analyzer_shared_objects.cc +++ b/test/pc/e2e/analyzer/video/default_video_quality_analyzer_shared_objects.cc @@ -26,7 +26,7 @@ constexpr int kMicrosPerSecond = 1000000; } // namespace std::string StreamCodecInfo::ToString() const { - rtc::StringBuilder out; + StringBuilder out; out << "{codec_name=" << codec_name << "; first_frame_id=" << first_frame_id << "; last_frame_id=" << last_frame_id << "; switched_on_at=" << webrtc::ToString(switched_on_at) @@ -38,8 +38,7 @@ std::ostream& operator<<(std::ostream& os, const StreamCodecInfo& state) { return os << state.ToString(); } -rtc::StringBuilder& operator<<(rtc::StringBuilder& sb, - const StreamCodecInfo& state) { +StringBuilder& operator<<(StringBuilder& sb, const StreamCodecInfo& state) { return sb << state.ToString(); } @@ -70,7 +69,7 @@ std::string ToString(FrameDropPhase phase) { std::ostream& operator<<(std::ostream& os, FrameDropPhase phase) { return os << ToString(phase); } -rtc::StringBuilder& operator<<(rtc::StringBuilder& sb, FrameDropPhase phase) { +StringBuilder& operator<<(StringBuilder& sb, FrameDropPhase phase) { return sb << ToString(phase); } @@ -100,7 +99,7 @@ StreamStats::StreamStats(Timestamp stream_started_time) } std::string StatsKey::ToString() const { - rtc::StringBuilder out; + StringBuilder out; out << stream_label << "_" << receiver; return out.str(); } diff --git a/test/pc/e2e/analyzer/video/default_video_quality_analyzer_shared_objects.h b/test/pc/e2e/analyzer/video/default_video_quality_analyzer_shared_objects.h index a2dbd5c761..5f529dd4a3 100644 --- a/test/pc/e2e/analyzer/video/default_video_quality_analyzer_shared_objects.h +++ b/test/pc/e2e/analyzer/video/default_video_quality_analyzer_shared_objects.h @@ -88,8 +88,7 @@ struct StreamCodecInfo { }; std::ostream& operator<<(std::ostream& os, const StreamCodecInfo& state); -rtc::StringBuilder& operator<<(rtc::StringBuilder& sb, - const StreamCodecInfo& state); +StringBuilder& operator<<(StringBuilder& sb, const StreamCodecInfo& state); bool operator==(const StreamCodecInfo& a, const StreamCodecInfo& b); // Represents phases where video frame can be dropped and such drop will be @@ -106,7 +105,7 @@ enum class FrameDropPhase : int { std::string ToString(FrameDropPhase phase); std::ostream& operator<<(std::ostream& os, FrameDropPhase phase); -rtc::StringBuilder& operator<<(rtc::StringBuilder& sb, FrameDropPhase phase); +StringBuilder& operator<<(StringBuilder& sb, FrameDropPhase phase); struct StreamStats { explicit StreamStats(Timestamp stream_started_time); diff --git a/test/pc/e2e/analyzer/video/default_video_quality_analyzer_test.cc b/test/pc/e2e/analyzer/video/default_video_quality_analyzer_test.cc index 93b13f166f..2ef4c1d64d 100644 --- a/test/pc/e2e/analyzer/video/default_video_quality_analyzer_test.cc +++ b/test/pc/e2e/analyzer/video/default_video_quality_analyzer_test.cc @@ -125,7 +125,7 @@ void ExpectRateIs(const SamplesRateCounter& rate_couter, double expected_rate) { } std::string ToString(const std::vector& values) { - rtc::StringBuilder out; + StringBuilder out; for (const auto& v : values) { out << "{ time_ms=" << v.time.ms() << "; value=" << v.value << "}, "; } diff --git a/test/pc/e2e/peer_connection_quality_test.cc b/test/pc/e2e/peer_connection_quality_test.cc index 8fa99826df..de353821bf 100644 --- a/test/pc/e2e/peer_connection_quality_test.cc +++ b/test/pc/e2e/peer_connection_quality_test.cc @@ -473,7 +473,7 @@ std::string PeerConnectionE2EQualityTest::GetFieldTrials( if (run_params.enable_flex_fec_support) { default_field_trials.push_back(kFlexFecEnabledFieldTrials); } - rtc::StringBuilder sb; + StringBuilder sb; sb << field_trial::GetFieldTrialString(); for (const absl::string_view& field_trial : default_field_trials) { sb << field_trial; diff --git a/test/pc/e2e/sdp/sdp_changer.cc b/test/pc/e2e/sdp/sdp_changer.cc index af55f29175..5df5318501 100644 --- a/test/pc/e2e/sdp/sdp_changer.cc +++ b/test/pc/e2e/sdp/sdp_changer.cc @@ -26,7 +26,7 @@ namespace { std::string CodecRequiredParamsToString( const std::map& codec_required_params) { - rtc::StringBuilder out; + StringBuilder out; for (const auto& entry : codec_required_params) { out << entry.first << "=" << entry.second << ";"; } @@ -35,7 +35,7 @@ std::string CodecRequiredParamsToString( std::string SupportedCodecsToString( rtc::ArrayView supported_codecs) { - rtc::StringBuilder out; + StringBuilder out; for (const auto& codec : supported_codecs) { out << codec.name; if (!codec.parameters.empty()) { diff --git a/test/pc/e2e/stats_based_network_quality_metrics_reporter.cc b/test/pc/e2e/stats_based_network_quality_metrics_reporter.cc index 706224ce08..a7d4d145d1 100644 --- a/test/pc/e2e/stats_based_network_quality_metrics_reporter.cc +++ b/test/pc/e2e/stats_based_network_quality_metrics_reporter.cc @@ -412,7 +412,7 @@ void StatsBasedNetworkQualityMetricsReporter::ReportStats( std::string StatsBasedNetworkQualityMetricsReporter::GetTestCaseName( absl::string_view network_label) const { - rtc::StringBuilder builder; + StringBuilder builder; builder << test_case_name_ << "/" << network_label.data(); return builder.str(); } @@ -432,7 +432,7 @@ void StatsBasedNetworkQualityMetricsReporter::LogNetworkLayerStats( std::map metric_metadata{ {MetricMetadataKey::kPeerMetadataKey, peer_name}, {MetricMetadataKey::kExperimentalTestNameMetadataKey, test_case_name_}}; - rtc::StringBuilder log; + StringBuilder log; log << "Raw network layer statistic for [" << peer_name << "]:\n" << "Local IPs:\n"; for (size_t i = 0; i < stats.endpoints_stats.local_addresses.size(); ++i) { diff --git a/test/scenario/column_printer.cc b/test/scenario/column_printer.cc index 661c83bd0d..a2b1ca7135 100644 --- a/test/scenario/column_printer.cc +++ b/test/scenario/column_printer.cc @@ -17,7 +17,7 @@ ColumnPrinter::~ColumnPrinter() = default; ColumnPrinter::ColumnPrinter( const char* headers, - std::function printer, + std::function printer, size_t max_length) : headers_(headers), printer_(printer), max_length_(max_length) {} @@ -29,7 +29,7 @@ ColumnPrinter ColumnPrinter::Fixed(const char* headers, std::string fields) { ColumnPrinter ColumnPrinter::Lambda( const char* headers, - std::function printer, + std::function printer, size_t max_length) { return ColumnPrinter(headers, printer, max_length); } @@ -59,7 +59,7 @@ void StatesPrinter::PrintHeaders() { void StatesPrinter::PrintRow() { // Note that this is run for null output to preserve side effects, this allows // setting break points etc. - rtc::SimpleStringBuilder sb(buffer_); + SimpleStringBuilder sb(buffer_); printers_[0].printer_(sb); for (size_t i = 1; i < printers_.size(); ++i) { sb << ' '; diff --git a/test/scenario/column_printer.h b/test/scenario/column_printer.h index 529f4597ec..0f31b651c8 100644 --- a/test/scenario/column_printer.h +++ b/test/scenario/column_printer.h @@ -26,18 +26,18 @@ class ColumnPrinter { static ColumnPrinter Fixed(const char* headers, std::string fields); static ColumnPrinter Lambda( const char* headers, - std::function printer, + std::function printer, size_t max_length = 256); protected: friend class StatesPrinter; const char* headers_; - std::function printer_; + std::function printer_; size_t max_length_; private: ColumnPrinter(const char* headers, - std::function printer, + std::function printer, size_t max_length); }; diff --git a/test/testsupport/file_utils.cc b/test/testsupport/file_utils.cc index 38d401901b..aa258271b3 100644 --- a/test/testsupport/file_utils.cc +++ b/test/testsupport/file_utils.cc @@ -116,7 +116,7 @@ std::string TempFilename(absl::string_view dir, absl::string_view prefix) { RTC_DCHECK_NOTREACHED(); return ""; #else - rtc::StringBuilder os; + StringBuilder os; os << dir << "/" << prefix << "XXXXXX"; std::string tempname = os.Release(); @@ -235,7 +235,7 @@ std::string ResourcePath(absl::string_view name, absl::string_view extension) { std::string JoinFilename(absl::string_view dir, absl::string_view name) { RTC_CHECK(!dir.empty()) << "Special cases not implemented."; - rtc::StringBuilder os; + StringBuilder os; os << dir; // If the directory path already ends with a path delimiter don't append it if (dir.back() != kPathDelimiter.back()) { diff --git a/test/testsupport/file_utils_override.cc b/test/testsupport/file_utils_override.cc index fe8cdd60c6..76231b9d66 100644 --- a/test/testsupport/file_utils_override.cc +++ b/test/testsupport/file_utils_override.cc @@ -159,7 +159,7 @@ std::string ResourcePath(absl::string_view name, absl::string_view extension) { #else std::optional path_opt = ProjectRootPath(); RTC_DCHECK(path_opt); - rtc::StringBuilder os(*path_opt); + StringBuilder os(*path_opt); os << kResourcesDirName << kPathDelimiter << name << "." << extension; return os.Release(); #endif diff --git a/test/testsupport/perf_test.cc b/test/testsupport/perf_test.cc index bbea5f841a..6f810009bb 100644 --- a/test/testsupport/perf_test.cc +++ b/test/testsupport/perf_test.cc @@ -198,7 +198,7 @@ class ResultsLinePrinter { absl::string_view units, bool important) { MutexLock lock(&mutex_); - rtc::StringBuilder message; + StringBuilder message; message << (important ? "*" : "") << "RESULT " << graph_name << ": " << trace_name << "= " << prefix << values << suffix << " " << units; // <*>RESULT : = @@ -268,7 +268,7 @@ void PrintResult(absl::string_view measurement, absl::string_view units, bool important, ImproveDirection improve_direction) { - rtc::StringBuilder graph_name; + StringBuilder graph_name; graph_name << measurement << modifier; RTC_CHECK(std::isfinite(value)) << "Expected finite value for graph " << graph_name.str() @@ -286,7 +286,7 @@ void PrintResult(absl::string_view measurement, absl::string_view units, const bool important, ImproveDirection improve_direction) { - rtc::StringBuilder graph_name; + StringBuilder graph_name; graph_name << measurement << modifier; GetPlottableCounterPrinter().AddCounter(graph_name.str(), trace, counter, units); @@ -323,7 +323,7 @@ void PrintResultMeanAndError(absl::string_view measurement, RTC_CHECK(std::isfinite(mean)); RTC_CHECK(std::isfinite(error)); - rtc::StringBuilder graph_name; + StringBuilder graph_name; graph_name << measurement << modifier; GetPerfWriter().LogResultMeanAndError(graph_name.str(), trace, mean, error, units, important, improve_direction); @@ -343,7 +343,7 @@ void PrintResultList(absl::string_view measurement, RTC_CHECK(std::isfinite(v)); } - rtc::StringBuilder graph_name; + StringBuilder graph_name; graph_name << measurement << modifier; GetPerfWriter().LogResultList(graph_name.str(), trace, values, units, important, improve_direction); diff --git a/test/testsupport/perf_test_histogram_writer.cc b/test/testsupport/perf_test_histogram_writer.cc index 93924ba16c..18fe17ed77 100644 --- a/test/testsupport/perf_test_histogram_writer.cc +++ b/test/testsupport/perf_test_histogram_writer.cc @@ -110,7 +110,7 @@ class PerfTestHistogramWriter : public PerfTestResultWriter { // Lookup on graph name + trace name (or measurement + story in catapult // parlance). There should be several histograms with the same measurement // if they're for different stories. - rtc::StringBuilder measurement_and_story; + StringBuilder measurement_and_story; measurement_and_story << graph_name << trace_name; MutexLock lock(&mutex_); if (histograms_.count(measurement_and_story.str()) == 0) { diff --git a/test/video_codec_tester.cc b/test/video_codec_tester.cc index a74ea47150..56a4709370 100644 --- a/test/video_codec_tester.cc +++ b/test/video_codec_tester.cc @@ -668,7 +668,7 @@ class VideoCodecAnalyzer : public VideoCodecTester::VideoCodecStats { RTC_LOG(LS_INFO) << "Write metrics to " << csv_path; FILE* csv_file = fopen(csv_path.data(), "w"); const std::string delimiter = ";"; - rtc::StringBuilder header; + StringBuilder header; header << "timestamp_rtp;spatial_idx;temporal_idx;width;height;frame_size_" "bytes;keyframe;qp;encode_time_us;decode_time_us;psnr_y_db;psnr_u_" @@ -679,7 +679,7 @@ class VideoCodecAnalyzer : public VideoCodecTester::VideoCodecStats { fwrite(header.str().c_str(), 1, header.size(), csv_file); for (const Frame& f : frames) { - rtc::StringBuilder row; + StringBuilder row; row << "\n" << f.timestamp_rtp; row << ";" << f.layer_id.spatial_idx; row << ";" << f.layer_id.temporal_idx; diff --git a/video/adaptation/video_stream_encoder_resource_manager.cc b/video/adaptation/video_stream_encoder_resource_manager.cc index 15e77627c4..f8fdde556c 100644 --- a/video/adaptation/video_stream_encoder_resource_manager.cc +++ b/video/adaptation/video_stream_encoder_resource_manager.cc @@ -747,7 +747,7 @@ void VideoStreamEncoderResourceManager::UpdateStatsAdaptationSettings() const { std::string VideoStreamEncoderResourceManager::ActiveCountsToString( const std::map& active_counts) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Downgrade counts: fps: {"; for (auto& reason_count : active_counts) { diff --git a/video/config/video_encoder_config.cc b/video/config/video_encoder_config.cc index 9dc9a52c89..982166889f 100644 --- a/video/config/video_encoder_config.cc +++ b/video/config/video_encoder_config.cc @@ -32,7 +32,7 @@ VideoStream::~VideoStream() = default; std::string VideoStream::ToString() const { char buf[1024]; - rtc::SimpleStringBuilder ss(buf); + SimpleStringBuilder ss(buf); ss << "{width: " << width; ss << ", height: " << height; ss << ", max_framerate: " << max_framerate; @@ -68,7 +68,7 @@ VideoEncoderConfig::~VideoEncoderConfig() = default; std::string VideoEncoderConfig::ToString() const { char buf[1024]; - rtc::SimpleStringBuilder ss(buf); + SimpleStringBuilder ss(buf); ss << "{codec_type: " << CodecTypeToPayloadString(codec_type); ss << ", content_type: "; switch (content_type) { diff --git a/video/end_to_end_tests/stats_tests.cc b/video/end_to_end_tests/stats_tests.cc index 4d14fa42e9..506de7492a 100644 --- a/video/end_to_end_tests/stats_tests.cc +++ b/video/end_to_end_tests/stats_tests.cc @@ -229,7 +229,7 @@ TEST_F(StatsEndToEndTest, GetStats) { } std::string CompoundKey(const char* name, uint32_t ssrc) { - rtc::StringBuilder oss; + StringBuilder oss; oss << name << "_" << ssrc; return oss.Release(); } diff --git a/video/frame_dumping_encoder.cc b/video/frame_dumping_encoder.cc index 4528250459..894b9ef279 100644 --- a/video/frame_dumping_encoder.cc +++ b/video/frame_dumping_encoder.cc @@ -95,7 +95,7 @@ class FrameDumpingEncoder : public VideoEncoder, public EncodedImageCallback { std::string FilenameFromSimulcastIndex(int index) RTC_EXCLUSIVE_LOCKS_REQUIRED(mu_) { char filename_buffer[1024]; - rtc::SimpleStringBuilder builder(filename_buffer); + SimpleStringBuilder builder(filename_buffer); builder << output_directory_ << "/webrtc_encoded_frames" << "." << origin_time_micros_ << "." << index << ".ivf"; return builder.str(); diff --git a/video/receive_statistics_proxy.cc b/video/receive_statistics_proxy.cc index 90f3a11d56..47f53d4ef2 100644 --- a/video/receive_statistics_proxy.cc +++ b/video/receive_statistics_proxy.cc @@ -102,7 +102,7 @@ void ReceiveStatisticsProxy::UpdateHistograms( RTC_DCHECK_RUN_ON(&main_thread_); char log_stream_buf[8 * 1024]; - rtc::SimpleStringBuilder log_stream(log_stream_buf); + SimpleStringBuilder log_stream(log_stream_buf); int stream_duration_sec = (clock_->TimeInMilliseconds() - start_ms_) / 1000; diff --git a/video/rtp_video_stream_receiver2.cc b/video/rtp_video_stream_receiver2.cc index 89b3151cdc..7009f20114 100644 --- a/video/rtp_video_stream_receiver2.cc +++ b/video/rtp_video_stream_receiver2.cc @@ -1388,7 +1388,7 @@ void RtpVideoStreamReceiver2::UpdatePacketReceiveTimestamps( // Periodically log the RTP header of incoming packets. if (now.ms() - last_packet_log_ms_ > kPacketLogIntervalMs) { - rtc::StringBuilder ss; + StringBuilder ss; ss << "Packet received on SSRC: " << packet.Ssrc() << " with payload type: " << static_cast(packet.PayloadType()) << ", timestamp: " << packet.Timestamp() diff --git a/video/send_statistics_proxy.cc b/video/send_statistics_proxy.cc index 412ff472f5..6c64da8be4 100644 --- a/video/send_statistics_proxy.cc +++ b/video/send_statistics_proxy.cc @@ -306,7 +306,7 @@ void SendStatisticsProxy::UmaSamplesContainer::UpdateHistograms( const int kIndex = uma_prefix_ == kScreenPrefix ? 1 : 0; const int kMinRequiredPeriodicSamples = 6; char log_stream_buf[8 * 1024]; - rtc::SimpleStringBuilder log_stream(log_stream_buf); + SimpleStringBuilder log_stream(log_stream_buf); int in_width = input_width_counter_.Avg(kMinRequiredMetricsSamples); int in_height = input_height_counter_.Avg(kMinRequiredMetricsSamples); if (in_width != -1) { diff --git a/video/stats_counter.cc b/video/stats_counter.cc index dc548ea3c3..09c2d4dd49 100644 --- a/video/stats_counter.cc +++ b/video/stats_counter.cc @@ -31,7 +31,7 @@ std::string AggregatedStats::ToString() const { } std::string AggregatedStats::ToStringWithMultiplier(int multiplier) const { - rtc::StringBuilder ss; + StringBuilder ss; ss << "periodic_samples:" << num_samples << ", {"; ss << "min:" << (min * multiplier) << ", "; ss << "avg:" << (average * multiplier) << ", "; diff --git a/video/video_quality_observer2.cc b/video/video_quality_observer2.cc index 421ed10bf9..3c48fd2747 100644 --- a/video/video_quality_observer2.cc +++ b/video/video_quality_observer2.cc @@ -63,7 +63,7 @@ void VideoQualityObserver::UpdateHistograms(bool screenshare) { } char log_stream_buf[2 * 1024]; - rtc::SimpleStringBuilder log_stream(log_stream_buf); + SimpleStringBuilder log_stream(log_stream_buf); if (last_frame_rendered_ms_ > last_unfreeze_time_ms_) { smooth_playback_durations_.Add(last_frame_rendered_ms_ - diff --git a/video/video_quality_test.cc b/video/video_quality_test.cc index bb3e31f6f5..98015275d3 100644 --- a/video/video_quality_test.cc +++ b/video/video_quality_test.cc @@ -344,7 +344,7 @@ std::unique_ptr VideoQualityTest::CreateVideoDecoder( decoder = decoder_factory_->Create(env, format); } if (!params_.logging.encoded_frame_base_path.empty()) { - rtc::StringBuilder str; + StringBuilder str; str << receive_logs_++; std::string path = params_.logging.encoded_frame_base_path + "." + str.str() + ".recv.ivf"; @@ -369,7 +369,7 @@ std::unique_ptr VideoQualityTest::CreateVideoEncoder( std::vector encoded_frame_dump_files; if (!params_.logging.encoded_frame_base_path.empty()) { char ss_buf[100]; - rtc::SimpleStringBuilder sb(ss_buf); + SimpleStringBuilder sb(ss_buf); sb << send_logs_++; std::string prefix = params_.logging.encoded_frame_base_path + "." + sb.str() + ".send."; @@ -472,7 +472,7 @@ VideoQualityTest::InjectionComponents::~InjectionComponents() = default; void VideoQualityTest::TestBody() {} std::string VideoQualityTest::GenerateGraphTitle() const { - rtc::StringBuilder ss; + StringBuilder ss; ss << params_.video[0].codec; ss << " (" << params_.video[0].target_bitrate_bps / 1000 << "kbps"; ss << ", " << params_.video[0].fps << " FPS"; diff --git a/video/video_receive_stream2.cc b/video/video_receive_stream2.cc index 70c82cc72f..3bf561f33a 100644 --- a/video/video_receive_stream2.cc +++ b/video/video_receive_stream2.cc @@ -540,7 +540,7 @@ void VideoReceiveStream2::CreateAndRegisterExternalDecoder( absl::c_replace(decoded_output_file, ';', '/'); if (!decoded_output_file.empty()) { char filename_buffer[256]; - rtc::SimpleStringBuilder ssb(filename_buffer); + SimpleStringBuilder ssb(filename_buffer); ssb << decoded_output_file << "/webrtc_receive_stream_" << remote_ssrc() << "-" << rtc::TimeMicros() << ".ivf"; video_decoder = CreateFrameDumpingDecoderWrapper( diff --git a/video/video_send_stream_tests.cc b/video/video_send_stream_tests.cc index 05fa0e4e6f..add6480211 100644 --- a/video/video_send_stream_tests.cc +++ b/video/video_send_stream_tests.cc @@ -172,7 +172,7 @@ using ParameterizationType = std::tuple; std::string ParamInfoToStr( const testing::TestParamInfo& info) { - rtc::StringBuilder sb; + StringBuilder sb; sb << std::get<0>(info.param).scalability_mode << "_" << (std::get<1>(info.param) ? "WithIdentifier" : "WithoutIdentifier"); return sb.str(); diff --git a/video/video_stream_encoder.cc b/video/video_stream_encoder.cc index 18b13ea6b0..7cf4f2a30e 100644 --- a/video/video_stream_encoder.cc +++ b/video/video_stream_encoder.cc @@ -1210,7 +1210,7 @@ void VideoStreamEncoder::ReconfigureEncoder() { } char log_stream_buf[4 * 1024]; - rtc::SimpleStringBuilder log_stream(log_stream_buf); + SimpleStringBuilder log_stream(log_stream_buf); log_stream << "ReconfigureEncoder: simulcast streams: "; for (size_t i = 0; i < codec.numberOfSimulcastStreams; ++i) { std::optional scalability_mode = diff --git a/video/video_stream_encoder_unittest.cc b/video/video_stream_encoder_unittest.cc index 417a42486d..721d309339 100644 --- a/video/video_stream_encoder_unittest.cc +++ b/video/video_stream_encoder_unittest.cc @@ -1635,7 +1635,7 @@ class VideoStreamEncoderTest : public ::testing::Test { MutexLock lock(&mutex_); ++number_of_layers_allocations_; last_layers_allocation_ = allocation; - rtc::StringBuilder log; + StringBuilder log; for (const auto& layer : allocation.active_spatial_layers) { log << layer.width << "x" << layer.height << "@" << layer.frame_rate_fps << "[";