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

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

Merge "Revert "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest... 

Merge "Revert "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed."" into rvc-dev am: 7a80b6c9 am: 2405b1a6 am: 723fc22c am: 42e13fa6 am: 99dba6a3 am: b85b6928 am: dfabe080

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



Change-Id: I50bed76d3242c854f88b7c781401b7f309aee4b9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 70e0901f dfabe080

media/ndk/NdkMediaCodec.cpp

+4 −4
Original line number Diff line number Diff line
@@ -668,7 +668,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;
@@ -685,7 +685,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;
@@ -703,7 +703,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;
@@ -716,7 +716,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;