From 79ee2399b67c7a11042c5904dc1309712a76f8cb Mon Sep 17 00:00:00 2001 From: Jianzheng Zhou Date: Tue, 14 Jan 2014 17:55:16 +0800 Subject: correct one logic error in decide whether should render or not Change-Id: Ie41663f6fd5a7d983279f14a2228cb57231771bf Signed-off-by: Jianzheng Zhou --- media/libstagefright/ACodec.cpp | 2 +- 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 &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 &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) { -- cgit v1.1