Merge "MTP: Add thumbnail generation for JPG" am: 5aac2c84ba am: d68b21d215 am: fe8e0b235f (733c4088) · Commits · e / os / android_frameworks_base

media/java/android/mtp/MtpDatabase.java

+15 −3

Original line number	Diff line number	Diff line
		@@ -805,8 +805,10 @@ public class MtpDatabase implements AutoCloseable {
		ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
		bitmap.compress(Bitmap.CompressFormat.JPEG, 100, byteStream);

		if (byteStream.size() > MAX_THUMB_SIZE)
		if (byteStream.size() > MAX_THUMB_SIZE) {
		Log.w(TAG, "getThumbnailProcess: size=" + byteStream.size());
		return null;
		}

		byte[] byteArray = byteStream.toByteArray();

		@@ -836,7 +838,15 @@ public class MtpDatabase implements AutoCloseable {
		outLongs[0] = thumbOffsetAndSize != null ? thumbOffsetAndSize[1] : 0;
		outLongs[1] = exif.getAttributeInt(ExifInterface.TAG_PIXEL_X_DIMENSION, 0);
		outLongs[2] = exif.getAttributeInt(ExifInterface.TAG_PIXEL_Y_DIMENSION, 0);
		if (exif.getThumbnailRange() != null) {
		if ((outLongs[0] == 0) \|\| (outLongs[1] == 0) \|\| (outLongs[2] == 0)) {
		Log.d(TAG, "getThumbnailInfo: check thumb info:"
		+ thumbOffsetAndSize[0] + "," + thumbOffsetAndSize[1]
		+ "," + outLongs[1] + "," + outLongs[2]);
		}

		return true;
		}
		} catch (IOException e) {
		// ignore and fall through
		}
		@@ -869,6 +879,8 @@ public class MtpDatabase implements AutoCloseable {
		case MtpConstants.FORMAT_JFIF:
		try {
		ExifInterface exif = new ExifInterface(path);

		if (exif.getThumbnailRange() != null)
		return exif.getThumbnail();
		} catch (IOException e) {
		// ignore and fall through

+8.41 KiB (8.41 KiB)

File changed.

No diff preview for this file type.

+3 −2

Original line number	Diff line number	Diff line
		@@ -271,9 +271,10 @@ public class MtpDatabaseTest {

		Log.d(TAG, "testMtpDatabaseThumbnail: Test bad JPG");

		testThumbnail(handleJpgBadThumb, jpgfileBadThumb, false);
		// Now we support to generate thumbnail if embedded thumbnail is corrupted or not existed
		testThumbnail(handleJpgBadThumb, jpgfileBadThumb, true);

		testThumbnail(handleJpgNoThumb, jpgFileNoThumb, false);
		testThumbnail(handleJpgNoThumb, jpgFileNoThumb, true);

		testThumbnail(handleJpgBad, jpgfileBad, false);