Merge "Read thumbnail into ExifData" into gb-ub-photos-arches

1 files changed, 57 insertions, 1 deletions

diff --git a/tests/src/com/android/gallery3d/exif/ExifReaderTest.java b/tests/src/com/android/gallery3d/exif/ExifReaderTest.java
index c0c2f9f81..67e695682 100644
--- a/tests/src/com/android/gallery3d/exif/ExifReaderTest.java
+++ b/tests/src/com/android/gallery3d/exif/ExifReaderTest.java
@@ -17,6 +17,7 @@
 package com.android.gallery3d.exif;
 
 import android.content.res.XmlResourceParser;
+import android.graphics.BitmapFactory;
 import android.test.InstrumentationTestCase;
 
 import java.io.IOException;
@@ -56,12 +57,67 @@ public class ExifReaderTest extends InstrumentationTestCase {
 
     public void testRead() throws ExifInvalidFormatException, IOException {
         ExifReader reader = new ExifReader();
-        ExifData exifData = reader.getExifData(mImageInputStream);
+        ExifData exifData = reader.read(mImageInputStream);
         checkIfd(exifData.getIfdData(IfdId.TYPE_IFD_0), mIfd0Value);
         checkIfd(exifData.getIfdData(IfdId.TYPE_IFD_1), mIfd1Value);
         checkIfd(exifData.getIfdData(IfdId.TYPE_IFD_EXIF), mExifIfdValue);
         checkIfd(exifData.getIfdData(IfdId.TYPE_IFD_INTEROPERABILITY),
                 mInteroperabilityIfdValue);
+        checkThumbnail(exifData);
+    }
+
+    private void checkThumbnail(ExifData exifData) {
+        IfdData ifd1 = exifData.getIfdData(IfdId.TYPE_IFD_1);
+        if (ifd1 != null) {
+            if (ifd1.getTag(ExifTag.TIFF_TAG.TAG_COMPRESSION).getUnsignedShort() ==
+                    ExifTag.TIFF_TAG.COMPRESSION_JPEG) {
+                assertTrue(exifData.hasCompressedThumbnail());
+                byte[] thumbnail = exifData.getCompressedThumbnail();
+                assertTrue(BitmapFactory.decodeByteArray(thumbnail, 0, thumbnail.length) != null);
+            } else {
+                // Try to check the strip count with the formula provided by EXIF spec.
+                int planarType = ExifTag.TIFF_TAG.PLANAR_CONFIGURATION_CHUNKY;
+                ExifTag planarTag = ifd1.getTag(ExifTag.TIFF_TAG.TAG_PLANAR_CONFIGURATION);
+                if (planarTag != null) {
+                    planarType = planarTag.getUnsignedShort();
+                }
+
+                ExifTag heightTag = ifd1.getTag(ExifTag.TIFF_TAG.TAG_IMAGE_HEIGHT);
+                ExifTag rowPerStripTag = ifd1.getTag(ExifTag.TIFF_TAG.TAG_ROWS_PER_STRIP);
+
+                int imageLength = getUnsignedIntOrShort(heightTag);
+                int rowsPerStrip = getUnsignedIntOrShort(rowPerStripTag);
+                int stripCount = ifd1.getTag(
+                        ExifTag.TIFF_TAG.TAG_STRIP_OFFSETS).getComponentCount();
+
+                if (planarType == ExifTag.TIFF_TAG.PLANAR_CONFIGURATION_CHUNKY) {
+                    assertTrue(stripCount == (imageLength + rowsPerStrip - 1) / rowsPerStrip);
+                } else {
+                    ExifTag samplePerPixelTag = ifd1.getTag(ExifTag.TIFF_TAG.TAG_SAMPLES_PER_PIXEL);
+                    int samplePerPixel = samplePerPixelTag.getUnsignedShort();
+                    assertTrue(stripCount ==
+                            (imageLength + rowsPerStrip - 1) / rowsPerStrip * samplePerPixel);
+                }
+
+                for (int i = 0; i < stripCount; i++) {
+                    ExifTag byteCountTag = ifd1.getTag(ExifTag.TIFF_TAG.TAG_STRIP_BYTE_COUNTS);
+                    if (byteCountTag.getDataType() == ExifTag.TYPE_UNSIGNED_SHORT) {
+                        assertEquals(byteCountTag.getUnsignedShort(i), exifData.getStrip(i).length);
+                    } else {
+                        assertEquals(
+                                byteCountTag.getUnsignedInt(i), exifData.getStrip(i).length);
+                    }
+                }
+            }
+        }
+    }
+
+    private int getUnsignedIntOrShort(ExifTag tag) {
+        if (tag.getDataType() == ExifTag.TYPE_UNSIGNED_SHORT) {
+            return tag.getUnsignedShort();
+        } else {
+            return (int) tag.getUnsignedInt();
+        }
     }
 
     private void checkIfd(IfdData ifd, HashMap<Short, String> ifdValue) {