commit 3db8bb9d44eef64553a88fdc2698ef3b593c49c7
author Austin Hu <austin.hu@intel.com> Thu Oct 20 16:40:50 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 20 16:40:50 2016 +0000
tree 38e9cac422296cef855c6dc14b0ffd9bebc30b4c
parent 68d39939cea6922473bce4912c5cf9bba250ca47
parent c0f2dd551d0445783010b6c70d9bf5ec4cdc10a9

Handle the skip decoding case. am: c98025c07f
am: c0f2dd551d

Change-Id: Ia9756e1ba5ceccae062e8963907ff8e139b19450

videocodec/OMXVideoDecoderVP9Hybrid.cpp

diff --git a/videocodec/OMXVideoDecoderVP9Hybrid.cpp b/videocodec/OMXVideoDecoderVP9Hybrid.cpp
index 53dbd48..fe8d5f8 100644
--- a/videocodec/OMXVideoDecoderVP9Hybrid.cpp
+++ b/videocodec/OMXVideoDecoderVP9Hybrid.cpp
@@ -379,6 +379,11 @@
             // drain the last frame, keep the current input buffer
             res = mDecoderDecode(mCtx,mHybridCtx,NULL,0,true);
             retains[INPORT_INDEX] = BUFFER_RETAIN_GETAGAIN;
+        } else if (res == -3) {
+            LOGW("on2 decoder skipped to decode the frame.");
+            (*pBuffers[OUTPORT_INDEX])->nOffset = 0;
+            (*pBuffers[OUTPORT_INDEX])->nFilledLen = 0;
+            return OMX_ErrorNone;
         } else {
             LOGE("on2 decoder failed to decode frame.");
             return OMX_ErrorBadParameter;