MediaCodec: add renderAndReleaseOutputBuffer() method with timestamp (fc7fca77) · Commits · e / os / android_frameworks_av

include/media/stagefright/MediaCodec.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -100,6 +100,7 @@ struct MediaCodec : public AHandler {
		uint32_t *flags,
		int64_t timeoutUs = 0ll);

		status_t renderOutputBufferAndRelease(size_t index, int64_t timestampNs);
		status_t renderOutputBufferAndRelease(size_t index);
		status_t releaseOutputBuffer(size_t index);

media/libstagefright/ACodec.cpp

+21 −0

Original line number	Diff line number	Diff line
		@@ -3670,7 +3670,28 @@ void ACodec::BaseState::onOutputBufferDrained(const sp<AMessage> &msg) {
		ATRACE_NAME("render");
		// The client wants this buffer to be rendered.

		int64_t timestampNs = 0;
		if (!msg->findInt64("timestampNs", &timestampNs)) {
		// TODO: it seems like we should use the timestamp
		// in the (media)buffer as it potentially came from
		// an input surface, but we did not propagate it prior to
		// API 20. Perhaps check for target SDK version.
		#if 0
		if (info->mData->meta()->findInt64("timeUs", &timestampNs)) {
		ALOGI("using buffer PTS of %" PRId64, timestampNs);
		timestampNs *= 1000;
		}
		#endif
		}

		status_t err;
		err = native_window_set_buffers_timestamp(mCodec->mNativeWindow.get(), timestampNs);
		if (err != OK) {
		ALOGW("failed to set buffer timestamp: %d", err);
		} else {
		ALOGI("set PTS to %" PRId64, timestampNs);
		}

		if ((err = mCodec->mNativeWindow->queueBuffer(
		mCodec->mNativeWindow.get(),
		info->mGraphicBuffer.get(), -1)) == OK) {

media/libstagefright/MediaCodec.cpp

+28 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		//#define LOG_NDEBUG 0
		#define LOG_TAG "MediaCodec"
		#include <utils/Log.h>
		#include <inttypes.h>

		#include <media/stagefright/MediaCodec.h>

		@@ -323,6 +324,16 @@ status_t MediaCodec::renderOutputBufferAndRelease(size_t index) {
		return PostAndAwaitResponse(msg, &response);
		}

		status_t MediaCodec::renderOutputBufferAndRelease(size_t index, int64_t timestampNs) {
		sp<AMessage> msg = new AMessage(kWhatReleaseOutputBuffer, id());
		msg->setSize("index", index);
		msg->setInt32("render", true);
		msg->setInt64("timestampNs", timestampNs);

		sp<AMessage> response;
		return PostAndAwaitResponse(msg, &response);
		}

		status_t MediaCodec::releaseOutputBuffer(size_t index) {
		sp<AMessage> msg = new AMessage(kWhatReleaseOutputBuffer, id());
		msg->setSize("index", index);
		@@ -1707,9 +1718,25 @@ status_t MediaCodec::onReleaseOutputBuffer(const sp<AMessage> &msg) {
		if (render && info->mData != NULL && info->mData->size() != 0) {
		info->mNotify->setInt32("render", true);

		int64_t timestampNs = 0;
		if (msg->findInt64("timestampNs", &timestampNs)) {
		info->mNotify->setInt64("timestampNs", timestampNs);
		} else {
		// TODO: it seems like we should use the timestamp
		// in the (media)buffer as it potentially came from
		// an input surface, but we did not propagate it prior to
		// API 20. Perhaps check for target SDK version.
		#if 0
		if (info->mData->meta()->findInt64("timeUs", &timestampNs)) {
		ALOGI("using buffer PTS of %" PRId64, timestampNs);
		timestampNs *= 1000;
		}
		#endif
		}

		if (mSoftRenderer != NULL) {
		mSoftRenderer->render(
		info->mData->data(), info->mData->size(), NULL);
		info->mData->data(), info->mData->size(), timestampNs, NULL);
		}
		}