Snap for 7514518 from df52650abe646a627f08c9b634462184e1fa3b56 to sc-d1-release

Change-Id: I34f4af8cb4440d01c2da5afcace180ebdf79ebce
diff --git a/31/64/arm64_armv8-a/source-based/libcodec2.so.lsdump b/31/64/arm64_armv8-a/source-based/libcodec2.so.lsdump
index b3e589e..9b68bc8 100644
--- a/31/64/arm64_armv8-a/source-based/libcodec2.so.lsdump
+++ b/31/64/arm64_armv8-a/source-based/libcodec2.so.lsdump
@@ -1718,6 +1718,14 @@
      "name" : "C2FrameData::FLAG_INCOMPLETE"
     },
     {
+     "enum_field_value" : 16,
+     "name" : "C2FrameData::FLAG_CORRECTED"
+    },
+    {
+     "enum_field_value" : 32,
+     "name" : "C2FrameData::FLAG_CORRUPT"
+    },
+    {
      "enum_field_value" : -2147483648,
      "name" : "C2FrameData::FLAG_CODEC_CONFIG"
     }
@@ -2748,7 +2756,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
-   "name" : "C2ColorXyStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1569:5)",
+   "name" : "C2ColorXyStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1568:5)",
    "referenced_type" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
    "size" : 4,
@@ -2851,7 +2859,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
-   "name" : "C2GopLayerStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1729:5)",
+   "name" : "C2GopLayerStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1728:5)",
    "referenced_type" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
    "size" : 4,
@@ -2869,10 +2877,6 @@
     {
      "enum_field_value" : 1,
      "name" : "C2PlatformConfig::S_HANDHELD"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "C2PlatformConfig::S_HANDHELD_PC"
     }
    ],
    "linker_set_key" : "_ZTIN16C2PlatformConfig24encoding_quality_level_tE",
@@ -2893,7 +2897,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
-   "name" : "C2ColorInfoStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1450:5)",
+   "name" : "C2ColorInfoStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1449:5)",
    "referenced_type" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -2910,7 +2914,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
-   "name" : "C2ColorInfoStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1450:5)",
+   "name" : "C2ColorInfoStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1449:5)",
    "referenced_type" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3021,7 +3025,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
-   "name" : "C2TileLayoutStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1886:5)",
+   "name" : "C2TileLayoutStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1885:5)",
    "referenced_type" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3038,7 +3042,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
-   "name" : "C2OutOfMemoryStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1072:5)",
+   "name" : "C2OutOfMemoryStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1071:5)",
    "referenced_type" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3055,7 +3059,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
-   "name" : "C2PictureSizeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1053:5)",
+   "name" : "C2PictureSizeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1052:5)",
    "referenced_type" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3089,7 +3093,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
-   "name" : "C2ChromaOffsetStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1419:5)",
+   "name" : "C2ChromaOffsetStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1418:5)",
    "referenced_type" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3106,7 +3110,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
-   "name" : "C2ColorAspectsStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1542:5)",
+   "name" : "C2ColorAspectsStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1541:5)",
    "referenced_type" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3123,7 +3127,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
-   "name" : "C2IntraRefreshStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1860:5)",
+   "name" : "C2IntraRefreshStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1859:5)",
    "referenced_type" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3140,7 +3144,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
-   "name" : "C2ProfileLevelStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:738:5)",
+   "name" : "C2ProfileLevelStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:737:5)",
    "referenced_type" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3157,7 +3161,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
-   "name" : "C2TimedControlStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2232:5)",
+   "name" : "C2TimedControlStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2231:5)",
    "referenced_type" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3174,7 +3178,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
-   "name" : "C2TunneledModeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2328:5)",
+   "name" : "C2TunneledModeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2327:5)",
    "referenced_type" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3191,7 +3195,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
-   "name" : "C2TunneledModeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2328:5)",
+   "name" : "C2TunneledModeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2327:5)",
    "referenced_type" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3254,7 +3258,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
-   "name" : "C2StoreIonUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2112:5)",
+   "name" : "C2StoreIonUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2111:5)",
    "referenced_type" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3300,7 +3304,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
-   "name" : "C2StoreDmaBufUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2140:5)",
+   "name" : "C2StoreDmaBufUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2139:5)",
    "referenced_type" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3317,7 +3321,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
-   "name" : "C2StoreDmaBufUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2140:5)",
+   "name" : "C2StoreDmaBufUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2139:5)",
    "referenced_type" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3334,7 +3338,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
