Merge "MediaCodec/Image: handle null cropRect correctly" into lmp-mr1-dev (aab38b7e) · Commits · e / os / android_frameworks_base

media/java/android/media/Image.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -146,8 +146,10 @@ public abstract class Image implements AutoCloseable {
		* using coordinates in the largest-resolution plane.
		*/
		public void setCropRect(Rect cropRect) {
		if (cropRect != null) {
		cropRect = new Rect(cropRect); // make a copy
		cropRect.intersect(0, 0, getWidth(), getHeight());
		}
		mCropRect = cropRect;
		}

+6 −4

Original line number	Diff line number	Diff line
		@@ -1778,10 +1778,6 @@ final public class MediaCodec {
		mIsValid = true;
		mIsReadOnly = buffer.isReadOnly();
		mBuffer = buffer.duplicate();
		if (cropRect != null) {
		cropRect.offset(-xOffset, -yOffset);
		}
		super.setCropRect(cropRect);

		// save offsets and info
		mXOffset = xOffset;
		@@ -1833,6 +1829,12 @@ final public class MediaCodec {
		throw new UnsupportedOperationException(
		"unsupported info length: " + info.remaining());
		}

		if (cropRect == null) {
		cropRect = new Rect(0, 0, mWidth, mHeight);
		}
		cropRect.offset(-xOffset, -yOffset);
		super.setCropRect(cropRect);
		}

		private class MediaPlane extends Plane {