commit 5fe52b5763ba61d72f71bb84b866a01e68f15efc
author Shaju Mathew <shaju@google.com> Tue Dec 12 02:37:04 2023 +0000
committer Shaju Mathew <shaju@google.com> Tue Dec 12 07:25:31 2023 +0000
tree fc2b2f5d2a3ce05ff6b2b070112fe2fd108a4420
parent b5034c24de427a88f3a33c9f1166827eb30c69ad

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

Test: Treehugger
Change-Id: Iff1d18aa446aa9b6544a13217b640daabcda0459

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.