Merge "Revert "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed."" into rvc-dev am: 7a80b6c9c9 am: 2405b1a6f4 am: 723fc22c29 am: 42e13fa660 am: 99dba6a345 am: b85b6928ca am: cafc567083 am: d4d8584a4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/25117107
Change-Id: I0d3d0949bf8f2178e30a6abedd794b219c553c35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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;