diff options
| author | Ray Essick <essick@google.com> | 2023-10-06 02:22:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-06 02:22:35 +0000 |
| commit | 97cda45c5a2bde5ee8df9bf8bd5e7535597fe880 (patch) | |
| tree | b4d37915b89c30d22bba31b995b45b3427f28a9b | |
| parent | 3e323e06bc38c60471c3baca19ed707350641a53 (diff) | |
| parent | 7fe9a14a666d4e08fe91cf1aba8085f39cf48dc4 (diff) | |
| download | av-97cda45c5a2bde5ee8df9bf8bd5e7535597fe880.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
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/24944816
Change-Id: I1adff202d21b1e902958880524b3730ccaa99e83
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 38e422df3c..1c655f9c73 100644 --- a/media/ndk/NdkMediaCodec.cpp +++ b/media/ndk/NdkMediaCodec.cpp @@ -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; |