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

Timestamp:

10/04/2022 02:06:29 AM (3 years ago)

Author:

desrosj

Message:

External Libraries: Update getID3 to version 1.9.22.

This updates the getID3 library from version 1.9.21 to 1.9.22, which contains a number of bug fixes and improvements to PHP 8.1 support.

A full list of changes can be found on GitHub: ​https://github.com/JamesHeinrich/getID3/compare/v1.9.21...v1.9.22.

Props jrf, desrosj.
Fixes #56692.

File:

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

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

@@ -316 +316 @@
         }
 
+        if (isset($thisfile_mpeg_audio['bitrate']) && $thisfile_mpeg_audio['bitrate'] === 'free') {
+            $encoder_options .= ' --freeformat';
+        }
+
         if (!empty($thisfile_mpeg_audio_lame['encoding_flags']['nogap_prev']) || !empty($thisfile_mpeg_audio_lame['encoding_flags']['nogap_next'])) {
             $encoder_options .= ' --nogap';
@@ -751 +755 @@
 
                             // It the LAME tag was only introduced in LAME v3.90
-                            // http://www.hydrogenaudio.org/?act=ST&f=15&t=9933
+                            // https://wiki.hydrogenaud.io/index.php/LAME#VBR_header_and_LAME_tag
+                            // https://hydrogenaud.io/index.php?topic=9933
 
                             // Offsets of various bytes in http://gabriel.mp3-tech.org/mp3infotag.html
@@ -787 +792 @@
 
                             // bytes $A7-$AE  Replay Gain
-                            // http://privatewww.essex.ac.uk/~djmrob/replaygain/rg_data_format.html
+                            // https://web.archive.org/web/20021015212753/http://privatewww.essex.ac.uk/~djmrob/replaygain/rg_data_format.html
                             // bytes $A7-$AA : 32 bit floating point "Peak signal amplitude"
                             if ($thisfile_mpeg_audio_lame['short_version'] >= 'LAME3.94b') {
@@ -915 +920 @@
 
                             // LAME CBR
-                            if ($thisfile_mpeg_audio_lame_raw['vbr_method'] == 1) {
+                            if ($thisfile_mpeg_audio_lame_raw['vbr_method'] == 1 && $thisfile_mpeg_audio['bitrate'] !== 'free') {
 
                                 $thisfile_mpeg_audio['bitrate_mode'] = 'cbr';
@@ -1170 +1175 @@
             $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) {