summaryrefslogtreecommitdiffstats
path: root/libvideoeditor
diff options
context:
space:
mode:
authorHong Teng <hongteng@google.com>2011-11-30 16:42:56 -0800
committerHong Teng <hongteng@google.com>2011-11-30 17:35:58 -0800
commit00b82d39c6d1b4e0594857ef5113f46775c4a065 (patch)
treee56345ffeb4157b9499436493c2e1b89d913ee17 /libvideoeditor
parentc8d53b6147249440e6b99f88adc795ac82e1a050 (diff)
downloadframeworks_av-00b82d39c6d1b4e0594857ef5113f46775c4a065.zip
frameworks_av-00b82d39c6d1b4e0594857ef5113f46775c4a065.tar.gz
frameworks_av-00b82d39c6d1b4e0594857ef5113f46775c4a065.tar.bz2
Fix for issue 5490443 Native crash while exporting a video
Handle the decoder error case, this modification is to fix the native crash. Change-Id: I3f2ef62b591ebfb9e01153b80b04eb330f575207
Diffstat (limited to 'libvideoeditor')
-rwxr-xr-xlibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
index 0d5ea64..82e149b 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
+++ b/libvideoeditor/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