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

Commit 334b8ecc authored by Treehugger Robot's avatar Treehugger Robot 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 main am: 80ad54f6

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



Change-Id: Idfc441fbf3e282ca3bfeb2aea554de08ee648e71
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7503659b 80ad54f6

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;