-   "name" : "C2SupplementalDataStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:794:5)",
+   "name" : "C2SupplementalDataStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:793:5)",
    "referenced_type" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3351,7 +3355,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
-   "name" : "C2SupplementalDataStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:794:5)",
+   "name" : "C2SupplementalDataStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:793:5)",
    "referenced_type" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3368,7 +3372,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
-   "name" : "C2TemporalLayeringStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1831:5)",
+   "name" : "C2TemporalLayeringStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1830:5)",
    "referenced_type" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3385,7 +3389,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
-   "name" : "C2TemporalLayeringStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1831:5)",
+   "name" : "C2TemporalLayeringStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1830:5)",
    "referenced_type" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3423,7 +3427,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
-   "name" : "C2PictureQuantizationStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1753:5)",
+   "name" : "C2PictureQuantizationStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1752:5)",
    "referenced_type" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3440,7 +3444,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
-   "name" : "C2TimestampGapAdjustmentStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2281:5)",
+   "name" : "C2TimestampGapAdjustmentStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2280:5)",
    "referenced_type" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3482,7 +3486,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
-   "name" : "C2MasteringDisplayColorVolumeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1583:5)",
+   "name" : "C2MasteringDisplayColorVolumeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1582:5)",
    "referenced_type" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3499,7 +3503,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
-   "name" : "C2FlexiblePixelFormatDescriptorStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2160:5)",
+   "name" : "C2FlexiblePixelFormatDescriptorStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2159:5)",
    "referenced_type" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
    "size" : 4,
diff --git a/31/64/arm_armv7-a-neon/source-based/libcodec2.so.lsdump b/31/64/arm_armv7-a-neon/source-based/libcodec2.so.lsdump
index a4ae7c1..f7389d3 100644
--- a/31/64/arm_armv7-a-neon/source-based/libcodec2.so.lsdump
+++ b/31/64/arm_armv7-a-neon/source-based/libcodec2.so.lsdump
@@ -1718,6 +1718,14 @@
      "name" : "C2FrameData::FLAG_INCOMPLETE"
     },
     {
+     "enum_field_value" : 16,
+     "name" : "C2FrameData::FLAG_CORRECTED"
+    },
+    {
+     "enum_field_value" : 32,
+     "name" : "C2FrameData::FLAG_CORRUPT"
+    },
+    {
      "enum_field_value" : -2147483648,
      "name" : "C2FrameData::FLAG_CODEC_CONFIG"
     }
@@ -2748,7 +2756,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
-   "name" : "C2ColorXyStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1569:5)",
+   "name" : "C2ColorXyStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1568:5)",
    "referenced_type" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
    "size" : 4,
@@ -2851,7 +2859,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
-   "name" : "C2GopLayerStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1729:5)",
+   "name" : "C2GopLayerStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1728:5)",
    "referenced_type" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
    "size" : 4,
@@ -2869,10 +2877,6 @@
     {
      "enum_field_value" : 1,
      "name" : "C2PlatformConfig::S_HANDHELD"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "C2PlatformConfig::S_HANDHELD_PC"
     }
    ],
    "linker_set_key" : "_ZTIN16C2PlatformConfig24encoding_quality_level_tE",
@@ -2893,7 +2897,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
-   "name" : "C2ColorInfoStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1450:5)",
+   "name" : "C2ColorInfoStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1449:5)",
    "referenced_type" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -2910,7 +2914,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
-   "name" : "C2ColorInfoStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1450:5)",
+   "name" : "C2ColorInfoStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1449:5)",
    "referenced_type" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3021,7 +3025,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
-   "name" : "C2TileLayoutStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1886:5)",
+   "name" : "C2TileLayoutStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1885:5)",
    "referenced_type" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3038,7 +3042,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
-   "name" : "C2OutOfMemoryStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1072:5)",
+   "name" : "C2OutOfMemoryStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1071:5)",
    "referenced_type" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3055,7 +3059,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
-   "name" : "C2PictureSizeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1053:5)",
+   "name" : "C2PictureSizeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1052:5)",
    "referenced_type" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3089,7 +3093,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
-   "name" : "C2ChromaOffsetStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1419:5)",
+   "name" : "C2ChromaOffsetStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1418:5)",
    "referenced_type" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3106,7 +3110,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
-   "name" : "C2ColorAspectsStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1542:5)",
+   "name" : "C2ColorAspectsStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1541:5)",
    "referenced_type" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3123,7 +3127,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
-   "name" : "C2IntraRefreshStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1860:5)",
+   "name" : "C2IntraRefreshStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1859:5)",
    "referenced_type" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3140,7 +3144,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
