diff options
| author | Ray Essick <essick@google.com> | 2023-10-20 21:20:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-20 21:20:52 +0000 |
| commit | 42e13fa660542c7bce4fc2a030ec37577f0389f2 (patch) | |
| tree | d35698caa6e40c4e41f776856e70cacb2e2eed25 | |
| parent | d21b39a7e1b73e6d59c0324325065782220b88c4 (diff) | |
| parent | 723fc22c29f9cfa94e6f7f13d949c76ad04ffba2 (diff) | |
| download | av-42e13fa660542c7bce4fc2a030ec37577f0389f2.tar.gz | |
Merge "Revert "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed."" into rvc-dev am: 7a80b6c9c9 am: 2405b1a6f4 am: 723fc22c29
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/25117107
Change-Id: I051432e263fdd1865c766b1181006f1ef99a10a3
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 920ec80d1c..1ae2b44114 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->base(); + return abuf->data(); } 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]->base(); + return abufs[idx]->data(); } 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->base(); + return abuf->data(); } 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]->base(); + return abufs[idx]->data(); } ALOGE("couldn't get output buffers"); return NULL; |