stagefright: Rename mBuf to mSlot (a8f5e0c2) · Commits · e / os / android_frameworks_av

media/libstagefright/MediaSync.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -635,7 +635,7 @@ void MediaSync::onFrameAvailableFromInput() {

		ALOGV("acquired buffer %#llx from input", (long long)bufferItem.mGraphicBuffer->getId());

		status = mInput->detachBuffer(bufferItem.mBuf);
		status = mInput->detachBuffer(bufferItem.mSlot);
		if (status != NO_ERROR) {
		ALOGE("detaching buffer from input failed (%d)", status);
		if (status == NO_INIT) {

media/libstagefright/SurfaceMediaSource.cpp

+6 −6

Original line number	Diff line number	Diff line
		@@ -308,9 +308,9 @@ status_t SurfaceMediaSource::read(

		// First time seeing the buffer? Added it to the SMS slot
		if (item.mGraphicBuffer != NULL) {
		mSlots[item.mBuf].mGraphicBuffer = item.mGraphicBuffer;
		mSlots[item.mSlot].mGraphicBuffer = item.mGraphicBuffer;
		}
		mSlots[item.mBuf].mFrameNumber = item.mFrameNumber;
		mSlots[item.mSlot].mFrameNumber = item.mFrameNumber;

		// check for the timing of this buffer
		if (mNumFramesReceived == 0 && !mUseAbsoluteTimestamps) {
		@@ -320,7 +320,7 @@ status_t SurfaceMediaSource::read(
		if (item.mTimestamp < mStartTimeNs) {
		// This frame predates start of record, discard
		mConsumer->releaseBuffer(
		item.mBuf, item.mFrameNumber, EGL_NO_DISPLAY,
		item.mSlot, item.mFrameNumber, EGL_NO_DISPLAY,
		EGL_NO_SYNC_KHR, Fence::NO_FENCE);
		continue;
		}
		@@ -346,13 +346,13 @@ status_t SurfaceMediaSource::read(
		return ERROR_END_OF_STREAM;
		}

		mCurrentSlot = item.mBuf;
		mCurrentSlot = item.mSlot;

		// First time seeing the buffer? Added it to the SMS slot
		if (item.mGraphicBuffer != NULL) {
		mSlots[item.mBuf].mGraphicBuffer = item.mGraphicBuffer;
		mSlots[item.mSlot].mGraphicBuffer = item.mGraphicBuffer;
		}
		mSlots[item.mBuf].mFrameNumber = item.mFrameNumber;
		mSlots[item.mSlot].mFrameNumber = item.mFrameNumber;

		mCurrentBuffers.push_back(mSlots[mCurrentSlot].mGraphicBuffer);
		int64_t prevTimeStamp = mCurrentTimestamp;

media/libstagefright/filters/GraphicBufferListener.cpp

+10 −10

Original line number	Diff line number	Diff line
		@@ -101,11 +101,11 @@ BufferItem GraphicBufferListener::getBufferItem() {
		if (err == BufferQueue::NO_BUFFER_AVAILABLE) {
		// shouldn't happen, since we track num frames available
		ALOGE("frame was not available");
		item.mBuf = -1;
		item.mSlot = -1;
		return item;
		} else if (err != OK) {
		ALOGE("acquireBuffer returned err=%d", err);
		item.mBuf = -1;
		item.mSlot = -1;
		return item;
		}

		@@ -119,8 +119,8 @@ BufferItem GraphicBufferListener::getBufferItem() {
		// If this is the first time we're seeing this buffer, add it to our
		// slot table.
		if (item.mGraphicBuffer != NULL) {
		ALOGV("setting mBufferSlot %d", item.mBuf);
		mBufferSlot[item.mBuf] = item.mGraphicBuffer;
		ALOGV("setting mBufferSlot %d", item.mSlot);
		mBufferSlot[item.mSlot] = item.mGraphicBuffer;
		}

		return item;
		@@ -128,24 +128,24 @@ BufferItem GraphicBufferListener::getBufferItem() {

		sp<GraphicBuffer> GraphicBufferListener::getBuffer(BufferItem item) {
		sp<GraphicBuffer> buf;
		if (item.mBuf < 0 \|\| item.mBuf >= BufferQueue::NUM_BUFFER_SLOTS) {
		ALOGE("getBuffer() received invalid BufferItem: mBuf==%d", item.mBuf);
		if (item.mSlot < 0 \|\| item.mSlot >= BufferQueue::NUM_BUFFER_SLOTS) {
		ALOGE("getBuffer() received invalid BufferItem: mSlot==%d", item.mSlot);
		return buf;
		}

		buf = mBufferSlot[item.mBuf];
		buf = mBufferSlot[item.mSlot];
		CHECK(buf.get() != NULL);

		return buf;
		}

		status_t GraphicBufferListener::releaseBuffer(BufferItem item) {
		if (item.mBuf < 0 \|\| item.mBuf >= BufferQueue::NUM_BUFFER_SLOTS) {
		ALOGE("getBuffer() received invalid BufferItem: mBuf==%d", item.mBuf);
		if (item.mSlot < 0 \|\| item.mSlot >= BufferQueue::NUM_BUFFER_SLOTS) {
		ALOGE("getBuffer() received invalid BufferItem: mSlot==%d", item.mSlot);
		return ERROR_OUT_OF_RANGE;
		}

		mConsumer->releaseBuffer(item.mBuf, item.mFrameNumber,
		mConsumer->releaseBuffer(item.mSlot, item.mFrameNumber,
		EGL_NO_DISPLAY, EGL_NO_SYNC_KHR, Fence::NO_FENCE);

		return OK;

media/libstagefright/filters/MediaFilter.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -773,7 +773,7 @@ void MediaFilter::onInputFrameAvailable() {
		convertRGBAToARGB(
		(uint8_t*)bufPtr, buf->getWidth(), buf->getHeight(),
		buf->getStride(), inputInfo->mData->data());
		inputInfo->mBufferID = item.mBuf;
		inputInfo->mBufferID = item.mSlot;
		inputInfo->mGeneration = mGeneration;
		inputInfo->mOutputFlags = 0;
		inputInfo->mStatus = BufferInfo::OWNED_BY_US;

media/libstagefright/omx/GraphicBufferSource.cpp

+17 −17

Original line number	Diff line number	Diff line
		@@ -64,19 +64,19 @@ void GraphicBufferSource::PersistentProxyListener::onFrameAvailable(
		return;
		}

		err = consumer->detachBuffer(bi.mBuf);
		err = consumer->detachBuffer(bi.mSlot);
		if (err != OK) {
		ALOGE("PersistentProxyListener: detachBuffer failed (%d)", err);
		return;
		}

		err = consumer->attachBuffer(&bi.mBuf, bi.mGraphicBuffer);
		err = consumer->attachBuffer(&bi.mSlot, bi.mGraphicBuffer);
		if (err != OK) {
		ALOGE("PersistentProxyListener: attachBuffer failed (%d)", err);
		return;
		}

		err = consumer->releaseBuffer(bi.mBuf, 0,
		err = consumer->releaseBuffer(bi.mSlot, 0,
		EGL_NO_DISPLAY, EGL_NO_SYNC_KHR, bi.mFence);
		if (err != OK) {
		ALOGE("PersistentProxyListener: releaseBuffer failed (%d)", err);
		@@ -382,7 +382,7 @@ void GraphicBufferSource::codecBufferEmptied(OMX_BUFFERHEADERTYPE* header, int f
		// Find matching entry in our cached copy of the BufferQueue slots.
		// If we find a match, release that slot. If we don't, the BufferQueue
		// has dropped that GraphicBuffer, and there's nothing for us to release.
		int id = codecBuffer.mBuf;
		int id = codecBuffer.mSlot;
		sp<Fence> fence = new Fence(fenceFd);
		if (mBufferSlot[id] != NULL &&
		mBufferSlot[id]->handle == codecBuffer.mGraphicBuffer->handle) {
		@@ -476,7 +476,7 @@ void GraphicBufferSource::suspend(bool suspend) {
		++mNumBufferAcquired;
		--mNumFramesAvailable;

		releaseBuffer(item.mBuf, item.mFrameNumber,
		releaseBuffer(item.mSlot, item.mFrameNumber,
		item.mGraphicBuffer, item.mFence);
		}
		return;
		@@ -530,8 +530,8 @@ bool GraphicBufferSource::fillCodecBuffer_l() {
		// If this is the first time we're seeing this buffer, add it to our
		// slot table.
		if (item.mGraphicBuffer != NULL) {
		ALOGV("fillCodecBuffer_l: setting mBufferSlot %d", item.mBuf);
		mBufferSlot[item.mBuf] = item.mGraphicBuffer;
		ALOGV("fillCodecBuffer_l: setting mBufferSlot %d", item.mSlot);
		mBufferSlot[item.mSlot] = item.mGraphicBuffer;
		}

		err = UNKNOWN_ERROR;
		@@ -557,10 +557,10 @@ bool GraphicBufferSource::fillCodecBuffer_l() {
		}

		if (err != OK) {
		ALOGV("submitBuffer_l failed, releasing bq buf %d", item.mBuf);
		releaseBuffer(item.mBuf, item.mFrameNumber, item.mGraphicBuffer, item.mFence);
		ALOGV("submitBuffer_l failed, releasing bq slot %d", item.mSlot);
		releaseBuffer(item.mSlot, item.mFrameNumber, item.mGraphicBuffer, item.mFence);
		} else {
		ALOGV("buffer submitted (bq %d, cbi %d)", item.mBuf, cbi);
		ALOGV("buffer submitted (bq %d, cbi %d)", item.mSlot, cbi);
		setLatestBuffer_l(item, dropped);
		}

		@@ -600,7 +600,7 @@ bool GraphicBufferSource::repeatLatestBuffer_l() {
		}

		BufferItem item;
		item.mBuf = mLatestBufferId;
		item.mSlot = mLatestBufferId;
		item.mFrameNumber = mLatestBufferFrameNum;
		item.mTimestamp = mRepeatLastFrameTimestamp;
		item.mFence = mLatestBufferFence;
		@@ -642,7 +642,7 @@ void GraphicBufferSource::setLatestBuffer_l(
		}
		}

		mLatestBufferId = item.mBuf;
		mLatestBufferId = item.mSlot;
		mLatestBufferFrameNum = item.mFrameNumber;
		mRepeatLastFrameTimestamp = item.mTimestamp + mRepeatAfterUs * 1000;

		@@ -754,8 +754,8 @@ status_t GraphicBufferSource::submitBuffer_l(const BufferItem &item, int cbi) {
		}

		CodecBuffer& codecBuffer(mCodecBuffers.editItemAt(cbi));
		codecBuffer.mGraphicBuffer = mBufferSlot[item.mBuf];
		codecBuffer.mBuf = item.mBuf;
		codecBuffer.mGraphicBuffer = mBufferSlot[item.mSlot];
		codecBuffer.mSlot = item.mSlot;
		codecBuffer.mFrameNumber = item.mFrameNumber;

		OMX_BUFFERHEADERTYPE* header = codecBuffer.mHeader;
		@@ -880,11 +880,11 @@ void GraphicBufferSource::onFrameAvailable(const BufferItem& /item/) {
		// If this is the first time we're seeing this buffer, add it to our
		// slot table.
		if (item.mGraphicBuffer != NULL) {
		ALOGV("onFrameAvailable: setting mBufferSlot %d", item.mBuf);
		mBufferSlot[item.mBuf] = item.mGraphicBuffer;
		ALOGV("onFrameAvailable: setting mBufferSlot %d", item.mSlot);
		mBufferSlot[item.mSlot] = item.mGraphicBuffer;
		}

		releaseBuffer(item.mBuf, item.mFrameNumber,
		releaseBuffer(item.mSlot, item.mFrameNumber,
		item.mGraphicBuffer, item.mFence);
		}
		return;