Merge "Improvements/fixes to ACodec." (669520b2) · Commits · e / os / android_frameworks_base

include/media/stagefright/ACodec.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -109,7 +109,7 @@ private:

	status_t allocateOutputBuffersFromNativeWindow();		status_t allocateOutputBuffersFromNativeWindow();
	status_t cancelBufferToNativeWindow(BufferInfo *info);		status_t cancelBufferToNativeWindow(BufferInfo *info);
	status_t freeOutputBuffersOwnedByNativeWindow();		status_t freeOutputBuffersNotOwnedByComponent();
	BufferInfo *dequeueBufferFromNativeWindow();		BufferInfo *dequeueBufferFromNativeWindow();

	BufferInfo *findBufferByID(		BufferInfo *findBufferByID(

media/libstagefright/ACodec.cpp

+86 −10

Original line number	Original line	Diff line number	Diff line
	@@ -197,6 +197,9 @@ struct ACodec::ExecutingState : public ACodec::BaseState {
	// to fill with data.		// to fill with data.
	void resume();		void resume();

			// Returns true iff input and output buffers are in play.
			bool active() const { return mActive; }

	protected:		protected:
	virtual PortMode getPortMode(OMX_U32 portIndex);		virtual PortMode getPortMode(OMX_U32 portIndex);
	virtual bool onMessageReceived(const sp<AMessage> &msg);		virtual bool onMessageReceived(const sp<AMessage> &msg);
	@@ -205,6 +208,8 @@ protected:
	virtual bool onOMXEvent(OMX_EVENTTYPE event, OMX_U32 data1, OMX_U32 data2);		virtual bool onOMXEvent(OMX_EVENTTYPE event, OMX_U32 data1, OMX_U32 data2);

	private:		private:
			bool mActive;

	DISALLOW_EVIL_CONSTRUCTORS(ExecutingState);		DISALLOW_EVIL_CONSTRUCTORS(ExecutingState);
	};		};

	@@ -564,13 +569,17 @@ status_t ACodec::freeBuffersOnPort(OMX_U32 portIndex) {
	return OK;		return OK;
	}		}

	status_t ACodec::freeOutputBuffersOwnedByNativeWindow() {		status_t ACodec::freeOutputBuffersNotOwnedByComponent() {
	for (size_t i = mBuffers[kPortIndexOutput].size(); i-- > 0;) {		for (size_t i = mBuffers[kPortIndexOutput].size(); i-- > 0;) {
	BufferInfo *info =		BufferInfo *info =
	&mBuffers[kPortIndexOutput].editItemAt(i);		&mBuffers[kPortIndexOutput].editItemAt(i);

	if (info->mStatus ==		if (info->mStatus !=
	BufferInfo::OWNED_BY_NATIVE_WINDOW) {		BufferInfo::OWNED_BY_COMPONENT) {
			// We shouldn't have sent out any buffers to the client at this
			// point.
			CHECK_NE((int)info->mStatus, (int)BufferInfo::OWNED_BY_DOWNSTREAM);

	CHECK_EQ((status_t)OK, freeBuffer(kPortIndexOutput, i));		CHECK_EQ((status_t)OK, freeBuffer(kPortIndexOutput, i));
	}		}
	}		}
	@@ -1195,6 +1204,9 @@ bool ACodec::BaseState::onOMXEvent(
	}		}

	bool ACodec::BaseState::onOMXEmptyBufferDone(IOMX::buffer_id bufferID) {		bool ACodec::BaseState::onOMXEmptyBufferDone(IOMX::buffer_id bufferID) {
			LOGV("[%s] onOMXEmptyBufferDone %p",
			mCodec->mComponentName.c_str(), bufferID);

	BufferInfo *info =		BufferInfo *info =
	mCodec->findBufferByID(kPortIndexInput, bufferID);		mCodec->findBufferByID(kPortIndexInput, bufferID);

	@@ -1295,7 +1307,7 @@ void ACodec::BaseState::onInputBufferFilled(const sp<AMessage> &msg) {
	}		}

	if (buffer != info->mData) {		if (buffer != info->mData) {
	if (!(flags & OMX_BUFFERFLAG_CODECCONFIG)) {		if (0 && !(flags & OMX_BUFFERFLAG_CODECCONFIG)) {
	LOGV("[%s] Needs to copy input data.",		LOGV("[%s] Needs to copy input data.",
	mCodec->mComponentName.c_str());		mCodec->mComponentName.c_str());
	}		}
	@@ -1304,6 +1316,9 @@ void ACodec::BaseState::onInputBufferFilled(const sp<AMessage> &msg) {
	memcpy(info->mData->data(), buffer->data(), buffer->size());		memcpy(info->mData->data(), buffer->data(), buffer->size());
	}		}

			LOGV("[%s] calling emptyBuffer %p",
			mCodec->mComponentName.c_str(), bufferID);

	CHECK_EQ(mCodec->mOMX->emptyBuffer(		CHECK_EQ(mCodec->mOMX->emptyBuffer(
	mCodec->mNode,		mCodec->mNode,
	bufferID,		bufferID,
	@@ -1320,6 +1335,9 @@ void ACodec::BaseState::onInputBufferFilled(const sp<AMessage> &msg) {
	LOGV("[%s] Signalling EOS on the input port",		LOGV("[%s] Signalling EOS on the input port",
	mCodec->mComponentName.c_str());		mCodec->mComponentName.c_str());

			LOGV("[%s] calling emptyBuffer %p",
			mCodec->mComponentName.c_str(), bufferID);

	CHECK_EQ(mCodec->mOMX->emptyBuffer(		CHECK_EQ(mCodec->mOMX->emptyBuffer(
	mCodec->mNode,		mCodec->mNode,
	bufferID,		bufferID,
	@@ -1378,6 +1396,9 @@ bool ACodec::BaseState::onOMXFillBufferDone(
	int64_t timeUs,		int64_t timeUs,
	void *platformPrivate,		void *platformPrivate,
	void *dataPtr) {		void *dataPtr) {
			LOGV("[%s] onOMXFillBufferDone %p",
			mCodec->mComponentName.c_str(), bufferID);

	ssize_t index;		ssize_t index;
	BufferInfo *info =		BufferInfo *info =
	mCodec->findBufferByID(kPortIndexOutput, bufferID, &index);		mCodec->findBufferByID(kPortIndexOutput, bufferID, &index);
	@@ -1396,6 +1417,9 @@ bool ACodec::BaseState::onOMXFillBufferDone(
	{		{
	if (rangeLength == 0) {		if (rangeLength == 0) {
	if (!(flags & OMX_BUFFERFLAG_EOS)) {		if (!(flags & OMX_BUFFERFLAG_EOS)) {
			LOGV("[%s] calling fillBuffer %p",
			mCodec->mComponentName.c_str(), info->mBufferID);

	CHECK_EQ(mCodec->mOMX->fillBuffer(		CHECK_EQ(mCodec->mOMX->fillBuffer(
	mCodec->mNode, info->mBufferID),		mCodec->mNode, info->mBufferID),
	(status_t)OK);		(status_t)OK);
	@@ -1503,6 +1527,9 @@ void ACodec::BaseState::onOutputBufferDrained(const sp<AMessage> &msg) {
	info = mCodec->dequeueBufferFromNativeWindow();		info = mCodec->dequeueBufferFromNativeWindow();
	}		}

			LOGV("[%s] calling fillBuffer %p",
			mCodec->mComponentName.c_str(), info->mBufferID);

	CHECK_EQ(mCodec->mOMX->fillBuffer(mCodec->mNode, info->mBufferID),		CHECK_EQ(mCodec->mOMX->fillBuffer(mCodec->mNode, info->mBufferID),
	(status_t)OK);		(status_t)OK);

	@@ -1600,6 +1627,9 @@ void ACodec::UninitializedState::onSetup(
	mCodec->mOMX = omx;		mCodec->mOMX = omx;
	mCodec->mNode = node;		mCodec->mNode = node;

			mCodec->mPortEOS[kPortIndexInput] =
			mCodec->mPortEOS[kPortIndexOutput] = false;

	mCodec->configureCodec(mime.c_str(), msg);		mCodec->configureCodec(mime.c_str(), msg);

	sp<RefBase> obj;		sp<RefBase> obj;
	@@ -1717,7 +1747,8 @@ bool ACodec::IdleToExecutingState::onOMXEvent(
	////////////////////////////////////////////////////////////////////////////////		////////////////////////////////////////////////////////////////////////////////

	ACodec::ExecutingState::ExecutingState(ACodec *codec)		ACodec::ExecutingState::ExecutingState(ACodec *codec)
	: BaseState(codec) {		: BaseState(codec),
			mActive(false) {
	}		}

	ACodec::BaseState::PortMode ACodec::ExecutingState::getPortMode(		ACodec::BaseState::PortMode ACodec::ExecutingState::getPortMode(
	@@ -1745,6 +1776,9 @@ void ACodec::ExecutingState::submitOutputBuffers() {
	CHECK_EQ((int)info->mStatus, (int)BufferInfo::OWNED_BY_US);		CHECK_EQ((int)info->mStatus, (int)BufferInfo::OWNED_BY_US);
	}		}

			LOGV("[%s] calling fillBuffer %p",
			mCodec->mComponentName.c_str(), info->mBufferID);

	CHECK_EQ(mCodec->mOMX->fillBuffer(mCodec->mNode, info->mBufferID),		CHECK_EQ(mCodec->mOMX->fillBuffer(mCodec->mNode, info->mBufferID),
	(status_t)OK);		(status_t)OK);

	@@ -1753,6 +1787,13 @@ void ACodec::ExecutingState::submitOutputBuffers() {
	}		}

	void ACodec::ExecutingState::resume() {		void ACodec::ExecutingState::resume() {
			if (mActive) {
			LOGV("[%s] We're already active, no need to resume.",
			mCodec->mComponentName.c_str());

			return;
			}

	submitOutputBuffers();		submitOutputBuffers();

	// Post the first input buffer.		// Post the first input buffer.
	@@ -1760,6 +1801,8 @@ void ACodec::ExecutingState::resume() {
	BufferInfo *info = &mCodec->mBuffers[kPortIndexInput].editItemAt(0);		BufferInfo *info = &mCodec->mBuffers[kPortIndexInput].editItemAt(0);

	postFillThisBuffer(info);		postFillThisBuffer(info);

			mActive = true;
	}		}

	void ACodec::ExecutingState::stateEntered() {		void ACodec::ExecutingState::stateEntered() {
	@@ -1774,6 +1817,8 @@ bool ACodec::ExecutingState::onMessageReceived(const sp<AMessage> &msg) {
	switch (msg->what()) {		switch (msg->what()) {
	case kWhatShutdown:		case kWhatShutdown:
	{		{
			mActive = false;

	CHECK_EQ(mCodec->mOMX->sendCommand(		CHECK_EQ(mCodec->mOMX->sendCommand(
	mCodec->mNode, OMX_CommandStateSet, OMX_StateIdle),		mCodec->mNode, OMX_CommandStateSet, OMX_StateIdle),
	(status_t)OK);		(status_t)OK);
	@@ -1786,6 +1831,8 @@ bool ACodec::ExecutingState::onMessageReceived(const sp<AMessage> &msg) {

	case kWhatFlush:		case kWhatFlush:
	{		{
			mActive = false;

	CHECK_EQ(mCodec->mOMX->sendCommand(		CHECK_EQ(mCodec->mOMX->sendCommand(
	mCodec->mNode, OMX_CommandFlush, OMX_ALL),		mCodec->mNode, OMX_CommandFlush, OMX_ALL),
	(status_t)OK);		(status_t)OK);
	@@ -1825,10 +1872,7 @@ bool ACodec::ExecutingState::onOMXEvent(
	OMX_CommandPortDisable, kPortIndexOutput),		OMX_CommandPortDisable, kPortIndexOutput),
	(status_t)OK);		(status_t)OK);

	if (mCodec->mNativeWindow != NULL) {		mCodec->freeOutputBuffersNotOwnedByComponent();
	CHECK_EQ((status_t)OK,
	mCodec->freeOutputBuffersOwnedByNativeWindow());
	}

	mCodec->changeState(mCodec->mOutputPortSettingsChangedState);		mCodec->changeState(mCodec->mOutputPortSettingsChangedState);
	} else if (data2 == OMX_IndexConfigCommonOutputCrop) {		} else if (data2 == OMX_IndexConfigCommonOutputCrop) {
	@@ -1876,7 +1920,12 @@ bool ACodec::OutputPortSettingsChangedState::onMessageReceived(
	switch (msg->what()) {		switch (msg->what()) {
	case kWhatFlush:		case kWhatFlush:
	case kWhatShutdown:		case kWhatShutdown:
			case kWhatResume:
	{		{
			if (msg->what() == kWhatResume) {
			LOGV("[%s] Deferring resume", mCodec->mComponentName.c_str());
			}

	mCodec->deferMessage(msg);		mCodec->deferMessage(msg);
	handled = true;		handled = true;
	break;		break;
	@@ -1925,7 +1974,10 @@ bool ACodec::OutputPortSettingsChangedState::onOMXEvent(
	LOGV("[%s] Output port now reenabled.",		LOGV("[%s] Output port now reenabled.",
	mCodec->mComponentName.c_str());		mCodec->mComponentName.c_str());

			if (mCodec->mExecutingState->active()) {
	mCodec->mExecutingState->submitOutputBuffers();		mCodec->mExecutingState->submitOutputBuffers();
			}

	mCodec->changeState(mCodec->mExecutingState);		mCodec->changeState(mCodec->mExecutingState);

	return true;		return true;
	@@ -1992,6 +2044,13 @@ bool ACodec::ExecutingToIdleState::onOMXEvent(
	return true;		return true;
	}		}

			case OMX_EventPortSettingsChanged:
			case OMX_EventBufferFlag:
			{
			// We're shutting down and don't care about this anymore.
			return true;
			}

	default:		default:
	return BaseState::onOMXEvent(event, data1, data2);		return BaseState::onOMXEvent(event, data1, data2);
	}		}
	@@ -2170,6 +2229,23 @@ bool ACodec::FlushingState::onOMXEvent(
	return true;		return true;
	}		}

			case OMX_EventPortSettingsChanged:
			{
			sp<AMessage> msg = new AMessage(kWhatOMXMessage, mCodec->id());
			msg->setInt32("type", omx_message::EVENT);
			msg->setPointer("node", mCodec->mNode);
			msg->setInt32("event", event);
			msg->setInt32("data1", data1);
			msg->setInt32("data2", data2);

			LOGV("[%s] Deferring OMX_EventPortSettingsChanged",
			mCodec->mComponentName.c_str());

			mCodec->deferMessage(msg);

			return true;
			}

	default:		default:
	return BaseState::onOMXEvent(event, data1, data2);		return BaseState::onOMXEvent(event, data1, data2);
	}		}