-   "name" : "C2ProfileLevelStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:738:5)",
+   "name" : "C2ProfileLevelStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:737:5)",
    "referenced_type" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3157,7 +3161,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
-   "name" : "C2TimedControlStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2232:5)",
+   "name" : "C2TimedControlStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2231:5)",
    "referenced_type" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3174,7 +3178,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
-   "name" : "C2TunneledModeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2328:5)",
+   "name" : "C2TunneledModeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2327:5)",
    "referenced_type" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3191,7 +3195,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
-   "name" : "C2TunneledModeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2328:5)",
+   "name" : "C2TunneledModeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2327:5)",
    "referenced_type" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3254,7 +3258,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
-   "name" : "C2StoreIonUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2112:5)",
+   "name" : "C2StoreIonUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2111:5)",
    "referenced_type" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3300,7 +3304,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
-   "name" : "C2StoreDmaBufUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2140:5)",
+   "name" : "C2StoreDmaBufUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2139:5)",
    "referenced_type" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3317,7 +3321,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
-   "name" : "C2StoreDmaBufUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2140:5)",
+   "name" : "C2StoreDmaBufUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2139:5)",
    "referenced_type" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3334,7 +3338,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
-   "name" : "C2SupplementalDataStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:794:5)",
+   "name" : "C2SupplementalDataStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:793:5)",
    "referenced_type" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3351,7 +3355,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
-   "name" : "C2SupplementalDataStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:794:5)",
+   "name" : "C2SupplementalDataStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:793:5)",
    "referenced_type" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3368,7 +3372,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
-   "name" : "C2TemporalLayeringStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1831:5)",
+   "name" : "C2TemporalLayeringStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1830:5)",
    "referenced_type" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3385,7 +3389,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
-   "name" : "C2TemporalLayeringStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1831:5)",
+   "name" : "C2TemporalLayeringStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1830:5)",
    "referenced_type" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3423,7 +3427,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
-   "name" : "C2PictureQuantizationStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1753:5)",
+   "name" : "C2PictureQuantizationStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1752:5)",
    "referenced_type" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3440,7 +3444,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
-   "name" : "C2TimestampGapAdjustmentStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2281:5)",
+   "name" : "C2TimestampGapAdjustmentStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2280:5)",
    "referenced_type" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3482,7 +3486,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
-   "name" : "C2MasteringDisplayColorVolumeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1583:5)",
+   "name" : "C2MasteringDisplayColorVolumeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1582:5)",
    "referenced_type" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3499,7 +3503,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
-   "name" : "C2FlexiblePixelFormatDescriptorStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2160:5)",
+   "name" : "C2FlexiblePixelFormatDescriptorStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2159:5)",
    "referenced_type" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
    "size" : 4,
diff --git a/31/64/arm_armv8-a/source-based/libcodec2.so.lsdump b/31/64/arm_armv8-a/source-based/libcodec2.so.lsdump
index a4ae7c1..f7389d3 100644
--- a/31/64/arm_armv8-a/source-based/libcodec2.so.lsdump
+++ b/31/64/arm_armv8-a/source-based/libcodec2.so.lsdump
@@ -1718,6 +1718,14 @@
      "name" : "C2FrameData::FLAG_INCOMPLETE"
     },
     {
+     "enum_field_value" : 16,
+     "name" : "C2FrameData::FLAG_CORRECTED"
+    },
+    {
+     "enum_field_value" : 32,
+     "name" : "C2FrameData::FLAG_CORRUPT"
+    },
+    {
      "enum_field_value" : -2147483648,
      "name" : "C2FrameData::FLAG_CODEC_CONFIG"
     }
@@ -2748,7 +2756,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
-   "name" : "C2ColorXyStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1569:5)",
+   "name" : "C2ColorXyStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1568:5)",
    "referenced_type" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
    "size" : 4,
@@ -2851,7 +2859,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
-   "name" : "C2GopLayerStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1729:5)",
+   "name" : "C2GopLayerStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1728:5)",
    "referenced_type" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
    "size" : 4,
@@ -2869,10 +2877,6 @@
     {
      "enum_field_value" : 1,
      "name" : "C2PlatformConfig::S_HANDHELD"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "C2PlatformConfig::S_HANDHELD_PC"
     }
    ],
    "linker_set_key" : "_ZTIN16C2PlatformConfig24encoding_quality_level_tE",
