diff options
author | Ray Essick <essick@google.com> | 2023-10-06 00:46:40 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-06 00:46:40 +0000 |
commit | d21b39a7e1b73e6d59c0324325065782220b88c4 (patch) | |
tree | a1e04b778f5d12b05f987a8ed63bbfdb0fe7f0cf | |
parent | 58552d0d6ae6225f59785f0d1389ac0320c5aef5 (diff) | |
parent | afa248f3bc534cc57d5e7c7062088d0fc29b8213 (diff) | |
download | av-d21b39a7e1b73e6d59c0324325065782220b88c4.tar.gz |
Merge "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed." into rvc-dev am: c1b100f2d6 am: aaefdfe73e am: afa248f3bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/24944816
Change-Id: I0db3bb9f8ad31a640fc659a947e670b2fe7057b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | media/ndk/NdkMediaCodec.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/ndk/NdkMediaCodec.cpp b/media/ndk/NdkMediaCodec.cpp index 1ae2b44114..920ec80d1c 100644 --- a/media/ndk/NdkMediaCodec.cpp +++ b/media/ndk/NdkMediaCodec.cpp @@ -546,7 +546,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; @@ -563,7 +563,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; @@ -581,7 +581,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; @@ -594,7 +594,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; |