diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-10-25 09:24:23 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-10-25 09:24:23 -0700 |
| commit | 04fdb627d164cc81c8fa2830db1b20cf1261aea4 (patch) | |
| tree | e25471a9244b6041523606ac692b648c309ef350 /media | |
| parent | 1735454321bf1fd7ba7c3ea1bd055c0b09efe99d (diff) | |
| parent | bbd59d7c0cf8a257867168699df50a3fcce3abbf (diff) | |
| download | frameworks_av-04fdb627d164cc81c8fa2830db1b20cf1261aea4.zip frameworks_av-04fdb627d164cc81c8fa2830db1b20cf1261aea4.tar.gz frameworks_av-04fdb627d164cc81c8fa2830db1b20cf1261aea4.tar.bz2 | |
Merge "stagefright: Wait longer before force releasing codec"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index a132637..3c80d03 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -619,8 +619,8 @@ void ACodec::initiateShutdown(bool keepComponentAllocated) { msg->setInt32("keepComponentAllocated", keepComponentAllocated); msg->post(); if (!keepComponentAllocated) { - // ensure shutdown completes in 10 seconds - (new AMessage(kWhatReleaseCodecInstance, this))->post(10000000); + // ensure shutdown completes in 30 seconds + (new AMessage(kWhatReleaseCodecInstance, this))->post(30000000); } } |