summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MPEG4Writer.cpp
diff options
context:
space:
mode:
authorDhanalakshmi Siddani <dsiddani@codeaurora.org>2015-07-01 14:34:44 +0530
committerLinux Build Service Account <lnxbuild@localhost>2015-10-06 03:24:36 -0600
commit1ea539f4af155d3acc635e59cbdafab255b06c54 (patch)
treef55aab4c1c4181889d6349424ac42760ebc20f8d /media/libstagefright/MPEG4Writer.cpp
parent390aa8dd83078bad748582ce275bded14868d1ac (diff)
downloadframeworks_av-1ea539f4af155d3acc635e59cbdafab255b06c54.zip
frameworks_av-1ea539f4af155d3acc635e59cbdafab255b06c54.tar.gz
frameworks_av-1ea539f4af155d3acc635e59cbdafab255b06c54.tar.bz2
Audio: post error to client during SSR
- Add support to post error to client if SSR is triggered during NT mode encoding Change-Id: Idf10939f1eb0c719a692e4f53f6e3040633fab40
Diffstat (limited to 'media/libstagefright/MPEG4Writer.cpp')
-rw-r--r--media/libstagefright/MPEG4Writer.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index 26686ab..7dfac76 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -2554,8 +2554,13 @@ status_t MPEG4Writer::Track::threadEntry() {
if (mIsAudio) {
ALOGI("Audio track drift time: %" PRId64 " us", mOwner->getDriftTimeUs());
}
-
- if (err == ERROR_END_OF_STREAM) {
+ // if err is ERROR_IO (ex: during SSR), return OK to save the
+ // recorded file successfully. Session tear down will happen as part of
+ // client callback
+ if (mIsAudio && (err == ERROR_IO)) {
+ return OK;
+ }
+ else if (err == ERROR_END_OF_STREAM) {
return OK;
}
return err;