+ MPEG-4: improve display of operating system and hardware

JeromeMartinez · JeromeMartinez · commit 162c3b471966 · 2025-02-21T17:16:22.000+01:00
Focused on Android (Samsung and Google) and iOS but also handle some cameras
diff --git a/Source/MediaInfo/File__Analyse_Automatic.h b/Source/MediaInfo/File__Analyse_Automatic.h
@@ -460,6 +460,16 @@ enum general
     General_Encoded_Library_Date,
     General_Encoded_Library_Settings,
     General_Encoded_OperatingSystem,
+    General_Encoded_OperatingSystem_String,
+    General_Encoded_OperatingSystem_CompanyName,
+    General_Encoded_OperatingSystem_Name,
+    General_Encoded_OperatingSystem_Version,
+    General_Encoded_Hardware,
+    General_Encoded_Hardware_String,
+    General_Encoded_Hardware_CompanyName,
+    General_Encoded_Hardware_Name,
+    General_Encoded_Hardware_Model,
+    General_Encoded_Hardware_Version,
     General_Cropped,
     General_Dimensions,
     General_DotsPerInch,
diff --git a/Source/MediaInfo/File__Analyze.h b/Source/MediaInfo/File__Analyze.h
@@ -40,6 +40,21 @@ template <class T> inline Ztring Get_Hex_ID(const T& Value)
     return ID_String;
 }
 
+template <class T> inline T IsAsciiLower(T Value)
+{
+    return ((unsigned)Value - 'a') < 26;
+}
+
+template <class T> inline T IsAsciiUpper(T Value)
+{
+    return ((unsigned)Value - 'A') < 26;
+}
+
+template <class T> inline T IsAsciiDigit(T Value)
+{
+    return ((unsigned)Value - '0') < 10;
+}
+
 struct buffer_data
 {
     size_t Size;
diff --git a/Source/MediaInfo/File__Analyze_Streams_Finish.cpp b/Source/MediaInfo/File__Analyze_Streams_Finish.cpp
@@ -991,6 +991,168 @@ void File__Analyze::Streams_Finish_StreamOnly_General(size_t StreamPos)
         if (Channels_Total)
             Fill(Stream_General, StreamPos, General_Audio_Channels_Total, Channels_Total);
     }