@@ -2893,7 +2897,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
-   "name" : "C2ColorInfoStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1450:5)",
+   "name" : "C2ColorInfoStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1449:5)",
    "referenced_type" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -2910,7 +2914,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
-   "name" : "C2ColorInfoStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1450:5)",
+   "name" : "C2ColorInfoStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1449:5)",
    "referenced_type" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3021,7 +3025,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
-   "name" : "C2TileLayoutStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1886:5)",
+   "name" : "C2TileLayoutStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1885:5)",
    "referenced_type" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3038,7 +3042,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
-   "name" : "C2OutOfMemoryStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1072:5)",
+   "name" : "C2OutOfMemoryStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1071:5)",
    "referenced_type" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3055,7 +3059,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
-   "name" : "C2PictureSizeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1053:5)",
+   "name" : "C2PictureSizeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1052:5)",
    "referenced_type" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3089,7 +3093,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
-   "name" : "C2ChromaOffsetStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1419:5)",
+   "name" : "C2ChromaOffsetStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1418:5)",
    "referenced_type" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3106,7 +3110,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
-   "name" : "C2ColorAspectsStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1542:5)",
+   "name" : "C2ColorAspectsStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1541:5)",
    "referenced_type" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3123,7 +3127,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
-   "name" : "C2IntraRefreshStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1860:5)",
+   "name" : "C2IntraRefreshStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1859:5)",
    "referenced_type" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3140,7 +3144,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
-   "name" : "C2ProfileLevelStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:738:5)",
+   "name" : "C2ProfileLevelStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:737:5)",
    "referenced_type" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3157,7 +3161,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
-   "name" : "C2TimedControlStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2232:5)",
+   "name" : "C2TimedControlStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2231:5)",
    "referenced_type" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3174,7 +3178,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
-   "name" : "C2TunneledModeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2328:5)",
+   "name" : "C2TunneledModeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2327:5)",
    "referenced_type" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3191,7 +3195,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
-   "name" : "C2TunneledModeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2328:5)",
+   "name" : "C2TunneledModeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2327:5)",
    "referenced_type" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3254,7 +3258,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
-   "name" : "C2StoreIonUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2112:5)",
+   "name" : "C2StoreIonUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2111:5)",
    "referenced_type" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3300,7 +3304,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
-   "name" : "C2StoreDmaBufUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2140:5)",
+   "name" : "C2StoreDmaBufUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2139:5)",
    "referenced_type" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3317,7 +3321,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
-   "name" : "C2StoreDmaBufUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2140:5)",
+   "name" : "C2StoreDmaBufUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2139:5)",
    "referenced_type" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3334,7 +3338,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
-   "name" : "C2SupplementalDataStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:794:5)",
+   "name" : "C2SupplementalDataStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:793:5)",
    "referenced_type" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3351,7 +3355,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
-   "name" : "C2SupplementalDataStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:794:5)",
+   "name" : "C2SupplementalDataStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:793:5)",
    "referenced_type" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3368,7 +3372,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
-   "name" : "C2TemporalLayeringStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1831:5)",
+   "name" : "C2TemporalLayeringStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1830:5)",
    "referenced_type" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3385,7 +3389,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
-   "name" : "C2TemporalLayeringStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1831:5)",
+   "name" : "C2TemporalLayeringStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1830:5)",
    "referenced_type" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3423,7 +3427,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
-   "name" : "C2PictureQuantizationStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1753:5)",
+   "name" : "C2PictureQuantizationStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1752:5)",
    "referenced_type" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3440,7 +3444,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
-   "name" : "C2TimestampGapAdjustmentStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2281:5)",
+   "name" : "C2TimestampGapAdjustmentStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2280:5)",
    "referenced_type" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3482,7 +3486,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
-   "name" : "C2MasteringDisplayColorVolumeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1583:5)",
+   "name" : "C2MasteringDisplayColorVolumeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1582:5)",
    "referenced_type" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3499,7 +3503,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
-   "name" : "C2FlexiblePixelFormatDescriptorStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2160:5)",
+   "name" : "C2FlexiblePixelFormatDescriptorStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2159:5)",
    "referenced_type" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
    "size" : 4,
diff --git a/31/64/x86/source-based/libcodec2.so.lsdump b/31/64/x86/source-based/libcodec2.so.lsdump
index e3a4b44..72c6243 100644
--- a/31/64/x86/source-based/libcodec2.so.lsdump
+++ b/31/64/x86/source-based/libcodec2.so.lsdump
@@ -1717,6 +1717,14 @@
      "name" : "C2FrameData::FLAG_INCOMPLETE"
     },
     {
+     "enum_field_value" : 16,
+     "name" : "C2FrameData::FLAG_CORRECTED"
+    },
+    {
+     "enum_field_value" : 32,
+     "name" : "C2FrameData::FLAG_CORRUPT"
+    },
+    {
      "enum_field_value" : -2147483648,
      "name" : "C2FrameData::FLAG_CODEC_CONFIG"
     }
