drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue 3414805 Crash during Overlay editing. JNI fixes.

Browse Source 
Change-Id: I5e966c6987920318d3ce03f78552d0028ef55a26
This commit is contained in:
Dharmaray Kundargi
2011-02-01 19:24:00 -08:00
parent 3b8657debc
commit c08f85a648
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
media/jni/mediaeditor/VideoEditorMain.cpp
View File

@ -1485,7 +1485,7 @@ videoEditor_populateSettings(
if ( pContext->pEditSettings->nbEffects ) if ( pContext->pEditSettings->nbEffects )
{ {
pOverlayIndex pOverlayIndex
= (int*) M4OSA_malloc(pContext->pEditSettings->nbEffects, 0, = (int*) M4OSA_malloc(pContext->pEditSettings->nbEffects * sizeof(int), 0,
(M4OSA_Char*)"pOverlayIndex"); (M4OSA_Char*)"pOverlayIndex");
} }
@ -1528,9 +1528,15 @@ videoEditor_populateSettings(
result = M4xVSS_internalConvertARGB888toYUV420_FrammingEffect(pContext->engineContext, result = M4xVSS_internalConvertARGB888toYUV420_FrammingEffect(pContext->engineContext,
&(pContext->pEditSettings->Effects[j]),aFramingCtx, &(pContext->pEditSettings->Effects[j]),aFramingCtx,
pContext->pEditSettings->Effects[j].xVSS.framingScaledSize); pContext->pEditSettings->Effects[j].xVSS.framingScaledSize);
if (result != M4NO_ERROR) videoEditJava_checkAndThrowRuntimeException(&needToBeLoaded, pEnv,
{ (M4NO_ERROR != result), result);
if (needToBeLoaded == false) {
M4OSA_TRACE1_1("M4xVSS_internalConvertARGB888toYUV420_FrammingEffect returned 0x%x", result); M4OSA_TRACE1_1("M4xVSS_internalConvertARGB888toYUV420_FrammingEffect returned 0x%x", result);
if (aFramingCtx != M4OSA_NULL) {
M4OSA_free((M4OSA_MemAddr32)aFramingCtx);
aFramingCtx = M4OSA_NULL;
}
return;
} }
//framing buffers are resized to fit the output video resolution. //framing buffers are resized to fit the output video resolution.