camera: Rename mBuf to mSlot (e361bc02) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/api1/client2/StreamingProcessor.cpp

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -788,7 +788,7 @@ status_t StreamingProcessor::processRecordingFrame() {
	return NO_MEMORY;		return NO_MEMORY;
	}		}
	for (size_t i = 0; i < mRecordingBuffers.size(); i++) {		for (size_t i = 0; i < mRecordingBuffers.size(); i++) {
	if (mRecordingBuffers[i].mBuf !=		if (mRecordingBuffers[i].mSlot !=
	BufferItemConsumer::INVALID_BUFFER_SLOT) {		BufferItemConsumer::INVALID_BUFFER_SLOT) {
	ALOGE("%s: Camera %d: Non-empty recording buffers list!",		ALOGE("%s: Camera %d: Non-empty recording buffers list!",
	__FUNCTION__, mId);		__FUNCTION__, mId);
	@@ -878,7 +878,7 @@ void StreamingProcessor::releaseRecordingFrame(const sp<IMemory>& mem) {
	size_t itemIndex;		size_t itemIndex;
	for (itemIndex = 0; itemIndex < mRecordingBuffers.size(); itemIndex++) {		for (itemIndex = 0; itemIndex < mRecordingBuffers.size(); itemIndex++) {
	const BufferItem item = mRecordingBuffers[itemIndex];		const BufferItem item = mRecordingBuffers[itemIndex];
	if (item.mBuf != BufferItemConsumer::INVALID_BUFFER_SLOT &&		if (item.mSlot != BufferItemConsumer::INVALID_BUFFER_SLOT &&
	item.mGraphicBuffer->getNativeBuffer() == payload->pBuffer) {		item.mGraphicBuffer->getNativeBuffer() == payload->pBuffer) {
	break;		break;
	}		}
	@@ -923,7 +923,7 @@ void StreamingProcessor::releaseAllRecordingFramesLocked() {
	size_t releasedCount = 0;		size_t releasedCount = 0;
	for (size_t itemIndex = 0; itemIndex < mRecordingBuffers.size(); itemIndex++) {		for (size_t itemIndex = 0; itemIndex < mRecordingBuffers.size(); itemIndex++) {
	const BufferItem item = mRecordingBuffers[itemIndex];		const BufferItem item = mRecordingBuffers[itemIndex];
	if (item.mBuf != BufferItemConsumer::INVALID_BUFFER_SLOT) {		if (item.mSlot != BufferItemConsumer::INVALID_BUFFER_SLOT) {
	res = mRecordingConsumer->releaseBuffer(mRecordingBuffers[itemIndex]);		res = mRecordingConsumer->releaseBuffer(mRecordingBuffers[itemIndex]);
	if (res != OK) {		if (res != OK) {
	ALOGE("%s: Camera %d: Unable to free recording frame "		ALOGE("%s: Camera %d: Unable to free recording frame "

services/camera/libcameraservice/gui/RingBufferConsumer.cpp

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -229,7 +229,7 @@ status_t RingBufferConsumer::releaseOldestBufferLocked(size_t* pinnedFrames) {

	// item.mGraphicBuffer was populated with the proper graphic-buffer		// item.mGraphicBuffer was populated with the proper graphic-buffer
	// at acquire even if it was previously acquired		// at acquire even if it was previously acquired
	err = addReleaseFenceLocked(item.mBuf,		err = addReleaseFenceLocked(item.mSlot,
	item.mGraphicBuffer, item.mFence);		item.mGraphicBuffer, item.mFence);

	if (err != OK) {		if (err != OK) {
	@@ -244,7 +244,7 @@ status_t RingBufferConsumer::releaseOldestBufferLocked(size_t* pinnedFrames) {

	// item.mGraphicBuffer was populated with the proper graphic-buffer		// item.mGraphicBuffer was populated with the proper graphic-buffer
	// at acquire even if it was previously acquired		// at acquire even if it was previously acquired
	err = releaseBufferLocked(item.mBuf, item.mGraphicBuffer,		err = releaseBufferLocked(item.mSlot, item.mGraphicBuffer,
	EGL_NO_DISPLAY,		EGL_NO_DISPLAY,
	EGL_NO_SYNC_KHR);		EGL_NO_SYNC_KHR);
	if (err != OK) {		if (err != OK) {
	@@ -318,7 +318,7 @@ void RingBufferConsumer::onFrameAvailable(const BufferItem& item) {

	mLatestTimestamp = item.mTimestamp;		mLatestTimestamp = item.mTimestamp;

	item.mGraphicBuffer = mSlots[item.mBuf].mGraphicBuffer;		item.mGraphicBuffer = mSlots[item.mSlot].mGraphicBuffer;
	} // end of mMutex lock		} // end of mMutex lock

	ConsumerBase::onFrameAvailable(item);		ConsumerBase::onFrameAvailable(item);
	@@ -335,7 +335,7 @@ void RingBufferConsumer::unpinBuffer(const BufferItem& item) {

	RingBufferItem& find = *it;		RingBufferItem& find = *it;
	if (item.mGraphicBuffer == find.mGraphicBuffer) {		if (item.mGraphicBuffer == find.mGraphicBuffer) {
	status_t res = addReleaseFenceLocked(item.mBuf,		status_t res = addReleaseFenceLocked(item.mSlot,
	item.mGraphicBuffer, item.mFence);		item.mGraphicBuffer, item.mFence);

	if (res != OK) {		if (res != OK) {

services/camera/libcameraservice/gui/RingBufferConsumer.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -133,7 +133,7 @@ class RingBufferConsumer : public ConsumerBase,
	}		}

	bool isEmpty() {		bool isEmpty() {
	return mBufferItem.mBuf == BufferQueue::INVALID_BUFFER_SLOT;		return mBufferItem.mSlot == BufferQueue::INVALID_BUFFER_SLOT;
	}		}

	BufferItem& getBufferItem() { return mBufferItem; }		BufferItem& getBufferItem() { return mBufferItem; }