summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2014-10-29 15:32:17 -0700
committerEric Laurent <elaurent@google.com>2014-10-29 15:32:17 -0700
commita5d316fd802cfc92954527f27e6f32206a896113 (patch)
tree1fa7702b5eb50186fc90a327c59c71ec83a2cc4a
parent701b96474dc8afd16046e440975e00be57cc4874 (diff)
downloadframeworks_av-a5d316fd802cfc92954527f27e6f32206a896113.zip
frameworks_av-a5d316fd802cfc92954527f27e6f32206a896113.tar.gz
frameworks_av-a5d316fd802cfc92954527f27e6f32206a896113.tar.bz2
NuPlayer: reduce offload pause teardown timeout.
Waiting 60 seconds to teardown an offloaded path when paused is not needed and causes unecessary battery drain. 10 seconds is enough to avaoid teardown when it would be problematic (seek, pause for notifications, buffering...). Bug: 13505340. Change-Id: Ibcaa609b59e86ba2bc49539620bd77504d534c0c
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp2
-rw-r--r--media/libstagefright/AwesomePlayer.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
index 86ce385..ed9e8f3 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
@@ -38,7 +38,7 @@ namespace android {
// Maximum time in paused state when offloading audio decompression. When elapsed, the AudioSink
// is closed to allow the audio DSP to power down.
-static const int64_t kOffloadPauseMaxUs = 60000000ll;
+static const int64_t kOffloadPauseMaxUs = 10000000ll;
// static
const int64_t NuPlayer::Renderer::kMinPositionUpdateDelayUs = 100000ll;
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index ab8ac79..6a56729 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -75,7 +75,7 @@ static const size_t kHighWaterMarkBytes = 200000;
// maximum time in paused state when offloading audio decompression. When elapsed, the AudioPlayer
// is destroyed to allow the audio DSP to power down.
-static int64_t kOffloadPauseMaxUs = 60000000ll;
+static int64_t kOffloadPauseMaxUs = 10000000ll;
struct AwesomeEvent : public TimedEventQueue::Event {