Changeset 56975 for trunk/src/wp-includes/ID3/module.audio-video.riff.php

Timestamp:

10/20/2023 01:27:56 PM (3 years ago)

Author:

SergeyBiryukov

Message:

External Libraries: Update getID3 to version 1.9.23.

The latest version includes numerous bug fixes, a few new features, as well as various improvements for PHP 8.1 and PHP 8.2 support.

This commit also includes PHPCS adjustments previously made for a passing PHP Compatibility scan.

References:

• ​getID3 1.9.23 release notes
• ​Full list of changes in getID3 1.9.23

Follow-up to [47601], [48278], [52254], [54376].

Props jrf.
Fixes #59683.

File:

• trunk/src/wp-includes/ID3/module.audio-video.riff.php (modified) (9 diffs)

trunk/src/wp-includes/ID3/module.audio-video.riff.php

@@ -215 +215 @@
 
                                         if (empty($info['playtime_seconds'])) { // may already be set (e.g. DTS-WAV)
-                                                $info['playtime_seconds'] = (float) ((($info['avdataend'] - $info['avdataoffset']) * 8) / $thisfile_audio['bitrate']);
+                                                $info['playtime_seconds'] =  (float)getid3_lib::SafeDiv(($info['avdataend'] - $info['avdataoffset']) * 8, $thisfile_audio['bitrate']);
                                         }
 
@@ -441 +441 @@
                                                 if (isset($parsedXML['SPEED']['MASTER_SPEED'])) {
                                                         @list($numerator, $denominator) = explode('/', $parsedXML['SPEED']['MASTER_SPEED']);
-                                                        $thisfile_riff_WAVE['iXML'][0]['master_speed'] = $numerator / ($denominator ? $denominator : 1000);
+                                                        $thisfile_riff_WAVE['iXML'][0]['master_speed'] = (int) $numerator / ($denominator ? $denominator : 1000);
                                                 }
                                                 if (isset($parsedXML['SPEED']['TIMECODE_RATE'])) {
                                                         @list($numerator, $denominator) = explode('/', $parsedXML['SPEED']['TIMECODE_RATE']);
-                                                        $thisfile_riff_WAVE['iXML'][0]['timecode_rate'] = $numerator / ($denominator ? $denominator : 1000);
+                                                        $thisfile_riff_WAVE['iXML'][0]['timecode_rate'] = (int) $numerator / ($denominator ? $denominator : 1000);
                                                 }
                                                 if (isset($parsedXML['SPEED']['TIMESTAMP_SAMPLES_SINCE_MIDNIGHT_LO']) && !empty($parsedXML['SPEED']['TIMESTAMP_SAMPLE_RATE']) && !empty($thisfile_riff_WAVE['iXML'][0]['timecode_rate'])) {
@@ -522 +522 @@
                                 if (!isset($thisfile_audio['bitrate']) && isset($thisfile_riff_audio[$streamindex]['bitrate'])) {
                                         $thisfile_audio['bitrate'] = $thisfile_riff_audio[$streamindex]['bitrate'];
-                                        $info['playtime_seconds'] = (float) ((($info['avdataend'] - $info['avdataoffset']) * 8) / $thisfile_audio['bitrate']);
+                                        $info['playtime_seconds'] = (float)getid3_lib::SafeDiv((($info['avdataend'] - $info['avdataoffset']) * 8), $thisfile_audio['bitrate']);
                                 }
 
@@ -532 +532 @@
                                         // Reset to the way it was - RIFF parsing will have messed this up
                                         $info['avdataend']        = $Original['avdataend'];
-                                        $thisfile_audio['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
+                                        $thisfile_audio['bitrate'] = getid3_lib::SafeDiv(($info['avdataend'] - $info['avdataoffset']) * 8, $info['playtime_seconds']);
 
                                         $this->fseek($info['avdataoffset'] - 44);
@@ -633 +633 @@
                                 }
                                 if ($info['avdataend'] > $info['filesize']) {
-                                        switch (!empty($thisfile_audio_dataformat) ? $thisfile_audio_dataformat : '') {
+                                        switch ($thisfile_audio_dataformat) {
                                                 case 'wavpack': // WavPack
                                                 case 'lpac':    // LPAC
@@ -673 +673 @@
                                         }
                                 }
-                                if (isset($thisfile_audio_dataformat) && ($thisfile_audio_dataformat == 'ac3')) {
+                                if ($thisfile_audio_dataformat == 'ac3') {
                                         unset($thisfile_audio['bits_per_sample']);
                                         if (!empty($info['ac3']['bitrate']) && ($info['ac3']['bitrate'] != $thisfile_audio['bitrate'])) {
@@ -782 +782 @@
                                         $thisfile_riff_video_current = &$thisfile_riff_video[$streamindex];
 
-                                        if ($thisfile_riff_raw_avih['dwWidth'] > 0) {
+                                        if ($thisfile_riff_raw_avih['dwWidth'] > 0) { // @phpstan-ignore-line
                                                 $thisfile_riff_video_current['frame_width'] = $thisfile_riff_raw_avih['dwWidth'];
                                                 $thisfile_video['resolution_x']             = $thisfile_riff_video_current['frame_width'];
                                         }
-                                        if ($thisfile_riff_raw_avih['dwHeight'] > 0) {
+                                        if ($thisfile_riff_raw_avih['dwHeight'] > 0) { // @phpstan-ignore-line
                                                 $thisfile_riff_video_current['frame_height'] = $thisfile_riff_raw_avih['dwHeight'];
                                                 $thisfile_video['resolution_y']              = $thisfile_riff_video_current['frame_height'];
                                         }
-                                        if ($thisfile_riff_raw_avih['dwTotalFrames'] > 0) {
+                                        if ($thisfile_riff_raw_avih['dwTotalFrames'] > 0) { // @phpstan-ignore-line
                                                 $thisfile_riff_video_current['total_frames'] = $thisfile_riff_raw_avih['dwTotalFrames'];
                                                 $thisfile_video['total_frames']              = $thisfile_riff_video_current['total_frames'];
@@ -1914 +1914 @@
                                                                                 unset($RIFFchunk[$chunkname][$thisindex]);
                                                                         }
-                                                                        if (isset($RIFFchunk[$chunkname]) && empty($RIFFchunk[$chunkname])) {
+                                                                        if (count($RIFFchunk[$chunkname]) === 0) {
                                                                                 unset($RIFFchunk[$chunkname]);
                                                                         }
@@ -2035 +2035 @@
                         if (isset($RIFFinfoArray[$key])) {
                                 foreach ($RIFFinfoArray[$key] as $commentid => $commentdata) {
-                                        if (trim($commentdata['data']) != '') {
+                                        if (!empty($commentdata['data']) && trim($commentdata['data']) != '') {
                                                 if (isset($CommentsTargetArray[$value])) {
                                                         $CommentsTargetArray[$value][] =     trim($commentdata['data']);