@@ -2747,7 +2755,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
-   "name" : "C2ColorXyStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1569:5)",
+   "name" : "C2ColorXyStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1568:5)",
    "referenced_type" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
    "size" : 4,
@@ -2850,7 +2858,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
-   "name" : "C2GopLayerStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1729:5)",
+   "name" : "C2GopLayerStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1728:5)",
    "referenced_type" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
    "size" : 4,
@@ -2868,10 +2876,6 @@
     {
      "enum_field_value" : 1,
      "name" : "C2PlatformConfig::S_HANDHELD"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "C2PlatformConfig::S_HANDHELD_PC"
     }
    ],
    "linker_set_key" : "_ZTIN16C2PlatformConfig24encoding_quality_level_tE",
@@ -2892,7 +2896,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
-   "name" : "C2ColorInfoStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1450:5)",
+   "name" : "C2ColorInfoStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1449:5)",
    "referenced_type" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -2909,7 +2913,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
-   "name" : "C2ColorInfoStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1450:5)",
+   "name" : "C2ColorInfoStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1449:5)",
    "referenced_type" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3020,7 +3024,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
-   "name" : "C2TileLayoutStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1886:5)",
+   "name" : "C2TileLayoutStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1885:5)",
    "referenced_type" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3037,7 +3041,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
-   "name" : "C2OutOfMemoryStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1072:5)",
+   "name" : "C2OutOfMemoryStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1071:5)",
    "referenced_type" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3054,7 +3058,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
-   "name" : "C2PictureSizeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1053:5)",
+   "name" : "C2PictureSizeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1052:5)",
    "referenced_type" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3088,7 +3092,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
-   "name" : "C2ChromaOffsetStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1419:5)",
+   "name" : "C2ChromaOffsetStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1418:5)",
    "referenced_type" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3105,7 +3109,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
-   "name" : "C2ColorAspectsStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1542:5)",
+   "name" : "C2ColorAspectsStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1541:5)",
    "referenced_type" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3122,7 +3126,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
-   "name" : "C2IntraRefreshStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1860:5)",
+   "name" : "C2IntraRefreshStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1859:5)",
    "referenced_type" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3139,7 +3143,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
-   "name" : "C2ProfileLevelStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:738:5)",
+   "name" : "C2ProfileLevelStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:737:5)",
    "referenced_type" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3156,7 +3160,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
-   "name" : "C2TimedControlStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2232:5)",
+   "name" : "C2TimedControlStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2231:5)",
    "referenced_type" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3173,7 +3177,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
-   "name" : "C2TunneledModeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2328:5)",
+   "name" : "C2TunneledModeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2327:5)",
    "referenced_type" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3190,7 +3194,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
-   "name" : "C2TunneledModeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2328:5)",
+   "name" : "C2TunneledModeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2327:5)",
    "referenced_type" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3253,7 +3257,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
-   "name" : "C2StoreIonUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2112:5)",
+   "name" : "C2StoreIonUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2111:5)",
    "referenced_type" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3299,7 +3303,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
-   "name" : "C2StoreDmaBufUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2140:5)",
+   "name" : "C2StoreDmaBufUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2139:5)",
    "referenced_type" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3316,7 +3320,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
-   "name" : "C2StoreDmaBufUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2140:5)",
+   "name" : "C2StoreDmaBufUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2139:5)",
    "referenced_type" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3333,7 +3337,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
-   "name" : "C2SupplementalDataStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:794:5)",
+   "name" : "C2SupplementalDataStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:793:5)",
    "referenced_type" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3350,7 +3354,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
-   "name" : "C2SupplementalDataStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:794:5)",
+   "name" : "C2SupplementalDataStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:793:5)",
    "referenced_type" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3367,7 +3371,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
-   "name" : "C2TemporalLayeringStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1831:5)",
+   "name" : "C2TemporalLayeringStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1830:5)",
    "referenced_type" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3384,7 +3388,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
-   "name" : "C2TemporalLayeringStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1831:5)",
+   "name" : "C2TemporalLayeringStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1830:5)",
    "referenced_type" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3422,7 +3426,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
