diff options
| author | Ray Essick <essick@google.com> | 2023-10-06 02:53:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-06 02:53:35 +0000 |
| commit | 70e0901fd1787d59b7f9db573d74fcaf915bbb05 (patch) | |
| tree | 2661e34979692da6c0753e446bc495b8f2998cc9 | |
| parent | 1e6a675fccdc37afcfb337f8fa97d1ddab90adf0 (diff) | |
| parent | 77d794ffb3d5e182f8f09f94e18cde598ba9acaa (diff) | |
| download | av-70e0901fd1787d59b7f9db573d74fcaf915bbb05.tar.gz | |
Merge "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed." into rvc-dev am: c1b100f2d6 am: aaefdfe73e am: afa248f3bc am: d21b39a7e1 am: cd02fa76f4 am: 7fe9a14a66 am: 77d794ffb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/24944816
Change-Id: I3e2aa576df303e7e7d862265d723071724eccab0
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 ed31c02125..e42280922b 100644 --- a/media/ndk/NdkMediaCodec.cpp +++ b/media/ndk/NdkMediaCodec.cpp @@ -668,7 +668,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; @@ -685,7 +685,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; @@ -703,7 +703,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; @@ -716,7 +716,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; |