Merge "Camera NDK: fix bug in lock order" into oc-mr1-dev (45cdbd0c) · Commits · e / os / android_frameworks_av

media/ndk/NdkImage.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -53,7 +53,6 @@ AImage::isClosed() const {

		void
		AImage::close(int releaseFenceFd) {
		lockReader();
		Mutex::Autolock _l(mLock);
		if (mIsClosed) {
		return;
		@@ -71,7 +70,6 @@ AImage::close(int releaseFenceFd) {
		mBuffer = nullptr;
		mLockedBuffer = nullptr;
		mIsClosed = true;
		unlockReader();
		}

		void
		@@ -622,7 +620,9 @@ EXPORT
		void AImage_deleteAsync(AImage* image, int releaseFenceFd) {
		ALOGV("%s", __FUNCTION__);
		if (image != nullptr) {
		image->lockReader();
		image->close(releaseFenceFd);
		image->unlockReader();
		if (!image->isClosed()) {
		LOG_ALWAYS_FATAL("Image close failed!");
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -349,8 +349,8 @@ AImageReader::~AImageReader() {
		for (auto it = mAcquiredImages.begin();
		it != mAcquiredImages.end(); it++) {
		AImage* image = *it;
		Mutex::Autolock _l(image->mLock);
		releaseImageLocked(image, /releaseFenceFd/-1);
		image->close();
		}

		// Delete Buffer Items
		@@ -502,6 +502,8 @@ AImageReader::releaseImageLocked(AImage* image, int releaseFenceFd) {
		mBufferItemConsumer->releaseBuffer(*buffer, bufferFence);
		returnBufferItemLocked(buffer);
		image->mBuffer = nullptr;
		image->mLockedBuffer = nullptr;
		image->mIsClosed = true;

		bool found = false;
		// cleanup acquired image list

+1 −1

Original line number	Diff line number	Diff line
		@@ -85,7 +85,7 @@ struct AImageReader : public RefBase {
		// Called by AImageReader_acquireXXX to acquire a Buffer and setup AImage.
		media_status_t acquireImageLocked(/out/AImage** image, /out/int* fenceFd);

		// Called by AImage to close image
		// Called by AImage/~AImageReader to close image. Caller is responsible to grab AImage::mLock
		void releaseImageLocked(AImage* image, int releaseFenceFd);

		static int getBufferWidth(BufferItem* buffer);