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

Commit 099906c5 authored by guochuang's avatar guochuang Committed by Android Build Coastguard Worker
Browse files

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



use Abuffer.base instead of data.

Bug: 300861053
Test: run cts -m CtsMediaV2TestCases -t android.mediav2.cts.CodecEncoderSurfaceTest
Signed-off-by: default avatarguochuang <guochuang@xiaomi.corp-partner.google.com>
(cherry picked from https://android-review.googlesource.com/q/commit:184293b550dec1bcb7b8ba5f2f5342c355f5b4dc)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:95f411fbda480f986811e6f8010f0a2fd91fd206)
Merged-In: I76ef2c404f8264843973e1af9be1b23fc1e6c3af
Change-Id: I76ef2c404f8264843973e1af9be1b23fc1e6c3af
parent 5f401fc9

media/ndk/NdkMediaCodec.cpp

+4 −4
Original line number Diff line number Diff line
@@ -626,7 +626,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;
@@ -643,7 +643,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;
@@ -661,7 +661,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;
@@ -674,7 +674,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;