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

Commit 4d7b78ef authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [3581037, 3581038, 3580473, 3580624, 3580656, 3580657,... 

Merge cherrypicks of [3581037, 3581038, 3580473, 3580624, 3580656, 3580657, 3580658, 3580382, 3580474, 3580475, 3581039, 3581040, 3580476, 3580206, 3581527, 3580955, 3580956, 3580957, 3580958, 3580959, 3580960, 3580961, 3580962, 3580963, 3580964, 3580965, 3580966, 3581567, 3581568, 3581569, 3581570, 3581571, 3580625, 3580626, 3581587, 3581513, 3581514, 3581515, 3580477, 3581588, 3580659, 3580660, 3580383, 3580384, 3580478, 3580719, 3580479, 3580480, 3581385, 3581528, 3581041, 3581042, 3581043, 3581044, 3581045, 3581046, 3581607, 3580385, 3580481, 3580482, 3580483, 3580661, 3580662, 3580663, 3580664, 3580665, 3580484, 3580485, 3581608, 3581609, 3581610, 3581611, 3581612, 3581589, 3581613, 3580486, 3581519, 3581627, 3581628, 3581529, 3581530, 3581531, 3581629, 3581630] into oc-mr1-release

Change-Id: I04f3b4a89e01913b77321b06b7605be6eb35532b
parents 72f790b9 12e25a75

media/libmedia/omx/1.0/WOmxNode.cpp

+2 −1
Original line number Diff line number Diff line
@@ -151,7 +151,8 @@ status_t LWOmxNode::allocateSecureBuffer( 
                    hidl_handle const& outNativeHandle) {

                fnStatus = toStatusT(status);

                *buffer = outBuffer;

                *native_handle = NativeHandle::create(

                *native_handle = outNativeHandle.getNativeHandle() == nullptr ?

                        nullptr : NativeHandle::create(

                        native_handle_clone(outNativeHandle), true);

            }));

    return transStatus == NO_ERROR ? fnStatus : transStatus;

media/libstagefright/avc_utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ static sp<ABuffer> FindNAL(const uint8_t *data, size_t size, unsigned nalType) { 
    const uint8_t *nalStart;

    size_t nalSize;

    while (getNextNALUnit(&data, &size, &nalStart, &nalSize, true) == OK) {

        if ((nalStart[0] & 0x1f) == nalType) {

        if (nalSize > 0 && (nalStart[0] & 0x1f) == nalType) {

            sp<ABuffer> buffer = new ABuffer(nalSize);

            memcpy(buffer->data(), nalStart, nalSize);

            return buffer;

media/libstagefright/omx/1.0/WOmxNode.cpp

+2 −1
Original line number Diff line number Diff line
@@ -154,7 +154,8 @@ status_t LWOmxNode::allocateSecureBuffer( 
                    hidl_handle const& outNativeHandle) {

                fnStatus = toStatusT(status);

                *buffer = outBuffer;

                *native_handle = NativeHandle::create(

                *native_handle = outNativeHandle.getNativeHandle() == nullptr ?

                        nullptr : NativeHandle::create(

                        native_handle_clone(outNativeHandle), true);

            }));

    return transStatus == NO_ERROR ? fnStatus : transStatus;