Changeset 48278 for trunk/src/wp-includes/ID3/module.audio-video.matroska.php

Timestamp:

07/02/2020 03:46:17 PM (6 years ago)

Author:

desrosj

Message:

External Libraries: Update getID3 to version 1.9.20.

A full list of changes in this update can be found on GitHub: ​https://github.com/JamesHeinrich/getID3/compare/v1.9.19...v1.9.20.

Props hareesh-pillai, desrosj.
Previously [47601-47604].
Fixes #49945.

File:

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

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

@@ -15 +15 @@
 /////////////////////////////////////////////////////////////////
 
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+    exit;
+}
 
 define('EBML_ID_CHAPTERS',                  0x0043A770); // [10][43][A7][70] -- A system to define basic menus and partition data. For more detailed information, look at the Chapters Explanation.
@@ -330 +333 @@
                         }
 
-                        $info['video']['streams'][] = $track_info;
+                        $info['video']['streams'][$trackarray['TrackUID']] = $track_info;
                         break;
 
@@ -363 +366 @@
                                 $getid3_temp = new getID3();
                                 if ($track_info['dataformat'] != 'flac') {
-                                    $getid3_temp->openfile($this->getid3->filename);
+                                    $getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
                                 }
                                 $getid3_temp->info['avdataoffset'] = $info['matroska']['track_data_offsets'][$trackarray['TrackNumber']]['offset'];
@@ -479 +482 @@
                         }
 
-                        $info['audio']['streams'][] = $track_info;
+                        $info['audio']['streams'][$trackarray['TrackUID']] = $track_info;
                         break;
                 }
@@ -508 +511 @@
         } elseif (isset($info['mime_type'])) {
             unset($info['mime_type']);
+        }
+
+        // use _STATISTICS_TAGS if available to set audio/video bitrates
+        if (!empty($info['matroska']['tags'])) {
+            $_STATISTICS_byTrackUID = array();
+            foreach ($info['matroska']['tags'] as $key1 => $value1) {
+                if (!empty($value1['Targets']['TagTrackUID'][0]) && !empty($value1['SimpleTag'])) {
+                    foreach ($value1['SimpleTag'] as $key2 => $value2) {
+                        if (!empty($value2['TagName']) && isset($value2['TagString'])) {
+                            $_STATISTICS_byTrackUID[$value1['Targets']['TagTrackUID'][0]][$value2['TagName']] = $value2['TagString'];
+                        }
+                    }
+                }
+            }
+            foreach (array('audio','video') as $avtype) {
+                if (!empty($info[$avtype]['streams'])) {
+                    foreach ($info[$avtype]['streams'] as $trackUID => $trackdata) {
+                        if (!isset($trackdata['bitrate']) && !empty($_STATISTICS_byTrackUID[$trackUID]['BPS'])) {
+                            $info[$avtype]['streams'][$trackUID]['bitrate'] = (int) $_STATISTICS_byTrackUID[$trackUID]['BPS'];
+                            @$info[$avtype]['bitrate'] += $info[$avtype]['streams'][$trackUID]['bitrate'];
+                        }
+                    }
+                }
+            }
         }
 
@@ -615 +642 @@
                                                 switch ($subelement['id']) {
 
+                                                    case EBML_ID_TRACKUID:
+                                                        $track_entry[$subelement['id_name']] = getid3_lib::PrintHexBytes($subelement['data'], true, false);
+                                                        break;
                                                     case EBML_ID_TRACKNUMBER:
-                                                    case EBML_ID_TRACKUID:
                                                     case EBML_ID_TRACKTYPE:
                                                     case EBML_ID_MINCACHE:
@@ -964 +993 @@
                                                                 case EBML_ID_TAGCHAPTERUID:
                                                                 case EBML_ID_TAGATTACHMENTUID:
-                                                                    $targets_entry[$sub_sub_subelement['id_name']][] = getid3_lib::BigEndian2Int($sub_sub_subelement['data']);
+                                                                    $targets_entry[$sub_sub_subelement['id_name']][] = getid3_lib::PrintHexBytes($sub_sub_subelement['data'], true, false);
                                                                     break;