diff options
author | Andreas Huber <andih@google.com> | 2013-04-11 11:07:55 -0700 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2013-04-11 11:31:55 -0700 |
commit | d85929f6086e050d7cb33bfe0d29f339ad7279e5 (patch) | |
tree | ba90eb3c58882adc2a7f030892ab6faf6970af7b /media/libmediaplayerservice/nuplayer | |
parent | da0dc0af0effe9fbfb3ce3187c8472fca2baf3c6 (diff) | |
download | frameworks_av-d85929f6086e050d7cb33bfe0d29f339ad7279e5.zip frameworks_av-d85929f6086e050d7cb33bfe0d29f339ad7279e5.tar.gz frameworks_av-d85929f6086e050d7cb33bfe0d29f339ad7279e5.tar.bz2 |
Instead of returning an error, return an invalid duration (-1 ms)
if no duration information was available. This prevents us from
entering ERROR state, effectively rendering the player instance useless.
Change-Id: I602d2661ae8b8633360306c0ea9208fb11e2bf17
related-to-bug: 8596285
Diffstat (limited to 'media/libmediaplayerservice/nuplayer')
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp index 723af09..bdafb29 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp @@ -314,11 +314,11 @@ status_t NuPlayerDriver::getDuration(int *msec) { Mutex::Autolock autoLock(mLock); if (mDurationUs < 0) { - *msec = 0; - } else { - *msec = (mDurationUs + 500ll) / 1000; + return UNKNOWN_ERROR; } + *msec = (mDurationUs + 500ll) / 1000; + return OK; } |