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

Commit 44b19364 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android Build Coastguard Worker
Browse files

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

This reverts commit 95f411fb.

Reason for revert: This breaks app compatibility
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:883e38b694a6a2a51d34ea145607b62b0bdb316f)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a2118fa4988f1d8135894800de122296e146a157)
Merged-In: I94d7034907d5befc0aabf7bf2b490d1fc86c69af
Change-Id: I94d7034907d5befc0aabf7bf2b490d1fc86c69af
parent ee9f2026

media/ndk/NdkMediaCodec.cpp

+4 −4
Original line number Diff line number Diff line
@@ -506,7 +506,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;
@@ -523,7 +523,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;
@@ -541,7 +541,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;
@@ -554,7 +554,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;