diff options
| author | Jianzheng Zhou <jianzheng.zhou@freescale.com> | 2014-01-14 17:55:16 +0800 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2014-02-03 17:51:56 +0000 |
| commit | 79ee2399b67c7a11042c5904dc1309712a76f8cb (patch) | |
| tree | a013d5bdc6c584479e7b0d751639b0bded315ab3 /media | |
| parent | c4eef29af4e306319d8741e0c3ade1ede9a0a2b5 (diff) | |
| download | frameworks_av-79ee2399b67c7a11042c5904dc1309712a76f8cb.zip frameworks_av-79ee2399b67c7a11042c5904dc1309712a76f8cb.tar.gz frameworks_av-79ee2399b67c7a11042c5904dc1309712a76f8cb.tar.bz2 | |
correct one logic error in decide whether should render or not
Change-Id: Ie41663f6fd5a7d983279f14a2228cb57231771bf
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/MediaCodec.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index 528fdb9..76a3358 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -3415,7 +3415,7 @@ void ACodec::BaseState::onOutputBufferDrained(const sp<AMessage> &msg) { int32_t render; if (mCodec->mNativeWindow != NULL && msg->findInt32("render", &render) && render != 0 - && (info->mData == NULL || info->mData->size() != 0)) { + && info->mData != NULL && info->mData->size() != 0) { // The client wants this buffer to be rendered. status_t err; diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp index 8af1aaf..c4c47b3 100644 --- a/media/libstagefright/MediaCodec.cpp +++ b/media/libstagefright/MediaCodec.cpp @@ -1680,7 +1680,7 @@ status_t MediaCodec::onReleaseOutputBuffer(const sp<AMessage> &msg) { return -EACCES; } - if (render && (info->mData == NULL || info->mData->size() != 0)) { + if (render && info->mData != NULL && info->mData->size() != 0) { info->mNotify->setInt32("render", true); if (mSoftRenderer != NULL) { |