commit e75ffb4d68787bba36ea985835e6a51a14393515
author Lajos Molnar <lajos@google.com> Thu Oct 19 18:39:26 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Oct 20 21:53:42 2023 +0000
tree 1c7fcc3259c381411cbde1fd2b53c008b06b1b37
parent 9caf2fd4be8b7af7d2602ef14d04d011c6220525

Revert "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed."

This reverts commit 95f411fbda480f986811e6f8010f0a2fd91fd206.

Reason for revert: This breaks app compatibility
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:883e38b694a6a2a51d34ea145607b62b0bdb316f)
Merged-In: I94d7034907d5befc0aabf7bf2b490d1fc86c69af
Change-Id: I94d7034907d5befc0aabf7bf2b490d1fc86c69af

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;