Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f1f81e0 authored by James Wei's avatar James Wei
Browse files

MTP: Add thumbnail generation for JPG 

Add thumbnail generation support for JPG image format
Instead of retrieving thumbnail from EXIF header

Bug: 178726106
Test: atest MtpTests
Test: manual test on Windows 10 file explorer
Test: manual test on Linux nautilus file browser
Change-Id: I29ad89835a8a27204a2e6dbd97b994209a813424
parent a819b9fc

media/java/android/mtp/MtpDatabase.java

+15 −3
Original line number Diff line number Diff line
@@ -821,8 +821,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();
@@ -852,7 +854,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

                }
@@ -885,6 +895,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

media/tests/MtpTests/src/android/mtp/MtpDatabaseTest.java

+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);