Concatenate string literals at compile time.

This CL was generated by running:
git ls-files | grep ".cc" | xargs perl -i -ne 'BEGIN {undef $/}; s/("[\s\n]*<<[\s\n]*")/" "/g; print;'; git cl format

After that I manually edited modules/audio_processing/gain_controller2.cc to preserve its original
formatting.

This primary benefit of this change is a small reduction in binary size.

Bug: None
Change-Id: I689fa7ba9c717c314bb167e5d592c3c4e0871e29
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/165961
Reviewed-by: Alessio Bazzica <alessiob@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Jonas Olsson <jonasolsson@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30251}
This commit is contained in:
Jonas Olsson
2020-01-14 12:11:31 +01:00
committed by Commit Bot
parent 6153e15d31
commit b2b2031457
98 changed files with 544 additions and 353 deletions

View File

@ -53,7 +53,8 @@ DecisionLogic::DecisionLogic(NetEqController::Config config)
{&estimate_dtx_delay_, &time_stretch_cn_, &target_level_window_ms_},
field_trial_name);
RTC_LOG(LS_INFO) << "NetEq decision logic settings:"
<< " estimate_dtx_delay=" << estimate_dtx_delay_
" estimate_dtx_delay="
<< estimate_dtx_delay_
<< " time_stretch_cn=" << time_stretch_cn_
<< " target_level_window_ms=" << target_level_window_ms_;
}

View File

@ -71,7 +71,8 @@ DelayHistogramConfig GetDelayHistogramConfig() {
}
}
RTC_LOG(LS_INFO) << "Delay histogram config:"
<< " quantile=" << config.quantile
" quantile="
<< config.quantile
<< " forget_factor=" << config.forget_factor
<< " start_forget_weight="
<< config.start_forget_weight.value_or(0);

View File

@ -141,8 +141,9 @@ NetEqImpl::NetEqImpl(const NetEq::Config& config,
RTC_LOG(LS_INFO) << "NetEq config: " << config.ToString();
int fs = config.sample_rate_hz;
if (fs != 8000 && fs != 16000 && fs != 32000 && fs != 48000) {
RTC_LOG(LS_ERROR) << "Sample rate " << fs << " Hz not supported. "
<< "Changing to 8000 Hz.";
RTC_LOG(LS_ERROR) << "Sample rate " << fs
<< " Hz not supported. "
"Changing to 8000 Hz.";
fs = 8000;
}
controller_->SetMaximumDelay(config.max_delay_ms);

View File

@ -21,13 +21,24 @@ NetEqInput::PacketData::~PacketData() = default;
std::string NetEqInput::PacketData::ToString() const {
rtc::StringBuilder ss;
ss << "{"
<< "time_ms: " << static_cast<int64_t>(time_ms) << ", "
<< "header: {"
<< "pt: " << static_cast<int>(header.payloadType) << ", "
<< "sn: " << header.sequenceNumber << ", "
<< "ts: " << header.timestamp << ", "
<< "ssrc: " << header.ssrc << "}, "
<< "payload bytes: " << payload.size() << "}";
"time_ms: "
<< static_cast<int64_t>(time_ms)
<< ", "
"header: {"
"pt: "
<< static_cast<int>(header.payloadType)
<< ", "
"sn: "
<< header.sequenceNumber
<< ", "
"ts: "
<< header.timestamp
<< ", "
"ssrc: "
<< header.ssrc
<< "}, "
"payload bytes: "
<< payload.size() << "}";
return ss.Release();
}

View File

@ -242,8 +242,9 @@ bool ValidateOutputFilesOptions(bool textlog,
bool output_files_base_name_specified = !output_files_base_name.empty();
if (!textlog && !plotting && output_files_base_name_specified) {
std::cout << "Error: --output_files_base_name cannot be used without at "
<< "least one of the following flags: --textlog, --matlabplot, "
<< "--pythonplot." << std::endl;
"least one of the following flags: --textlog, --matlabplot, "
"--pythonplot."
<< std::endl;
return false;
}
// Without |output_audio_filename|, |output_files_base_name| is required when
@ -252,8 +253,9 @@ bool ValidateOutputFilesOptions(bool textlog,
if (output_audio_filename.empty() && plotting &&
!output_files_base_name_specified) {
std::cout << "Error: when no output audio file is specified and "
<< "--matlabplot and/or --pythonplot are used, "
<< "--output_files_base_name must be also used." << std::endl;
"--matlabplot and/or --pythonplot are used, "
"--output_files_base_name must be also used."
<< std::endl;
return false;
}
return true;