commit e31ac8a2decec1ecda02bc9739984c35783fc92c
author Wei Jia <wjia@google.com> Thu Oct 25 11:06:21 2018 -0700
committer Wei Jia <wjia@google.com> Thu Oct 25 11:28:54 2018 -0700
tree 275526fa98f5be607aa5abbb207adf7b5fb1140d
parent 2d4cf009bb6e7ed9a35971061323ba566bf1a61c

DataSourceDesc: set max time in ms and us

Test: cts
Bug: 112549021

Change-Id: I3198cf221dc17b9c6504b3c160121a385a848487

media/libmediaplayer2/nuplayer2/NuPlayer2.cpp

diff --git a/media/libmediaplayer2/nuplayer2/NuPlayer2.cpp b/media/libmediaplayer2/nuplayer2/NuPlayer2.cpp
index 7b9ff30..bc17d13 100644
--- a/media/libmediaplayer2/nuplayer2/NuPlayer2.cpp
+++ b/media/libmediaplayer2/nuplayer2/NuPlayer2.cpp
@@ -1753,8 +1753,13 @@
 }
 
 void NuPlayer2::addEndTimeMonitor() {
-    sp<AMessage> msg = new AMessage(kWhatEOSMonitor, this);
     ++mEOSMonitorGeneration;
+
+    if (mCurrentSourceInfo.mEndTimeUs == DataSourceDesc::kMaxTimeUs) {
+        return;
+    }
+
+    sp<AMessage> msg = new AMessage(kWhatEOSMonitor, this);
     msg->setInt32("generation", mEOSMonitorGeneration);
     mMediaClock->addTimer(msg, mCurrentSourceInfo.mEndTimeUs);
 }
@@ -3216,7 +3221,7 @@
       mSrcId(0),
       mSourceFlags(0),
       mStartTimeUs(0),
-      mEndTimeUs(INT64_MAX) {
+      mEndTimeUs(DataSourceDesc::kMaxTimeUs) {
 }
 
 NuPlayer2::SourceInfo & NuPlayer2::SourceInfo::operator=(const NuPlayer2::SourceInfo &other) {