commit 74cc2a07847aa87e46085f2295f43cfe2cc745ad
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Oct 02 15:38:44 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 02 15:38:44 2023 +0000
tree b57db5ef4f92dd033bb3e5d0c4b889ec8764386b
parent cc7ef16ee23ce823facf0931c9f9088ae42b23ee
parent 184293b550dec1bcb7b8ba5f2f5342c355f5b4dc

Merge "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed." into main

media/ndk/NdkMediaCodec.cpp

diff --git a/media/ndk/NdkMediaCodec.cpp b/media/ndk/NdkMediaCodec.cpp
index ed31c02..e422809 100644
--- a/media/ndk/NdkMediaCodec.cpp
+++ b/media/ndk/NdkMediaCodec.cpp
@@ -668,7 +668,7 @@
         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 @@
         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 @@
         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 @@
         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;