commit 7a0d96e9223a6a2b68f98b27e86d75a443080189
author Andrew Lewis <andrewlewis@google.com> Fri Jun 05 11:57:24 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 05 11:57:24 2020 +0000
tree d7923ce3ba468fc234c424813e1fa2e4423190e2
parent 8edfea7301d5142c5646aa08d1eb12fd0c7e2bef
parent 8a5bfc35916863759285af1a292d8989b6421c59

Merge "Clamp audio seek to non-zero timestamp" into rvc-dev

media/libmediaplayerservice/nuplayer/GenericSource.cpp

diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index 0eaa503..e6bb2e1 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -1159,7 +1159,7 @@
         readBuffer(MEDIA_TRACK_TYPE_VIDEO, seekTimeUs, mode, &actualTimeUs);
 
         if (mode != MediaPlayerSeekMode::SEEK_CLOSEST) {
-            seekTimeUs = actualTimeUs;
+            seekTimeUs = std::max<int64_t>(0, actualTimeUs);
         }
         mVideoLastDequeueTimeUs = actualTimeUs;
     }