summaryrefslogtreecommitdiff
path: root/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/nodes/IAudioSourceNode.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/nodes/IAudioSourceNode.cpp')
-rw-r--r--service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/nodes/IAudioSourceNode.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/nodes/IAudioSourceNode.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/nodes/IAudioSourceNode.cpp
index 8bedca46..3eff8305 100644
--- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/nodes/IAudioSourceNode.cpp
+++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/nodes/IAudioSourceNode.cpp
@@ -33,6 +33,8 @@ IAudioSourceNode::IAudioSourceNode(BaseSessionCallback* callback) :
mRunningCodecMode = 0;
mFirstFrame = false;
mMediaDirection = 0;
+ mIsOctetAligned = false;
+ mIsDtxEnabled = false;
}
IAudioSourceNode::~IAudioSourceNode() {}
@@ -54,6 +56,8 @@ ImsMediaResult IAudioSourceNode::ProcessStart()
mAudioSource->SetPtime(mPtime);
mAudioSource->SetSamplingRate(mSamplingRate * 1000);
mAudioSource->SetMediaDirection(mMediaDirection);
+ mAudioSource->SetDtxEnabled(mIsDtxEnabled);
+ mAudioSource->SetOctetAligned(mIsOctetAligned);
if (mCodecType == kAudioCodecEvs)
{
@@ -120,6 +124,7 @@ void IAudioSourceNode::SetConfig(void* config)
if (mCodecType == kAudioCodecAmr || mCodecType == kAudioCodecAmrWb)
{
mCodecMode = pConfig->getAmrParams().getAmrMode();
+ mIsOctetAligned = pConfig->getAmrParams().getOctetAligned();
}
else if (mCodecType == kAudioCodecEvs)
{
@@ -132,6 +137,7 @@ void IAudioSourceNode::SetConfig(void* config)
mMediaDirection = pConfig->getMediaDirection();
mSamplingRate = pConfig->getSamplingRateKHz();
mPtime = pConfig->getPtimeMillis();
+ mIsDtxEnabled = pConfig->getDtxEnabled();
}
bool IAudioSourceNode::IsSameConfig(void* config)
@@ -149,7 +155,9 @@ bool IAudioSourceNode::IsSameConfig(void* config)
{
return (mCodecMode == pConfig->getAmrParams().getAmrMode() &&
mSamplingRate == pConfig->getSamplingRateKHz() &&
- mMediaDirection == pConfig->getMediaDirection());
+ mMediaDirection == pConfig->getMediaDirection() &&
+ mIsDtxEnabled == pConfig->getDtxEnabled() &&
+ mIsOctetAligned == pConfig->getAmrParams().getOctetAligned());
}
else if (mCodecType == kAudioCodecEvs)
{
@@ -159,7 +167,8 @@ bool IAudioSourceNode::IsSameConfig(void* config)
pConfig->getEvsParams().getEvsBandwidth()) &&
mEvsChAwOffset == pConfig->getEvsParams().getChannelAwareMode() &&
mSamplingRate == pConfig->getSamplingRateKHz() &&
- mMediaDirection == pConfig->getMediaDirection());
+ mMediaDirection == pConfig->getMediaDirection() &&
+ mIsDtxEnabled == pConfig->getDtxEnabled());
}
}