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

Commit fb281f3a authored by Shyam Pallapothu's avatar Shyam Pallapothu Committed by Android (Google) Code Review
Browse files

Merge "Fix for issue 4133431 "Remove OSAL layer" in JNI part"

parents 45c515b0 c0125dd4

media/jni/mediaeditor/VideoBrowserInternal.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
{ \

    if (M4OSA_NULL != p) \

    { \

        M4OSA_free((M4OSA_MemAddr32)p) ; \

        free(p) ; \

        p = M4OSA_NULL ; \

    } \

}

media/jni/mediaeditor/VideoBrowserMain.c

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ M4OSA_ERR videoBrowserSetWindow( 


    if (pC->m_frameColorType == VideoBrowser_kGB565) {

        pC->m_outputPlane[0].u_stride = pC->m_outputPlane[0].u_width << 1;

        pC->m_outputPlane[0].pac_data = (M4OSA_UInt8*)M4OSA_malloc(

        pC->m_outputPlane[0].pac_data = (M4OSA_UInt8*)M4OSA_32bitAlignedMalloc(

            pC->m_outputPlane[0].u_stride * pC->m_outputPlane[0].u_height,

            VIDEOBROWSER, (M4OSA_Char *)"output plane");
@@ -154,7 +154,7 @@ M4OSA_ERR videoBrowserCreate( 
    CHECK_PTR(videoBrowserCreate, pURL,  err, M4ERR_PARAMETER);



    /*--- Create context ---*/

    pContext = (VideoBrowserContext*)M4OSA_malloc(

    pContext = (VideoBrowserContext*)M4OSA_32bitAlignedMalloc(

            sizeof(VideoBrowserContext),

            VIDEOBROWSER, (M4OSA_Char*)"Video browser context");

media/jni/mediaeditor/VideoEditorClasses.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2465,7 +2465,7 @@ videoEditClasses_getEffectSettings( 
        if (pSettings->xVSS.pFramingFilePath != M4OSA_NULL)

        {

            pSettings->xVSS.pFramingBuffer =

                (M4VIFI_ImagePlane *)M4OSA_malloc(sizeof(M4VIFI_ImagePlane),

                (M4VIFI_ImagePlane *)M4OSA_32bitAlignedMalloc(sizeof(M4VIFI_ImagePlane),

                0x00,(M4OSA_Char *)"framing buffer");

        }

media/jni/mediaeditor/VideoEditorMain.cpp

+74 −74

File changed.

Preview size limit exceeded, changes collapsed.

media/jni/mediaeditor/VideoEditorOsal.cpp

+3 −3
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ videoEditOsal_alloc( 
    if (*pResult)

    {

        // Allocate memory for the settings.

        pData = (M4VSS3GPP_EditSettings*)M4OSA_malloc(size, 0, (M4OSA_Char*)pDescription);

        pData = (M4VSS3GPP_EditSettings*)M4OSA_32bitAlignedMalloc(size, 0, (M4OSA_Char*)pDescription);

        if (M4OSA_NULL != pData)

        {

            // Reset the allocated memory.
@@ -314,10 +314,10 @@ videoEditOsal_free( 
        VIDEOEDIT_LOG_FUNCTION(ANDROID_LOG_INFO, "VIDEO_EDITOR_OSAL", "videoEditOsal_free()");



        // Log the API call.

        VIDEOEDIT_LOG_API(ANDROID_LOG_INFO, "VIDEO_EDITOR_OSAL", "M4OSA_free()");

        VIDEOEDIT_LOG_API(ANDROID_LOG_INFO, "VIDEO_EDITOR_OSAL", "free");



        // Free the memory.

        M4OSA_free((M4OSA_MemAddr32)pData);

        free(pData);

#ifdef OSAL_MEM_LEAK_DEBUG

        // Update the allocated block count.

        gAllocatedBlockCount--;