diff options
| author | Lajos Molnar <lajos@google.com> | 2013-10-28 14:59:21 -0700 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2013-10-30 13:43:51 -0700 |
| commit | 7fa015217e618265ff5a844cf6961ecc316c81a4 (patch) | |
| tree | 0891bfc23870221cdb9705e79cbfcef07c79de3d /media/libstagefright/ACodec.cpp | |
| parent | c76b9f52cf4e39f6943c53f5b3657dfee65857ac (diff) | |
| download | frameworks_av-7fa015217e618265ff5a844cf6961ecc316c81a4.zip frameworks_av-7fa015217e618265ff5a844cf6961ecc316c81a4.tar.gz frameworks_av-7fa015217e618265ff5a844cf6961ecc316c81a4.tar.bz2 | |
Restore NuPlayer error and EOS handling
This was erroneously removed by commit a73c954
Change-Id: I4742339139e770f0181c99d427875897fd60b68e
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 11413439
Diffstat (limited to 'media/libstagefright/ACodec.cpp')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index 1adab38..92a5361 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -3072,11 +3072,16 @@ void ACodec::BaseState::onInputBufferFilled(const sp<AMessage> &msg) { /* these are unfilled buffers returned by client */ CHECK(msg->findInt32("err", &err)); - ALOGV("[%s] saw error %d instead of an input buffer", - mCodec->mComponentName.c_str(), err); + if (err == OK) { + /* buffers with no errors are returned on MediaCodec.flush */ + mode = KEEP_BUFFERS; + } else { + ALOGV("[%s] saw error %d instead of an input buffer", + mCodec->mComponentName.c_str(), err); + eos = true; + } buffer.clear(); - mode = KEEP_BUFFERS; } int32_t tmp; |