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

Merge "Fix for issue 3431967: Memory leak from video editor engine"

Browse Source
This commit is contained in:
Santosh Madhava
2011-02-28 09:12:34 -08:00
committed by Android (Google) Code Review
parent dd1ddc3b16 7c8f25f5b8
commit 15f5eeef0e
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1707,12 +1707,19 @@ videoEditor_populateSettings(
if (aFramingCtx->FramingYuv != M4OSA_NULL )
{
if (aFramingCtx->FramingYuv->pac_data != M4OSA_NULL) {
M4OSA_free((M4OSA_MemAddr32)aFramingCtx->FramingYuv->pac_data);
aFramingCtx->FramingYuv->pac_data = M4OSA_NULL;
if (aFramingCtx->FramingYuv[0].pac_data != M4OSA_NULL) {
M4OSA_free((M4OSA_MemAddr32)aFramingCtx->FramingYuv[0].pac_data);
aFramingCtx->FramingYuv[0].pac_data = M4OSA_NULL;
}
}
if (aFramingCtx->FramingYuv != M4OSA_NULL) {
if (aFramingCtx->FramingYuv[1].pac_data != M4OSA_NULL) {
M4OSA_free((M4OSA_MemAddr32)aFramingCtx->FramingYuv[1].pac_data);
aFramingCtx->FramingYuv[1].pac_data = M4OSA_NULL;
}
if (aFramingCtx->FramingYuv[2].pac_data != M4OSA_NULL) {
M4OSA_free((M4OSA_MemAddr32)aFramingCtx->FramingYuv[2].pac_data);
aFramingCtx->FramingYuv[2].pac_data = M4OSA_NULL;
}
M4OSA_free((M4OSA_MemAddr32)aFramingCtx->FramingYuv);
aFramingCtx->FramingYuv = M4OSA_NULL;
}