commit 99dba6a34528082cbf948f7ca721e1664fe1e225
author Ray Essick <essick@google.com> Fri Oct 20 22:05:11 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 20 22:05:11 2023 +0000
tree 22dd5e8140bb1d02ab0e248a68dcb42eaa2c9243
parent cd02fa76f44524c6f758a4c60127d03125e1e14f
parent 42e13fa660542c7bce4fc2a030ec37577f0389f2

Merge "Revert "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed."" into rvc-dev am: 7a80b6c9c9 am: 2405b1a6f4 am: 723fc22c29 am: 42e13fa660

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/25117107

Change-Id: Ifacb32757015aef931c21a4ec6b818ba1c8986a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

media/ndk/NdkMediaCodec.cpp

diff --git a/media/ndk/NdkMediaCodec.cpp b/media/ndk/NdkMediaCodec.cpp
index 920ec80..1ae2b44 100644
--- a/media/ndk/NdkMediaCodec.cpp
+++ b/media/ndk/NdkMediaCodec.cpp
@@ -546,7 +546,7 @@
         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 @@
         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 @@
         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 @@
         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;