commit dbe54ca63901fcb0bce02261b43bf7b222db3e5c
author Dichen Zhang <dichenzhang@google.com> Wed Feb 02 12:10:11 2022 -0800
committer Dichen Zhang <dichenzhang@google.com> Thu Feb 03 11:00:14 2022 -0800
tree 756f5aeb62e7f32298c88a6e19dfe5da4aab17c7
parent 0fe05c417b4437e09aceb75fa7c647d61b1a0d74

HEIF decoding: if tiled, check decoder supports tile dimensions instead
of the image dimensions.

Bug: b/205714066
Test: CTS BitmapFactoryTest
Change-Id: I53407c6740eecbc8c3c610827074c4cf10aa341e

media/libmediaplayerservice/StagefrightMetadataRetriever.cpp

diff --git a/media/libmediaplayerservice/StagefrightMetadataRetriever.cpp b/media/libmediaplayerservice/StagefrightMetadataRetriever.cpp
index 8c86e16..609298f 100644
--- a/media/libmediaplayerservice/StagefrightMetadataRetriever.cpp
+++ b/media/libmediaplayerservice/StagefrightMetadataRetriever.cpp
@@ -206,6 +206,7 @@
     }
 
     const char *mime;
+    bool isHeif = false;
     if (!trackMeta->findCString(kKeyMIMEType, &mime)) {
         ALOGE("image track has no mime type");
         return NULL;
@@ -215,6 +216,7 @@
         mime = MEDIA_MIMETYPE_VIDEO_HEVC;
         trackMeta = new MetaData(*trackMeta);
         trackMeta->setCString(kKeyMIMEType, mime);
+        isHeif = true;
     } else if (!strcasecmp(mime, MEDIA_MIMETYPE_IMAGE_AVIF)) {
         mime = MEDIA_MIMETYPE_VIDEO_AV1;
         trackMeta = new MetaData(*trackMeta);
@@ -240,6 +242,16 @@
         format->setInt32("width", thumbWidth);
     }
 
+    // If decoding tiled HEIF check decoder supports tile dimensions instead
+    if (!thumbnail && isHeif && format != NULL) {
+        int32_t tileWidth, tileHeight;
+        if (trackMeta->findInt32(kKeyTileWidth, &tileWidth) && tileWidth > 0
+                && trackMeta->findInt32(kKeyTileHeight, &tileHeight) && tileHeight > 0) {
+            format->setInt32("height", tileHeight);
+            format->setInt32("width", tileWidth);
+        }
+    }
+
     MediaCodecList::findMatchingCodecs(
             mime,
             false, /* encoder */