generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Get rid of 'using' from .h

Browse Source 
- Add parenthesis to make order of evaluation clearer.

BUG=
R=minyue@webrtc.org, tina.legrand@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/12659004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6304 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
solenberg@webrtc.org 2014-06-02 15:22:33 +00:00
parent 2f7c7ce020
commit a28c697d93
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
webrtc/modules/audio_coding/codecs/isac/fix/test/isac_speed_test.cc
View File

@ -12,6 +12,7 @@
#include "webrtc/modules/audio_coding/codecs/isac/fix/source/settings.h"
#include "webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.h"
using ::std::string;
using ::std::tr1::make_tuple;
using ::testing::ValuesIn;

1
webrtc/modules/audio_coding/codecs/opus/opus_speed_test.cc
View File

@ -11,6 +11,7 @@
#include "webrtc/modules/audio_coding/codecs/opus/interface/opus_interface.h"
#include "webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.h"
using ::std::string;
using ::std::tr1::make_tuple;
using ::testing::ValuesIn;

4
webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc
View File

@ -117,8 +117,8 @@ void AudioCodecSpeedTest::EncodeDecode(size_t audio_duration_sec) {
}
printf("Encoding: %.2f%% real time,\nDecoding: %.2f%% real time.\n",
encoding_time_ms_ / audio_duration_sec / 10.0,
decoding_time_ms_ / audio_duration_sec / 10.0);
(encoding_time_ms_ / audio_duration_sec) / 10.0,
(decoding_time_ms_ / audio_duration_sec) / 10.0);
}
} // namespace webrtc

10
webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.h
View File

@ -16,17 +16,13 @@
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/typedefs.h"
using ::std::string;
using ::std::tr1::tuple;
using ::testing::TestWithParam;
namespace webrtc {
// Define coding parameter as
// <channels, bit_rate, file_name, extension, if_save_output>.
typedef tuple<int, int, string, string, bool> coding_param;
typedef std::tr1::tuple<int, int, std::string, std::string, bool> coding_param;
class AudioCodecSpeedTest : public TestWithParam<coding_param> {
class AudioCodecSpeedTest : public testing::TestWithParam<coding_param> {
protected:
AudioCodecSpeedTest(int block_duration_ms,
int input_sampling_khz,
@ -83,7 +79,7 @@ class AudioCodecSpeedTest : public TestWithParam<coding_param> {
// Bit rate is in bit-per-second.
int bit_rate_;
string in_filename_;
std::string in_filename_;
// Determines whether to save the output to file.
bool save_out_data_;