commit bb37e1ce90fe46963512a8dfa5f2f9a974a2424f
author Eric Laurent <elaurent@google.com> Fri Jul 11 22:09:52 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 10 21:09:47 2014 +0000
tree b70f3fa2b8cc82cc104d268857ed104d91fc7b2c
parent e125bba94afe74df330c661ab0a64b1e9e2ac5b7
parent 1e693b55d888b9d3e0a2ce770ae2b72b59c1a317

Merge "audio policy: add rules to select audio parameters"

media/libstagefright/AudioPlayer.cpp

diff --git a/media/libstagefright/AudioPlayer.cpp b/media/libstagefright/AudioPlayer.cpp
index 04fc88b..e24824b 100644
--- a/media/libstagefright/AudioPlayer.cpp
+++ b/media/libstagefright/AudioPlayer.cpp
@@ -766,6 +766,11 @@
         if (mSeeking) {
             return mSeekTimeUs;
         }
+        if (mReachedEOS) {
+            int64_t durationUs;
+            mSource->getFormat()->findInt64(kKeyDuration, &durationUs);
+            return durationUs;
+        }
         mPositionTimeRealUs = getOutputPlayPositionUs_l();
         ALOGV("getMediaTimeUs getOutputPlayPositionUs_l() mPositionTimeRealUs %" PRId64,
               mPositionTimeRealUs);