JXL: Parse Exif and XMP

Author: cjee21

Source/MediaInfo/Multiple/File_Mpeg4.h

@@ -76,16 +76,20 @@ private :
 
     //Elements
     void bloc();
+    void brob();
     void cdat();
+    void Exif();
     void cdt2() {cdat();}
     void free();
     void ftyp();
+    void hrgm();
     void idat();
     void idsc();
     void jp2c();
     void jp2h();
     void jp2h_colr();
     void jp2h_ihdr();
+    void JXL_();
     void jp2h_ricc() {jp2h_colr(); }
     void mdat();
     void mdat_xxxx();
@@ -416,6 +420,7 @@ private :
     void skip();
     void sidx();
     void wide();
+    void xml_();
 
     //Helpers
     Ztring Language_Get(int16u Language);

Source/MediaInfo/Multiple/File_Mpeg4_Elements.cpp

@@ -703,8 +703,10 @@ std::string File_Mpeg4_sv3d_Mesh_index_type(int8u Value)
 namespace Elements
 {
     const int64u bloc=0x626C6F63;
+    const int64u brob=0x62726F62;
     const int64u cdat=0x63646174;
     const int64u cdt2=0x63647432;
+    const int64u Exif=0x45786966;
     const int64u free=0x66726565;
     const int64u ftyp=0x66747970;
     const int64u ftyp_qt=0x71742020;
@@ -715,13 +717,15 @@ namespace Elements
     const int64u ftyp_dash=0x64617368;
     const int64u ftyp_isom=0x69736F6D;
     const int64u ftyp_caqv=0x63617176;
+    const int64u hrgm=0x6872676D;
     const int64u idat=0x69646174;
     const int64u idsc=0x69647363;
     const int64u jp2c=0x6A703263;
     const int64u jp2h=0x6A703268;
     const int64u jp2h_colr=0x636F6C72;
     const int64u jp2h_ihdr=0x69686472;
     const int64u jp2h_ricc=0x72696363;
+    const int64u JXL_=0x4A584C20;
     const int64u mdat=0x6D646174;
     const int64u meta=0x6D657461;
     const int64u meta_grpl=0x6772706C;
@@ -1086,6 +1090,7 @@ namespace Elements
     const int64u skip=0x736B6970;
     const int64u sidx=0x73696478;
     const int64u wide=0x77696465;
+    const int64u xml_=0x786D6C20;
 }
 
 //---------------------------------------------------------------------------
@@ -1124,10 +1129,13 @@ void File_Mpeg4::Data_Parse()
     //Parsing
     DATA_BEGIN
     ATOM(bloc)
+    ATOM(brob)
     ATOM(cdat)
     ATOM(cdt2)
+    ATOM(Exif)
     LIST_SKIP(free)
     ATOM(ftyp)
+    ATOM(hrgm)
     ATOM(idat)
     ATOM(idsc)
     ATOM(jp2c)
@@ -1137,6 +1145,7 @@ void File_Mpeg4::Data_Parse()
         ATOM(jp2h_ihdr)
         ATOM(jp2h_ricc)
         ATOM_END
+    ATOM(JXL_)
     LIST(mdat)
         ATOM_DEFAULT_ALONE(mdat_xxxx)
     LIST(meta)
@@ -1586,6 +1595,7 @@ void File_Mpeg4::Data_Parse()
     LIST_SKIP(skip)
     ATOM(sidx)
     LIST_SKIP(wide)
+    ATOM(xml_)
     DATA_END
 }
 
@@ -1707,6 +1717,18 @@ void File_Mpeg4::bloc()
     Skip_XX(512,                                                "Reserved");
 }
 
+//-------------------------------------------------------------------------
+void File_Mpeg4::brob()
+{
+    Element_Name("Brotli-compressed box");
+
+    int32u type;
+    Get_C4(type,                                                "payload box type");
+    Element_Info1(Ztring::ToZtring_From_CC4(type));
+
+    Skip_XX(Element_Size - 4,                                   "compressed data");
+}
+
 //---------------------------------------------------------------------------
 void File_Mpeg4::cdat()
 {
@@ -1745,6 +1767,29 @@ void File_Mpeg4::cdat()
     }
 }
 
