Changeset 61253 for trunk/src/wp-includes/ID3/module.audio.mp3.php

Timestamp:

11/17/2025 10:20:32 PM (10 months ago)

Author:

desrosj

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

Props TobiasBg.
Fixes #64253.

File:

• trunk/src/wp-includes/ID3/module.audio.mp3.php (modified) (7 diffs)

trunk/src/wp-includes/ID3/module.audio.mp3.php

@@ -306 +306 @@
 
                         if ($info['audio']['bitrate_mode'] == 'cbr') {
-                                $encoder_options = strtoupper($info['audio']['bitrate_mode']).round($info['audio']['bitrate'] / 1000);
+                                if ($info['audio']['bitrate'] == 'free') {
+                                        $encoder_options = strtoupper($info['audio']['bitrate_mode']);
+                                } else {
+                                        $encoder_options = strtoupper($info['audio']['bitrate_mode']).round($info['audio']['bitrate'] / 1000);
+                                }
                         } else {
                                 $encoder_options = strtoupper($info['audio']['bitrate_mode']);
@@ -316 +320 @@
                 }
 
-                if (isset($thisfile_mpeg_audio['bitrate']) && $thisfile_mpeg_audio['bitrate'] === 'free') {
+                if (isset($thisfile_mpeg_audio['bitrate']) && ($thisfile_mpeg_audio['bitrate'] === 'free')) {
                         $encoder_options .= ' --freeformat';
                 }
@@ -713 +717 @@
                                                 $info['audio']['bitrate'] = $framelengthfloat * $thisfile_mpeg_audio['sample_rate'] * (2 / $info['audio']['channels']) / 144;
                                         }
-                                        $thisfile_mpeg_audio['framelength'] = floor($framelengthfloat);
+                                        $thisfile_mpeg_audio['framelength'] = (int) floor($framelengthfloat);
                                 }
 
@@ -920 +924 @@
 
                                                         // LAME CBR
-                                                        if ($thisfile_mpeg_audio_lame_raw['vbr_method'] == 1 && $thisfile_mpeg_audio['bitrate'] !== 'free') {
+                                                        if (($thisfile_mpeg_audio_lame_raw['vbr_method'] == 1) && ($thisfile_mpeg_audio['bitrate'] !== 'free')) {
 
                                                                 $thisfile_mpeg_audio['bitrate_mode'] = 'cbr';
@@ -1175 +1179 @@
                         $nextframetestarray = array('error' => array(), 'warning' => array(), 'avdataend' => $info['avdataend'], 'avdataoffset'=>$info['avdataoffset']);
                         if ($this->decodeMPEGaudioHeader($nextframetestoffset, $nextframetestarray, false)) {
-                                /** @phpstan-ignore-next-line */
                                 getid3_lib::safe_inc($info['mp3_validity_check_bitrates'][$nextframetestarray['mpeg']['audio']['bitrate']]);
                                 if ($ScanAsCBR) {
@@ -1187 +1190 @@
                                 // next frame is OK, get ready to check the one after that
                                 if (isset($nextframetestarray['mpeg']['audio']['framelength']) && ($nextframetestarray['mpeg']['audio']['framelength'] > 0)) {
-                                        $nextframetestoffset += $nextframetestarray['mpeg']['audio']['framelength'];
+                                        $nextframetestoffset += (int) $nextframetestarray['mpeg']['audio']['framelength'];
                                 } else {
                                         $this->error('Frame at offset ('.$offset.') is has an invalid frame length.');
@@ -1762 +1765 @@
                 if (empty($MPEGaudioBitrate)) {
                         $MPEGaudioBitrate = array (
-                                '1'  =>  array (1 => array('free', 32000, 64000, 96000, 128000, 160000, 192000, 224000, 256000, 288000, 320000, 352000, 384000, 416000, 448000),
-                                                                2 => array('free', 32000, 48000, 56000,  64000,  80000,  96000, 112000, 128000, 160000, 192000, 224000, 256000, 320000, 384000),
-                                                                3 => array('free', 32000, 40000, 48000,  56000,  64000,  80000,  96000, 112000, 128000, 160000, 192000, 224000, 256000, 320000)
-                                                           ),
-
-                                '2'  =>  array (1 => array('free', 32000, 48000, 56000,  64000,  80000,  96000, 112000, 128000, 144000, 160000, 176000, 192000, 224000, 256000),
-                                                                2 => array('free',  8000, 16000, 24000,  32000,  40000,  48000,  56000,  64000,  80000,  96000, 112000, 128000, 144000, 160000),
-                                                           )
+                                '1' => array(
+                                        1 => array('free', 32000, 64000, 96000, 128000, 160000, 192000, 224000, 256000, 288000, 320000, 352000, 384000, 416000, 448000),
+                                        2 => array('free', 32000, 48000, 56000,  64000,  80000,  96000, 112000, 128000, 160000, 192000, 224000, 256000, 320000, 384000),
+                                        3 => array('free', 32000, 40000, 48000,  56000,  64000,  80000,  96000, 112000, 128000, 160000, 192000, 224000, 256000, 320000)
+                                ),
+                                '2' => array(
+                                        1 => array('free', 32000, 48000, 56000,  64000,  80000,  96000, 112000, 128000, 144000, 160000, 176000, 192000, 224000, 256000),
+                                        2 => array('free',  8000, 16000, 24000,  32000,  40000,  48000,  56000,  64000,  80000,  96000, 112000, 128000, 144000, 160000),
+                                ),
                         );
                         $MPEGaudioBitrate['2'][3] = $MPEGaudioBitrate['2'][2];