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

Commit 05f0c2a6 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25117107'] into udc-qpr1-release. 

Change-Id: Idae86a10ad6014d5025640f5d32b412fc8c23ec7
parents 9caf2fd4 e75ffb4d

media/ndk/NdkMediaCodec.cpp

+4 −4
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ uint8_t* AMediaCodec_getInputBuffer(AMediaCodec *mData, size_t idx, size_t *out_ 
        if (out_size != NULL) {

            *out_size = abuf->capacity();

        }

        return abuf->base();

        return abuf->data();

    }



    android::Vector<android::sp<android::MediaCodecBuffer> > abufs;
@@ -689,7 +689,7 @@ uint8_t* AMediaCodec_getInputBuffer(AMediaCodec *mData, size_t idx, size_t *out_ 
        if (out_size != NULL) {

            *out_size = abufs[idx]->capacity();

        }

        return abufs[idx]->base();

        return abufs[idx]->data();

    }

    ALOGE("couldn't get input buffers");

    return NULL;
@@ -707,7 +707,7 @@ uint8_t* AMediaCodec_getOutputBuffer(AMediaCodec *mData, size_t idx, size_t *out 
        if (out_size != NULL) {

            *out_size = abuf->capacity();

        }

        return abuf->base();

        return abuf->data();

    }



    android::Vector<android::sp<android::MediaCodecBuffer> > abufs;
@@ -720,7 +720,7 @@ uint8_t* AMediaCodec_getOutputBuffer(AMediaCodec *mData, size_t idx, size_t *out 
        if (out_size != NULL) {

            *out_size = abufs[idx]->capacity();

        }

        return abufs[idx]->base();

        return abufs[idx]->data();

    }

    ALOGE("couldn't get output buffers");

    return NULL;