+//---------------------------------------------------------------------------
+void File_Mpeg4::Exif()
+{
+    Element_Name("Exif box");
+
+    //Parsing
+    #if defined(MEDIAINFO_EXIF_YES)
+    File_Exif MI{};
+    MI.FromHeif = true;
+    Open_Buffer_Init(&MI);
+    Open_Buffer_Continue(&MI);
+    Open_Buffer_Finalize(&MI);
+    Merge(MI, Stream_General, 0, 0, false);
+    Merge(MI, Stream_Image, 0, 0, false);
+    size_t Count = MI.Count_Get(Stream_Image);
+    for (size_t i = 1; i < Count; ++i) {
+        Merge(MI, Stream_Image, i, StreamPos_Last + 1, false);
+    }
+    #else
+    Skip_UTF8(Element_Size - Element_Offset,                    "EXIF Tags");
+    #endif
+}
+
 //---------------------------------------------------------------------------
 void File_Mpeg4::free()
 {
@@ -1839,6 +1884,13 @@ void File_Mpeg4::ftyp()
     FILLING_END();
 }
 
+//---------------------------------------------------------------------------
+void File_Mpeg4::hrgm()
+{
+    Element_Name("HDR Gain Map");
+    Skip_XX(Element_Size,                                       "Data");
+}
+
 //---------------------------------------------------------------------------
 void File_Mpeg4::idat()
 {
@@ -2006,6 +2058,18 @@ void File_Mpeg4::jp2h_ihdr()
     FILLING_END()
 }
 
+//---------------------------------------------------------------------------
+void File_Mpeg4::JXL_()
+{
+    Element_Name("JPEG XL Signature box");
+    int32u signature;
+    Get_B4(signature,                                           "Signature");
+    FILLING_BEGIN_PRECISE()
+        if (signature == 0x0D0A870A)
+            Fill(Stream_General, 0, General_Format, "JPEG XL");
+    FILLING_END()
+}
+
 //---------------------------------------------------------------------------
 void File_Mpeg4::mdat()
 {
@@ -11319,6 +11383,25 @@ void File_Mpeg4::wide()
     Skip_XX(Element_Size,                                       "Free");
 }
 
+//---------------------------------------------------------------------------
+void File_Mpeg4::xml_()
+{
+    Element_Name("XML box");
+
+    //Parsing
+    #if defined(MEDIAINFO_XMP_YES)
+    File_Xmp MI{};
+    Open_Buffer_Init(&MI);
+    auto Element_Offset_Sav = Element_Offset;
+    Open_Buffer_Continue(&MI);
+    Element_Offset = Element_Offset_Sav;
+    Open_Buffer_Finalize(&MI);
+    Element_Show(); //TODO: why is it needed?
+    Merge(MI, Stream_General, 0, 0, false);
+    #endif
+    Skip_UTF8(Element_Size - Element_Offset,                    "XMP metadata");
+}
+
 //***************************************************************************
 // C++
 //***************************************************************************

Source/MediaInfo/Tag/File_Exif.cpp

@@ -1994,15 +1994,15 @@ void File_Exif::FileHeader_Parse()
 
     //HEIF
     if (FromHeif) {
-        int32u Size;
-        Get_B4 (Size,                                           "Exif header length");
+        int32u exif_tiff_header_offset;
+        Get_B4 (exif_tiff_header_offset,                        "exif_tiff_header_offset");
         string Identifier;
-        Get_String(Size, Identifier,                            "Identifier");
-        if (!(Size == 0 || (Size == 6 && !strncmp(Identifier.c_str(), "Exif\0", 6)))) {
+        Get_String(exif_tiff_header_offset, Identifier,         "Identifier");
+        if (!(exif_tiff_header_offset == 0 || (exif_tiff_header_offset == 6 && !strncmp(Identifier.c_str(), "Exif\0", 6)))) {
             Reject();
             return;
         }
-        OffsetFromContainer = static_cast<int64s>(4) + Size;
+        OffsetFromContainer = static_cast<int64s>(4) + exif_tiff_header_offset;
     }
 
     //Exif Makernotes