-   "name" : "C2PictureQuantizationStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1753:5)",
+   "name" : "C2PictureQuantizationStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1752:5)",
    "referenced_type" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3439,7 +3443,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
-   "name" : "C2TimestampGapAdjustmentStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2281:5)",
+   "name" : "C2TimestampGapAdjustmentStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2280:5)",
    "referenced_type" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3481,7 +3485,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
-   "name" : "C2MasteringDisplayColorVolumeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1583:5)",
+   "name" : "C2MasteringDisplayColorVolumeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1582:5)",
    "referenced_type" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3498,7 +3502,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
-   "name" : "C2FlexiblePixelFormatDescriptorStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2160:5)",
+   "name" : "C2FlexiblePixelFormatDescriptorStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2159:5)",
    "referenced_type" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
    "size" : 4,
diff --git a/31/64/x86_64/source-based/libcodec2.so.lsdump b/31/64/x86_64/source-based/libcodec2.so.lsdump
index a92d164..2a9aaae 100644
--- a/31/64/x86_64/source-based/libcodec2.so.lsdump
+++ b/31/64/x86_64/source-based/libcodec2.so.lsdump
@@ -1717,6 +1717,14 @@
      "name" : "C2FrameData::FLAG_INCOMPLETE"
     },
     {
+     "enum_field_value" : 16,
+     "name" : "C2FrameData::FLAG_CORRECTED"
+    },
+    {
+     "enum_field_value" : 32,
+     "name" : "C2FrameData::FLAG_CORRUPT"
+    },
+    {
      "enum_field_value" : -2147483648,
      "name" : "C2FrameData::FLAG_CODEC_CONFIG"
     }
@@ -2747,7 +2755,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
-   "name" : "C2ColorXyStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1569:5)",
+   "name" : "C2ColorXyStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1568:5)",
    "referenced_type" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
    "size" : 4,
@@ -2850,7 +2858,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
-   "name" : "C2GopLayerStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1729:5)",
+   "name" : "C2GopLayerStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1728:5)",
    "referenced_type" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
    "size" : 4,
@@ -2868,10 +2876,6 @@
     {
      "enum_field_value" : 1,
      "name" : "C2PlatformConfig::S_HANDHELD"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "C2PlatformConfig::S_HANDHELD_PC"
     }
    ],
    "linker_set_key" : "_ZTIN16C2PlatformConfig24encoding_quality_level_tE",
@@ -2892,7 +2896,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
-   "name" : "C2ColorInfoStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1450:5)",
+   "name" : "C2ColorInfoStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1449:5)",
    "referenced_type" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -2909,7 +2913,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
-   "name" : "C2ColorInfoStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1450:5)",
+   "name" : "C2ColorInfoStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1449:5)",
    "referenced_type" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3020,7 +3024,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
-   "name" : "C2TileLayoutStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1886:5)",
+   "name" : "C2TileLayoutStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1885:5)",
    "referenced_type" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3037,7 +3041,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
-   "name" : "C2OutOfMemoryStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1072:5)",
+   "name" : "C2OutOfMemoryStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1071:5)",
    "referenced_type" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3054,7 +3058,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
-   "name" : "C2PictureSizeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1053:5)",
+   "name" : "C2PictureSizeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1052:5)",
    "referenced_type" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3088,7 +3092,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
-   "name" : "C2ChromaOffsetStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1419:5)",
+   "name" : "C2ChromaOffsetStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1418:5)",
    "referenced_type" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3105,7 +3109,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
-   "name" : "C2ColorAspectsStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1542:5)",
+   "name" : "C2ColorAspectsStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1541:5)",
    "referenced_type" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3122,7 +3126,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
-   "name" : "C2IntraRefreshStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1860:5)",
+   "name" : "C2IntraRefreshStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1859:5)",
    "referenced_type" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3139,7 +3143,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
-   "name" : "C2ProfileLevelStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:738:5)",
+   "name" : "C2ProfileLevelStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:737:5)",
    "referenced_type" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3156,7 +3160,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
-   "name" : "C2TimedControlStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2232:5)",
+   "name" : "C2TimedControlStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2231:5)",
    "referenced_type" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3173,7 +3177,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
-   "name" : "C2TunneledModeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2328:5)",
+   "name" : "C2TunneledModeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2327:5)",
    "referenced_type" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3190,7 +3194,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
-   "name" : "C2TunneledModeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2328:5)",
+   "name" : "C2TunneledModeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2327:5)",
    "referenced_type" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3253,7 +3257,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
