commit 6aade6058521b0dbd35a9a4620f4d04f02f90444
author Marco Nelissen <marcone@google.com> Thu May 09 09:15:34 2013 -0700
committer Marco Nelissen <marcone@google.com> Fri May 10 08:17:09 2013 -0700
tree 1bb4840ad3429f7d4cc4b399f3e354db7dfe01ea
parent e464e15a31bb57754a227f5058299160e6d47ebb

Don't render buffers that have size 0

b/8857451

Change-Id: I12a31a2f85af76602db9e6f0ec80632954b3f7ed

media/libstagefright/ACodec.cpp

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 058852e..994d3f4 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -3131,7 +3131,8 @@
 
     int32_t render;
     if (mCodec->mNativeWindow != NULL
-            && msg->findInt32("render", &render) && render != 0) {
+            && msg->findInt32("render", &render) && render != 0
+            && (info->mData == NULL || info->mData->size() != 0)) {
         // The client wants this buffer to be rendered.
 
         status_t err;

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index 714da55..f412dc8 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -1656,7 +1656,7 @@
         return -EACCES;
     }
 
-    if (render) {
+    if (render && (info->mData == NULL || info->mData->size() != 0)) {
         info->mNotify->setInt32("render", true);
 
         if (mSoftRenderer != NULL) {