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

Commit e119fa57 authored by Shaju Mathew's avatar Shaju Mathew Committed by Automerger Merge Worker
Browse files

Merge "1. lambda param explicit capture by-ref 2. ExternalMetaItem field init ... 

Merge "1. lambda param explicit capture by-ref 2. ExternalMetaItem field init    order." into main am: dc572007

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2869639



Change-Id: If282aeabb2ebb434214344b867ce723dbc50bbcf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 494e9f1f dc572007

media/module/extractors/mp4/ItemTable.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1452,9 +1452,9 @@ status_t ItemTable::buildImageItemsIfPossible(uint32_t type) { 
                    info.isExif(), (long long)offset, (long long)size);

            if ((info.isExif() && size > 4) || (info.isXmp() && size > 0)) {

                ExternalMetaItem metaItem = {

                        .isExif = info.isExif(),

                        .offset = offset,

                        .size = size,

                        .isExif = info.isExif(),

                };

                mItemIdToMetaMap.add(info.itemId, metaItem);

            }

media/module/extractors/mp4/MPEG4Extractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -522,7 +522,7 @@ media_status_t MPEG4Extractor::getTrackMetaData( 
        return AMEDIA_ERROR_UNKNOWN;

    }



    [=] {

    [this, &track] {

        int64_t duration;

        int32_t samplerate;

        // Only for audio track.