-   "name" : "C2StoreIonUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2112:5)",
+   "name" : "C2StoreIonUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2111:5)",
    "referenced_type" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3299,7 +3303,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
-   "name" : "C2StoreDmaBufUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2140:5)",
+   "name" : "C2StoreDmaBufUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2139:5)",
    "referenced_type" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3316,7 +3320,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
-   "name" : "C2StoreDmaBufUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2140:5)",
+   "name" : "C2StoreDmaBufUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2139:5)",
    "referenced_type" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3333,7 +3337,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
-   "name" : "C2SupplementalDataStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:794:5)",
+   "name" : "C2SupplementalDataStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:793:5)",
    "referenced_type" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3350,7 +3354,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
-   "name" : "C2SupplementalDataStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:794:5)",
+   "name" : "C2SupplementalDataStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:793:5)",
    "referenced_type" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3367,7 +3371,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
-   "name" : "C2TemporalLayeringStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1831:5)",
+   "name" : "C2TemporalLayeringStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1830:5)",
    "referenced_type" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3384,7 +3388,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
-   "name" : "C2TemporalLayeringStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1831:5)",
+   "name" : "C2TemporalLayeringStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1830:5)",
    "referenced_type" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3422,7 +3426,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
-   "name" : "C2PictureQuantizationStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1753:5)",
+   "name" : "C2PictureQuantizationStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1752:5)",
    "referenced_type" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3439,7 +3443,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
-   "name" : "C2TimestampGapAdjustmentStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2281:5)",
+   "name" : "C2TimestampGapAdjustmentStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2280:5)",
    "referenced_type" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3481,7 +3485,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
-   "name" : "C2MasteringDisplayColorVolumeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1583:5)",
+   "name" : "C2MasteringDisplayColorVolumeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1582:5)",
    "referenced_type" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3498,7 +3502,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
-   "name" : "C2FlexiblePixelFormatDescriptorStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2160:5)",
+   "name" : "C2FlexiblePixelFormatDescriptorStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2159:5)",
    "referenced_type" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
    "size" : 4,
diff --git a/31/64/x86_x86_64/source-based/libcodec2.so.lsdump b/31/64/x86_x86_64/source-based/libcodec2.so.lsdump
index e3a4b44..72c6243 100644
--- a/31/64/x86_x86_64/source-based/libcodec2.so.lsdump
+++ b/31/64/x86_x86_64/source-based/libcodec2.so.lsdump
@@ -1717,6 +1717,14 @@
      "name" : "C2FrameData::FLAG_INCOMPLETE"
     },
     {
+     "enum_field_value" : 16,
+     "name" : "C2FrameData::FLAG_CORRECTED"
+    },
+    {
+     "enum_field_value" : 32,
+     "name" : "C2FrameData::FLAG_CORRUPT"
+    },
+    {
      "enum_field_value" : -2147483648,
      "name" : "C2FrameData::FLAG_CODEC_CONFIG"
     }
@@ -2747,7 +2755,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
-   "name" : "C2ColorXyStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1569:5)",
+   "name" : "C2ColorXyStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1568:5)",
    "referenced_type" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN15C2ColorXyStruct11$CORE_INDEXE",
    "size" : 4,
@@ -2850,7 +2858,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
-   "name" : "C2GopLayerStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1729:5)",
+   "name" : "C2GopLayerStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1728:5)",
    "referenced_type" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN16C2GopLayerStruct11$CORE_INDEXE",
    "size" : 4,
@@ -2868,10 +2876,6 @@
     {
      "enum_field_value" : 1,
      "name" : "C2PlatformConfig::S_HANDHELD"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "C2PlatformConfig::S_HANDHELD_PC"
     }
    ],
    "linker_set_key" : "_ZTIN16C2PlatformConfig24encoding_quality_level_tE",
@@ -2892,7 +2896,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
-   "name" : "C2ColorInfoStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1450:5)",
+   "name" : "C2ColorInfoStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1449:5)",
    "referenced_type" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN17C2ColorInfoStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -2909,7 +2913,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
-   "name" : "C2ColorInfoStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1450:5)",
+   "name" : "C2ColorInfoStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1449:5)",
    "referenced_type" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN17C2ColorInfoStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3020,7 +3024,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
-   "name" : "C2TileLayoutStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1886:5)",
+   "name" : "C2TileLayoutStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1885:5)",
    "referenced_type" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN18C2TileLayoutStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3037,7 +3041,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
-   "name" : "C2OutOfMemoryStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1072:5)",
+   "name" : "C2OutOfMemoryStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1071:5)",
    "referenced_type" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN19C2OutOfMemoryStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3054,7 +3058,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
