commit 4c1f95845160320a689d388598a11f2aeb067d78
author Chong Zhang <chz@google.com> Wed Mar 13 15:15:53 2019 +0900
committer Chong Zhang <chz@google.com> Thu Mar 14 14:51:27 2019 -0700
tree 5306da35281e7debbf403b5569f0322be7ef670f
parent 0a2fc30b155c92db29ed483f85c8e92c3c9cf85b

Fix thumbnail hvcc key in ItemTable

In HEIF files the hvcc for main image and the thumbnail
are separate. Add AMEDIAFORMAT_KEY_THUMBNAIL_CSD_HEVC for
thumbnail hvcc, and set it in ItemTable.

test:
- thumbnail test from the bug;
- manual testing of HEIF image decoding of various files;
- cts MediaMetadataRetriverTest.

bug: 128494513
Change-Id: I219a86cf362f641d546236dda78e8559ffcfa8aa

media/extractors/mp4/ItemTable.cpp

diff --git a/media/extractors/mp4/ItemTable.cpp b/media/extractors/mp4/ItemTable.cpp
index a72e589..d56abaa 100644
--- a/media/extractors/mp4/ItemTable.cpp
+++ b/media/extractors/mp4/ItemTable.cpp
@@ -1540,7 +1540,8 @@
                 AMediaFormat_setInt32(meta,
                         AMEDIAFORMAT_KEY_THUMBNAIL_HEIGHT, thumbnail.height);
                 AMediaFormat_setBuffer(meta,
-                        AMEDIAFORMAT_KEY_CSD_HEVC, thumbnail.hvcc->data(), thumbnail.hvcc->size());
+                        AMEDIAFORMAT_KEY_THUMBNAIL_CSD_HEVC,
+                        thumbnail.hvcc->data(), thumbnail.hvcc->size());
                 ALOGV("image[%u]: thumbnail: size %dx%d, item index %zd",
                         imageIndex, thumbnail.width, thumbnail.height, thumbItemIndex);
             } else {