diff options
| author | Chong Zhang <chz@google.com> | 2014-07-25 00:02:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-24 22:06:48 +0000 |
| commit | 858c7517abd04c58d2f140df0f27cbad1253e18a (patch) | |
| tree | b9757721fbc8fbdfd72a9f27ed0525fb8bb59fdc /media | |
| parent | d1365d3654faedff3b125c794b547daae73d75b8 (diff) | |
| parent | d459e303f2f1d34c2b8c1af4f943747b20a8b1b2 (diff) | |
| download | frameworks_av-858c7517abd04c58d2f140df0f27cbad1253e18a.zip frameworks_av-858c7517abd04c58d2f140df0f27cbad1253e18a.tar.gz frameworks_av-858c7517abd04c58d2f140df0f27cbad1253e18a.tar.bz2 | |
Merge "signal mFrameAvailableCondition when AudioSource is stopped" into lmp-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/AudioSource.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/AudioSource.cpp b/media/libstagefright/AudioSource.cpp index d9aed01..a67fabe 100644 --- a/media/libstagefright/AudioSource.cpp +++ b/media/libstagefright/AudioSource.cpp @@ -159,6 +159,8 @@ status_t AudioSource::reset() { waitOutstandingEncodingFrames_l(); releaseQueuedFrames_l(); + mFrameAvailableCondition.signal(); + return OK; } |