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

Commit 44237a8d authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am b71298ee: Merge "avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function" 

* commit 'b71298ee':
  avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function
parents 68d44b06 b71298ee

media/libstagefright/codecs/avc/common/include/avcapi_common.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -213,7 +213,7 @@ typedef void (*FuctionType_FrameUnbind)(void *userData, int); 
    memory usage.

    memory usage.

\param "size" "Size of requested memory in bytes."

\param "size" "Size of requested memory in bytes."

\param "attribute" "Some value specifying types, priority, etc. of the memory."

\param "attribute" "Some value specifying types, priority, etc. of the memory."

\return "The address of the allocated memory"

\return "The address of the allocated, zero-initialized memory"

*/

*/

typedef void* (*FunctionType_Malloc)(void *userData, int32 size, int attribute);

typedef void* (*FunctionType_Malloc)(void *userData, int32 size, int attribute);

media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp

+4 −1
Original line number Original line Diff line number Diff line
@@ -133,7 +133,10 @@ inline static void ConvertYUV420SemiPlanarToYUV420Planar( 




static void* MallocWrapper(

static void* MallocWrapper(

        void *userData, int32_t size, int32_t attrs) {

        void *userData, int32_t size, int32_t attrs) {

    return malloc(size);

    void *ptr = malloc(size);

    if (ptr)

        memset(ptr, 0, size);

    return ptr;

}

}





static void FreeWrapper(void *userData, void* ptr) {

static void FreeWrapper(void *userData, void* ptr) {