Snap for 10914968 from 42431387bc235d422206863c6c87d4b3bec522b2 to udc-qpr1-release (93af6c44) · Commits · e / os / android_frameworks_av

media/ndk/NdkMediaCodec.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -672,7 +672,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;
		@@ -689,7 +689,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;
		@@ -707,7 +707,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;
		@@ -720,7 +720,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;