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

Unified Diff: webrtc/modules/audio_coding/codecs/opus/opus_fec_test.cc

Issue 1316523002: Convert channel counts to size_t. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Rebase onto cleanup change Created 5 years 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/audio_coding/codecs/opus/opus_fec_test.cc
diff --git a/webrtc/modules/audio_coding/codecs/opus/opus_fec_test.cc b/webrtc/modules/audio_coding/codecs/opus/opus_fec_test.cc
index cb895a5d9d071f8e3a92ce6e0c1c56d3f9d0839b..bf0d5e542062938041ae4c5798eb7baf33128aeb 100644
--- a/webrtc/modules/audio_coding/codecs/opus/opus_fec_test.cc
+++ b/webrtc/modules/audio_coding/codecs/opus/opus_fec_test.cc
@@ -9,6 +9,7 @@
*/
#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/base/format_macros.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h"
#include "webrtc/test/testsupport/fileutils.h"
@@ -47,7 +48,7 @@ class OpusFecTest : public TestWithParam<coding_param> {
int sampling_khz_;
size_t block_length_sample_;
- int channels_;
+ size_t channels_;
int bit_rate_;
size_t data_pointer_;
@@ -66,9 +67,9 @@ class OpusFecTest : public TestWithParam<coding_param> {
};
void OpusFecTest::SetUp() {
- channels_ = get<0>(GetParam());
+ channels_ = static_cast<size_t>(get<0>(GetParam()));
minyue-webrtc 2015/12/29 10:42:47 Nit: can redefine this param if you like
Peter Kasting 2015/12/30 00:55:45 I don't understand what "redefine" means here. Wh
minyue-webrtc 2016/01/04 09:06:02 See line 25.
Peter Kasting 2016/01/04 19:49:42 Oh. Hmm, I'm not familiar with how TestWithParam<
minyue-webrtc 2016/01/04 22:03:18 I think it is just safe to change the first param
Peter Kasting 2016/01/08 02:45:06 Done.
bit_rate_ = get<1>(GetParam());
- printf("Coding %d channel signal at %d bps.\n", channels_, bit_rate_);
+ printf("Coding %" PRIuS " channel signal at %d bps.\n", channels_, bit_rate_);
in_filename_ = test::ResourcePath(get<2>(GetParam()), get<3>(GetParam()));

Powered by Google App Engine
This is Rietveld 408576698