diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-21 19:56:55 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-21 19:56:55 +0000 |
| commit | ddd0cff3eb5acdc581c8f6f5b36b1bf8b90c8bed (patch) | |
| tree | 77daebc4c4c41dae651a3425504a52dd1ccc21b1 /service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/nodes/IAudioSourceNode.cpp | |
| parent | cad0938b23a933110df171fb7c9f96721f606cd2 (diff) | |
| parent | 1879ee137ede0d62b88cd16da3d46138ca540dfa (diff) | |
| download | ImsMedia-ddd0cff3eb5acdc581c8f6f5b36b1bf8b90c8bed.tar.gz | |
Snap for 9989322 from 1879ee137ede0d62b88cd16da3d46138ca540dfa to mainline-rkpd-release
Change-Id: I35046c7ba53f650c5d42314f226f1df5b7cd8dc1
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.cpp | 13 |
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()); } } |