| Index: webrtc/voice_engine/test/auto_test/standard/codec_test.cc
|
| diff --git a/webrtc/voice_engine/test/auto_test/standard/codec_test.cc b/webrtc/voice_engine/test/auto_test/standard/codec_test.cc
|
| index a263a592134f84595a613a051bcd8d0f7967cb2d..2b5d12d8fd5f194b458047197d0ebe5837156e2c 100644
|
| --- a/webrtc/voice_engine/test/auto_test/standard/codec_test.cc
|
| +++ b/webrtc/voice_engine/test/auto_test/standard/codec_test.cc
|
| @@ -31,7 +31,7 @@ class CodecTest : public AfterStreamingFixture {
|
| };
|
|
|
| static void SetRateIfILBC(webrtc::CodecInst* codec_instance, int packet_size) {
|
| - if (!_stricmp(codec_instance->plname, "ilbc")) {
|
| + if (!STR_CASE_CMP(codec_instance->plname, "ilbc")) {
|
| if (packet_size == 160 || packet_size == 320) {
|
| codec_instance->rate = 15200;
|
| } else {
|
| @@ -41,9 +41,9 @@ static void SetRateIfILBC(webrtc::CodecInst* codec_instance, int packet_size) {
|
| }
|
|
|
| static bool IsNotViableSendCodec(const char* codec_name) {
|
| - return !_stricmp(codec_name, "CN") ||
|
| - !_stricmp(codec_name, "telephone-event") ||
|
| - !_stricmp(codec_name, "red");
|
| + return !STR_CASE_CMP(codec_name, "CN") ||
|
| + !STR_CASE_CMP(codec_name, "telephone-event") ||
|
| + !STR_CASE_CMP(codec_name, "red");
|
| }
|
|
|
| TEST_F(CodecTest, PcmuIsDefaultCodecAndHasTheRightValues) {
|
| @@ -138,7 +138,7 @@ TEST_F(CodecTest, VoiceActivityDetectionCanBeTurnedOff) {
|
| TEST_F(CodecTest, OpusMaxPlaybackRateCanBeSet) {
|
| for (int i = 0; i < voe_codec_->NumOfCodecs(); ++i) {
|
| voe_codec_->GetCodec(i, codec_instance_);
|
| - if (_stricmp("opus", codec_instance_.plname)) {
|
| + if (STR_CASE_CMP("opus", codec_instance_.plname)) {
|
| continue;
|
| }
|
| voe_codec_->SetSendCodec(channel_, codec_instance_);
|
| @@ -154,7 +154,7 @@ TEST_F(CodecTest, OpusMaxPlaybackRateCanBeSet) {
|
| TEST_F(CodecTest, OpusDtxCanBeSetForOpus) {
|
| for (int i = 0; i < voe_codec_->NumOfCodecs(); ++i) {
|
| voe_codec_->GetCodec(i, codec_instance_);
|
| - if (_stricmp("opus", codec_instance_.plname)) {
|
| + if (STR_CASE_CMP("opus", codec_instance_.plname)) {
|
| continue;
|
| }
|
| voe_codec_->SetSendCodec(channel_, codec_instance_);
|
| @@ -166,7 +166,7 @@ TEST_F(CodecTest, OpusDtxCanBeSetForOpus) {
|
| TEST_F(CodecTest, OpusDtxCannotBeSetForNonOpus) {
|
| for (int i = 0; i < voe_codec_->NumOfCodecs(); ++i) {
|
| voe_codec_->GetCodec(i, codec_instance_);
|
| - if (!_stricmp("opus", codec_instance_.plname)) {
|
| + if (!STR_CASE_CMP("opus", codec_instance_.plname)) {
|
| continue;
|
| }
|
| voe_codec_->SetSendCodec(channel_, codec_instance_);
|
|
|