commit 700f19315c453addd67a8264f6ab6f8c1756dbb7
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Oct 02 18:32:51 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 02 18:32:51 2023 +0000
tree 18764e41b9b09c7a9d72755ccd31bf3443374e2c
parent 47f9d132aca091a9a56c9d7317b4cc6ad49dfe20
parent 7556f9fd9760bbe23ca9608c840a90f9ef20e0eb

Merge "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed." into main am: 74cc2a0784 am: 7556f9fd97

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

Change-Id: Ia8227f9a7ddfff7cba3a99fcb1ae226d074689a4
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 b230df5..2fb5728 100644
--- a/media/ndk/NdkMediaCodec.cpp
+++ b/media/ndk/NdkMediaCodec.cpp
@@ -672,7 +672,7 @@
         if (out_size != NULL) {
             *out_size = abuf->capacity();
         }
-        return abuf->data();
+        return abuf->base();
     }
 
     android::Vector<android::sp<android::MediaCodecBuffer> > abufs;
@@ -689,7 +689,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;
@@ -707,7 +707,7 @@
         if (out_size != NULL) {
             *out_size = abuf->capacity();
         }
-        return abuf->data();
+        return abuf->base();
     }
 
     android::Vector<android::sp<android::MediaCodecBuffer> > abufs;
@@ -720,7 +720,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;