diff options
| author | Eric Laurent <elaurent@google.com> | 2014-10-31 00:13:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-31 00:13:41 +0000 |
| commit | f6a22ab15c6d4f3bbb49a30a896dd73553fccc83 (patch) | |
| tree | abedabb81fe8e04f43f724894fa32d95a9eb43f1 /media | |
| parent | 0307c3ce5be18d83093e0e45b8cbd90caf30c4fc (diff) | |
| parent | b2147445920d99609ac8fda9f85220e43354af7e (diff) | |
| download | frameworks_av-f6a22ab15c6d4f3bbb49a30a896dd73553fccc83.zip frameworks_av-f6a22ab15c6d4f3bbb49a30a896dd73553fccc83.tar.gz frameworks_av-f6a22ab15c6d4f3bbb49a30a896dd73553fccc83.tar.bz2 | |
am b2147445: am 7011ee31: Merge "NuPlayer: reduce offload pause teardown timeout." into lmp-mr1-dev
* commit 'b2147445920d99609ac8fda9f85220e43354af7e':
NuPlayer: reduce offload pause teardown timeout.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 2 |
2 files changed, 2 insertions, 2 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; 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 { |