Fix for issue 5490443 Native crash while exporting a videoandroid-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0.3_r2android-cts-4.0.3_r1ics-mr1

Handle the decoder error case, this modification is to fix the native crash.

Change-Id: I3f2ef62b591ebfb9e01153b80b04eb330f575207

1 files changed, 5 insertions, 0 deletions

diff --git a/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp b/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
index 0d5ea64..82e149b 100755
--- a/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
+++ b/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
@@ -1396,6 +1396,11 @@ M4OSA_ERR VideoEditorVideoDecoder_decode(M4OSA_Context context,
                 break;
             }
             continue;
+        } else if (errStatus != OK) {
+            LOGE("VideoEditorVideoDecoder_decode ERROR:0x%x(%d)",
+                errStatus,errStatus);
+            lerr = errStatus;
+            goto VIDEOEDITOR_VideoDecode_cleanUP;
         }
 
         // The OMXCodec client should expect to receive 0-length buffers