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

Merge "Fix for issue 3404671 Crash when exporting movie in JNI" into honeycomb

Browse Source
This commit is contained in:
Dheeraj Sharma
2011-01-30 18:12:25 -08:00
committed by Android (Google) Code Review
parent 260c3c77d9 5618e037af
commit cd73d1ed6d
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -307,7 +307,7 @@ static JNINativeMethod gManualEditMethods[] = {
}; };
// temp file name of VSS out file // temp file name of VSS out file
#define TEMP_MCS_OUT_FILE_PATH "/tmpOut.3gp" #define TEMP_MCS_OUT_FILE_PATH "tmpOut.3gp"
void void
getClipSetting( getClipSetting(
@ -1144,13 +1144,13 @@ M4OSA_ERR videoEditor_generateAudio(JNIEnv* pEnv,ManualEditContext* pContext,
// generate the path for temp 3gp output file // generate the path for temp 3gp output file
pTemp3gpFilePath = (M4OSA_Char*) M4OSA_malloc ( pTemp3gpFilePath = (M4OSA_Char*) M4OSA_malloc (
(M4OSA_chrLength((M4OSA_Char*)pContext->initParams.pTempPath) (M4OSA_chrLength((M4OSA_Char*)pContext->initParams.pTempPath)
+ M4OSA_chrLength ((M4OSA_Char*)TEMP_MCS_OUT_FILE_PATH)) , 0x0, + M4OSA_chrLength ((M4OSA_Char*)TEMP_MCS_OUT_FILE_PATH)) + 1 /* for null termination */ , 0x0,
(M4OSA_Char*) "Malloc for temp 3gp file"); (M4OSA_Char*) "Malloc for temp 3gp file");
if ( pTemp3gpFilePath != M4OSA_NULL ) if ( pTemp3gpFilePath != M4OSA_NULL )
{ {
M4OSA_memset(pTemp3gpFilePath , M4OSA_memset(pTemp3gpFilePath ,
M4OSA_chrLength((M4OSA_Char*)pContext->initParams.pTempPath) M4OSA_chrLength((M4OSA_Char*)pContext->initParams.pTempPath)
+ M4OSA_chrLength((M4OSA_Char*)TEMP_MCS_OUT_FILE_PATH), 0); + M4OSA_chrLength((M4OSA_Char*)TEMP_MCS_OUT_FILE_PATH) + 1, 0);
M4OSA_chrNCat ( (M4OSA_Char*)pTemp3gpFilePath, M4OSA_chrNCat ( (M4OSA_Char*)pTemp3gpFilePath,
(M4OSA_Char*)pContext->initParams.pTempPath , (M4OSA_Char*)pContext->initParams.pTempPath ,
M4OSA_chrLength ((M4OSA_Char*)pContext->initParams.pTempPath)); M4OSA_chrLength ((M4OSA_Char*)pContext->initParams.pTempPath));
@ -2385,7 +2385,7 @@ M4OSA_ERR videoEditor_processClip(
"not initialized"); "not initialized");
// We start in Analyzing state // We start in Analyzing state
pContext->state = ManualEditState_ANALYZING; pContext->state = ManualEditState_INITIALIZED;
M4OSA_ERR completionResult = M4VSS3GPP_WAR_ANALYZING_DONE; M4OSA_ERR completionResult = M4VSS3GPP_WAR_ANALYZING_DONE;
ManualEditState completionState = ManualEditState_OPENED; ManualEditState completionState = ManualEditState_OPENED;
ManualEditState errorState = ManualEditState_ANALYZING_ERROR; ManualEditState errorState = ManualEditState_ANALYZING_ERROR;
@ -2560,9 +2560,10 @@ videoEditor_generateClip(
result = videoEditor_processClip(pEnv, thiz, 0 /*item id is unused*/); result = videoEditor_processClip(pEnv, thiz, 0 /*item id is unused*/);
LOGV("videoEditor_generateClip videoEditor_processClip returned 0x%x", result); LOGV("videoEditor_generateClip videoEditor_processClip returned 0x%x", result);
if (pContext->state != ManualEditState_INITIALIZED) {
// Free up memory (whatever the result) // Free up memory (whatever the result)
videoEditor_unloadSettings(pEnv, thiz); videoEditor_unloadSettings(pEnv, thiz);
//LVME_release(pEnv, thiz); }
LOGV("videoEditor_generateClip END 0x%x", (unsigned int) result); LOGV("videoEditor_generateClip END 0x%x", (unsigned int) result);
return result; return result;