Merge "NdkMedia: fix android.mediav2.cts.CodecEncoderSurfaceTest failed." into rvc-dev (c1b100f2) · Commits · e / os / android_frameworks_av

media/ndk/NdkMediaCodec.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -506,7 +506,7 @@ uint8_t* AMediaCodec_getInputBuffer(AMediaCodec mData, size_t idx, size_t out_
		if (out_size != NULL) {
		*out_size = abuf->capacity();
		}
		return abuf->data();
		return abuf->base();
		}

		android::Vector<android::sp<android::MediaCodecBuffer> > abufs;
		@@ -523,7 +523,7 @@ uint8_t* AMediaCodec_getInputBuffer(AMediaCodec mData, size_t idx, size_t out_
		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;
		@@ -541,7 +541,7 @@ uint8_t* AMediaCodec_getOutputBuffer(AMediaCodec mData, size_t idx, size_t out
		if (out_size != NULL) {
		*out_size = abuf->capacity();
		}
		return abuf->data();
		return abuf->base();
		}

		android::Vector<android::sp<android::MediaCodecBuffer> > abufs;
		@@ -554,7 +554,7 @@ uint8_t* AMediaCodec_getOutputBuffer(AMediaCodec mData, size_t idx, size_t out
		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;