commit dc5720072303c3daba4586337df0a5ef6be33a45
author Shaju Mathew <shaju@google.com> Wed Dec 13 04:26:14 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 13 04:26:14 2023 +0000
tree 5499008e8eedd1207291458127616f6a90c5bd99
parent 70e745122bdbcd1965c02dfcb306e1520db70835
parent 5fe52b5763ba61d72f71bb84b866a01e68f15efc

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

media/module/extractors/mp4/ItemTable.cpp

diff --git a/media/module/extractors/mp4/ItemTable.cpp b/media/module/extractors/mp4/ItemTable.cpp
index 7fe5ba7..06da18d 100644
--- a/media/module/extractors/mp4/ItemTable.cpp
+++ b/media/module/extractors/mp4/ItemTable.cpp
@@ -1452,9 +1452,9 @@
                     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

diff --git a/media/module/extractors/mp4/MPEG4Extractor.cpp b/media/module/extractors/mp4/MPEG4Extractor.cpp
index a9ca078..4b0dfe8 100644
--- a/media/module/extractors/mp4/MPEG4Extractor.cpp
+++ b/media/module/extractors/mp4/MPEG4Extractor.cpp
@@ -522,7 +522,7 @@
         return AMEDIA_ERROR_UNKNOWN;
     }
 
-    [=] {
+    [this, &track] {
         int64_t duration;
         int32_t samplerate;
         // Only for audio track.