summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2013-04-11 11:07:55 -0700
committerAndreas Huber <andih@google.com>2013-04-11 11:31:55 -0700
commit2070254f241f52cadb69bc2323f56df72704f1ca (patch)
treedd5aead0ce971332761599cc73189b8e1fea96a9 /media/libmediaplayerservice/nuplayer
parentecba7488c5cceaacef95836b1b476433451e7761 (diff)
downloadframeworks_av-2070254f241f52cadb69bc2323f56df72704f1ca.zip
frameworks_av-2070254f241f52cadb69bc2323f56df72704f1ca.tar.gz
frameworks_av-2070254f241f52cadb69bc2323f56df72704f1ca.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.cpp6
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;
}