commit a387dae8d10de10fcffef60bc7eb4c7106e9eba2
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Oct 23 23:29:22 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Oct 23 23:29:22 2023 +0000
tree b8661a3ddc1d29c1265aeb1c9c6e21a620cc58cc
parent 175f3aba702d71cd307a60ecf98389fc51be8897
parent b64110db98ca71cd10e5e2b887eedcfc106c6639

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

Change-Id: I20f404a1742ae21af12baeafa1e1d046146be51f

media/ndk/NdkMediaCodec.cpp

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