Fix the infinite loop error in AudioJitterBuffer am: 7bd2a617bc

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/ImsMedia/+/22322436

Change-Id: Ic1a3bfe98ed8829d6329174616d1c1358a300c48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 4 insertions, 8 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 64890329..98bf8014 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
@@ -608,19 +608,15 @@ bool AudioJitterBuffer::Resync(uint32_t currentTime)
         }
         else
         {
-            if (!IsSID(entry->nBufferSize))
-            {
-                // the first voice frame
-                mCurrPlayingTS = entry->nTimestamp;
-                IMLOGD2("[Resync] currTs[%d], delay[%d]", mCurrPlayingTS, timeDiff);
-                return true;
-            }
-            else if (timeDiff > (mCurrJitterBufferSize - 1) * FRAME_INTERVAL)
+            if (!IsSID(entry->nBufferSize) ||
+                    timeDiff > (mCurrJitterBufferSize - 1) * FRAME_INTERVAL)
             {
                 mCurrPlayingTS = entry->nTimestamp;
                 IMLOGD2("[Resync] currTs[%d], delay[%d]", mCurrPlayingTS, timeDiff);
                 return true;
             }
+
+            break;
         }
     }