summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2014-10-29 23:11:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-29 23:11:37 +0000
commit7011ee31d65917a9e15b271942e863f06eee2da1 (patch)
treeeeeb40b36da0c065189cbda7760a4619687d8550 /media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
parentcde2b72229fd6e06ee301238fd2943cdc1c40686 (diff)
parenta5d316fd802cfc92954527f27e6f32206a896113 (diff)
downloadframeworks_av-7011ee31d65917a9e15b271942e863f06eee2da1.zip
frameworks_av-7011ee31d65917a9e15b271942e863f06eee2da1.tar.gz
frameworks_av-7011ee31d65917a9e15b271942e863f06eee2da1.tar.bz2
Merge "NuPlayer: reduce offload pause teardown timeout." into lmp-mr1-dev
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
index e0c5e18..5d9001c 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;