Changeset 61289 for branches/6.9/src/wp-includes/ID3/getid3.php

Timestamp:

11/24/2025 06:36:59 PM (3 months ago)

Author:

SergeyBiryukov

Message:

External Libraries: Update getID3 to version 1.9.24.

In [60812], two changes related to PHP 8.5 compatibility were cherry picked from the upstream repository to be included in time for WordPress 6.9. Since then, a proper release has been tagged which includes several bug fixes in addition to the previous two changes.

HEIF support has also been added to the Quicktime audio/video module.

A full list of changes can be found on GitHub: ​https://github.com/JamesHeinrich/getID3/releases/tag/v1.9.24

Reviewed by desrosj, SergeyBiryukov.
Merges [61253] to the 6.9 branch.

Props TobiasBg.
Fixes #64253.

Location:

branches/6.9

Files:

• . (modified) (1 prop)
• src/wp-includes/ID3/getid3.php (modified) (8 diffs)

branches/6.9/src/wp-includes/ID3/getid3.php

@@ -388 +388 @@
     protected $startup_warning = '';
 
-    const VERSION           = '1.9.23-202310190849';
+    const VERSION           = '1.9.24-202509040923';
     const FREAD_BUFFER_SIZE = 32768;
 
@@ -410 +410 @@
         if (preg_match('#([0-9]+) ?M#i', $memoryLimit, $matches)) {
             // could be stored as "16M" rather than 16777216 for example
-            $memoryLimit = $matches[1] * 1048576;
+            $memoryLimit = (int) $matches[1] * 1048576;
         } elseif (preg_match('#([0-9]+) ?G#i', $memoryLimit, $matches)) { // The 'G' modifier is available since PHP 5.1.0
             // could be stored as "2G" rather than 2147483648 for example
-            $memoryLimit = $matches[1] * 1073741824;
+            $memoryLimit = (int) $matches[1] * 1073741824;
         }
         $this->memory_limit = $memoryLimit;
@@ -447 +447 @@
             // Check for magic_quotes_gpc
             if (function_exists('get_magic_quotes_gpc')) {
-                if (get_magic_quotes_gpc()) { // @phpstan-ignore-line
+                if (get_magic_quotes_gpc()) {
                     $this->startup_error .= 'magic_quotes_gpc must be disabled before running getID3(). Surround getid3 block by set_magic_quotes_gpc(0) and set_magic_quotes_gpc(1).'."\n";
                 }
@@ -530 +530 @@
      */
     public function setOption($optArray) {
-        if (!is_array($optArray) || empty($optArray)) {
+        if (empty($optArray)) {
             return false;
         }
@@ -681 +681 @@
                         throw $e;
                     }
+                } else {
+                    $this->warning('skipping check for '.$tag_name.' tags since option_tag_'.$tag_name.'=FALSE');
                 }
             }
@@ -1477 +1479 @@
 
                 // Misc other formats
+
+                // GPX - data         - GPS Exchange Format
+                'gpx' => array (
+                            'pattern'   => '^<\\?xml [^>]+>[\s]*<gpx ',
+                            'group'     => 'misc',
+                            'module'    => 'gpx',
+                            'mime_type' => 'application/gpx+xml',
+                            'fail_id3'  => 'ERROR',
+                            'fail_ape'  => 'ERROR',
+                        ),
 
                 // PAR2 - data        - Parity Volume Set Specification 2.0
@@ -1891 +1903 @@
         // Calculate combined bitrate - audio + video
         $CombinedBitrate  = 0;
-        $CombinedBitrate += (isset($this->info['audio']['bitrate']) ? $this->info['audio']['bitrate'] : 0);
-        $CombinedBitrate += (isset($this->info['video']['bitrate']) ? $this->info['video']['bitrate'] : 0);
+        $CombinedBitrate += (isset($this->info['audio']['bitrate']) && ($this->info['audio']['bitrate'] != 'free') ? $this->info['audio']['bitrate'] : 0);
+        $CombinedBitrate += (isset($this->info['video']['bitrate'])                                                ? $this->info['video']['bitrate'] : 0);
         if (($CombinedBitrate > 0) && empty($this->info['bitrate'])) {
             $this->info['bitrate'] = $CombinedBitrate;
@@ -1999 +2011 @@
             return false;
         }
-        $this->info['audio']['compression_ratio'] = $this->info['audio']['bitrate'] / ($this->info['audio']['channels'] * $this->info['audio']['sample_rate'] * (!empty($this->info['audio']['bits_per_sample']) ? $this->info['audio']['bits_per_sample'] : 16));
+        if ($this->info['audio']['bitrate'] != 'free') {
+            $this->info['audio']['compression_ratio'] = $this->info['audio']['bitrate'] / ($this->info['audio']['channels'] * $this->info['audio']['sample_rate'] * (!empty($this->info['audio']['bits_per_sample']) ? $this->info['audio']['bits_per_sample'] : 16));
+        }
 
         if (!empty($this->info['audio']['streams'])) {