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

Commit f631183a authored by Jessica Wagantall's avatar Jessica Wagantall
Browse files

Merge tag 'android-5.1.1_r37' into HEAD 

Ticket: CYNGNOS-2213
Android 5.1.1 release 37
parents b053bad3 3097f364

include/media/mediametadataretriever.h

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ public: 
    const char* extractMetadata(int keyCode);



private:

    static const sp<IMediaPlayerService>& getService();

    static const sp<IMediaPlayerService> getService();



    class DeathNotifier: public IBinder::DeathRecipient

    {

media/libmedia/IOMX.cpp

+37 −30
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ public: 
        remote()->transact(CONFIGURE_VIDEO_TUNNEL_MODE, data, &reply);



        status_t err = reply.readInt32();

        if (sidebandHandle) {

        if (err == OK && sidebandHandle) {

            *sidebandHandle = (native_handle_t *)reply.readNativeHandle();

        }

        return err;
@@ -618,10 +618,13 @@ status_t BnOMX::onTransact( 


            size_t size = data.readInt64();



            void *params = malloc(size);

            data.read(params, size);



            status_t err;

            status_t err = NO_MEMORY;

            void *params = calloc(size, 1);

            if (params) {

                err = data.read(params, size);

                if (err != OK) {

                    android_errorWriteLog(0x534e4554, "26914474");

                } else {

                    switch (code) {

                        case GET_PARAMETER:

                            err = getParameter(node, index, params, size);
@@ -647,6 +650,8 @@ status_t BnOMX::onTransact( 
                        default:

                            TRESPASS();

                    }

                }

            }



            reply->writeInt32(err);
@@ -833,11 +838,13 @@ status_t BnOMX::onTransact( 
            OMX_BOOL tunneled = (OMX_BOOL)data.readInt32();

            OMX_U32 audio_hw_sync = data.readInt32();



            native_handle_t *sideband_handle;

            native_handle_t *sideband_handle = NULL;

            status_t err = configureVideoTunnelMode(

                    node, port_index, tunneled, audio_hw_sync, &sideband_handle);

            reply->writeInt32(err);

            if(err == OK){

                reply->writeNativeHandle(sideband_handle);

            }



            return NO_ERROR;

        }

media/libmedia/mediametadataretriever.cpp

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ Mutex MediaMetadataRetriever::sServiceLock; 
sp<IMediaPlayerService> MediaMetadataRetriever::sService;

sp<MediaMetadataRetriever::DeathNotifier> MediaMetadataRetriever::sDeathNotifier;



const sp<IMediaPlayerService>& MediaMetadataRetriever::getService()

const sp<IMediaPlayerService> MediaMetadataRetriever::getService()

{

    Mutex::Autolock lock(sServiceLock);

    if (sService == 0) {
@@ -62,7 +62,7 @@ const sp<IMediaPlayerService>& MediaMetadataRetriever::getService() 
MediaMetadataRetriever::MediaMetadataRetriever()

{

    ALOGV("constructor");

    const sp<IMediaPlayerService>& service(getService());

    const sp<IMediaPlayerService> service(getService());

    if (service == 0) {

        ALOGE("failed to obtain MediaMetadataRetrieverService");

        return;

media/libstagefright/MPEG4Extractor.cpp

+9 −1
Original line number Diff line number Diff line
@@ -4295,7 +4295,15 @@ status_t MPEG4Source::read( 
                    continue;

                }



                CHECK(dstOffset + 4 <= mBuffer->size());

                if (dstOffset > SIZE_MAX - 4 ||

                        dstOffset + 4 > SIZE_MAX - nalLength ||

                        dstOffset + 4 + nalLength > mBuffer->size()) {

                    ALOGE("b/27208621 : %zu %zu", dstOffset, mBuffer->size());

                    android_errorWriteLog(0x534e4554, "27208621");

                    mBuffer->release();

                    mBuffer = NULL;

                    return ERROR_MALFORMED;

                }



                dstData[dstOffset++] = 0;

                dstData[dstOffset++] = 0;