+
+    //Exceptions (empiric)
+    {
+        const auto& Application_Name=Retrieve_Const(Stream_General, StreamPos, General_Encoded_Application_Name);
+        if (Application_Name.size()>=5 && Application_Name.find(__T(", LLC"))==Application_Name.size()-5)
+        {
+            Fill(Stream_General, 0, General_Encoded_Application_CompanyName, Application_Name.substr(0, Application_Name.size()-5));
+            Clear(Stream_General, StreamPos, General_Encoded_Application_Name);
+        }
+    }
+    {
+        const auto& Application_Name=Retrieve_Const(Stream_General, StreamPos, General_Encoded_Application_Name);
+        if (Application_Name.size()>=5 && Application_Name.rfind(__T("Mac OS X "), 0)==0)
+        {
+            Fill(Stream_General, 0, General_Encoded_Application_Version, Application_Name.substr(9), true);
+            const auto& Application_CompanyName=Retrieve_Const(Stream_General, StreamPos, General_Encoded_Application_CompanyName);
+            if (Application_CompanyName.empty())
+                Fill(Stream_General, 0, General_Encoded_Application_CompanyName, "Apple");
+            Fill(Stream_General, StreamPos, General_Encoded_Application_Name, "Mac OS X", Unlimited, true, true);
+        }
+        if (Application_Name.size()>=5 && Application_Name.rfind(__T("Sorenson "), 0)==0)
+        {
+            auto Application_Name_Max=Application_Name.find(__T(" / "));
+            if (Application_Name_Max!=(size_t)-1)
+                Application_Name_Max-=9;
+            Fill(Stream_General, 0, General_Encoded_Application_Name, Application_Name.substr(9, Application_Name_Max), true);
+            const auto& Application_CompanyName=Retrieve_Const(Stream_General, StreamPos, General_Encoded_Application_CompanyName);
+            if (Application_CompanyName.empty())
+                Fill(Stream_General, 0, General_Encoded_Application_CompanyName, "Sorenson");
+        }
+    }
+    {
+        const auto& Application_Name=Retrieve_Const(Stream_General, StreamPos, General_Encoded_Application_Name);
+        const auto& OperatingSystem_Version=Retrieve_Const(Stream_General, StreamPos, General_Encoded_OperatingSystem_Version);
+        const auto& Hardware_Name=Retrieve_Const(Stream_General, StreamPos, General_Encoded_Hardware_Name);
+        if (OperatingSystem_Version.empty() && !Application_Name.empty() && Application_Name.find_first_not_of(__T("0123456789."))==string::npos && Hardware_Name.rfind(__T("iPhone "), 0)==0)
+        {
+            Fill(Stream_General, 0, General_Encoded_OperatingSystem_Version, Application_Name);
+            Fill(Stream_General, 0, General_Encoded_OperatingSystem_Name, "iOS", Unlimited, true, true);
+            const auto& OperatingSystem_CompanyName=Retrieve_Const(Stream_General, StreamPos, General_Encoded_OperatingSystem_CompanyName);
+            if (OperatingSystem_CompanyName.empty())
+                Fill(Stream_General, 0, General_Encoded_OperatingSystem_CompanyName, "Apple");
+            Clear(Stream_General, StreamPos, General_Encoded_Application_Name);
+        }
+    }
+    {
+        const auto& Hardware_CompanyName=Retrieve_Const(Stream_General, StreamPos, General_Encoded_Hardware_CompanyName);
+        const auto& Hardware_Name=Retrieve_Const(Stream_General, StreamPos, General_Encoded_Hardware_Name);
+        if (Hardware_Name.rfind(Hardware_CompanyName+__T(' '), 0) == 0)
+            Fill(Stream_General, StreamPos, General_Encoded_Hardware_Name, Hardware_Name.substr(Hardware_CompanyName.size()+1), true);
+    }
+    if (Retrieve_Const(Stream_General, StreamPos, General_Encoded_Hardware_Name).empty())
+    {
+        const auto& Performer=Retrieve_Const(Stream_General, StreamPos, General_Performer);
+        const auto& Hardware_CompanyName=Retrieve_Const(Stream_General, StreamPos, General_Encoded_Hardware_CompanyName);
+        ZtringList PerformerList;
+        PerformerList.Separator_Set(0, __T(" / "));
+        PerformerList.Write(Performer);
+        set<Ztring> HardwareName_List;
+        for (size_t i=0; i<PerformerList.size(); i++)
+        {
+            const auto& PerformerItem=PerformerList[i];
+            auto ShortAndContainsHardwareCompanyName=PerformerItem.size()-Hardware_CompanyName.size()<=16 && PerformerItem.rfind(Hardware_CompanyName+__T(' '), 0)==0;
+            if (ShortAndContainsHardwareCompanyName || Hardware_CompanyName==__T("Samsung") && PerformerItem.size()<=32 && PerformerItem.rfind(__T("Galaxy "), 0)==0)
+            {
+                ZtringList Items;
+                Items.Separator_Set(0, __T(" "));
+                Items.Write(PerformerItem);
+                if (Items.size()<6)
+                {
+                    auto IsLikelyName=false;
+                    auto LastHasOnlyDigits=false;
+                    for (const auto& Item : Items)
+                    {
+                        size_t HasUpper=0;
+                        size_t HasDigit=0;
+                        for (const auto& Value : Item)
+                        {
+                            HasUpper+=IsAsciiUpper(Value);
+                            HasDigit+=IsAsciiDigit(Value);
+                        }
+                        LastHasOnlyDigits=HasDigit==Item.size();
+                        if (Item.size()==1 || HasUpper>=2 || (HasDigit && HasDigit<Item.size()))
+                            IsLikelyName=true;
+                    }
+                    if (IsLikelyName || LastHasOnlyDigits)
+                    {
+                        HardwareName_List.insert(PerformerItem.substr(ShortAndContainsHardwareCompanyName?(Hardware_CompanyName.size()+1):0));
+                        PerformerList.erase(PerformerList.begin()+i);
+                        continue;
+                    }
+                }
+            }
+        }
+        if (HardwareName_List.size()==1)
+        {
+            //Performer is likely the actual performer
+            Fill(Stream_General, StreamPos, General_Encoded_Hardware_Name, *HardwareName_List.begin());
+            Fill(Stream_General, StreamPos, General_Performer, PerformerList.Read(), true);
+        }
+    }
+    {
+        const auto& Name=Retrieve_Const(Stream_General, StreamPos, General_Encoded_Hardware_Name);
+        const auto& Model=Retrieve_Const(Stream_General, StreamPos, General_Encoded_Hardware_Model);
+        if (Name==Model)
+        {
+            //Name is actually the model (technical name), keeping only model
+            Clear(Stream_General, StreamPos, General_Encoded_Hardware_Name);
+        }
+    }
+
+    //OperatingSystem
+    if (Retrieve_Const(Stream_General, StreamPos, General_Encoded_OperatingSystem_String).empty())
+    {
+        //Filling
+        const auto& CompanyName=Retrieve_Const(Stream_General, StreamPos, General_Encoded_OperatingSystem_CompanyName);
+        const auto& Name=Retrieve_Const(Stream_General, StreamPos, General_Encoded_OperatingSystem_Name);
+        const auto& Version=Retrieve_Const(Stream_General, StreamPos, General_Encoded_OperatingSystem_Version);
+        Ztring OperatingSystem=CompanyName;
+        if (!Name.empty())
+        {
+            if (!OperatingSystem.empty())
+                OperatingSystem+=' ';
+            OperatingSystem+=Name;
+            if (!Version.empty())
+            {
+                OperatingSystem+=' ';
+                OperatingSystem+=Version;
+            }
+        }
+        Fill(Stream_General, StreamPos, General_Encoded_OperatingSystem_String, OperatingSystem);
+    }
+
+    //Hardware
+    if (Retrieve_Const(Stream_General, StreamPos, General_Encoded_Hardware_String).empty())
+    {
+        //Filling
+        const auto& CompanyName=Retrieve_Const(Stream_General, StreamPos, General_Encoded_Hardware_CompanyName);
+        const auto& Name=Retrieve_Const(Stream_General, StreamPos, General_Encoded_Hardware_Name);
+        const auto& Model=Retrieve_Const(Stream_General, StreamPos, General_Encoded_Hardware_Model);
+        const auto& Version=Retrieve_Const(Stream_General, StreamPos, General_Encoded_Hardware_Version);
+        Ztring Hardware=CompanyName;
+        if (!Name.empty())
+        {
+            if (!Hardware.empty())
+                Hardware+=' ';
+            Hardware+=Name;
+        }
+        if (!Model.empty())
+        {
+            if (!Hardware.empty())
+                Hardware+=' ';
+            if (!Name.empty())
+                Hardware+='(';
+            Hardware+=Model;
+            if (!Name.empty())
+                Hardware+=')';
+        }
+        if (!Hardware.empty() && !Version.empty())
+            Hardware+=Version;
+        Fill(Stream_General, StreamPos, General_Encoded_Hardware_String, Hardware);
+    }
 }
 
 //---------------------------------------------------------------------------
