summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MediaCodec.cpp
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2013-10-28 14:59:21 -0700
committerLajos Molnar <lajos@google.com>2013-10-30 13:43:51 -0700
commit7fa015217e618265ff5a844cf6961ecc316c81a4 (patch)
tree0891bfc23870221cdb9705e79cbfcef07c79de3d /media/libstagefright/MediaCodec.cpp
parentc76b9f52cf4e39f6943c53f5b3657dfee65857ac (diff)
downloadframeworks_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/MediaCodec.cpp')
-rw-r--r--media/libstagefright/MediaCodec.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index e0686be..c36dd7c 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -1500,7 +1500,8 @@ void MediaCodec::returnBuffersToCodecOnPort(int32_t portIndex) {
info->mOwnedByClient = false;
if (portIndex == kPortIndexInput) {
- msg->setInt32("err", ERROR_END_OF_STREAM);
+ /* no error, just returning buffers */
+ msg->setInt32("err", OK);
}
msg->post();
}