Merge "ImageWriter: remove mCloseLock guard from queue and dequeue operations" into tm-qpr-dev (8809b275) · Commits · e / os / android_frameworks_base

media/java/android/media/ImageWriter.java

+52 −58

Original line number	Diff line number	Diff line
		@@ -452,7 +452,6 @@ public class ImageWriter implements AutoCloseable {
		* @see Image#close
		*/
		public Image dequeueInputImage() {
		synchronized (mCloseLock) {
		if (mDequeuedImages.size() >= mMaxImages) {
		throw new IllegalStateException(
		"Already dequeued max number of Images " + mMaxImages);
		@@ -463,7 +462,6 @@ public class ImageWriter implements AutoCloseable {
		newImage.mIsImageValid = true;
		return newImage;
		}
		}

		/**
		* <p>
		@@ -521,7 +519,6 @@ public class ImageWriter implements AutoCloseable {
		throw new IllegalArgumentException("image shouldn't be null");
		}

		synchronized (mCloseLock) {
		boolean ownedByMe = isImageOwnedByMe(image);
		if (ownedByMe && !(((WriterSurfaceImage) image).mIsImageValid)) {
		throw new IllegalStateException("Image from ImageWriter is invalid");
		@@ -568,7 +565,6 @@ public class ImageWriter implements AutoCloseable {
		wi.mIsImageValid = false;
		}
		}
		}

		/**
		* Get the ImageWriter format.
		@@ -702,11 +698,11 @@ public class ImageWriter implements AutoCloseable {
		*/
		@Override
		public void close() {
		setOnImageReleasedListener(null, null);
		synchronized (mCloseLock) {
		if (!mIsWriterValid) {
		return;
		}
		setOnImageReleasedListener(null, null);
		for (Image image : mDequeuedImages) {
		image.close();
		}
		@@ -836,14 +832,12 @@ public class ImageWriter implements AutoCloseable {
		}

		final Handler handler;
		final boolean isWriterValid;
		synchronized (iw.mListenerLock) {
		handler = iw.mListenerHandler;
		}
		synchronized (iw.mCloseLock) {
		isWriterValid = iw.mIsWriterValid;
		}
		if (handler != null && isWriterValid) {

		if (handler != null) {
		// The ListenerHandler will take care of ensuring that the parent ImageWriter is valid
		handler.sendEmptyMessage(0);
		}
		}