commit 17944af5b111ade413e8e71a34898ccf8a51c15a
author Wei Jia <wjia@google.com> Thu Dec 13 18:13:10 2018 -0800
committer Wei Jia <wjia@google.com> Thu Dec 13 20:04:45 2018 -0800
tree fd28b2e1a64b2bdb75a0ff20f75c9e125da3e67d
parent d00c4607a5f7d25dfe925a20a1fc5fd7cfcee67a

mediaplayer2: add srcId for source dependent API's

Test: cts
Bug: 112549021
Change-Id: I619c85af8f59cb5956ca0b399e918ea38e3b32b5

media/libmediaplayer2/mediaplayer2.cpp

diff --git a/media/libmediaplayer2/mediaplayer2.cpp b/media/libmediaplayer2/mediaplayer2.cpp
index 2ae5a8c..f432059 100644
--- a/media/libmediaplayer2/mediaplayer2.cpp
+++ b/media/libmediaplayer2/mediaplayer2.cpp
@@ -718,8 +718,15 @@
     return ret;
 }
 
-status_t MediaPlayer2::getDuration(int64_t *msec) {
+status_t MediaPlayer2::getDuration(int64_t srcId, int64_t *msec) {
     Mutex::Autolock _l(mLock);
+    // TODO: cache duration for currentSrcId and nextSrcId, and return correct
+    // value for nextSrcId.
+    if (srcId != mSrcId) {
+        *msec = -1;
+        return OK;
+    }
+
     ALOGV("getDuration_l");
     bool isValidState = (mCurrentState & (MEDIA_PLAYER2_PREPARED | MEDIA_PLAYER2_STARTED |
             MEDIA_PLAYER2_PAUSED | MEDIA_PLAYER2_PLAYBACK_COMPLETE));