axiomatic-systems · jongov · Sep 20, 2023
diff --git a/Build/Makefiles/Lib.exp b/Build/Makefiles/Lib.exp
@@ -10,4 +10,4 @@
 # exports
 ##########################################################################
 TARGET_LIBRARIES += AP4
-INCLUDES_CPP     += -I$(SOURCE_ROOT)/Core -I$(SOURCE_ROOT)/Config -I$(SOURCE_ROOT)/MetaData -I$(SOURCE_ROOT)/System/StdC -I$(SOURCE_ROOT)/Crypto -I$(SOURCE_ROOT)/Codecs
+INCLUDES_CPP     += -I$(SOURCE_ROOT)/Core -I$(SOURCE_ROOT)/Config -I$(SOURCE_ROOT)/MetaData -I$(SOURCE_ROOT)/System/StdC -I$(SOURCE_ROOT)/Crypto -I$(SOURCE_ROOT)/Codecs -I$(SOURCE_ROOT)/XML/src
diff --git a/Build/Makefiles/Lib.mak b/Build/Makefiles/Lib.mak
@@ -133,6 +133,8 @@ CORE_SOURCES = 								\
     Ap4Eac3Parser.cpp                       \
     Ap4HevcParser.cpp                       \
     Ap4SegmentBuilder.cpp                   \
+    Ap4XMLAtom.cpp                          \
+    pugixml.cpp                             \
 
 
 CORE_OBJECTS=$(CORE_SOURCES:.cpp=.o)
@@ -164,6 +166,7 @@ VPATH += $(SOURCE_ROOT)/System/Posix
 VPATH += $(SOURCE_ROOT)/Codecs
 VPATH += $(SOURCE_ROOT)/MetaData
 VPATH += $(SOURCE_ROOT)/CApi
+VPATH += $(SOURCE_ROOT)/XML/src
 
 ##########################################################################
 # includes

diff --git a/Build/Targets/x86_64-microsoft-win32-vs2019/Bento4/Bento4.vcxproj b/Build/Targets/x86_64-microsoft-win32-vs2019/Bento4/Bento4.vcxproj
@@ -71,7 +71,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Config;..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Crypto;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Config;..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Crypto;..\..\..\..\Source\C++\XML\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;AP4_DEBUG;_LIB;AP4_PLATFORM_BYTE_ORDER=AP4_PLATFORM_BYTE_ORDER_LITTLE_ENDIAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>
       </MinimalRebuild>
@@ -92,7 +92,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Config;..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Crypto;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Config;..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Crypto;..\..\..\..\Source\C++\XML\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;AP4_DEBUG;_LIB;AP4_PLATFORM_BYTE_ORDER=AP4_PLATFORM_BYTE_ORDER_LITTLE_ENDIAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -111,7 +111,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Config;..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Crypto;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Config;..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Crypto;..\..\..\..\Source\C++\XML\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;AP4_PLATFORM_BYTE_ORDER=AP4_PLATFORM_BYTE_ORDER_LITTLE_ENDIAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>
@@ -132,7 +132,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Config;..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Crypto;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Config;..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Crypto;..\..\..\..\Source\C++\XML\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;AP4_PLATFORM_BYTE_ORDER=AP4_PLATFORM_BYTE_ORDER_LITTLE_ENDIAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>
@@ -182,6 +182,7 @@
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4TencAtom.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4TfdtAtom.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4VpccAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4XMLAtom.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Crypto\Ap4AesBlockCipher.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Atom.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4AtomFactory.cpp" />
@@ -284,6 +285,7 @@
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Utils.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4UuidAtom.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4VmhdAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\XML\src\pugixml.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4Ac3Parser.h" />
@@ -316,6 +318,7 @@
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4TencAtom.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4TfdtAtom.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4VpccAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4XMLAtom.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Crypto\Ap4AesBlockCipher.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Array.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Atom.h" />

diff --git a/Build/Targets/x86_64-microsoft-win32-vs2019/Bento4/Bento4.vcxproj.filters b/Build/Targets/x86_64-microsoft-win32-vs2019/Bento4/Bento4.vcxproj.filters
@@ -411,6 +411,12 @@
     <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4Eac3Parser.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4XMLAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\XML\src\pugixml.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4.h">