@@ -2149,14 +2311,11 @@ void File__Analyze::Streams_Finish_HumanReadable_PerStream(stream_t StreamKind,
         Ztring Name=Retrieve(StreamKind, StreamPos, "Encoded_Application_Name");
         Ztring Version=Retrieve(StreamKind, StreamPos, "Encoded_Application_Version");
         Ztring Date=Retrieve(StreamKind, StreamPos, "Encoded_Application_Date");
-        if (!Name.empty())
+        if (!CompanyName.empty() || !Name.empty())
         {
-            Ztring String;
-            if (!CompanyName.empty())
-            {
-                String+=CompanyName;
-                String+=__T(" ");
-            }
+            Ztring String=CompanyName;
+            if (!CompanyName.empty() && !Name.empty())
+                String+=' ';
             String+=Name;
             if (!Version.empty())
             {
diff --git a/Source/MediaInfo/MediaInfo_Config_Automatic.cpp b/Source/MediaInfo/MediaInfo_Config_Automatic.cpp
@@ -215,7 +215,6 @@ void MediaInfo_Config_DefaultLanguage (Translation &Info)
     "Alignment_Split;Split across interleaves\n"
     "All;All\n"
     "AlternateGroup;Alternate group\n"
-    "Android_Version;Android version\n"
     "Archival_Location;Archival location\n"
     "Arranger;Arranger\n"
     "ArtDirector;ArtDirector\n"
@@ -412,8 +411,10 @@ void MediaInfo_Config_DefaultLanguage (Translation &Info)
     "EMail;E-Mail\n"
     "Encoded_Application;Writing application\n"
     "Encoded_Date;Encoded date\n"
+    "Encoded_Hardware;Writing hardware\n"
     "Encoded_Library;Writing library\n"
     "Encoded_Library_Settings;Encoding settings\n"
+    "Encoded_OperatingSystem;Writing operating system\n"
     "Encoded_Original;Original support\n"
     "EncodedBy;Encoded by\n"
     "EPG_Positions;EPG positions (internal)\n"
@@ -1169,7 +1170,6 @@ void MediaInfo_Config_DefaultLanguage (Translation &Info)
     "SamplesPerFrame;Samples per frame\n"
     "SamplingCount;Samples count\n"
     "SamplingRate;Sampling rate\n"
-    "Samsung_Model_Number;Samsung model number\n"
     "Save;Save\n"
     "ScanOrder;Scan order\n"
     "ScanOrder_Original;Original scan order\n"
@@ -4600,6 +4600,16 @@ void MediaInfo_Config_General (ZtringListList &Info)
     "Encoded_Library_Date;;;N YTY\n"
     "Encoded_Library_Settings;;;Y YTY\n"
     "Encoded_OperatingSystem;;;N YTY\n"
+    "Encoded_OperatingSystem/String;;;Y NT\n"
+    "Encoded_OperatingSystem_CompanyName;;;N YTY\n"
+    "Encoded_OperatingSystem_Name;;;N YTY\n"
+    "Encoded_OperatingSystem_Version;;;N YTY\n"
+    "Encoded_Hardware;;;N YTY\n"
+    "Encoded_Hardware/String;;;Y NT\n"
+    "Encoded_Hardware_CompanyName;;;N YTY\n"
+    "Encoded_Hardware_Name;;;N YTY\n"
+    "Encoded_Hardware_Model;;;N YTY\n"
+    "Encoded_Hardware_Version;;;N YTY\n"
     "Cropped;;;Y YTY\n"
     "Dimensions;;;Y YTY\n"
     "DotsPerInch;;;Y YTY\n"
diff --git a/Source/MediaInfo/Multiple/File_Mpeg4_Elements.cpp b/Source/MediaInfo/Multiple/File_Mpeg4_Elements.cpp
@@ -3985,14 +3985,30 @@ void File_Mpeg4::moov_meta_ilst_xxxx_data()
                         Fill(Stream_General, 0, General_Comment, Value, true);
                     else if (Parameter=="com.apple.quicktime.description")
                         Fill(Stream_General, 0, General_Description, Value, true);
+                    else if (Parameter == "com.apple.quicktime.creationdate")
+                        Fill(Stream_General, 0, General_Recorded_Date, Value);
+                    else if (Parameter == "com.apple.quicktime.make")
+                        Fill(Stream_General, 0, General_Encoded_Hardware_CompanyName, Value);
+                    else if (Parameter == "com.apple.quicktime.model")
+                        Fill(Stream_General, 0, General_Encoded_Hardware_Name, Value);
+                    else if (Parameter == "com.apple.quicktime.software")
+                        Fill(Stream_General, 0, General_Encoded_Application_Name, Value);
                     else if (Parameter=="com.apple.finalcutstudio.media.uuid")
                         Fill(Stream_General, 0, "Media/UUID", Value);
                     else if (Parameter=="com.apple.finalcutstudio.media.history.uuid")
                         Fill(Stream_General, 0, "Media/History/UUID", Value);
                     else if (Parameter=="com.android.capture.fps")
                         FrameRate_Real=Value;
+                    else if (Parameter=="com.android.manufacturer")
+                        Fill(Stream_General, 0, General_Encoded_Hardware_CompanyName, Value);
+                    else if (Parameter=="com.android.model")
+                        Fill(Stream_General, 0, General_Encoded_Hardware_Name, Value);
                     else if (Parameter=="com.android.version")
-                        Fill(Stream_General, 0, "Android_Version", Value);
+                    {
+                        Fill(Stream_General, 0, General_Encoded_OperatingSystem_CompanyName, "Google");
+                        Fill(Stream_General, 0, General_Encoded_OperatingSystem_Name, "Android");
+                        Fill(Stream_General, 0, General_Encoded_OperatingSystem_Version, Value);
+                    }
                     else if (Parameter=="com.universaladid.idregistry")
                     {
                         Fill(Stream_General, 0, "UniversalAdID_Registry", Value);
@@ -4020,6 +4036,11 @@ void File_Mpeg4::moov_meta_ilst_xxxx_data()
                         if (i!=string::npos)
                             DisplayAspectRatio.From_Number(Ztring(DisplayAspectRatio.substr(0, i)).To_float64()/Ztring(DisplayAspectRatio.substr(i+1)).To_float64(), 3);
                     }
+                    else if (Parameter=="Encoded_With")
+                    {
+                        if (Value!=Retrieve_Const(Stream_General, 0, General_Encoded_Application_Name))
+                            Fill(Stream_General, 0, General_Encoded_Application_Name, Value);
+                    }
                     else if (!Parameter.empty())
                         Fill(Stream_General, 0, Parameter.c_str(), Value, true);
                 FILLING_END();
@@ -9850,7 +9871,8 @@ void File_Mpeg4::moov_udta_smta_mdln()
 
     //Filling
     FILLING_BEGIN();
-        Fill(Stream_General, 0, "Samsung_Model_Number", SamsungModelNumber);
+        Fill(Stream_General, 0, General_Encoded_Hardware_CompanyName, "Samsung");
+        Fill(Stream_General, 0, General_Encoded_Hardware_Model, SamsungModelNumber);
     FILLING_END();
 }
 
diff --git a/Source/MediaInfo/Multiple/File_Riff_Elements.cpp b/Source/MediaInfo/Multiple/File_Riff_Elements.cpp
@@ -957,11 +957,11 @@ void File_Riff::AVI__exif_xxxx()
     //Filling
     switch (Element_Code)
     {
-        case Elements::AVI__exif_ecor : Fill(Stream_General, 0, "Make", Value); break;
-        case Elements::AVI__exif_emdl : Fill(Stream_General, 0, "Model", Value); break;
+        case Elements::AVI__exif_ecor : Fill(Stream_General, 0, General_Encoded_Hardware_CompanyName, Value); break;
+        case Elements::AVI__exif_emdl : Fill(Stream_General, 0, General_Encoded_Hardware_Name, Value); break;
         case Elements::AVI__exif_emnt : Fill(Stream_General, 0, "MakerNotes", Value); break;
         case Elements::AVI__exif_erel : Fill(Stream_General, 0, "RelatedImageFile", Value); break;
-        case Elements::AVI__exif_etim : Fill(Stream_General, 0, "Written_Date", Value); break;
+        case Elements::AVI__exif_etim : Fill(Stream_General, 0, General_Encoded_Date, Value); break;
         case Elements::AVI__exif_eucm : Fill(Stream_General, 0, General_Comment, Value); break;
         case Elements::AVI__exif_ever : break; //Exif version
         default:                    Fill(Stream_General, 0, Ztring().From_CC4((int32u)Element_Code).To_Local().c_str(), Value);
diff --git a/Source/Resource/Text/Language/DefaultLanguage.csv b/Source/Resource/Text/Language/DefaultLanguage.csv
@@ -186,7 +186,6 @@ Alignment_Aligned;Aligned on interleaves
 Alignment_Split;Split across interleaves
 All;All
 AlternateGroup;Alternate group
-Android_Version;Android version
 Archival_Location;Archival location
 Arranger;Arranger
 ArtDirector;ArtDirector
@@ -383,8 +382,10 @@ ElementCount;Count of elements
 EMail;E-Mail
 Encoded_Application;Writing application
 Encoded_Date;Encoded date
+Encoded_Hardware;Writing hardware
 Encoded_Library;Writing library
 Encoded_Library_Settings;Encoding settings
+Encoded_OperatingSystem;Writing operating system
 Encoded_Original;Original support
 EncodedBy;Encoded by
 EPG_Positions;EPG positions (internal)
@@ -1140,7 +1141,6 @@ SamplePeakLevel_Album;Sample peak level (album)
 SamplesPerFrame;Samples per frame
 SamplingCount;Samples count
 SamplingRate;Sampling rate
-Samsung_Model_Number;Samsung model number
 Save;Save
 ScanOrder;Scan order
 ScanOrder_Original;Original scan order
diff --git a/Source/Resource/Text/Stream/General.csv b/Source/Resource/Text/Stream/General.csv
