zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove simple stringstream usages.

Browse Source 
This CL replaces std::o?stringstream with rtc::StringBuilder where that's possible to do without changing any of the surrounding code. It also updates includes and build files as appropriate.

The CL was generated by running 'git grep -l -P std::o?stringstream | xargs perl -pi -e "s/std::o?stringstream/rtc::StringBuilder/g"'. Then I've manually updated the #includes and BUILD files, run 'git cl format' and unstaged any file that would need more complex fixes.

Bug: webrtc:8982
Change-Id: Ibc32153f4a3fd177e260b6ad05ce393972549357
Reviewed-on: https://webrtc-review.googlesource.com/98460
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Jonas Olsson <jonasolsson@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24605}
This commit is contained in:
Jonas Olsson
2018-09-06 13:41:30 +02:00
committed by Commit Bot
parent 96ede16a4e
commit 366a50c4ef
75 changed files with 191 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/audio_coding/neteq/buffer_level_filter_unittest.cc
View File

@ -14,6 +14,7 @@
#include <math.h> // Access to pow function.
#include "rtc_base/strings/string_builder.h"
#include "test/gtest.h"
namespace webrtc {
@ -30,7 +31,7 @@ TEST(BufferLevelFilter, ConvergenceTest) {
for (int value = 100; value <= 200; value += 10) {
filter.Reset();
filter.SetTargetBufferLevel(1); // Makes filter coefficient 251/256.
std::ostringstream ss;
rtc::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) {

5
modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc
View File

@ -16,6 +16,7 @@
#include "common_audio/include/audio_util.h"
#include "modules/audio_coding/neteq/audio_multi_vector.h"
#include "rtc_base/strings/string_builder.h"
#include "test/gtest.h"
namespace webrtc {
@ -33,7 +34,7 @@ class DtmfToneGeneratorTest : public ::testing::Test {
AudioMultiVector signal(channels);
for (int event = 0; event <= 15; ++event) {
std::ostringstream ss;
rtc::StringBuilder ss;
ss << "Checking event " << event << " at sample rate " << fs_hz;
SCOPED_TRACE(ss.str());
const int kAttenuation = 0;
@ -72,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) {
std::ostringstream ss;
rtc::StringBuilder ss;
ss << "Checking event " << event << " at sample rate " << fs_hz;
ss << "; attenuation " << attenuation;
SCOPED_TRACE(ss.str());

3
modules/audio_coding/neteq/neteq_external_decoder_unittest.cc
View File

@ -19,6 +19,7 @@
#include "modules/audio_coding/neteq/tools/input_audio_file.h"
#include "modules/audio_coding/neteq/tools/neteq_external_decoder_test.h"
#include "modules/audio_coding/neteq/tools/rtp_generator.h"
#include "rtc_base/strings/string_builder.h"
#include "test/gmock.h"
#include "test/testsupport/fileutils.h"
@ -122,7 +123,7 @@ class NetEqExternalDecoderUnitTest : public test::NetEqExternalDecoderTest {
} while (Lost()); // If lost, immediately read the next packet.
}
std::ostringstream ss;
rtc::StringBuilder ss;
ss << "Lap number " << k << ".";
SCOPED_TRACE(ss.str()); // Print out the parameter values on failure.
// Compare mono and multi-channel.

3
modules/audio_coding/neteq/neteq_stereo_unittest.cc
View File

@ -22,6 +22,7 @@
#include "modules/audio_coding/neteq/include/neteq.h"
#include "modules/audio_coding/neteq/tools/input_audio_file.h"
#include "modules/audio_coding/neteq/tools/rtp_generator.h"
#include "rtc_base/strings/string_builder.h"
#include "test/gtest.h"
#include "test/testsupport/fileutils.h"
@ -228,7 +229,7 @@ class NetEqStereoTest : public ::testing::TestWithParam<TestParameters> {
EXPECT_EQ(num_channels_, output_multi_channel_.num_channels_);
EXPECT_EQ(output_size_samples_,
output_multi_channel_.samples_per_channel_);
std::ostringstream ss;
rtc::StringBuilder ss;
ss << "Lap number " << k << ".";
SCOPED_TRACE(ss.str()); // Print out the parameter values on failure.
// Compare mono and multi-channel.

11
modules/audio_coding/neteq/neteq_unittest.cc
View File

@ -33,6 +33,7 @@
#include "rtc_base/numerics/safe_conversions.h"
#include "rtc_base/protobuf_utils.h"
#include "rtc_base/stringencode.h"
#include "rtc_base/strings/string_builder.h"
#include "rtc_base/system/arch.h"
#include "test/field_trial.h"
#include "test/gtest.h"
@ -386,7 +387,7 @@ void NetEqDecodingTest::DecodeAndCompare(
uint64_t last_concealed_samples = 0;
uint64_t last_total_samples_received = 0;
while (packet_) {
std::ostringstream ss;
rtc::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());
@ -900,7 +901,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) {
std::ostringstream ss;
rtc::StringBuilder ss;
ss << "i = " << i;
SCOPED_TRACE(ss.str()); // Print out the parameter values on failure.
EXPECT_EQ(0, const_out_frame_data[i]);
@ -922,7 +923,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) {
std::ostringstream ss;
rtc::StringBuilder ss;
ss << "i = " << i;
SCOPED_TRACE(ss.str()); // Print out the parameter values on failure.
EXPECT_EQ(0, const_out_frame_data[i]);
@ -1532,7 +1533,7 @@ TEST_F(NetEqDecodingTestTwoInstances, CompareMutedStateOnOff) {
AudioFrame out_frame1, out_frame2;
bool muted;
for (int i = 0; i < 1000; ++i) {
std::ostringstream ss;
rtc::StringBuilder ss;
ss << "i = " << i;
SCOPED_TRACE(ss.str()); // Print out the loop iterator on failure.
EXPECT_EQ(0, neteq_->GetAudio(&out_frame1, &muted));
@ -1555,7 +1556,7 @@ TEST_F(NetEqDecodingTestTwoInstances, CompareMutedStateOnOff) {
int counter = 0;
while (out_frame1.speech_type_ != AudioFrame::kNormalSpeech) {
ASSERT_LT(counter++, 1000) << "Test timed out";
std::ostringstream ss;
rtc::StringBuilder ss;
ss << "counter = " << counter;
SCOPED_TRACE(ss.str()); // Print out the loop iterator on failure.
EXPECT_EQ(0, neteq_->GetAudio(&out_frame1, &muted));

4
modules/audio_coding/neteq/tools/neteq_input.cc
View File

@ -10,7 +10,7 @@
#include "modules/audio_coding/neteq/tools/neteq_input.h"
#include <sstream>
#include "rtc_base/strings/string_builder.h"
namespace webrtc {
namespace test {
@ -19,7 +19,7 @@ NetEqInput::PacketData::PacketData() = default;
NetEqInput::PacketData::~PacketData() = default;
std::string NetEqInput::PacketData::ToString() const {
std::stringstream ss;
rtc::StringBuilder ss;
ss << "{"
<< "time_ms: " << static_cast<int64_t>(time_ms) << ", "
<< "header: {"