Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15f5eeef authored by Santosh Madhava's avatar Santosh Madhava Committed by Android (Google) Code Review
Browse files

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

parents dd1ddc3b 7c8f25f5

media/jni/mediaeditor/VideoEditorMain.cpp

+12 −5
Original line number Diff line number Diff line
@@ -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[1].pac_data != M4OSA_NULL) {

                        M4OSA_free((M4OSA_MemAddr32)aFramingCtx->FramingYuv[1].pac_data);

                        aFramingCtx->FramingYuv[1].pac_data = M4OSA_NULL;

                    }

                if (aFramingCtx->FramingYuv != 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;

                }