Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for issue 3431967: Memory leak from video editor engine

Browse Source 
Change-Id: Ibaa66d7c95f2a60b59dc3102d3b5130ff1fbc62e
This commit is contained in:
Santosh Madhava
2011-02-28 18:30:53 -08:00
parent 108500ab22
commit 71771b3b1b
1 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -453,7 +453,11 @@ static void jniPreviewProgressCallback (void* cookie, M4OSA_UInt32 msgType,
case MSG_TYPE_OVERLAY_CLEAR:
isSendProgress = false;
pContext->mOverlayFileName = NULL;
if (pContext->mOverlayFileName != NULL) {
M4OSA_free((M4OSA_MemAddr32)pContext->mOverlayFileName);
pContext->mOverlayFileName = NULL;
}
LOGV("MSG_TYPE_OVERLAY_CLEAR");
//argc is not used
pContext->mIsUpdateOverlay = true;
@@ -1760,6 +1764,17 @@ videoEditor_populateSettings(
VIDEOEDIT_LOG_EDIT_SETTINGS(pContext->pEditSettings);
}
}
/* free previous allocations , if any */
if (pContext->mAudioSettings != M4OSA_NULL) {
if (pContext->mAudioSettings->pFile != NULL) {
M4OSA_free((M4OSA_MemAddr32)pContext->mAudioSettings->pFile);
pContext->mAudioSettings->pFile = M4OSA_NULL;
}
if (pContext->mAudioSettings->pPCMFilePath != NULL) {
M4OSA_free((M4OSA_MemAddr32)pContext->mAudioSettings->pPCMFilePath);
pContext->mAudioSettings->pPCMFilePath = M4OSA_NULL;
}
}
if (audioSettingObject != M4OSA_NULL) {
jclass audioSettingClazz = pEnv->FindClass(AUDIO_SETTINGS_CLASS_NAME);
@@ -1823,16 +1838,6 @@ videoEditor_populateSettings(
= pEnv->GetIntField(audioSettingObject,fid);
M4OSA_TRACE1_1("fileType = %d",pContext->mAudioSettings->fileType);
/* free previous allocations , if any */
if (pContext->mAudioSettings->pFile != NULL) {
M4OSA_free((M4OSA_MemAddr32)pContext->mAudioSettings->pFile);
pContext->mAudioSettings->pFile = M4OSA_NULL;
}
if (pContext->mAudioSettings->pPCMFilePath != NULL) {
M4OSA_free((M4OSA_MemAddr32)pContext->mAudioSettings->pPCMFilePath);
pContext->mAudioSettings->pPCMFilePath = M4OSA_NULL;
}
fid = pEnv->GetFieldID(audioSettingClazz,"pFile","Ljava/lang/String;");
strPath = (jstring)pEnv->GetObjectField(audioSettingObject,fid);
pTempChar = (M4OSA_Char*)pEnv->GetStringUTFChars(strPath, M4OSA_NULL);
@@ -3044,18 +3049,18 @@ videoEditor_release(
pContext->mPreviewController = M4OSA_NULL;
}
if (pContext->mAudioSettings->pFile != NULL) {
M4OSA_free((M4OSA_MemAddr32)pContext->mAudioSettings->pFile);
pContext->mAudioSettings->pFile = M4OSA_NULL;
}
if (pContext->mAudioSettings->pPCMFilePath != NULL) {
M4OSA_free((M4OSA_MemAddr32)pContext->mAudioSettings->pPCMFilePath);
pContext->mAudioSettings->pPCMFilePath = M4OSA_NULL;
}
// Free the context.
// Free the mAudioSettings context.
if(pContext->mAudioSettings != M4OSA_NULL)
{
if (pContext->mAudioSettings->pFile != NULL) {
M4OSA_free((M4OSA_MemAddr32)pContext->mAudioSettings->pFile);
pContext->mAudioSettings->pFile = M4OSA_NULL;
}
if (pContext->mAudioSettings->pPCMFilePath != NULL) {
M4OSA_free((M4OSA_MemAddr32)pContext->mAudioSettings->pPCMFilePath);
pContext->mAudioSettings->pPCMFilePath = M4OSA_NULL;
}
M4OSA_free((M4OSA_MemAddr32)pContext->mAudioSettings);
pContext->mAudioSettings = M4OSA_NULL;
}