Changeset 32979 for trunk/src/wp-includes/ID3/module.audio-video.quicktime.php

Timestamp:

06/28/2015 12:16:17 AM (9 years ago)

Author:

wonderboymusic

Message:

Update getID3 to 1.9.9

Changelog:

• ​https://github.com/JamesHeinrich/getID3/blob/master/changelog.txt
• ​https://github.com/JamesHeinrich/getID3/compare/v1.9.8...v1.9.9

Fixes #32806.

File:

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

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

@@ -36 +36 @@
         $offset      = 0;
         $atomcounter = 0;
-
+        $atom_data_read_buffer_size = ($info['php_memory_limit'] ? round($info['php_memory_limit'] / 2) : $this->getid3->option_fread_buffer_size * 1024); // allow [default: 32MB] if PHP configured with no memory_limit
         while ($offset < $info['avdataend']) {
             if (!getid3_lib::intValueSupported($offset)) {
@@ -69 +69 @@
             }
             $atomHierarchy = array();
-            $info['quicktime'][$atomname] = $this->QuicktimeParseAtom($atomname, $atomsize, $this->fread(min($atomsize, round($this->getid3->memory_limit / 2))), $offset, $atomHierarchy, $this->ParseAllPossibleAtoms);
+            $info['quicktime'][$atomname] = $this->QuicktimeParseAtom($atomname, $atomsize, $this->fread(min($atomsize, $atom_data_read_buffer_size)), $offset, $atomHierarchy, $this->ParseAllPossibleAtoms);
 
             $offset += $atomsize;
@@ -800 +800 @@
                 $frames_count = 0;
 
-                $max_stts_entries_to_scan = min(floor($this->getid3->memory_limit / 10000), $atom_structure['number_entries']);
+                $max_stts_entries_to_scan = ($info['php_memory_limit'] ? min(floor($this->getid3->memory_limit / 10000), $atom_structure['number_entries']) : $atom_structure['number_entries']);
                 if ($max_stts_entries_to_scan < $atom_structure['number_entries']) {
-                    $info['warning'][] = 'QuickTime atom "stts" has '.$atom_structure['number_entries'].' but only scanning the first '.$max_stts_entries_to_scan.' entries due to limited PHP memory available ('.floor($this->getid3->memory_limit / 1048576).'MB).';
+                    $info['warning'][] = 'QuickTime atom "stts" has '.$atom_structure['number_entries'].' but only scanning the first '.$max_stts_entries_to_scan.' entries due to limited PHP memory available ('.floor($atom_structure['number_entries'] / 1048576).'MB).';
                 }
                 for ($i = 0; $i < $max_stts_entries_to_scan; $i++) {
@@ -1400 +1400 @@
             case 'meta': // METAdata atom
                 // some kind of metacontainer, may contain a big data dump such as:
-                // mdta keys  mdtacom.apple.quicktime.make (mdtacom.apple.quicktime.creationdate ,mdtacom.apple.quicktime.location.ISO6709 $mdtacom.apple.quicktime.software !mdtacom.apple.quicktime.model ilst 
-  data DEApple 0  (data DE2011-05-11T17:54:04+0200 2  *data DE+52.4936+013.3897+040.247/ 
-  data DE4.3.1  data DEiPhone 4
+                // mdta keys \005 mdtacom.apple.quicktime.make (mdtacom.apple.quicktime.creationdate ,mdtacom.apple.quicktime.location.ISO6709 $mdtacom.apple.quicktime.software !mdtacom.apple.quicktime.model ilst \01D \001 \015data \001DE\010Apple 0 \002 (data \001DE\0102011-05-11T17:54:04+0200 2 \003 *data \001DE\010+52.4936+013.3897+040.247/ \01D \004 \015data \001DE\0104.3.1 \005 \018data \001DE\010iPhone 4
                 // http://www.geocities.com/xhelmboyx/quicktime/formats/qti-layout.txt