-   "name" : "C2PictureSizeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1053:5)",
+   "name" : "C2PictureSizeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1052:5)",
    "referenced_type" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN19C2PictureSizeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3088,7 +3092,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
-   "name" : "C2ChromaOffsetStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1419:5)",
+   "name" : "C2ChromaOffsetStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1418:5)",
    "referenced_type" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ChromaOffsetStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3105,7 +3109,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
-   "name" : "C2ColorAspectsStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1542:5)",
+   "name" : "C2ColorAspectsStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1541:5)",
    "referenced_type" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ColorAspectsStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3122,7 +3126,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
-   "name" : "C2IntraRefreshStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1860:5)",
+   "name" : "C2IntraRefreshStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1859:5)",
    "referenced_type" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2IntraRefreshStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3139,7 +3143,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
-   "name" : "C2ProfileLevelStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:738:5)",
+   "name" : "C2ProfileLevelStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:737:5)",
    "referenced_type" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2ProfileLevelStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3156,7 +3160,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
-   "name" : "C2TimedControlStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2232:5)",
+   "name" : "C2TimedControlStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2231:5)",
    "referenced_type" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2TimedControlStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3173,7 +3177,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
-   "name" : "C2TunneledModeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2328:5)",
+   "name" : "C2TunneledModeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2327:5)",
    "referenced_type" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN20C2TunneledModeStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3190,7 +3194,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
-   "name" : "C2TunneledModeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2328:5)",
+   "name" : "C2TunneledModeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2327:5)",
    "referenced_type" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN20C2TunneledModeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3253,7 +3257,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
-   "name" : "C2StoreIonUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2112:5)",
+   "name" : "C2StoreIonUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2111:5)",
    "referenced_type" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN21C2StoreIonUsageStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3299,7 +3303,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
-   "name" : "C2StoreDmaBufUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2140:5)",
+   "name" : "C2StoreDmaBufUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2139:5)",
    "referenced_type" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2StoreDmaBufUsageStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3316,7 +3320,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
-   "name" : "C2StoreDmaBufUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2140:5)",
+   "name" : "C2StoreDmaBufUsageStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2139:5)",
    "referenced_type" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2StoreDmaBufUsageStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3333,7 +3337,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
-   "name" : "C2SupplementalDataStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:794:5)",
+   "name" : "C2SupplementalDataStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:793:5)",
    "referenced_type" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2SupplementalDataStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3350,7 +3354,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
-   "name" : "C2SupplementalDataStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:794:5)",
+   "name" : "C2SupplementalDataStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:793:5)",
    "referenced_type" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2SupplementalDataStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3367,7 +3371,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
-   "name" : "C2TemporalLayeringStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1831:5)",
+   "name" : "C2TemporalLayeringStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1830:5)",
    "referenced_type" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
    "self_type" : "_ZTIN24C2TemporalLayeringStruct10$FLEX_SIZEE",
    "size" : 4,
@@ -3384,7 +3388,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
-   "name" : "C2TemporalLayeringStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1831:5)",
+   "name" : "C2TemporalLayeringStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1830:5)",
    "referenced_type" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN24C2TemporalLayeringStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3422,7 +3426,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
-   "name" : "C2PictureQuantizationStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1753:5)",
+   "name" : "C2PictureQuantizationStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1752:5)",
    "referenced_type" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN27C2PictureQuantizationStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3439,7 +3443,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
-   "name" : "C2TimestampGapAdjustmentStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2281:5)",
+   "name" : "C2TimestampGapAdjustmentStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2280:5)",
    "referenced_type" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN30C2TimestampGapAdjustmentStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3481,7 +3485,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
-   "name" : "C2MasteringDisplayColorVolumeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1583:5)",
+   "name" : "C2MasteringDisplayColorVolumeStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:1582:5)",
    "referenced_type" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN35C2MasteringDisplayColorVolumeStruct11$CORE_INDEXE",
    "size" : 4,
@@ -3498,7 +3502,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
-   "name" : "C2FlexiblePixelFormatDescriptorStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2160:5)",
+   "name" : "C2FlexiblePixelFormatDescriptorStruct::(anonymous enum at frameworks/av/media/codec2/core/include/C2Config.h:2159:5)",
    "referenced_type" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
    "self_type" : "_ZTIN37C2FlexiblePixelFormatDescriptorStruct11$CORE_INDEXE",
    "size" : 4,