Merge "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed." into rvc-dev am: c1b100f2d6 am: aaefdfe73e am: afa248f3bc am: d21b39a7e1 am: cd02fa76f4 am: 7fe9a14a66 am: 77d794ffb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/24944816
Change-Id: I3e2aa576df303e7e7d862265d723071724eccab0
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 ed31c02..e422809 100644
--- a/media/ndk/NdkMediaCodec.cpp
+++ b/media/ndk/NdkMediaCodec.cpp
@@ -668,7 +668,7 @@
if (out_size != NULL) {
*out_size = abuf->capacity();
}
- return abuf->data();
+ return abuf->base();
}
android::Vector<android::sp<android::MediaCodecBuffer> > abufs;
@@ -685,7 +685,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;
@@ -703,7 +703,7 @@
if (out_size != NULL) {
*out_size = abuf->capacity();
}
- return abuf->data();
+ return abuf->base();
}
android::Vector<android::sp<android::MediaCodecBuffer> > abufs;
@@ -716,7 +716,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;