Fix for EVS audio mute due to codec mode bit masking
Test: Tested with device
Bug: 248257784
Change-Id: I9cad96e6faa13a7271e66090dc2236143d24650b
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/ImsMediaAudioUtil.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/ImsMediaAudioUtil.h
index 42102b8..65089f3 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/ImsMediaAudioUtil.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/ImsMediaAudioUtil.h
@@ -88,39 +88,48 @@
kImsAudioAmrWbModeMax
};
-enum kImsAudioEvsPrimaryMode
+enum kImsAudioEvsMode
{
- kImsAudioEvsPrimaryMode00280 = 0, /* 2.8 kbps, Special case */
- kImsAudioEvsPrimaryMode00720 = 1, /* 7.2 kbps, EVS Primary */
- kImsAudioEvsPrimaryMode00800 = 2, /* 8 kbps, EVS Primary */
- kImsAudioEvsPrimaryMode00960 = 3, /* 9.6 kbps, EVS Primary */
- kImsAudioEvsPrimaryMode01320 = 4, /* 13.20 kbps, EVS Primary */
- kImsAudioEvsPrimaryMode01640 = 5, /* 16.4 kbps, EVS Primary */
- kImsAudioEvsPrimaryMode02440 = 6, /* 24.4 kbps, EVS Primary */
- kImsAudioEvsPrimaryMode03200 = 7, /* 32 kbps, EVS Primary */
- kImsAudioEvsPrimaryMode04800 = 8, /* 48 kbps, EVS Primary */
- kImsAudioEvsPrimaryMode06400 = 9, /* 64 kbps, EVS Primary */
- kImsAudioEvsPrimaryMode09600 = 10, /* 96 kbps, EVS Primary */
- kImsAudioEvsPrimaryMode12800 = 11, /* 128 kbps, EVS Primary */
- kImsAudioEvsPrimaryModeSID = 12, /* 2.4 kbps, EVS Primary SID */
- /* 13 is remaind for future use.. */
- kImsAudioEvsPrimaryModeSpeechLost = 14, /* SPEECH LOST */
- kImsAudioEvsPrimaryModeNoData = 15, /* NO DATA */
- kImsAudioEvsPrimaryModeMax
+ kImsAudioEvsAmrWbIoMode660 = 0, /* 6.60 kbps AMR-IO*/
+ kImsAudioEvsAmrWbIoMode885 = 1, /* 8.85 kbps AMR-IO*/
+ kImsAudioEvsAmrWbIoMode1265 = 2, /* 12.65 kbps AMR-IO */
+ kImsAudioEvsAmrWbIoMode1425 = 3, /* 14.25 kbps AMR-IO */
+ kImsAudioEvsAmrWbIoMode1585 = 4, /* 15.85 kbps AMR-IO */
+ kImsAudioEvsAmrWbIoMode1825 = 5, /* 18.25 kbps AMR-IO */
+ kImsAudioEvsAmrWbIoMode1985 = 6, /* 19.85 kbps AMR-IO */
+ kImsAudioEvsAmrWbIoMode2305 = 7, /* 23.05 kbps AMR-IO */
+ kImsAudioEvsAmrWbIoMode2385 = 8, /* 23.85 kbps AMR-IO */
+ kImsAudioEvsPrimaryMode5900 = 9, /* 5.9 kbps, EVS Primary */
+ kImsAudioEvsPrimaryMode7200 = 10, /* 7.2 kbps, EVS Primary */
+ kImsAudioEvsPrimaryMode8000 = 11, /* 8.0 kbps, EVS Primary */
+ kImsAudioEvsPrimaryMode9600 = 12, /* 9.6 kbps, EVS Primary */
+ kImsAudioEvsPrimaryMode13200 = 13, /* 13.2 kbps, EVS Primary */
+ kImsAudioEvsPrimaryMode16400 = 14, /* 16.4 kbps, EVS Primary */
+ kImsAudioEvsPrimaryMode24400 = 15, /* 24.4 kbps, EVS Primary */
+ kImsAudioEvsPrimaryMode32000 = 16, /* 32.0 kbps, EVS Primary */
+ kImsAudioEvsPrimaryMode48000 = 17, /* 48.0 kbps, EVS Primary */
+ kImsAudioEvsPrimaryMode64000 = 18, /* 64.0 kbps, EVS Primary */
+ kImsAudioEvsPrimaryMode96000 = 19, /* 96.0 kbps, EVS Primary */
+ kImsAudioEvsPrimaryMode128000 = 20, /* 128.0 kbps, EVS Primary */
+ kImsAudioEvsPrimaryModeSID = 21, /* 2.4 kbps, EVS Primary SID */
+ kImsAudioEvsPrimaryModeSpeechLost = 22, /* SPEECH LOST */
+ kImsAudioEvsPrimaryModeNoData = 23, /* NO DATA */
+ kImsAudioEvsModeMax
};
+// TODO: need to remove this with respective changes
enum kImsAudioEvsAmrWbIoMode
{
- kImsAudioEvsAmrWbIoMode660 = 0, /* 6.60 kbit/s */
- kImsAudioEvsAmrWbIoMode885 = 1, /* 8.85 kbit/s */
- kImsAudioEvsAmrWbIoMode1265 = 2, /* 12.65 kbit/s */
- kImsAudioEvsAmrWbIoMode1425 = 3, /* 14.25 kbit/s */
- kImsAudioEvsAmrWbIoMode1585 = 4, /* 15.85 kbit/s */
- kImsAudioEvsAmrWbIoMode1825 = 5, /* 18.25 kbit/s */
- kImsAudioEvsAmrWbIoMode1985 = 6, /* 19.85 kbit/s */
- kImsAudioEvsAmrWbIoMode2305 = 7, /* 23.05 kbit/s */
- kImsAudioEvsAmrWbIoMode2385 = 8, /* 23.85 kbit/s */
- kImsAudioEvsAmrWbIoModeSID = 9, /* AMRWB SID */
+ kImsAudioEvsAmrWbIoMode0660 = 0, /* 6.60 kbit/s */
+ kImsAudioEvsAmrWbIoMode0885 = 1, /* 8.85 kbit/s */
+ kImsAudioEvsAmrWbIoMode01265 = 2, /* 12.65 kbit/s */
+ kImsAudioEvsAmrWbIoMode01425 = 3, /* 14.25 kbit/s */
+ kImsAudioEvsAmrWbIoMode01585 = 4, /* 15.85 kbit/s */
+ kImsAudioEvsAmrWbIoMode01825 = 5, /* 18.25 kbit/s */
+ kImsAudioEvsAmrWbIoMode01985 = 6, /* 19.85 kbit/s */
+ kImsAudioEvsAmrWbIoMode02305 = 7, /* 23.05 kbit/s */
+ kImsAudioEvsAmrWbIoMode02385 = 8, /* 23.85 kbit/s */
+ kImsAudioEvsAmrWbIoModeSID = 9, /* AMRWB SID */
/* 10~13: for future use */
kImsAudioEvsAmrWbIoModeSPL = 14, /* AMRWB Speech Lost frame */
kImsAudioEvsAmrWbIoModeNoData = 15, /* AMRWB No Data */
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/nodes/AudioRtpPayloadDecoderNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/nodes/AudioRtpPayloadDecoderNode.h
index 5775889..c0002f0 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/nodes/AudioRtpPayloadDecoderNode.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/nodes/AudioRtpPayloadDecoderNode.h
@@ -65,6 +65,7 @@
kRtpPyaloadHeaderMode mEvsPayloadHeaderMode;
int32_t mEvsModetoBitRate;
kEvsBitrate mEvsMode;
+ int32_t mCoreEvsMode;
int32_t mEvsOffset;
int32_t EvsChAOffset;
};
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/nodes/AudioRtpPayloadEncoderNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/nodes/AudioRtpPayloadEncoderNode.h
index 3a335a6..5372508 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/nodes/AudioRtpPayloadEncoderNode.h
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/include/audio/nodes/AudioRtpPayloadEncoderNode.h
@@ -66,6 +66,7 @@
bool mSendCMR;
int32_t mEvsBitRate;
kEvsBitrate mEvsMode;
+ int32_t mCoreEvsMode;
kRtpPyaloadHeaderMode mEvsPayloadHeaderMode;
};
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/AudioRtpPayloadDecoderNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/AudioRtpPayloadDecoderNode.cpp
index 9514445..9da8370 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/AudioRtpPayloadDecoderNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/AudioRtpPayloadDecoderNode.cpp
@@ -38,6 +38,10 @@
ImsMediaResult AudioRtpPayloadDecoderNode::Start()
{
IMLOGD0("[Start]");
+ mEvsMode = (kEvsBitrate)ImsMediaAudioUtil::GetMaximumEvsMode(mCoreEvsMode);
+ mEvsCodecMode = (kEvsCodecMode)ImsMediaAudioUtil::ConvertEvsCodecMode(mEvsMode);
+ mEvsModetoBitRate = ImsMediaAudioUtil::ConvertEVSModeToBitRate(mEvsMode);
+
std::lock_guard<std::mutex> guard(mMutexExit);
mPrevCMR = 15;
mNodeState = kNodeStateRunning;
@@ -74,13 +78,9 @@
else if (mCodecType == kAudioCodecEvs)
{
mEvsBandwidth = (kEvsBandwidth)pConfig->getEvsParams().getEvsBandwidth();
+ mCoreEvsMode = pConfig->getEvsParams().getEvsMode();
mEvsPayloadHeaderMode =
(kRtpPyaloadHeaderMode)pConfig->getEvsParams().getUseHeaderFullOnly();
- mEvsCodecMode = (kEvsCodecMode)ImsMediaAudioUtil::ConvertEvsCodecMode(
- pConfig->getEvsParams().getEvsMode());
- mEvsMode = (kEvsBitrate)pConfig->getEvsParams().getEvsMode();
- mEvsModetoBitRate = ImsMediaAudioUtil::ConvertEVSModeToBitRate(
- pConfig->getEvsParams().getEvsMode());
mEvsOffset = pConfig->getEvsParams().getChannelAwareMode();
}
}
@@ -103,12 +103,8 @@
return (mEvsBandwidth == (kEvsBandwidth)pConfig->getEvsParams().getEvsBandwidth() &&
mEvsPayloadHeaderMode ==
(kRtpPyaloadHeaderMode)pConfig->getEvsParams().getUseHeaderFullOnly() &&
- mEvsCodecMode ==
- ImsMediaAudioUtil::ConvertEvsCodecMode(
- pConfig->getEvsParams().getEvsMode()) &&
- mEvsMode == (kEvsBitrate)pConfig->getEvsParams().getEvsMode() &&
- mEvsModetoBitRate ==
- ImsMediaAudioUtil::ConvertEVSModeToBitRate(
+ mCoreEvsMode ==
+ ImsMediaAudioUtil::GetMaximumEvsMode(
pConfig->getEvsParams().getEvsMode()) &&
mEvsOffset == pConfig->getEvsParams().getChannelAwareMode());
}
@@ -317,9 +313,9 @@
{
// calculate nDataBitSize from nDataSize
nFrameType = (uint32_t)ImsMediaAudioUtil::ConvertLenToEVSAudioMode(nDataSize);
- // TODO: remove kImsAudioEvsPrimaryMode
- nDataBitSize = ImsMediaAudioUtil::ConvertEVSAudioModeToBitLen(
- (kImsAudioEvsPrimaryMode)nFrameType);
+ // TODO: remove kImsAudioEvsMode
+ nDataBitSize =
+ ImsMediaAudioUtil::ConvertEVSAudioModeToBitLen((kImsAudioEvsMode)nFrameType);
mBitReader.ReadByteBuffer(mPayload, nDataBitSize);
@@ -639,8 +635,8 @@
if (toc_ft_m == 0) // EVS Primary mode
{
- nDataBitSize = ImsMediaAudioUtil::ConvertEVSAudioModeToBitLen(
- (kImsAudioEvsPrimaryMode)toc_ft_b);
+ nDataBitSize =
+ ImsMediaAudioUtil::ConvertEVSAudioModeToBitLen((kImsAudioEvsMode)toc_ft_b);
}
else // AMR-WB IO mode
{
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/AudioRtpPayloadEncoderNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/AudioRtpPayloadEncoderNode.cpp
index 54979fb..f6de850 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/AudioRtpPayloadEncoderNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/AudioRtpPayloadEncoderNode.cpp
@@ -43,6 +43,9 @@
IMLOGD2("[Start] codecType[%d], mode[%d]", mCodecType, mOctetAligned);
std::lock_guard<std::mutex> guard(mMutexExit);
mMaxNumOfFrame = mPtime / 20;
+ mEvsMode = (kEvsBitrate)ImsMediaAudioUtil::GetMaximumEvsMode(mCoreEvsMode);
+ mEvsCodecMode = (kEvsCodecMode)ImsMediaAudioUtil::ConvertEvsCodecMode(mEvsMode);
+ mEvsBitRate = ImsMediaAudioUtil::ConvertEVSModeToBitRate(mEvsMode);
if (mMaxNumOfFrame == 0 || mMaxNumOfFrame > MAX_FRAME_IN_PACKET)
{
@@ -117,11 +120,7 @@
mEvsBandwidth = (kEvsBandwidth)pConfig->getEvsParams().getEvsBandwidth();
mEvsPayloadHeaderMode =
(kRtpPyaloadHeaderMode)pConfig->getEvsParams().getUseHeaderFullOnly();
- mEvsMode = (kEvsBitrate)pConfig->getEvsParams().getEvsMode();
- mEvsCodecMode = (kEvsCodecMode)ImsMediaAudioUtil::ConvertEvsCodecMode(
- pConfig->getEvsParams().getEvsMode());
- mEvsBitRate = ImsMediaAudioUtil::ConvertEVSModeToBitRate(
- pConfig->getEvsParams().getEvsMode());
+ mCoreEvsMode = pConfig->getEvsParams().getEvsMode();
mEvsOffset = pConfig->getEvsParams().getChannelAwareMode();
mSendCMR = pConfig->getCodecModeRequest();
}
@@ -147,12 +146,8 @@
return (mEvsBandwidth == (kEvsBandwidth)pConfig->getEvsParams().getEvsBandwidth() &&
mEvsPayloadHeaderMode ==
(kRtpPyaloadHeaderMode)pConfig->getEvsParams().getUseHeaderFullOnly() &&
- mEvsCodecMode ==
- ImsMediaAudioUtil::ConvertEvsCodecMode(
- pConfig->getEvsParams().getEvsMode()) &&
- mEvsMode == (kEvsBitrate)pConfig->getEvsParams().getEvsMode() &&
- mEvsBitRate ==
- ImsMediaAudioUtil::ConvertEVSModeToBitRate(
+ mCoreEvsMode ==
+ ImsMediaAudioUtil::GetMaximumEvsMode(
pConfig->getEvsParams().getEvsMode()) &&
mEvsOffset == pConfig->getEvsParams().getChannelAwareMode());
}
@@ -357,8 +352,8 @@
{
// calculate nDataBitSize from nDataSize
nFrameType = (uint32_t)ImsMediaAudioUtil::ConvertLenToEVSAudioMode(nDataSize);
- nDataBitSize = ImsMediaAudioUtil::ConvertEVSAudioModeToBitLen(
- (kImsAudioEvsPrimaryMode)nFrameType);
+ nDataBitSize =
+ ImsMediaAudioUtil::ConvertEVSAudioModeToBitLen((kImsAudioEvsMode)nFrameType);
if (nDataBitSize == 0)
{
@@ -547,8 +542,8 @@
toc_ft_q = 0; // Q bit(1bit) - zero for kEvsCodecModePrimary
toc_ft_b =
ImsMediaAudioUtil::ConvertLenToEVSAudioMode(nDataSize); // EVS bit rate(4bits)
- nDataBitSize = ImsMediaAudioUtil::ConvertEVSAudioModeToBitLen(
- (kImsAudioEvsPrimaryMode)toc_ft_b);
+ nDataBitSize =
+ ImsMediaAudioUtil::ConvertEVSAudioModeToBitLen((kImsAudioEvsMode)toc_ft_b);
// write CMR and seek the position of the first paylaod
if (mCurrNumOfFrame == 1)
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/IAudioPlayerNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/IAudioPlayerNode.cpp
index 517a4ed..0bf0792 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/IAudioPlayerNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/IAudioPlayerNode.cpp
@@ -57,8 +57,9 @@
{
mAudioPlayer->SetEvsBandwidth(mEvsBandwidth);
mAudioPlayer->SetEvsPayloadHeaderMode(mEvsPayloadHeaderMode);
- mAudioPlayer->SetEvsBitRate(ImsMediaAudioUtil::ConvertEVSModeToBitRate(mMode));
- mAudioPlayer->SetCodecMode(mMode);
+ mAudioPlayer->SetEvsBitRate(ImsMediaAudioUtil::ConvertEVSModeToBitRate(
+ ImsMediaAudioUtil::GetMaximumEvsMode(mMode)));
+ mAudioPlayer->SetCodecMode(ImsMediaAudioUtil::GetMaximumEvsMode(mMode));
}
mAudioPlayer->Start();
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/IAudioSourceNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/IAudioSourceNode.cpp
index e585603..829a332 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/IAudioSourceNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/IAudioSourceNode.cpp
@@ -50,18 +50,19 @@
mAudioSource->SetUplinkCallback(this);
mAudioSource->SetCodec(mCodecType);
mRunningCodecMode = ImsMediaAudioUtil::GetMaximumAmrMode(mCodecMode);
- mAudioSource->SetCodecMode(mRunningCodecMode);
mAudioSource->SetPtime(mPtime);
mAudioSource->SetSamplingRate(mSamplingRate * 1000);
if (mCodecType == kAudioCodecEvs)
{
- mAudioSource->SetEvsBandwidth(mEvsBandwidth);
+ mAudioSource->SetEvsBandwidth(
+ (kEvsBandwidth)ImsMediaAudioUtil::FindMaxEvsBandwidthFromRange(mEvsBandwidth));
mAudioSource->SetEvsChAwOffset(mEvsChAwOffset);
mRunningCodecMode = ImsMediaAudioUtil::GetMaximumEvsMode(mCodecMode);
mAudioSource->SetEvsBitRate(
ImsMediaAudioUtil::ConvertEVSModeToBitRate(mRunningCodecMode));
}
+ mAudioSource->SetCodecMode(mRunningCodecMode);
if (mAudioSource->Start())
{
@@ -117,8 +118,7 @@
else if (mCodecType == kAudioCodecEvs)
{
mCodecMode = pConfig->getEvsParams().getEvsMode();
- mEvsBandwidth = (kEvsBandwidth)ImsMediaAudioUtil::FindMaxEvsBandwidthFromRange(
- pConfig->getEvsParams().getEvsBandwidth());
+ mEvsBandwidth = (kEvsBandwidth)pConfig->getEvsParams().getEvsBandwidth();
mEvsChAwOffset = pConfig->getEvsParams().getChannelAwareMode();
}
@@ -145,9 +145,7 @@
else if (mCodecType == kAudioCodecEvs)
{
return (mCodecMode == pConfig->getEvsParams().getEvsMode() &&
- mEvsBandwidth ==
- (kEvsBandwidth)ImsMediaAudioUtil::FindMaxEvsBandwidthFromRange(
- pConfig->getEvsParams().getEvsBandwidth()) &&
+ mEvsBandwidth == (kEvsBandwidth)pConfig->getEvsParams().getEvsBandwidth() &&
mEvsChAwOffset == pConfig->getEvsParams().getChannelAwareMode() &&
mSamplingRate == pConfig->getSamplingRateKHz());
}
@@ -205,4 +203,4 @@
mRunningCodecMode = cmr;
}
}
-}
\ No newline at end of file
+}
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/ImsMediaAudioUtil.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/ImsMediaAudioUtil.cpp
index 1e8a922..0f2b341 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/ImsMediaAudioUtil.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/src/audio/nodes/ImsMediaAudioUtil.cpp
@@ -379,58 +379,57 @@
{
if (bitmask & (1 << i))
{
- maxMode = 1 << i;
+ maxMode = i;
}
}
-
return maxMode;
}
int32_t ImsMediaAudioUtil::ConvertEVSModeToBitRate(int32_t mode)
{
- switch (mode)
+ switch ((kImsAudioEvsMode)mode)
{
- case EvsParams::EVS_MODE_0:
+ case kImsAudioEvsAmrWbIoMode660:
return 6600;
- case EvsParams::EVS_MODE_1:
+ case kImsAudioEvsAmrWbIoMode885:
return 8850;
- case EvsParams::EVS_MODE_2:
+ case kImsAudioEvsAmrWbIoMode1265:
return 12650;
- case EvsParams::EVS_MODE_3:
+ case kImsAudioEvsAmrWbIoMode1425:
return 14250;
- case EvsParams::EVS_MODE_4:
+ case kImsAudioEvsAmrWbIoMode1585:
return 15850;
- case EvsParams::EVS_MODE_5:
+ case kImsAudioEvsAmrWbIoMode1825:
return 18250;
- case EvsParams::EVS_MODE_6:
+ case kImsAudioEvsAmrWbIoMode1985:
return 19850;
- case EvsParams::EVS_MODE_7:
+ case kImsAudioEvsAmrWbIoMode2305:
return 23050;
- case EvsParams::EVS_MODE_8:
+ case kImsAudioEvsAmrWbIoMode2385:
return 23850;
- case EvsParams::EVS_MODE_9:
+ case kImsAudioEvsPrimaryMode5900:
return 5900;
- case EvsParams::EVS_MODE_10:
+ case kImsAudioEvsPrimaryMode7200:
return 7200;
- case EvsParams::EVS_MODE_11:
+ case kImsAudioEvsPrimaryMode8000:
return 8000;
- case EvsParams::EVS_MODE_12:
+ case kImsAudioEvsPrimaryMode9600:
return 9600;
- case EvsParams::EVS_MODE_13:
+ case kImsAudioEvsPrimaryMode13200:
return 13200;
- case EvsParams::EVS_MODE_14:
+ case kImsAudioEvsPrimaryMode16400:
return 16400;
- case EvsParams::EVS_MODE_15:
+ case kImsAudioEvsPrimaryMode24400:
return 24400;
- case EvsParams::EVS_MODE_16:
+ case kImsAudioEvsPrimaryMode32000:
return 32000;
- case EvsParams::EVS_MODE_17:
+ case kImsAudioEvsPrimaryMode48000:
return 48000;
- case EvsParams::EVS_MODE_18:
+ case kImsAudioEvsPrimaryMode64000:
return 64000;
- case EvsParams::EVS_MODE_19:
+ case kImsAudioEvsPrimaryMode96000:
return 96000;
- case EvsParams::EVS_MODE_20:
+ case kImsAudioEvsPrimaryMode128000:
return 128000;
default:
return 13200;