@@ -833,5 +839,8 @@
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Ac4Utils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4XMLAtom.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Dump/Mp4Dump.vcxproj b/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Dump/Mp4Dump.vcxproj
@@ -82,7 +82,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\XML\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -116,7 +116,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\XML\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -152,7 +152,7 @@
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\XML\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -193,7 +193,7 @@
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\XML\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

diff --git a/Source/C++/Core/Ap4Atom.h b/Source/C++/Core/Ap4Atom.h
@@ -588,6 +588,7 @@ const AP4_Atom::Type AP4_ATOM_TYPE_SIDX = AP4_ATOM_TYPE('s','i','d','x');
 const AP4_Atom::Type AP4_ATOM_TYPE_SSIX = AP4_ATOM_TYPE('s','s','i','x');
 const AP4_Atom::Type AP4_ATOM_TYPE_SBGP = AP4_ATOM_TYPE('s','b','g','p');
 const AP4_Atom::Type AP4_ATOM_TYPE_SGPD = AP4_ATOM_TYPE('s','g','p','d');
+const AP4_Atom::Type AP4_ATOM_TYPE_XML  = AP4_ATOM_TYPE('x','m','l',' ');
 
 /*----------------------------------------------------------------------
 |   AP4_AtomListInspector

diff --git a/Source/C++/Core/Ap4AtomFactory.cpp b/Source/C++/Core/Ap4AtomFactory.cpp
@@ -108,6 +108,7 @@
 #include "Ap4SidxAtom.h"
 #include "Ap4SbgpAtom.h"
 #include "Ap4SgpdAtom.h"
+#include "Ap4XMLAtom.h"
 
 /*----------------------------------------------------------------------
 |   AP4_AtomFactory::~AP4_AtomFactory
@@ -835,6 +836,9 @@ AP4_AtomFactory::CreateAtomFromStream(AP4_ByteStream& stream,
           case AP4_ATOM_TYPE_MDAT:
             // generic atoms
             break;
+          case AP4_ATOM_TYPE_XML:
+              atom = AP4_XMLAtom::Create(size_32, stream);
+              break;
 
           default: {
             // try all the external type handlers

diff --git a/Source/C++/Core/Ap4XMLAtom.cpp b/Source/C++/Core/Ap4XMLAtom.cpp
@@ -0,0 +1,182 @@
+/*****************************************************************
+|
+|    AP4 - xml Atom
+|    
+|    Tsviatko Jongov - jongov@gmail.com
+|
+|
+|    This file is part of Bento4/AP4 (MP4 Atom Processing Library).
+|
+|    Unless you have obtained Bento4 under a difference license,
+|    this version of Bento4 is Bento4|GPL.
+|    Bento4|GPL is free software; you can redistribute it and/or modify
+|    it under the terms of the GNU General Public License as published by
+|    the Free Software Foundation; either version 2, or (at your option)
+|    any later version.
+|
+|    Bento4|GPL is distributed in the hope that it will be useful,
+|    but WITHOUT ANY WARRANTY; without even the implied warranty of
+|    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+|    GNU General Public License for more details.
+|
+|    You should have received a copy of the GNU General Public License
+|    along with Bento4|GPL; see the file COPYING.  If not, write to the
+|    Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+|    02111-1307, USA.
+|
+ ****************************************************************/
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "Ap4XMLAtom.h"
+#include "Ap4AtomFactory.h"
+#include "Ap4Utils.h"
+#include <string>
+#include <iostream>
+#include <fstream>
+#include <sstream>
+#include <vector>
+#include <map>
+#include <pugixml.hpp>
+
+/*----------------------------------------------------------------------
+|   dynamic cast support
++---------------------------------------------------------------------*/
+AP4_DEFINE_DYNAMIC_CAST_ANCHOR(AP4_XMLAtom)
+
+/*----------------------------------------------------------------------
+|   AP4_XMLAtom::Create
++---------------------------------------------------------------------*/
+AP4_XMLAtom*
+AP4_XMLAtom::Create(AP4_Size size, AP4_ByteStream& stream)
+{
+    AP4_UI08 version;
+    AP4_UI32 flags;
+    if (size < AP4_FULL_ATOM_HEADER_SIZE) return NULL;
+    if (AP4_FAILED(AP4_Atom::ReadFullHeader(stream, version, flags))) return NULL;
+    if (version != 0) return NULL;
+    return new AP4_XMLAtom(size, version, flags, stream);
+}
+
+/*----------------------------------------------------------------------
+|   AP4_XMLAtom::AP4_XMLAtom
++---------------------------------------------------------------------*/
+AP4_XMLAtom::AP4_XMLAtom(const char* xml) :
+    AP4_Atom(AP4_ATOM_TYPE_XML, AP4_FULL_ATOM_HEADER_SIZE, 0, 0)
+{
+
+}
+// Function to recursively convert XML to a JSON-like structure
+std::string xmlToJson(const pugi::xml_node& node, int indent = 0) {
+    std::ostringstream result;
+
+    // Indentation for formatting
+    std::string indentation(indent, ' ');
+
+    result << "{\n";
+
+    // Process attributes
+    for (const auto& attr : node.attributes()) {
+        result << indentation << "  \"" << attr.name() << "\": \"" << attr.value() << "\",\n";
+    }
+
+    // Process child nodes
+    bool hasChild = false;
+    for (const auto& child : node.children()) {
+        if (child.type() == pugi::node_element) {
+            if (!hasChild) {
+                result << "\n";
+                hasChild = true;
+            }
+            result << indentation << "  \"" << child.name() << "\": ";
+            result << xmlToJson(child, indent + 2) << ",\n";
+        }
+        else if (child.type() == pugi::node_pcdata) {
+            // Text content
+            if (!hasChild) {
+                result << "\n";
+                hasChild = true;
+            }
+            result << indentation << "  \"text\": \"" << child.value() << "\",\n";
+        }
+    }
+
+    if (hasChild) {
+        // Remove trailing comma
+        result.seekp(-2, std::ios_base::end);
+        result << "\n" << indentation;
+    }
+
+    result << "}";
+
+    return result.str();
+}
+
+/*----------------------------------------------------------------------
+|   AP4_XMLAtom::AP4_XMLAtom
++---------------------------------------------------------------------*/
+AP4_XMLAtom::AP4_XMLAtom(AP4_UI32        size, 
+                         AP4_UI08        version,
+                         AP4_UI32        flags,
+                         AP4_ByteStream& stream) :
+    AP4_Atom(AP4_ATOM_TYPE_XML, size, version, flags)
+{    
+    // read the name unless it is empty
+    if (size < AP4_FULL_ATOM_HEADER_SIZE) return;
+    AP4_UI32 name_size = size-(AP4_FULL_ATOM_HEADER_SIZE);
+    char* name = new char[name_size+1];
+
+    if (name == NULL) return;
+
+    stream.Read(name, name_size);
+
+    name[name_size] = '\0'; // force a null termination    
+
+    // Load XML from the char* variable
+    pugi::xml_document doc;
+    pugi::xml_parse_result result = doc.load_buffer(name, strlen(name));
+
+    if (result) {
+        // Convert XML to JSON-like structure
+        std::string jsonString = xmlToJson(doc.first_child());
+
+        m_JSON = jsonString.c_str();
+    }
+
+    // handle a special case: the Quicktime files have a pascal
+    // string here, but ISO MP4 files have a C string.
+    // we try to detect a pascal encoding and correct it.
+    if ((AP4_UI08)name[0] == (AP4_UI08)(name_size-1)) {
+        m_XML = name+1;                
+    } else {
+        m_XML = name;
+    }
+    delete[] name;
+
+
+}
+
+/*----------------------------------------------------------------------
+|   AP4_XMLAtom::WriteFields
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_XMLAtom::WriteFields(AP4_ByteStream& stream)
+{
+    return AP4_ERROR_NOT_SUPPORTED;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_XMLAtom::InspectFields
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_XMLAtom::InspectFields(AP4_AtomInspector& inspector)
+{
+    //Return XML
+    inspector.AddField("xml", m_XML.GetChars());
+
+    //Return JSON
+    //inspector.AddField("xml", m_JSON.GetChars());
+
+    return AP4_SUCCESS;
+}