Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1186)

Side by Side Diff: webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.h

Issue 1316523002: Convert channel counts to size_t. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Fix compile Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_TOOLS_AUDIO_CODEC_SPEED_TEST_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_TOOLS_AUDIO_CODEC_SPEED_TEST_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_TOOLS_AUDIO_CODEC_SPEED_TEST_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_TOOLS_AUDIO_CODEC_SPEED_TEST_H_
13 13
14 #include <string> 14 #include <string>
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 #include "webrtc/base/scoped_ptr.h" 16 #include "webrtc/base/scoped_ptr.h"
17 #include "webrtc/typedefs.h" 17 #include "webrtc/typedefs.h"
18 18
19 namespace webrtc { 19 namespace webrtc {
20 20
21 // Define coding parameter as 21 // Define coding parameter as
22 // <channels, bit_rate, file_name, extension, if_save_output>. 22 // <channels, bit_rate, file_name, extension, if_save_output>.
23 typedef std::tr1::tuple<int, int, std::string, std::string, bool> coding_param; 23 typedef std::tr1::tuple<size_t, int, std::string, std::string, bool>
24 coding_param;
24 25
25 class AudioCodecSpeedTest : public testing::TestWithParam<coding_param> { 26 class AudioCodecSpeedTest : public testing::TestWithParam<coding_param> {
26 protected: 27 protected:
27 AudioCodecSpeedTest(int block_duration_ms, 28 AudioCodecSpeedTest(int block_duration_ms,
28 int input_sampling_khz, 29 int input_sampling_khz,
29 int output_sampling_khz); 30 int output_sampling_khz);
30 virtual void SetUp(); 31 virtual void SetUp();
31 virtual void TearDown(); 32 virtual void TearDown();
32 33
33 // EncodeABlock(...) does the following: 34 // EncodeABlock(...) does the following:
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 rtc::scoped_ptr<uint8_t[]> bit_stream_; 68 rtc::scoped_ptr<uint8_t[]> bit_stream_;
68 69
69 // Maximum number of bytes in output bitstream for a frame of audio. 70 // Maximum number of bytes in output bitstream for a frame of audio.
70 size_t max_bytes_; 71 size_t max_bytes_;
71 72
72 size_t encoded_bytes_; 73 size_t encoded_bytes_;
73 float encoding_time_ms_; 74 float encoding_time_ms_;
74 float decoding_time_ms_; 75 float decoding_time_ms_;
75 FILE* out_file_; 76 FILE* out_file_;
76 77
77 int channels_; 78 size_t channels_;
78 79
79 // Bit rate is in bit-per-second. 80 // Bit rate is in bit-per-second.
80 int bit_rate_; 81 int bit_rate_;
81 82
82 std::string in_filename_; 83 std::string in_filename_;
83 84
84 // Determines whether to save the output to file. 85 // Determines whether to save the output to file.
85 bool save_out_data_; 86 bool save_out_data_;
86 }; 87 };
87 88
88 } // namespace webrtc 89 } // namespace webrtc
89 90
90 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_TOOLS_AUDIO_CODEC_SPEED_TEST_H_ 91 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_TOOLS_AUDIO_CODEC_SPEED_TEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698