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

Timestamp:

10/20/2023 01:27:56 PM (17 months 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.ogg.php (modified) (4 diffs)

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

@@ -211 +211 @@
 
             $info['ogg']['skeleton']['fishead']['version']          = $info['ogg']['skeleton']['fishead']['raw']['version_major'].'.'.$info['ogg']['skeleton']['fishead']['raw']['version_minor'];
-            $info['ogg']['skeleton']['fishead']['presentationtime'] = $info['ogg']['skeleton']['fishead']['raw']['presentationtime_numerator'] / $info['ogg']['skeleton']['fishead']['raw']['presentationtime_denominator'];
-            $info['ogg']['skeleton']['fishead']['basetime']         = $info['ogg']['skeleton']['fishead']['raw']['basetime_numerator']         / $info['ogg']['skeleton']['fishead']['raw']['basetime_denominator'];
+            $info['ogg']['skeleton']['fishead']['presentationtime'] = getid3_lib::SafeDiv($info['ogg']['skeleton']['fishead']['raw']['presentationtime_numerator'], $info['ogg']['skeleton']['fishead']['raw']['presentationtime_denominator']);
+            $info['ogg']['skeleton']['fishead']['basetime']         = getid3_lib::SafeDiv($info['ogg']['skeleton']['fishead']['raw']['basetime_numerator'],         $info['ogg']['skeleton']['fishead']['raw']['basetime_denominator']);
             $info['ogg']['skeleton']['fishead']['utc']              = $info['ogg']['skeleton']['fishead']['raw']['utc'];
 
@@ -289 +289 @@
                 $info['audio']['channels']        = $info['flac']['STREAMINFO']['channels'];
                 $info['audio']['bits_per_sample'] = $info['flac']['STREAMINFO']['bits_per_sample'];
-                $info['playtime_seconds']         = $info['flac']['STREAMINFO']['samples_stream'] / $info['flac']['STREAMINFO']['sample_rate'];
+                $info['playtime_seconds']         = getid3_lib::SafeDiv($info['flac']['STREAMINFO']['samples_stream'], $info['flac']['STREAMINFO']['sample_rate']);
             }
 
@@ -360 +360 @@
                 }
                 if (!empty($info['audio']['sample_rate'])) {
-                    $info['ogg']['bitrate_average'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / ($info['ogg']['samples'] / $info['audio']['sample_rate']);
+                    $info['ogg']['bitrate_average'] = (($info['avdataend'] - $info['avdataoffset']) * 8) * $info['audio']['sample_rate'] / $info['ogg']['samples'];
                 }
             }
@@ -535 +535 @@
         $filedata = $this->fread($this->getid3->fread_buffer_size());
         $filedataoffset = 0;
-        while ((substr($filedata, $filedataoffset++, 4) != 'OggS')) {
+        while (substr($filedata, $filedataoffset++, 4) != 'OggS') {
             if (($this->ftell() - $oggheader['page_start_offset']) >= $this->getid3->fread_buffer_size()) {
                 // should be found before here
                 return false;
             }
-            if ((($filedataoffset + 28) > strlen($filedata)) || (strlen($filedata) < 28)) {
+            if (($filedataoffset + 28) > strlen($filedata)) {
                 if ($this->feof() || (($filedata .= $this->fread($this->getid3->fread_buffer_size())) === '')) {
                     // get some more data, unless eof, in which case fail