From 4ba5353f52bc9d5425f52f136d75a7f6bc2a51cc Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Tue, 7 Apr 2020 16:17:51 +0900
Subject: [PATCH] media store: improved size detection for AVI

---
 .../aves/channelhandlers/ImageDecodeTask.java         |  2 +-
 .../java/deckers/thibault/aves/model/ImageEntry.java  | 11 +++++++++++
 .../java/deckers/thibault/aves/utils/MimeTypes.java   |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/android/app/src/main/java/deckers/thibault/aves/channelhandlers/ImageDecodeTask.java b/android/app/src/main/java/deckers/thibault/aves/channelhandlers/ImageDecodeTask.java
index f42b4d1e1..27cd31d94 100644
--- a/android/app/src/main/java/deckers/thibault/aves/channelhandlers/ImageDecodeTask.java
+++ b/android/app/src/main/java/deckers/thibault/aves/channelhandlers/ImageDecodeTask.java
@@ -98,7 +98,7 @@ public class ImageDecodeTask extends AsyncTask<ImageDecodeTask.Params, Void, Ima
         try {
             return resolver.loadThumbnail(entry.uri, new Size(width, height), null);
         } catch (IOException e) {
-            Log.e(LOG_TAG, "failed to load thumbnail for uri=" + entry.uri, e);
+            Log.e(LOG_TAG, "failed to load thumbnail for uri=" + entry.uri + ", path=" + entry.path + ", width=" + width + ", height=" + height, e);
         }
         return null;
     }
diff --git a/android/app/src/main/java/deckers/thibault/aves/model/ImageEntry.java b/android/app/src/main/java/deckers/thibault/aves/model/ImageEntry.java
index d785b41b3..82646575b 100644
--- a/android/app/src/main/java/deckers/thibault/aves/model/ImageEntry.java
+++ b/android/app/src/main/java/deckers/thibault/aves/model/ImageEntry.java
@@ -14,6 +14,7 @@ import com.drew.imaging.ImageMetadataReader;
 import com.drew.imaging.ImageProcessingException;
 import com.drew.metadata.Metadata;
 import com.drew.metadata.MetadataException;
+import com.drew.metadata.avi.AviDirectory;
 import com.drew.metadata.exif.ExifIFD0Directory;
 import com.drew.metadata.jpeg.JpegDirectory;
 import com.drew.metadata.mp4.media.Mp4VideoDirectory;
@@ -217,6 +218,16 @@ public class ImageEntry {
                         height = mp4VideoDir.getInt(Mp4VideoDirectory.TAG_HEIGHT);
                     }
                 }
+            } else if (MimeTypes.AVI.equals(mimeType)) {
+                AviDirectory aviDir = metadata.getFirstDirectoryOfType(AviDirectory.class);
+                if (aviDir != null) {
+                    if (aviDir.containsTag(AviDirectory.TAG_WIDTH)) {
+                        width = aviDir.getInt(AviDirectory.TAG_WIDTH);
+                    }
+                    if (aviDir.containsTag(AviDirectory.TAG_HEIGHT)) {
+                        height = aviDir.getInt(AviDirectory.TAG_HEIGHT);
+                    }
+                }
             }
         } catch (IOException | ImageProcessingException | MetadataException e) {
             // ignore
diff --git a/android/app/src/main/java/deckers/thibault/aves/utils/MimeTypes.java b/android/app/src/main/java/deckers/thibault/aves/utils/MimeTypes.java
index 5b89a7337..5285c967f 100644
--- a/android/app/src/main/java/deckers/thibault/aves/utils/MimeTypes.java
+++ b/android/app/src/main/java/deckers/thibault/aves/utils/MimeTypes.java
@@ -10,6 +10,7 @@ public class MimeTypes {
     public static final String SVG = "image/svg+xml";
 
     public static final String VIDEO = "video";
+    public static final String AVI = "video/avi";
     public static final String MP2T = "video/mp2t"; // .m2ts
     public static final String MP4 = "video/mp4";
 }