diff options
| author | Andy Hung <hunga@google.com> | 2014-09-23 14:59:01 -0700 |
|---|---|---|
| committer | Andy Hung <hunga@google.com> | 2014-09-24 18:46:49 -0700 |
| commit | cf31f1eecf46d599428e115dfee8dd47b76c83fc (patch) | |
| tree | c28c387f27388abc22a1658f40adf0395afb4262 /media/libstagefright/foundation | |
| parent | 80ec934ae7d4e3a78af87554fdb77a58f6386ba0 (diff) | |
| download | frameworks_av-cf31f1eecf46d599428e115dfee8dd47b76c83fc.zip frameworks_av-cf31f1eecf46d599428e115dfee8dd47b76c83fc.tar.gz frameworks_av-cf31f1eecf46d599428e115dfee8dd47b76c83fc.tar.bz2 | |
NuPlayer: Fix decoder error handling
Upon error, release MediaCodec after flushing data.
Report errors when they occur with ALOGE.
Fix onInputBufferFilled mInputBufferIsDequeued check.
Bug: 17423087
Bug: 17622642
Change-Id: I316601a19d5ec95cf8e14f5bc0418a05ec423041
Diffstat (limited to 'media/libstagefright/foundation')
| -rw-r--r-- | media/libstagefright/foundation/AMessage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/foundation/AMessage.cpp b/media/libstagefright/foundation/AMessage.cpp index bc3e3fb..795e8a6 100644 --- a/media/libstagefright/foundation/AMessage.cpp +++ b/media/libstagefright/foundation/AMessage.cpp @@ -485,7 +485,7 @@ AString AMessage::debugString(int32_t indent) const { { sp<ABuffer> buffer = static_cast<ABuffer *>(item.u.refValue); - if (buffer != NULL && buffer->size() <= 64) { + if (buffer != NULL && buffer->data() != NULL && buffer->size() <= 64) { tmp = StringPrintf("Buffer %s = {\n", item.mName); hexdump(buffer->data(), buffer->size(), indent + 4, &tmp); appendIndent(&tmp, indent + 2); |