diff options
| author | Bodam Nam <bodamnam@google.com> | 2023-03-22 16:47:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-22 16:47:25 +0000 |
| commit | e27ff35389300347976304ec7228410212648927 (patch) | |
| tree | c9c0f29a7c509465f4e668e32b9a019bde19b7dd | |
| parent | b54a68c03883f3f22f78dffb8515201bd385345e (diff) | |
| parent | b1a4f02e6d4d60c36ea5d32e902abd744aeb56a3 (diff) | |
| download | ImsMedia-e27ff35389300347976304ec7228410212648927.tar.gz | |
Revert "Fix the SID playout delay issue" am: b1a4f02e6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/ImsMedia/+/22184176
Change-Id: I5fc0242e3d582236a8a5b36f31cc711bbc7078f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioJitterBuffer.cpp | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioJitterBuffer.cpp b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioJitterBuffer.cpp index ac152b2b..5b948204 100644 --- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioJitterBuffer.cpp +++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/audio/AudioJitterBuffer.cpp @@ -284,20 +284,14 @@ bool AudioJitterBuffer::Get(ImsMediaSubType* psubtype, uint8_t** ppData, uint32_ if (mDataQueue.GetCount() == 0) { - IMLOGD_PACKET0(IM_PACKET_LOG_JITTER, "[Get] fail - empty"); - - if (!mWaiting) - { - mCurrPlayingTS += FRAME_INTERVAL; - } - + IMLOGD_PACKET0(IM_PACKET_LOG_JITTER, "[Get] wait - empty"); return false; } else if (mDataQueue.Get(&pEntry) && mWaiting) { uint32_t jitterDelay = currentTime - pEntry->arrivalTime; - if (jitterDelay < (mCurrJitterBufferSize - 1) * FRAME_INTERVAL) + if (jitterDelay < (mCurrJitterBufferSize - 1) * FRAME_INTERVAL + ALLOWABLE_ERROR) { if (psubtype) *psubtype = MEDIASUBTYPE_UNDEFINED; @@ -327,10 +321,6 @@ bool AudioJitterBuffer::Get(ImsMediaSubType* psubtype, uint8_t** ppData, uint32_ } else { - IMLOGD_PACKET4(IM_PACKET_LOG_JITTER, - "[Get] Wait - seq[%u], CurrJBSize[%u], delay[%u], QueueCount[%u]", - pEntry->nSeqNum, mCurrJitterBufferSize, jitterDelay, mDataQueue.GetCount()); - mCannotGetCount++; return false; } } @@ -603,7 +593,7 @@ bool AudioJitterBuffer::Resync(uint32_t currentTime) { uint32_t timeDiff = currentTime - entry->arrivalTime; - if (timeDiff > mCurrJitterBufferSize * FRAME_INTERVAL + ALLOWABLE_ERROR) + if (timeDiff > mCurrJitterBufferSize * FRAME_INTERVAL) { CollectRxRtpStatus(entry->nSeqNum, kRtpStatusDiscarded); mDataQueue.Delete(); |