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

Timestamp:

09/11/2014 07:06:33 PM (10 years ago)

Author:

wonderboymusic

Message:

Update getID3 library to 1.9.8.

Changes:
​https://github.com/JamesHeinrich/getID3/compare/1.9.7...v1.9.8

Fixes #29627.

File:

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

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

@@ -4 +4 @@
 //  available at http://getid3.sourceforge.net                 //
 //            or http://www.getid3.org                         //
+//          also https://github.com/JamesHeinrich/getID3       //
 /////////////////////////////////////////////////////////////////
 // See readme.txt for more details                             //
@@ -282 +283 @@
                         switch ($trackarray['CodecID']) {
                             case 'V_MS/VFW/FOURCC':
-                                if (!getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, false)) {
-                                    $this->warning('Unable to parse codec private data ['.basename(__FILE__).':'.__LINE__.'] because cannot include "module.audio-video.riff.php"');
-                                    break;
-                                }
+                                getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, true);
+
                                 $parsed = getid3_riff::ParseBITMAPINFOHEADER($trackarray['CodecPrivate']);
                                 $track_info['codec'] = getid3_riff::fourccLookup($parsed['fourcc']);
@@ -336 +335 @@
                             case 'A_MPEG/L2':
                             case 'A_FLAC':
-                                if (!getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.'.($track_info['dataformat'] == 'mp2' ? 'mp3' : $track_info['dataformat']).'.php', __FILE__, false)) {
-                                    $this->warning('Unable to parse audio data ['.basename(__FILE__).':'.__LINE__.'] because cannot include "module.audio.'.$track_info['dataformat'].'.php"');
-                                    break;
-                                }
+                                getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.'.($track_info['dataformat'] == 'mp2' ? 'mp3' : $track_info['dataformat']).'.php', __FILE__, true);
 
                                 if (!isset($info['matroska']['track_data_offsets'][$trackarray['TrackNumber']])) {
@@ -386 +382 @@
                                 if (!empty($getid3_temp->info['warning'])) {
                                     foreach ($getid3_temp->info['warning'] as $newerror) {
-                                        if ($track_info['dataformat'] == 'mp3' && preg_match('/^Probable truncated file: expecting \d+ bytes of audio data, only found \d+ \(short by \d+ bytes\)$/', $newerror)) {
-                                            // LAME/Xing header is probably set, but audio data is chunked into Matroska file and near-impossible to verify if audio stream is complete, so ignore useless warning
-                                            continue;
-                                        }
                                         $this->warning($class.'() says: ['.$newerror.']');
                                     }
@@ -401 +393 @@
                             case 'A_AAC/MPEG4/LC':
                             case 'A_AAC/MPEG4/LC/SBR':
-                                $this->warning($trackarray['CodecID'].' audio data contains no header, audio/video bitrates can\'t be calculated');
+                                $this->warning($trackarray['CodecID'].' audio data contains no header, audio/video bitrates can\'t be calculated');
                                 break;
 
@@ -416 +408 @@
                                 $vorbis_offset -= 1;
 
-                                if (!getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.ogg.php', __FILE__, false)) {
-                                    $this->warning('Unable to parse audio data ['.basename(__FILE__).':'.__LINE__.'] because cannot include "module.audio.ogg.php"');
-                                    break;
-                                }
+                                getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.ogg.php', __FILE__, true);
 
                                 // create temp instance
@@ -456 +445 @@
 
                             case 'A_MS/ACM':
-                                if (!getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, false)) {
-                                    $this->warning('Unable to parse audio data ['.basename(__FILE__).':'.__LINE__.'] because cannot include "module.audio-video.riff.php"');
-                                    break;
-                                }
+                                getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, true);
 
                                 $parsed = getid3_riff::parseWAVEFORMATex($trackarray['CodecPrivate']);
@@ -516 +502 @@
 
                 case EBML_ID_EBML:
-                    $info['fileformat'] = 'matroska';
                     $info['matroska']['header']['offset'] = $top_element['offset'];
                     $info['matroska']['header']['length'] = $top_element['length'];
@@ -535 +520 @@
                                 $element_data['data'] = getid3_lib::trimNullByte($element_data['data']);
                                 $info['matroska']['doctype'] = $element_data['data'];
+                                $info['fileformat'] = $element_data['data'];
                                 break;
 
@@ -1527 +1513 @@
             $CodecIDlist['V_MPEG4/ISO/SP']   = 'mpeg4';
             $CodecIDlist['V_VP8']            = 'vp8';
-            $CodecIDlist['V_MS/VFW/FOURCC']  = 'riff';
-            $CodecIDlist['A_MS/ACM']         = 'riff';
+            $CodecIDlist['V_MS/VFW/FOURCC']  = 'vcm'; // Microsoft (TM) Video Codec Manager (VCM)
+            $CodecIDlist['A_MS/ACM']         = 'acm'; // Microsoft (TM) Audio Codec Manager (ACM)
         }
         return (isset($CodecIDlist[$codecid]) ? $CodecIDlist[$codecid] : $codecid);