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

This is a minor change.

Browse Source 
Wrong macro used for AMR and AMR-wb. The real name for the macros are without "GSM".

Magnus, please review the change in modules/media_file.
Henrik G, please review the change in voice_engine

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2921 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
tina.legrand@webrtc.org
2012-10-12 12:50:14 +00:00
parent 912981fd0c
commit eb232cee9a
3 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/modules/media_file/source/media_file_utility.cc
View File

@@ -1407,7 +1407,7 @@ WebRtc_Word32 ModuleFileUtility::InitCompressedReading(
start, start,
stop); stop);
#if defined(WEBRTC_CODEC_GSMAMR) || defined(WEBRTC_CODEC_GSMAMRWB) || \ #if defined(WEBRTC_CODEC_AMR) || defined(WEBRTC_CODEC_AMRWB) || \
defined(WEBRTC_CODEC_ILBC) defined(WEBRTC_CODEC_ILBC)
WebRtc_Word16 read_len = 0; WebRtc_Word16 read_len = 0;
#endif #endif
@@ -1418,10 +1418,10 @@ WebRtc_Word32 ModuleFileUtility::InitCompressedReading(
_startPointInMs = start; _startPointInMs = start;
_stopPointInMs = stop; _stopPointInMs = stop;
#ifdef WEBRTC_CODEC_GSMAMR #ifdef WEBRTC_CODEC_AMR
WebRtc_Word32 AMRmode2bytes[9]={12,13,15,17,19,20,26,31,5}; WebRtc_Word32 AMRmode2bytes[9]={12,13,15,17,19,20,26,31,5};
#endif #endif
#ifdef WEBRTC_CODEC_GSMAMRWB #ifdef WEBRTC_CODEC_AMRWB
WebRtc_Word32 AMRWBmode2bytes[10]={17,23,32,36,40,46,50,58,60,6}; WebRtc_Word32 AMRWBmode2bytes[10]={17,23,32,36,40,46,50,58,60,6};
#endif #endif
@@ -1440,7 +1440,7 @@ WebRtc_Word32 ModuleFileUtility::InitCompressedReading(
buf[cnt]=0; buf[cnt]=0;
} }
#ifdef WEBRTC_CODEC_GSMAMR #ifdef WEBRTC_CODEC_AMR
if(!strcmp("#!AMR\n", buf)) if(!strcmp("#!AMR\n", buf))
{ {
strcpy(codec_info_.plname, "amr"); strcpy(codec_info_.plname, "amr");
@@ -1484,7 +1484,7 @@ WebRtc_Word32 ModuleFileUtility::InitCompressedReading(
} }
} }
#endif #endif
#ifdef WEBRTC_CODEC_GSMAMRWB #ifdef WEBRTC_CODEC_AMRWB
if(!strcmp("#!AMRWB\n", buf)) if(!strcmp("#!AMRWB\n", buf))
{ {
strcpy(codec_info_.plname, "amr-wb"); strcpy(codec_info_.plname, "amr-wb");
@@ -1605,10 +1605,10 @@ WebRtc_Word32 ModuleFileUtility::ReadCompressedData(InStream& in,
outData, outData,
bufferSize); bufferSize);
#ifdef WEBRTC_CODEC_GSMAMR #ifdef WEBRTC_CODEC_AMR
WebRtc_UWord32 AMRmode2bytes[9]={12,13,15,17,19,20,26,31,5}; WebRtc_UWord32 AMRmode2bytes[9]={12,13,15,17,19,20,26,31,5};
#endif #endif
#ifdef WEBRTC_CODEC_GSMAMRWB #ifdef WEBRTC_CODEC_AMRWB
WebRtc_UWord32 AMRWBmode2bytes[10]={17,23,32,36,40,46,50,58,60,6}; WebRtc_UWord32 AMRWBmode2bytes[10]={17,23,32,36,40,46,50,58,60,6};
#endif #endif
WebRtc_UWord32 bytesRead = 0; WebRtc_UWord32 bytesRead = 0;
@@ -1619,7 +1619,7 @@ WebRtc_Word32 ModuleFileUtility::ReadCompressedData(InStream& in,
return -1; return -1;
} }
#ifdef WEBRTC_CODEC_GSMAMR #ifdef WEBRTC_CODEC_AMR
if(_codecId == kCodecAmr) if(_codecId == kCodecAmr)
{ {
WebRtc_Word32 res = in.Read(outData, 1); WebRtc_Word32 res = in.Read(outData, 1);
@@ -1677,7 +1677,7 @@ WebRtc_Word32 ModuleFileUtility::ReadCompressedData(InStream& in,
} }
} }
#endif #endif
#ifdef WEBRTC_CODEC_GSMAMRWB #ifdef WEBRTC_CODEC_AMRWB
if(_codecId == kCodecAmrWb) if(_codecId == kCodecAmrWb)
{ {
WebRtc_Word32 res = in.Read(outData, 1); WebRtc_Word32 res = in.Read(outData, 1);
@@ -1809,7 +1809,7 @@ WebRtc_Word32 ModuleFileUtility::InitCompressedWriting(
_writing = false; _writing = false;
#ifdef WEBRTC_CODEC_GSMAMR #ifdef WEBRTC_CODEC_AMR
if(STR_CASE_CMP(codecInst.plname, "amr") == 0) if(STR_CASE_CMP(codecInst.plname, "amr") == 0)
{ {
if(codecInst.pacsize == 160) if(codecInst.pacsize == 160)
@@ -1822,7 +1822,7 @@ WebRtc_Word32 ModuleFileUtility::InitCompressedWriting(
} }
} }
#endif #endif
#ifdef WEBRTC_CODEC_GSMAMRWB #ifdef WEBRTC_CODEC_AMRWB
if(STR_CASE_CMP(codecInst.plname, "amr-wb") == 0) if(STR_CASE_CMP(codecInst.plname, "amr-wb") == 0)
{ {
if(codecInst.pacsize == 320) if(codecInst.pacsize == 320)
@@ -2172,13 +2172,13 @@ WebRtc_Word32 ModuleFileUtility::set_codec_info(const CodecInst& codecInst)
_codecId = kCodecL16_32Khz; _codecId = kCodecL16_32Khz;
} }
} }
#ifdef WEBRTC_CODEC_GSMAMR #ifdef WEBRTC_CODEC_AMR
else if(STR_CASE_CMP(codecInst.plname, "amr") == 0) else if(STR_CASE_CMP(codecInst.plname, "amr") == 0)
{ {
_codecId = kCodecAmr; _codecId = kCodecAmr;
} }
#endif #endif
#ifdef WEBRTC_CODEC_GSMAMRWB #ifdef WEBRTC_CODEC_AMRWB
else if(STR_CASE_CMP(codecInst.plname, "amr-wb") == 0) else if(STR_CASE_CMP(codecInst.plname, "amr-wb") == 0)
{ {
_codecId = kCodecAmrWb; _codecId = kCodecAmrWb;
@@ -2394,7 +2394,7 @@ WebRtc_Word32 ModuleFileUtility::FileDurationMs(const char* fileName,
{ {
buf[cnt] = 0; buf[cnt] = 0;
} }
#ifdef WEBRTC_CODEC_GSMAMR #ifdef WEBRTC_CODEC_AMR
if(!strcmp("#!AMR\n", buf)) if(!strcmp("#!AMR\n", buf))
{ {
WebRtc_UWord8 dummy; WebRtc_UWord8 dummy;
@@ -2456,7 +2456,7 @@ WebRtc_Word32 ModuleFileUtility::FileDurationMs(const char* fileName,
} }
} }
#endif #endif
#ifdef WEBRTC_CODEC_GSMAMRWB #ifdef WEBRTC_CODEC_AMRWB
if(!strcmp("#!AMRWB\n", buf)) if(!strcmp("#!AMRWB\n", buf))
{ {
WebRtc_UWord8 dummy; WebRtc_UWord8 dummy;

8
src/voice_engine/test/auto_test/voe_extended_test.cc
View File

@@ -2244,7 +2244,7 @@ int VoEExtendedTest::TestCodec() {
ANL(); ANL();
ANL(); ANL();
#ifdef WEBRTC_CODEC_GSMAMR #ifdef WEBRTC_CODEC_AMR
////////////////////////// //////////////////////////
// SetAMREncFormat // SetAMREncFormat
@@ -2308,8 +2308,8 @@ int VoEExtendedTest::TestCodec() {
ANL(); ANL();
AOK(); AOK();
ANL(); ANL();
#endif // #ifdef WEBRTC_CODEC_GSMAMR #endif // #ifdef WEBRTC_CODEC_AMR
#ifdef WEBRTC_CODEC_GSMAMRWB #ifdef WEBRTC_CODEC_AMRWB
////////////////////////// //////////////////////////
// SetAMRWbEncFormat // SetAMRWbEncFormat
@@ -2373,7 +2373,7 @@ int VoEExtendedTest::TestCodec() {
ANL(); ANL();
AOK(); AOK();
ANL(); ANL();
#endif // #ifdef WEBRTC_CODEC_GSMAMRWB #endif // #ifdef WEBRTC_CODEC_AMRWB
/////////////////////////////// ///////////////////////////////
// SetSendCNPayloadType // SetSendCNPayloadType
TEST(SetSendCNPayloadType); TEST(SetSendCNPayloadType);

8
src/voice_engine/voe_codec_impl.cc
View File

@@ -217,7 +217,7 @@ int VoECodecImpl::SetAMREncFormat(int channel, AmrMode mode)
{ {
WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1), WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
"SetAMREncFormat(channel=%d, mode=%d)", channel, mode); "SetAMREncFormat(channel=%d, mode=%d)", channel, mode);
#ifdef WEBRTC_CODEC_GSMAMR #ifdef WEBRTC_CODEC_AMR
if (!_shared->statistics().Initialized()) if (!_shared->statistics().Initialized())
{ {
_shared->SetLastError(VE_NOT_INITED, kTraceError); _shared->SetLastError(VE_NOT_INITED, kTraceError);
@@ -243,7 +243,7 @@ int VoECodecImpl::SetAMRDecFormat(int channel, AmrMode mode)
{ {
WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1), WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
"SetAMRDecFormat(channel=%i, mode=%i)", channel, mode); "SetAMRDecFormat(channel=%i, mode=%i)", channel, mode);
#ifdef WEBRTC_CODEC_GSMAMR #ifdef WEBRTC_CODEC_AMR
if (!_shared->statistics().Initialized()) if (!_shared->statistics().Initialized())
{ {
_shared->SetLastError(VE_NOT_INITED, kTraceError); _shared->SetLastError(VE_NOT_INITED, kTraceError);
@@ -271,7 +271,7 @@ int VoECodecImpl::SetAMRWbEncFormat(int channel, AmrMode mode)
"SetAMRWbEncFormat(channel=%d, mode=%d)", channel, mode); "SetAMRWbEncFormat(channel=%d, mode=%d)", channel, mode);
ANDROID_NOT_SUPPORTED(_shared->statistics()); ANDROID_NOT_SUPPORTED(_shared->statistics());
IPHONE_NOT_SUPPORTED(_shared->statistics()); IPHONE_NOT_SUPPORTED(_shared->statistics());
#ifdef WEBRTC_CODEC_GSMAMRWB #ifdef WEBRTC_CODEC_AMRWB
if (!_shared->statistics().Initialized()) if (!_shared->statistics().Initialized())
{ {
_shared->SetLastError(VE_NOT_INITED, kTraceError); _shared->SetLastError(VE_NOT_INITED, kTraceError);
@@ -299,7 +299,7 @@ int VoECodecImpl::SetAMRWbDecFormat(int channel, AmrMode mode)
"SetAMRWbDecFormat(channel=%i, mode=%i)", channel, mode); "SetAMRWbDecFormat(channel=%i, mode=%i)", channel, mode);
ANDROID_NOT_SUPPORTED(_shared->statistics()); ANDROID_NOT_SUPPORTED(_shared->statistics());
IPHONE_NOT_SUPPORTED(_shared->statistics()); IPHONE_NOT_SUPPORTED(_shared->statistics());
#ifdef WEBRTC_CODEC_GSMAMRWB #ifdef WEBRTC_CODEC_AMRWB
if (!_shared->statistics().Initialized()) if (!_shared->statistics().Initialized())
{ {
_shared->SetLastError(VE_NOT_INITED, kTraceError); _shared->SetLastError(VE_NOT_INITED, kTraceError);