diff options
| author | Ray Essick <essick@google.com> | 2023-10-05 23:58:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-05 23:58:08 +0000 |
| commit | afa248f3bc534cc57d5e7c7062088d0fc29b8213 (patch) | |
| tree | 481b732f5a8c7bbe9b7da4d805951c4749d6dad5 | |
| parent | 0aea3fff1fe458e210907f7ec4eb83ab8edc9eba (diff) | |
| parent | aaefdfe73eb9d438168d0fd741c55709d6998d8d (diff) | |
| download | av-afa248f3bc534cc57d5e7c7062088d0fc29b8213.tar.gz | |
Merge "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed." into rvc-dev am: c1b100f2d6 am: aaefdfe73e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/24944816
Change-Id: I07d714cc3a1871cdd589bd35253d47755daf9bac
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; |