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

Commit f8100767 authored by Ray Essick's avatar Ray Essick Committed by Automerger Merge Worker
Browse files

Merge "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed." into... 

Merge "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed." into rvc-dev am: c1b100f2 am: aaefdfe7 am: afa248f3 am: d21b39a7 am: cd02fa76 am: 7fe9a14a am: 97cda45c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/24944816



Change-Id: Ibe2d95a4145c9e93af5f198387ff047132af4968
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dd833ba6 97cda45c

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->data();

        return abuf->base();

    }



    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]->data();

        return abufs[idx]->base();

    }

    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->data();

        return abuf->base();

    }



    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]->data();

        return abufs[idx]->base();

    }

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

    return NULL;