Merge "Bug 5622637 missing XA_PLAYEVENT_HEADATPOS" into ics-mr1

1 files changed, 6 insertions, 0 deletions

diff --git a/wilhelm/src/android/android_GenericPlayer.cpp b/wilhelm/src/android/android_GenericPlayer.cpp
index 10e613fc..85a8b1a7 100644
--- a/wilhelm/src/android/android_GenericPlayer.cpp
+++ b/wilhelm/src/android/android_GenericPlayer.cpp
@@ -600,6 +600,12 @@ void GenericPlayer::updateOneShot(int positionMs)
         }
     }
 
+    // if we observe the player position going backwards, even without without a seek, then recover
+    if (mObservedPositionMs != ANDROID_UNKNOWN_TIME && positionMs < mObservedPositionMs) {
+        mDeliveredNewPosMs = ANDROID_UNKNOWN_TIME;
+        mObservedPositionMs = positionMs;
+    }
+
     // delayUs is the expected delay between current position and marker;
     // the default is infinity in case there are no upcoming marker(s)
     int64_t delayUs = -1;