summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSharad Sangle <assangle@codeaurora.org>2014-08-11 23:59:23 +0530
committerSteve Kondik <shade@chemlab.org>2014-10-20 13:54:37 -0700
commit88192404eb2f4b2d9ee8b2a197fa25992e23a713 (patch)
tree3781b697df3f05aec6d176bda0d5dd31d9005230
parent721128faa991d56d5765ead3d62aa9cf29967d1f (diff)
downloadframeworks_av-88192404eb2f4b2d9ee8b2a197fa25992e23a713.tar.gz
frameworks_av-88192404eb2f4b2d9ee8b2a197fa25992e23a713.tar.bz2
frameworks_av-88192404eb2f4b2d9ee8b2a197fa25992e23a713.zip
libstagefright: Handle INFO_FORMAT_CHANGED for dolby clips
-For dolby clips when device is switched from headset to BT multiple times, media error is observed, and playback stops -When end device is changed, s/w Dolby decoder generates format change event which in certain condition leads to media error and playback stops -Make sure format change error is handled in AudioPlayer layer CRs-Fixed: 706801 Change-Id: I3ff3ef84b15ea5f9d3288215c1491dc30d17a413
-rw-r--r--media/libstagefright/AudioPlayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/AudioPlayer.cpp b/media/libstagefright/AudioPlayer.cpp
index 0a00161924..ba7678d5a7 100644
--- a/media/libstagefright/AudioPlayer.cpp
+++ b/media/libstagefright/AudioPlayer.cpp
@@ -647,7 +647,7 @@ size_t AudioPlayer::fillBuffer(void *data, size_t size) {
Mutex::Autolock autoLock(mLock);
- if (err != OK) {
+ if (err != OK && err != INFO_FORMAT_CHANGED) {
if (!mReachedEOS) {
if (useOffload()) {
// After seek there is a possible race condition if