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

Commit d20ad8ff authored by Dongwon Kang's avatar Dongwon Kang Committed by Android (Google) Code Review
Browse files

Merge "Add a null checking for heic thumbnail data."

parents a8ed0369 c0fa2711

media/extractors/mp4/ItemTable.cpp

+10 −6
Original line number Diff line number Diff line
@@ -1529,12 +1529,16 @@ sp<MetaData> ItemTable::getImageMeta(const uint32_t imageIndex) { 
        if (thumbItemIndex >= 0) {

            const ImageItem &thumbnail = mItemIdToItemMap[thumbItemIndex];



            if (thumbnail.hvcc != NULL) {

                meta->setInt32(kKeyThumbnailWidth, thumbnail.width);

                meta->setInt32(kKeyThumbnailHeight, thumbnail.height);

                meta->setData(kKeyThumbnailHVCC, kTypeHVCC,

                        thumbnail.hvcc->data(), thumbnail.hvcc->size());

                ALOGV("image[%u]: thumbnail: size %dx%d, item index %zd",

                        imageIndex, thumbnail.width, thumbnail.height, thumbItemIndex);

            } else {

                ALOGW("%s: thumbnail data is missing for image[%u]!", __FUNCTION__, imageIndex);

            }

        } else {

            ALOGW("%s: Referenced thumbnail does not exist!", __FUNCTION__);

        }