commit d8fed53fd418da0865f32b684c477d53cc648fec
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Oct 23 23:29:06 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Oct 23 23:29:06 2023 +0000
tree 8f4abafaf927e962279a3dadf515dc415807e63b
parent b3cff0c137f4449585fa91003ff7d0fe0df9eeb0
parent 6bde746cad1c6692b9d19fd1ed7b9453deafca21

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25156067'] into security-aosp-sc-release.

Change-Id: Ic7f7594709d41a9165849ce4ed1d0b794b793f87

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;