commit 36cd37ffb8584cc7410620c7137770209d6b74f8
author Treehugger Robot <treehugger-gerrit@google.com> Wed Dec 23 22:25:12 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 23 22:25:12 2020 +0000
tree 37c558f347e8c41e9302ac5c86eea78169f12d28
parent af5c22012f5c547e743701feed8205c205424049
parent 2b293d5a57fa98495354a4db0975b07d82c33e06

Merge "MediaCodec: Report error when render surface is obsolete"

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index a3a4aba..4fe871f 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -4083,7 +4083,15 @@
                 }
             }
         }
-        mBufferChannel->renderOutputBuffer(buffer, renderTimeNs);
+        status_t err = mBufferChannel->renderOutputBuffer(buffer, renderTimeNs);
+
+        if (err == NO_INIT) {
+            ALOGE("rendering to non-initilized(obsolete) surface");
+            return err;
+        }
+        if (err != OK) {
+            ALOGI("rendring output error %d", err);
+        }
     } else {
         mBufferChannel->discardBuffer(buffer);
     }