[pLog-svn] r7236 - plog/branches/lifetype-1.2/class/gallery/getid3
jondaley at devel.lifetype.net
jondaley at devel.lifetype.net
Wed Jul 15 03:52:53 EDT 2020
Author: jondaley
Date: 2020-07-15 03:52:53 -0400 (Wed, 15 Jul 2020)
New Revision: 7236
Modified:
plog/branches/lifetype-1.2/class/gallery/getid3/extension.cache.dbm.php
plog/branches/lifetype-1.2/class/gallery/getid3/extension.cache.mysql.php
plog/branches/lifetype-1.2/class/gallery/getid3/getid3.lib.php
plog/branches/lifetype-1.2/class/gallery/getid3/getid3.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.archive.gzip.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.archive.rar.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.archive.szip.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.archive.tar.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.archive.zip.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.asf.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.bink.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.flv.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.matroska.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.mpeg.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.nsv.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.quicktime.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.real.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.riff.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.swf.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.aac.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.ac3.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.au.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.avr.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.bonk.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.flac.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.la.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.lpac.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.midi.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.mod.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.monkey.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.mp3.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.mpc.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.ogg.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.optimfrog.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.rkau.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.shorten.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.tta.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.voc.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.vqf.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.wavpack.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.bmp.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.gif.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.jpg.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.pcd.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.png.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.svg.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.tiff.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.misc.exe.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.misc.iso.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.tag.apetag.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.tag.id3v1.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.tag.id3v2.php
plog/branches/lifetype-1.2/class/gallery/getid3/module.tag.lyrics3.php
plog/branches/lifetype-1.2/class/gallery/getid3/write.apetag.php
plog/branches/lifetype-1.2/class/gallery/getid3/write.id3v1.php
plog/branches/lifetype-1.2/class/gallery/getid3/write.id3v2.php
plog/branches/lifetype-1.2/class/gallery/getid3/write.lyrics3.php
plog/branches/lifetype-1.2/class/gallery/getid3/write.metaflac.php
plog/branches/lifetype-1.2/class/gallery/getid3/write.php
plog/branches/lifetype-1.2/class/gallery/getid3/write.real.php
plog/branches/lifetype-1.2/class/gallery/getid3/write.vorbiscomment.php
Log:
downloaded version 1.9.20, without our local customizations
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/extension.cache.dbm.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/extension.cache.dbm.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/extension.cache.dbm.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,9 +1,10 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
-/////////////////////////////////////////////////////////////////
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
// //
// extension.cache.dbm.php - part of getID3() //
// Please see readme.txt for more information //
@@ -10,7 +11,7 @@
// ///
/////////////////////////////////////////////////////////////////
// //
-// This extension written by Allan Hansen <ahØartemis*dk> //
+// This extension written by Allan Hansen <ahØartemis*dk> //
// ///
/////////////////////////////////////////////////////////////////
@@ -71,41 +72,58 @@
class getID3_cached_dbm extends getID3
{
+ /**
+ * @var resource
+ */
+ private $dba;
- // public: constructor - see top of this file for cache type and cache_options
- function getID3_cached_dbm($cache_type, $dbm_filename, $lock_filename) {
+ /**
+ * @var resource|bool
+ */
+ private $lock;
+ /**
+ * @var string
+ */
+ private $cache_type;
+
+ /**
+ * @var string
+ */
+ private $dbm_filename;
+
+ /**
+ * constructor - see top of this file for cache type and cache_options
+ *
+ * @param string $cache_type
+ * @param string $dbm_filename
+ * @param string $lock_filename
+ *
+ * @throws Exception
+ * @throws getid3_exception
+ */
+ public function __construct($cache_type, $dbm_filename, $lock_filename) {
+
// Check for dba extension
if (!extension_loaded('dba')) {
- die('PHP is not compiled with dba support, required to use DBM style cache.');
+ throw new Exception('PHP is not compiled with dba support, required to use DBM style cache.');
}
// Check for specific dba driver
- if (function_exists('dba_handlers')) { // PHP 4.3.0+
- if (!in_array('db3', dba_handlers())) {
- die('PHP is not compiled --with '.$cache_type.' support, required to use DBM style cache.');
- }
+ if (!function_exists('dba_handlers') || !in_array($cache_type, dba_handlers())) {
+ throw new Exception('PHP is not compiled --with '.$cache_type.' support, required to use DBM style cache.');
}
- else { // PHP <= 4.2.3
- ob_start(); // nasty, buy the only way to check...
- phpinfo();
- $contents = ob_get_contents();
- ob_end_clean();
- if (!strstr($contents, $cache_type)) {
- die('PHP is not compiled --with '.$cache_type.' support, required to use DBM style cache.');
- }
- }
// Create lock file if needed
if (!file_exists($lock_filename)) {
if (!touch($lock_filename)) {
- die('failed to create lock file: ' . $lock_filename);
+ throw new Exception('failed to create lock file: '.$lock_filename);
}
}
// Open lock file for writing
if (!is_writeable($lock_filename)) {
- die('lock file: ' . $lock_filename . ' is not writable');
+ throw new Exception('lock file: '.$lock_filename.' is not writable');
}
$this->lock = fopen($lock_filename, 'w');
@@ -115,12 +133,12 @@
// Create dbm-file if needed
if (!file_exists($dbm_filename)) {
if (!touch($dbm_filename)) {
- die('failed to create dbm file: ' . $dbm_filename);
+ throw new Exception('failed to create dbm file: '.$dbm_filename);
}
}
// Try to open dbm file for writing
- $this->dba = @dba_open($dbm_filename, 'w', $cache_type);
+ $this->dba = dba_open($dbm_filename, 'w', $cache_type);
if (!$this->dba) {
// Failed - create new dbm file
@@ -127,11 +145,11 @@
$this->dba = dba_open($dbm_filename, 'n', $cache_type);
if (!$this->dba) {
- die('failed to create dbm file: ' . $dbm_filename);
+ throw new Exception('failed to create dbm file: '.$dbm_filename);
}
// Insert getID3 version number
- dba_insert(GETID3_VERSION, GETID3_VERSION, $this->dba);
+ dba_insert(getID3::VERSION, getID3::VERSION, $this->dba);
}
// Init misc values
@@ -142,32 +160,38 @@
register_shutdown_function(array($this, '__destruct'));
// Check version number and clear cache if changed
- if (dba_fetch(GETID3_VERSION, $this->dba) != GETID3_VERSION) {
+ if (dba_fetch(getID3::VERSION, $this->dba) != getID3::VERSION) {
$this->clear_cache();
}
- parent::getID3();
+ parent::__construct();
}
- // public: destuctor
- function __destruct() {
+ /**
+ * destructor
+ */
+ public function __destruct() {
// Close dbm file
- @dba_close($this->dba);
+ dba_close($this->dba);
// Release exclusive lock
- @flock($this->lock, LOCK_UN);
+ flock($this->lock, LOCK_UN);
// Close lock file
- @fclose($this->lock);
+ fclose($this->lock);
}
- // public: clear cache
- function clear_cache() {
+ /**
+ * clear cache
+ *
+ * @throws Exception
+ */
+ public function clear_cache() {
// Close dbm file
dba_close($this->dba);
@@ -176,25 +200,34 @@
$this->dba = dba_open($this->dbm_filename, 'n', $this->cache_type);
if (!$this->dba) {
- die('failed to clear cache/recreate dbm file: ' . $this->dbm_filename);
+ throw new Exception('failed to clear cache/recreate dbm file: '.$this->dbm_filename);
}
// Insert getID3 version number
- dba_insert(GETID3_VERSION, GETID3_VERSION, $this->dba);
+ dba_insert(getID3::VERSION, getID3::VERSION, $this->dba);
- // Reregister shutdown function
+ // Re-register shutdown function
register_shutdown_function(array($this, '__destruct'));
}
- // public: analyze file
- function analyze($filename) {
+ /**
+ * clear cache
+ *
+ * @param string $filename
+ * @param int $filesize
+ * @param string $original_filename
+ * @param resource $fp
+ *
+ * @return mixed
+ */
+ public function analyze($filename, $filesize=null, $original_filename='', $fp=null) {
if (file_exists($filename)) {
// Calc key filename::mod_time::size - should be unique
- $key = $filename . '::' . filemtime($filename) . '::' . filesize($filename);
+ $key = $filename.'::'.filemtime($filename).'::'.filesize($filename);
// Loopup key
$result = dba_fetch($key, $this->dba);
@@ -206,10 +239,10 @@
}
// Miss
- $result = parent::analyze($filename);
+ $result = parent::analyze($filename, $filesize, $original_filename, $fp);
// Save result
- if (file_exists($filename)) {
+ if (isset($key) && file_exists($filename)) {
dba_insert($key, serialize($result), $this->dba);
}
@@ -217,6 +250,3 @@
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/extension.cache.mysql.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/extension.cache.mysql.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/extension.cache.mysql.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,9 +1,10 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
-/////////////////////////////////////////////////////////////////
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
// //
// extension.cache.mysql.php - part of getID3() //
// Please see readme.txt for more information //
@@ -10,7 +11,8 @@
// ///
/////////////////////////////////////////////////////////////////
// //
-// This extension written by Allan Hansen <ahØartemis*dk> //
+// This extension written by Allan Hansen <ahØartemis*dk> //
+// Table name mod by Carlo Capocasa <calroØcarlocapocasa*com> //
// ///
/////////////////////////////////////////////////////////////////
@@ -33,8 +35,8 @@
*
* require_once 'getid3/getid3.php';
* require_once 'getid3/getid3/extension.cache.mysql.php';
-* $getID3 = new getID3_cached_mysql('localhost', 'database',
-* 'username', 'password');
+* // 5th parameter (tablename) is optional, default is 'getid3_cache'
+* $getID3 = new getID3_cached_mysql('localhost', 'database', 'username', 'password', 'tablename');
* $getID3->encoding = 'UTF-8';
* $info1 = $getID3->analyze('file1.flac');
* $info2 = $getID3->analyze('file2.wv');
@@ -71,101 +73,155 @@
class getID3_cached_mysql extends getID3
{
+ /**
+ * @var resource
+ */
+ private $cursor;
- // private vars
- var $cursor;
- var $connection;
+ /**
+ * @var resource
+ */
+ private $connection;
+ /**
+ * @var string
+ */
+ private $table;
- // public: constructor - see top of this file for cache type and cache_options
- function getID3_cached_mysql($host, $database, $username, $password) {
+ /**
+ * constructor - see top of this file for cache type and cache_options
+ *
+ * @param string $host
+ * @param string $database
+ * @param string $username
+ * @param string $password
+ * @param string $table
+ *
+ * @throws Exception
+ * @throws getid3_exception
+ */
+ public function __construct($host, $database, $username, $password, $table='getid3_cache') {
+
// Check for mysql support
if (!function_exists('mysql_pconnect')) {
- die('PHP not compiled with mysql support.');
+ throw new Exception('PHP not compiled with mysql support.');
}
// Connect to database
$this->connection = mysql_pconnect($host, $username, $password);
if (!$this->connection) {
- die('mysql_pconnect() failed - check permissions and spelling.');
+ throw new Exception('mysql_pconnect() failed - check permissions and spelling.');
}
// Select database
if (!mysql_select_db($database, $this->connection)) {
- die('Cannot use database '.$database);
+ throw new Exception('Cannot use database '.$database);
}
+ // Set table
+ $this->table = $table;
+
// Create cache table if not exists
$this->create_table();
// Check version number and clear cache if changed
- $this->cursor = mysql_query("SELECT `value` FROM `getid3_cache` WHERE (`filename` = '".GETID3_VERSION."') AND (`filesize` = '-1') AND (`filetime` = '-1') AND (`analyzetime` = '-1')", $this->connection);
- list($version) = @mysql_fetch_array($this->cursor);
- if ($version != GETID3_VERSION) {
+ $version = '';
+ $SQLquery = 'SELECT `value`';
+ $SQLquery .= ' FROM `'.mysql_real_escape_string($this->table).'`';
+ $SQLquery .= ' WHERE (`filename` = \''.mysql_real_escape_string(getID3::VERSION).'\')';
+ $SQLquery .= ' AND (`filesize` = -1)';
+ $SQLquery .= ' AND (`filetime` = -1)';
+ $SQLquery .= ' AND (`analyzetime` = -1)';
+ if ($this->cursor = mysql_query($SQLquery, $this->connection)) {
+ list($version) = mysql_fetch_array($this->cursor);
+ }
+ if ($version != getID3::VERSION) {
$this->clear_cache();
}
- parent::getID3();
+ parent::__construct();
}
- // public: clear cache
- function clear_cache() {
+ /**
+ * clear cache
+ */
+ public function clear_cache() {
- $this->cursor = mysql_query("DELETE FROM `getid3_cache`", $this->connection);
- $this->cursor = mysql_query("INSERT INTO `getid3_cache` VALUES ('".GETID3_VERSION."', -1, -1, -1, '".GETID3_VERSION."')", $this->connection);
+ $this->cursor = mysql_query('DELETE FROM `'.mysql_real_escape_string($this->table).'`', $this->connection);
+ $this->cursor = mysql_query('INSERT INTO `'.mysql_real_escape_string($this->table).'` VALUES (\''.getID3::VERSION.'\', -1, -1, -1, \''.getID3::VERSION.'\')', $this->connection);
}
- // public: analyze file
- function analyze($filename) {
+ /**
+ * analyze file
+ *
+ * @param string $filename
+ * @param int $filesize
+ * @param string $original_filename
+ * @param resource $fp
+ *
+ * @return mixed
+ */
+ public function analyze($filename, $filesize=null, $original_filename='', $fp=null) {
+ $filetime = 0;
if (file_exists($filename)) {
// Short-hands
$filetime = filemtime($filename);
- $filesize = filesize($filename);
- $filenam2 = mysql_escape_string($filename);
+ $filesize = filesize($filename);
- // Loopup file
- $this->cursor = mysql_query("SELECT `value` FROM `getid3_cache` WHERE (`filename`='".$filenam2."') AND (`filesize`='".$filesize."') AND (`filetime`='".$filetime."')", $this->connection);
- list($result) = @mysql_fetch_array($this->cursor);
-
- // Hit
- if ($result) {
- return unserialize($result);
+ // Lookup file
+ $SQLquery = 'SELECT `value`';
+ $SQLquery .= ' FROM `'.mysql_real_escape_string($this->table).'`';
+ $SQLquery .= ' WHERE (`filename` = \''.mysql_real_escape_string($filename).'\')';
+ $SQLquery .= ' AND (`filesize` = \''.mysql_real_escape_string($filesize).'\')';
+ $SQLquery .= ' AND (`filetime` = \''.mysql_real_escape_string($filetime).'\')';
+ $this->cursor = mysql_query($SQLquery, $this->connection);
+ if (mysql_num_rows($this->cursor) > 0) {
+ // Hit
+ list($result) = mysql_fetch_array($this->cursor);
+ return unserialize(base64_decode($result));
}
}
// Miss
- $result = parent::analyze($filename);
+ $analysis = parent::analyze($filename, $filesize, $original_filename, $fp);
// Save result
if (file_exists($filename)) {
- $res2 = mysql_escape_string(serialize($result));
- $this->cursor = mysql_query("INSERT INTO `getid3_cache` (`filename`, `filesize`, `filetime`, `analyzetime`, `value`) VALUES ('".$filenam2."', '".$filesize."', '".$filetime."', '".time()."', '".$res2."')", $this->connection);
+ $SQLquery = 'INSERT INTO `'.mysql_real_escape_string($this->table).'` (`filename`, `filesize`, `filetime`, `analyzetime`, `value`) VALUES (';
+ $SQLquery .= '\''.mysql_real_escape_string($filename).'\'';
+ $SQLquery .= ', \''.mysql_real_escape_string($filesize).'\'';
+ $SQLquery .= ', \''.mysql_real_escape_string($filetime).'\'';
+ $SQLquery .= ', \''.mysql_real_escape_string(time() ).'\'';
+ $SQLquery .= ', \''.mysql_real_escape_string(base64_encode(serialize($analysis))).'\')';
+ $this->cursor = mysql_query($SQLquery, $this->connection);
}
- return $result;
+ return $analysis;
}
- // private: (re)create sql table
- function create_table($drop = false) {
+ /**
+ * (re)create sql table
+ *
+ * @param bool $drop
+ */
+ private function create_table($drop=false) {
- $this->cursor = mysql_query("CREATE TABLE IF NOT EXISTS `getid3_cache` (
- `filename` VARCHAR(255) NOT NULL DEFAULT '',
- `filesize` INT(11) NOT NULL DEFAULT '0',
- `filetime` INT(11) NOT NULL DEFAULT '0',
- `analyzetime` INT(11) NOT NULL DEFAULT '0',
- `value` TEXT NOT NULL,
- PRIMARY KEY (`filename`,`filesize`,`filetime`)) TYPE=MyISAM", $this->connection);
+ $SQLquery = 'CREATE TABLE IF NOT EXISTS `'.mysql_real_escape_string($this->table).'` (';
+ $SQLquery .= '`filename` VARCHAR(990) NOT NULL DEFAULT \'\'';
+ $SQLquery .= ', `filesize` INT(11) NOT NULL DEFAULT \'0\'';
+ $SQLquery .= ', `filetime` INT(11) NOT NULL DEFAULT \'0\'';
+ $SQLquery .= ', `analyzetime` INT(11) NOT NULL DEFAULT \'0\'';
+ $SQLquery .= ', `value` LONGTEXT NOT NULL';
+ $SQLquery .= ', PRIMARY KEY (`filename`, `filesize`, `filetime`))';
+ $this->cursor = mysql_query($SQLquery, $this->connection);
echo mysql_error($this->connection);
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/getid3.lib.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/getid3.lib.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/getid3.lib.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,12 +1,13 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
-/////////////////////////////////////////////////////////////////
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
// //
// getid3.lib.php - part of getID3() //
-// See readme.txt for more details //
+// see readme.txt for more details //
// ///
/////////////////////////////////////////////////////////////////
@@ -13,36 +14,43 @@
class getid3_lib
{
-
- function PrintHexBytes($string, $hex=true, $spaces=true, $htmlsafe=true) {
+ /**
+ * @param string $string
+ * @param bool $hex
+ * @param bool $spaces
+ * @param string|bool $htmlencoding
+ *
+ * @return string
+ */
+ public static function PrintHexBytes($string, $hex=true, $spaces=true, $htmlencoding='UTF-8') {
$returnstring = '';
for ($i = 0; $i < strlen($string); $i++) {
if ($hex) {
- $returnstring .= str_pad(dechex(ord($string{$i})), 2, '0', STR_PAD_LEFT);
+ $returnstring .= str_pad(dechex(ord($string[$i])), 2, '0', STR_PAD_LEFT);
} else {
- $returnstring .= ' '.(ereg("[\x20-\x7E]", $string{$i}) ? $string{$i} : '¤');
+ $returnstring .= ' '.(preg_match("#[\x20-\x7E]#", $string[$i]) ? $string[$i] : '¤');
}
if ($spaces) {
$returnstring .= ' ';
}
}
- if ($htmlsafe) {
- $returnstring = htmlentities($returnstring);
+ if (!empty($htmlencoding)) {
+ if ($htmlencoding === true) {
+ $htmlencoding = 'UTF-8'; // prior to getID3 v1.9.0 the function's 4th parameter was boolean
+ }
+ $returnstring = htmlentities($returnstring, ENT_QUOTES, $htmlencoding);
}
return $returnstring;
}
- function SafeStripSlashes($text) {
- if (get_magic_quotes_gpc()) {
- return stripslashes($text);
- }
- return $text;
- }
-
-
- function trunc($floatnumber) {
- // truncates a floating-point number at the decimal point
- // returns int (if possible, otherwise float)
+ /**
+ * Truncates a floating-point number at the decimal point.
+ *
+ * @param float $floatnumber
+ *
+ * @return float|int returns int (if possible, otherwise float)
+ */
+ public static function trunc($floatnumber) {
if ($floatnumber >= 1) {
$truncatednumber = floor($floatnumber);
} elseif ($floatnumber <= -1) {
@@ -50,21 +58,40 @@
} else {
$truncatednumber = 0;
}
- if ($truncatednumber <= 1073741824) { // 2^30
+ if (self::intValueSupported($truncatednumber)) {
$truncatednumber = (int) $truncatednumber;
}
return $truncatednumber;
}
+ /**
+ * @param int|null $variable
+ * @param int $increment
+ *
+ * @return bool
+ */
+ public static function safe_inc(&$variable, $increment=1) {
+ if (isset($variable)) {
+ $variable += $increment;
+ } else {
+ $variable = $increment;
+ }
+ return true;
+ }
- function CastAsInt($floatnum) {
+ /**
+ * @param int|float $floatnum
+ *
+ * @return int|float
+ */
+ public static function CastAsInt($floatnum) {
// convert to float if not already
$floatnum = (float) $floatnum;
// convert a float to type int, only if possible
- if (getid3_lib::trunc($floatnum) == $floatnum) {
+ if (self::trunc($floatnum) == $floatnum) {
// it's not floating point
- if ($floatnum <= 1073741824) { // 2^30
+ if (self::intValueSupported($floatnum)) {
// it's within int range
$floatnum = (int) $floatnum;
}
@@ -72,23 +99,64 @@
return $floatnum;
}
+ /**
+ * @param int $num
+ *
+ * @return bool
+ */
+ public static function intValueSupported($num) {
+ // check if integers are 64-bit
+ static $hasINT64 = null;
+ if ($hasINT64 === null) { // 10x faster than is_null()
+ $hasINT64 = is_int(pow(2, 31)); // 32-bit int are limited to (2^31)-1
+ if (!$hasINT64 && !defined('PHP_INT_MIN')) {
+ define('PHP_INT_MIN', ~PHP_INT_MAX);
+ }
+ }
+ // if integers are 64-bit - no other check required
+ if ($hasINT64 || (($num <= PHP_INT_MAX) && ($num >= PHP_INT_MIN))) {
+ return true;
+ }
+ return false;
+ }
- function DecimalBinary2Float($binarynumerator) {
- $numerator = getid3_lib::Bin2Dec($binarynumerator);
- $denominator = getid3_lib::Bin2Dec('1'.str_repeat('0', strlen($binarynumerator)));
+ /**
+ * @param string $fraction
+ *
+ * @return float
+ */
+ public static function DecimalizeFraction($fraction) {
+ list($numerator, $denominator) = explode('/', $fraction);
+ return $numerator / ($denominator ? $denominator : 1);
+ }
+
+ /**
+ * @param string $binarynumerator
+ *
+ * @return float
+ */
+ public static function DecimalBinary2Float($binarynumerator) {
+ $numerator = self::Bin2Dec($binarynumerator);
+ $denominator = self::Bin2Dec('1'.str_repeat('0', strlen($binarynumerator)));
return ($numerator / $denominator);
}
-
- function NormalizeBinaryPoint($binarypointnumber, $maxbits=52) {
- // http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/binary.html
+ /**
+ * @link http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/binary.html
+ *
+ * @param string $binarypointnumber
+ * @param int $maxbits
+ *
+ * @return array
+ */
+ public static function NormalizeBinaryPoint($binarypointnumber, $maxbits=52) {
if (strpos($binarypointnumber, '.') === false) {
$binarypointnumber = '0.'.$binarypointnumber;
- } elseif ($binarypointnumber{0} == '.') {
+ } elseif ($binarypointnumber[0] == '.') {
$binarypointnumber = '0'.$binarypointnumber;
}
$exponent = 0;
- while (($binarypointnumber{0} != '1') || (substr($binarypointnumber, 1, 1) != '.')) {
+ while (($binarypointnumber[0] != '1') || (substr($binarypointnumber, 1, 1) != '.')) {
if (substr($binarypointnumber, 1, 1) == '.') {
$exponent--;
$binarypointnumber = substr($binarypointnumber, 2, 1).'.'.substr($binarypointnumber, 3);
@@ -96,7 +164,7 @@
$pointpos = strpos($binarypointnumber, '.');
$exponent += ($pointpos - 1);
$binarypointnumber = str_replace('.', '', $binarypointnumber);
- $binarypointnumber = $binarypointnumber{0}.'.'.substr($binarypointnumber, 1);
+ $binarypointnumber = $binarypointnumber[0].'.'.substr($binarypointnumber, 1);
}
}
$binarypointnumber = str_pad(substr($binarypointnumber, 0, $maxbits + 2), $maxbits + 2, '0', STR_PAD_RIGHT);
@@ -103,25 +171,38 @@
return array('normalized'=>$binarypointnumber, 'exponent'=>(int) $exponent);
}
-
- function Float2BinaryDecimal($floatvalue) {
- // http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/binary.html
+ /**
+ * @link http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/binary.html
+ *
+ * @param float $floatvalue
+ *
+ * @return string
+ */
+ public static function Float2BinaryDecimal($floatvalue) {
$maxbits = 128; // to how many bits of precision should the calculations be taken?
- $intpart = getid3_lib::trunc($floatvalue);
+ $intpart = self::trunc($floatvalue);
$floatpart = abs($floatvalue - $intpart);
$pointbitstring = '';
while (($floatpart != 0) && (strlen($pointbitstring) < $maxbits)) {
$floatpart *= 2;
- $pointbitstring .= (string) getid3_lib::trunc($floatpart);
- $floatpart -= getid3_lib::trunc($floatpart);
+ $pointbitstring .= (string) self::trunc($floatpart);
+ $floatpart -= self::trunc($floatpart);
}
$binarypointnumber = decbin($intpart).'.'.$pointbitstring;
return $binarypointnumber;
}
-
- function Float2String($floatvalue, $bits) {
- // http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/ieee-expl.html
+ /**
+ * @link http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/ieee-expl.html
+ *
+ * @param float $floatvalue
+ * @param int $bits
+ *
+ * @return string|false
+ */
+ public static function Float2String($floatvalue, $bits) {
+ $exponentbits = 0;
+ $fractionbits = 0;
switch ($bits) {
case 32:
$exponentbits = 8;
@@ -135,7 +216,6 @@
default:
return false;
- break;
}
if ($floatvalue >= 0) {
$signbit = '0';
@@ -142,28 +222,43 @@
} else {
$signbit = '1';
}
- $normalizedbinary = getid3_lib::NormalizeBinaryPoint(getid3_lib::Float2BinaryDecimal($floatvalue), $fractionbits);
+ $normalizedbinary = self::NormalizeBinaryPoint(self::Float2BinaryDecimal($floatvalue), $fractionbits);
$biasedexponent = pow(2, $exponentbits - 1) - 1 + $normalizedbinary['exponent']; // (127 or 1023) +/- exponent
$exponentbitstring = str_pad(decbin($biasedexponent), $exponentbits, '0', STR_PAD_LEFT);
$fractionbitstring = str_pad(substr($normalizedbinary['normalized'], 2), $fractionbits, '0', STR_PAD_RIGHT);
- return getid3_lib::BigEndian2String(getid3_lib::Bin2Dec($signbit.$exponentbitstring.$fractionbitstring), $bits % 8, false);
+ return self::BigEndian2String(self::Bin2Dec($signbit.$exponentbitstring.$fractionbitstring), $bits % 8, false);
}
-
- function LittleEndian2Float($byteword) {
- return getid3_lib::BigEndian2Float(strrev($byteword));
+ /**
+ * @param string $byteword
+ *
+ * @return float|false
+ */
+ public static function LittleEndian2Float($byteword) {
+ return self::BigEndian2Float(strrev($byteword));
}
+ /**
+ * ANSI/IEEE Standard 754-1985, Standard for Binary Floating Point Arithmetic
+ *
+ * @link http://www.psc.edu/general/software/packages/ieee/ieee.html
+ * @link http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/ieee.html
+ *
+ * @param string $byteword
+ *
+ * @return float|false
+ */
+ public static function BigEndian2Float($byteword) {
+ $bitword = self::BigEndian2Bin($byteword);
+ if (!$bitword) {
+ return 0;
+ }
+ $signbit = $bitword[0];
+ $floatvalue = 0;
+ $exponentbits = 0;
+ $fractionbits = 0;
- function BigEndian2Float($byteword) {
- // ANSI/IEEE Standard 754-1985, Standard for Binary Floating Point Arithmetic
- // http://www.psc.edu/general/software/packages/ieee/ieee.html
- // http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/ieee.html
-
- $bitword = getid3_lib::BigEndian2Bin($byteword);
- $signbit = $bitword{0};
-
switch (strlen($byteword) * 8) {
case 32:
$exponentbits = 8;
@@ -179,25 +274,23 @@
// 80-bit Apple SANE format
// http://www.mactech.com/articles/mactech/Vol.06/06.01/SANENormalized/
$exponentstring = substr($bitword, 1, 15);
- $isnormalized = intval($bitword{16});
+ $isnormalized = intval($bitword[16]);
$fractionstring = substr($bitword, 17, 63);
- $exponent = pow(2, getid3_lib::Bin2Dec($exponentstring) - 16383);
- $fraction = $isnormalized + getid3_lib::DecimalBinary2Float($fractionstring);
+ $exponent = pow(2, self::Bin2Dec($exponentstring) - 16383);
+ $fraction = $isnormalized + self::DecimalBinary2Float($fractionstring);
$floatvalue = $exponent * $fraction;
if ($signbit == '1') {
$floatvalue *= -1;
}
return $floatvalue;
- break;
default:
return false;
- break;
}
$exponentstring = substr($bitword, 1, $exponentbits);
$fractionstring = substr($bitword, $exponentbits + 1, $fractionbits);
- $exponent = getid3_lib::Bin2Dec($exponentstring);
- $fraction = getid3_lib::Bin2Dec($fractionstring);
+ $exponent = self::Bin2Dec($exponentstring);
+ $fraction = self::Bin2Dec($fractionstring);
if (($exponent == (pow(2, $exponentbits) - 1)) && ($fraction != 0)) {
// Not a Number
@@ -217,12 +310,12 @@
$floatvalue = ($signbit ? 0 : -0);
} elseif (($exponent == 0) && ($fraction != 0)) {
// These are 'unnormalized' values
- $floatvalue = pow(2, (-1 * (pow(2, $exponentbits - 1) - 2))) * getid3_lib::DecimalBinary2Float($fractionstring);
+ $floatvalue = pow(2, (-1 * (pow(2, $exponentbits - 1) - 2))) * self::DecimalBinary2Float($fractionstring);
if ($signbit == '1') {
$floatvalue *= -1;
}
} elseif ($exponent != 0) {
- $floatvalue = pow(2, ($exponent - (pow(2, $exponentbits - 1) - 1))) * (1 + getid3_lib::DecimalBinary2Float($fractionstring));
+ $floatvalue = pow(2, ($exponent - (pow(2, $exponentbits - 1) - 1))) * (1 + self::DecimalBinary2Float($fractionstring));
if ($signbit == '1') {
$floatvalue *= -1;
}
@@ -230,63 +323,93 @@
return (float) $floatvalue;
}
-
- function BigEndian2Int($byteword, $synchsafe=false, $signed=false) {
+ /**
+ * @param string $byteword
+ * @param bool $synchsafe
+ * @param bool $signed
+ *
+ * @return int|float|false
+ * @throws Exception
+ */
+ public static function BigEndian2Int($byteword, $synchsafe=false, $signed=false) {
$intvalue = 0;
$bytewordlen = strlen($byteword);
+ if ($bytewordlen == 0) {
+ return false;
+ }
for ($i = 0; $i < $bytewordlen; $i++) {
if ($synchsafe) { // disregard MSB, effectively 7-bit bytes
- $intvalue = $intvalue | (ord($byteword{$i}) & 0x7F) << (($bytewordlen - 1 - $i) * 7);
+ //$intvalue = $intvalue | (ord($byteword{$i}) & 0x7F) << (($bytewordlen - 1 - $i) * 7); // faster, but runs into problems past 2^31 on 32-bit systems
+ $intvalue += (ord($byteword[$i]) & 0x7F) * pow(2, ($bytewordlen - 1 - $i) * 7);
} else {
- $intvalue += ord($byteword{$i}) * pow(256, ($bytewordlen - 1 - $i));
+ $intvalue += ord($byteword[$i]) * pow(256, ($bytewordlen - 1 - $i));
}
}
if ($signed && !$synchsafe) {
// synchsafe ints are not allowed to be signed
- switch ($bytewordlen) {
- case 1:
- case 2:
- case 3:
- case 4:
- $signmaskbit = 0x80 << (8 * ($bytewordlen - 1));
- if ($intvalue & $signmaskbit) {
- $intvalue = 0 - ($intvalue & ($signmaskbit - 1));
- }
- break;
-
- default:
- die('ERROR: Cannot have signed integers larger than 32-bits in getid3_lib::BigEndian2Int()');
- break;
+ if ($bytewordlen <= PHP_INT_SIZE) {
+ $signMaskBit = 0x80 << (8 * ($bytewordlen - 1));
+ if ($intvalue & $signMaskBit) {
+ $intvalue = 0 - ($intvalue & ($signMaskBit - 1));
+ }
+ } else {
+ throw new Exception('ERROR: Cannot have signed integers larger than '.(8 * PHP_INT_SIZE).'-bits ('.strlen($byteword).') in self::BigEndian2Int()');
}
}
- return getid3_lib::CastAsInt($intvalue);
+ return self::CastAsInt($intvalue);
}
+ /**
+ * @param string $byteword
+ * @param bool $signed
+ *
+ * @return int|float|false
+ */
+ public static function LittleEndian2Int($byteword, $signed=false) {
+ return self::BigEndian2Int(strrev($byteword), false, $signed);
+ }
- function LittleEndian2Int($byteword, $signed=false) {
- return getid3_lib::BigEndian2Int(strrev($byteword), false, $signed);
+ /**
+ * @param string $byteword
+ *
+ * @return string
+ */
+ public static function LittleEndian2Bin($byteword) {
+ return self::BigEndian2Bin(strrev($byteword));
}
-
- function BigEndian2Bin($byteword) {
+ /**
+ * @param string $byteword
+ *
+ * @return string
+ */
+ public static function BigEndian2Bin($byteword) {
$binvalue = '';
$bytewordlen = strlen($byteword);
for ($i = 0; $i < $bytewordlen; $i++) {
- $binvalue .= str_pad(decbin(ord($byteword{$i})), 8, '0', STR_PAD_LEFT);
+ $binvalue .= str_pad(decbin(ord($byteword[$i])), 8, '0', STR_PAD_LEFT);
}
return $binvalue;
}
-
- function BigEndian2String($number, $minbytes=1, $synchsafe=false, $signed=false) {
+ /**
+ * @param int $number
+ * @param int $minbytes
+ * @param bool $synchsafe
+ * @param bool $signed
+ *
+ * @return string
+ * @throws Exception
+ */
+ public static function BigEndian2String($number, $minbytes=1, $synchsafe=false, $signed=false) {
if ($number < 0) {
- return false;
+ throw new Exception('ERROR: self::BigEndian2String() does not support negative numbers');
}
$maskbyte = (($synchsafe || $signed) ? 0x7F : 0xFF);
$intstring = '';
if ($signed) {
- if ($minbytes > 4) {
- die('ERROR: Cannot have signed integers larger than 32-bits in getid3_lib::BigEndian2String()');
+ if ($minbytes > PHP_INT_SIZE) {
+ throw new Exception('ERROR: Cannot have signed integers larger than '.(8 * PHP_INT_SIZE).'-bits in self::BigEndian2String()');
}
$number = $number & (0x80 << (8 * ($minbytes - 1)));
}
@@ -298,8 +421,12 @@
return str_pad($intstring, $minbytes, "\x00", STR_PAD_LEFT);
}
-
- function Dec2Bin($number) {
+ /**
+ * @param int $number
+ *
+ * @return string
+ */
+ public static function Dec2Bin($number) {
while ($number >= 256) {
$bytes[] = (($number / 256) - (floor($number / 256))) * 256;
$number = floor($number / 256);
@@ -312,11 +439,16 @@
return $binstring;
}
-
- function Bin2Dec($binstring, $signed=false) {
+ /**
+ * @param string $binstring
+ * @param bool $signed
+ *
+ * @return int|float
+ */
+ public static function Bin2Dec($binstring, $signed=false) {
$signmult = 1;
if ($signed) {
- if ($binstring{0} == '1') {
+ if ($binstring[0] == '1') {
$signmult = -1;
}
$binstring = substr($binstring, 1);
@@ -325,22 +457,32 @@
for ($i = 0; $i < strlen($binstring); $i++) {
$decvalue += ((int) substr($binstring, strlen($binstring) - $i - 1, 1)) * pow(2, $i);
}
- return getid3_lib::CastAsInt($decvalue * $signmult);
+ return self::CastAsInt($decvalue * $signmult);
}
-
- function Bin2String($binstring) {
+ /**
+ * @param string $binstring
+ *
+ * @return string
+ */
+ public static function Bin2String($binstring) {
// return 'hi' for input of '0110100001101001'
$string = '';
$binstringreversed = strrev($binstring);
for ($i = 0; $i < strlen($binstringreversed); $i += 8) {
- $string = chr(getid3_lib::Bin2Dec(strrev(substr($binstringreversed, $i, 8)))).$string;
+ $string = chr(self::Bin2Dec(strrev(substr($binstringreversed, $i, 8)))).$string;
}
return $string;
}
-
- function LittleEndian2String($number, $minbytes=1, $synchsafe=false) {
+ /**
+ * @param int $number
+ * @param int $minbytes
+ * @param bool $synchsafe
+ *
+ * @return string
+ */
+ public static function LittleEndian2String($number, $minbytes=1, $synchsafe=false) {
$intstring = '';
while ($number > 0) {
if ($synchsafe) {
@@ -354,9 +496,14 @@
return str_pad($intstring, $minbytes, "\x00", STR_PAD_RIGHT);
}
-
- function array_merge_clobber($array1, $array2) {
- // written by kcØhireability*com
+ /**
+ * @param mixed $array1
+ * @param mixed $array2
+ *
+ * @return array|false
+ */
+ public static function array_merge_clobber($array1, $array2) {
+ // written by kcØhireability*com
// taken from http://www.php.net/manual/en/function.array-merge-recursive.php
if (!is_array($array1) || !is_array($array2)) {
return false;
@@ -364,7 +511,7 @@
$newarray = $array1;
foreach ($array2 as $key => $val) {
if (is_array($val) && isset($newarray[$key]) && is_array($newarray[$key])) {
- $newarray[$key] = getid3_lib::array_merge_clobber($newarray[$key], $val);
+ $newarray[$key] = self::array_merge_clobber($newarray[$key], $val);
} else {
$newarray[$key] = $val;
}
@@ -372,8 +519,13 @@
return $newarray;
}
-
- function array_merge_noclobber($array1, $array2) {
+ /**
+ * @param mixed $array1
+ * @param mixed $array2
+ *
+ * @return array|false
+ */
+ public static function array_merge_noclobber($array1, $array2) {
if (!is_array($array1) || !is_array($array2)) {
return false;
}
@@ -380,7 +532,7 @@
$newarray = $array1;
foreach ($array2 as $key => $val) {
if (is_array($val) && isset($newarray[$key]) && is_array($newarray[$key])) {
- $newarray[$key] = getid3_lib::array_merge_noclobber($newarray[$key], $val);
+ $newarray[$key] = self::array_merge_noclobber($newarray[$key], $val);
} elseif (!isset($newarray[$key])) {
$newarray[$key] = $val;
}
@@ -388,8 +540,48 @@
return $newarray;
}
+ /**
+ * @param mixed $array1
+ * @param mixed $array2
+ *
+ * @return array|false|null
+ */
+ public static function flipped_array_merge_noclobber($array1, $array2) {
+ if (!is_array($array1) || !is_array($array2)) {
+ return false;
+ }
+ # naturally, this only works non-recursively
+ $newarray = array_flip($array1);
+ foreach (array_flip($array2) as $key => $val) {
+ if (!isset($newarray[$key])) {
+ $newarray[$key] = count($newarray);
+ }
+ }
+ return array_flip($newarray);
+ }
- function fileextension($filename, $numextensions=1) {
+ /**
+ * @param array $theArray
+ *
+ * @return bool
+ */
+ public static function ksort_recursive(&$theArray) {
+ ksort($theArray);
+ foreach ($theArray as $key => $value) {
+ if (is_array($value)) {
+ self::ksort_recursive($theArray[$key]);
+ }
+ }
+ return true;
+ }
+
+ /**
+ * @param string $filename
+ * @param int $numextensions
+ *
+ * @return string
+ */
+ public static function fileextension($filename, $numextensions=1) {
if (strstr($filename, '.')) {
$reversedfilename = strrev($filename);
$offset = 0;
@@ -404,76 +596,77 @@
return '';
}
-
- function PlaytimeString($playtimeseconds) {
- $contentseconds = round((($playtimeseconds / 60) - floor($playtimeseconds / 60)) * 60);
- $contentminutes = floor($playtimeseconds / 60);
- if ($contentseconds >= 60) {
- $contentseconds -= 60;
- $contentminutes++;
- }
- return intval($contentminutes).':'.str_pad($contentseconds, 2, 0, STR_PAD_LEFT);
+ /**
+ * @param int $seconds
+ *
+ * @return string
+ */
+ public static function PlaytimeString($seconds) {
+ $sign = (($seconds < 0) ? '-' : '');
+ $seconds = round(abs($seconds));
+ $H = (int) floor( $seconds / 3600);
+ $M = (int) floor(($seconds - (3600 * $H) ) / 60);
+ $S = (int) round( $seconds - (3600 * $H) - (60 * $M) );
+ return $sign.($H ? $H.':' : '').($H ? str_pad($M, 2, '0', STR_PAD_LEFT) : intval($M)).':'.str_pad($S, 2, 0, STR_PAD_LEFT);
}
-
- function image_type_to_mime_type($imagetypeid) {
- // only available in PHP v4.3.0+
- static $image_type_to_mime_type = array();
- if (empty($image_type_to_mime_type)) {
- $image_type_to_mime_type[1] = 'image/gif'; // GIF
- $image_type_to_mime_type[2] = 'image/jpeg'; // JPEG
- $image_type_to_mime_type[3] = 'image/png'; // PNG
- $image_type_to_mime_type[4] = 'application/x-shockwave-flash'; // Flash
- $image_type_to_mime_type[5] = 'image/psd'; // PSD
- $image_type_to_mime_type[6] = 'image/bmp'; // BMP
- $image_type_to_mime_type[7] = 'image/tiff'; // TIFF: little-endian (Intel)
- $image_type_to_mime_type[8] = 'image/tiff'; // TIFF: big-endian (Motorola)
- //$image_type_to_mime_type[9] = 'image/jpc'; // JPC
- //$image_type_to_mime_type[10] = 'image/jp2'; // JPC
- //$image_type_to_mime_type[11] = 'image/jpx'; // JPC
- //$image_type_to_mime_type[12] = 'image/jb2'; // JPC
- $image_type_to_mime_type[13] = 'application/x-shockwave-flash'; // Shockwave
- $image_type_to_mime_type[14] = 'image/iff'; // IFF
- }
- return (isset($image_type_to_mime_type[$imagetypeid]) ? $image_type_to_mime_type[$imagetypeid] : 'application/octet-stream');
- }
-
-
- function DateMac2Unix($macdate) {
+ /**
+ * @param int $macdate
+ *
+ * @return int|float
+ */
+ public static function DateMac2Unix($macdate) {
// Macintosh timestamp: seconds since 00:00h January 1, 1904
// UNIX timestamp: seconds since 00:00h January 1, 1970
- return getid3_lib::CastAsInt($macdate - 2082844800);
+ return self::CastAsInt($macdate - 2082844800);
}
-
- function FixedPoint8_8($rawdata) {
- return getid3_lib::BigEndian2Int(substr($rawdata, 0, 1)) + (float) (getid3_lib::BigEndian2Int(substr($rawdata, 1, 1)) / pow(2, 8));
+ /**
+ * @param string $rawdata
+ *
+ * @return float
+ */
+ public static function FixedPoint8_8($rawdata) {
+ return self::BigEndian2Int(substr($rawdata, 0, 1)) + (float) (self::BigEndian2Int(substr($rawdata, 1, 1)) / pow(2, 8));
}
-
- function FixedPoint16_16($rawdata) {
- return getid3_lib::BigEndian2Int(substr($rawdata, 0, 2)) + (float) (getid3_lib::BigEndian2Int(substr($rawdata, 2, 2)) / pow(2, 16));
+ /**
+ * @param string $rawdata
+ *
+ * @return float
+ */
+ public static function FixedPoint16_16($rawdata) {
+ return self::BigEndian2Int(substr($rawdata, 0, 2)) + (float) (self::BigEndian2Int(substr($rawdata, 2, 2)) / pow(2, 16));
}
-
- function FixedPoint2_30($rawdata) {
- $binarystring = getid3_lib::BigEndian2Bin($rawdata);
- return getid3_lib::Bin2Dec(substr($binarystring, 0, 2)) + (float) (getid3_lib::Bin2Dec(substr($binarystring, 2, 30)) / 1073741824);
+ /**
+ * @param string $rawdata
+ *
+ * @return float
+ */
+ public static function FixedPoint2_30($rawdata) {
+ $binarystring = self::BigEndian2Bin($rawdata);
+ return self::Bin2Dec(substr($binarystring, 0, 2)) + (float) (self::Bin2Dec(substr($binarystring, 2, 30)) / pow(2, 30));
}
- function CreateDeepArray($ArrayPath, $Separator, $Value) {
+ /**
+ * @param string $ArrayPath
+ * @param string $Separator
+ * @param mixed $Value
+ *
+ * @return array
+ */
+ public static function CreateDeepArray($ArrayPath, $Separator, $Value) {
// assigns $Value to a nested array path:
- // $foo = getid3_lib::CreateDeepArray('/path/to/my', '/', 'file.txt')
+ // $foo = self::CreateDeepArray('/path/to/my', '/', 'file.txt')
// is the same as:
// $foo = array('path'=>array('to'=>'array('my'=>array('file.txt'))));
// or
// $foo['path']['to']['my'] = 'file.txt';
- while ($ArrayPath && ($ArrayPath{0} == $Separator)) {
- $ArrayPath = substr($ArrayPath, 1);
- }
+ $ArrayPath = ltrim($ArrayPath, $Separator);
if (($pos = strpos($ArrayPath, $Separator)) !== false) {
- $ReturnedArray[substr($ArrayPath, 0, $pos)] = getid3_lib::CreateDeepArray(substr($ArrayPath, $pos + 1), $Separator, $Value);
+ $ReturnedArray[substr($ArrayPath, 0, $pos)] = self::CreateDeepArray(substr($ArrayPath, $pos + 1), $Separator, $Value);
} else {
$ReturnedArray[$ArrayPath] = $Value;
}
@@ -480,12 +673,18 @@
return $ReturnedArray;
}
- function array_max($arraydata, $returnkey=false) {
+ /**
+ * @param array $arraydata
+ * @param bool $returnkey
+ *
+ * @return int|false
+ */
+ public static function array_max($arraydata, $returnkey=false) {
$maxvalue = false;
- $maxkey = false;
+ $maxkey = false;
foreach ($arraydata as $key => $value) {
if (!is_array($value)) {
- if ($value > $maxvalue) {
+ if (($maxvalue === false) || ($value > $maxvalue)) {
$maxvalue = $value;
$maxkey = $key;
}
@@ -494,12 +693,18 @@
return ($returnkey ? $maxkey : $maxvalue);
}
- function array_min($arraydata, $returnkey=false) {
+ /**
+ * @param array $arraydata
+ * @param bool $returnkey
+ *
+ * @return int|false
+ */
+ public static function array_min($arraydata, $returnkey=false) {
$minvalue = false;
- $minkey = false;
+ $minkey = false;
foreach ($arraydata as $key => $value) {
if (!is_array($value)) {
- if ($value > $minvalue) {
+ if (($minvalue === false) || ($value < $minvalue)) {
$minvalue = $value;
$minkey = $key;
}
@@ -508,189 +713,149 @@
return ($returnkey ? $minkey : $minvalue);
}
-
- function md5_file($file) {
-
- // md5_file() exists in PHP 4.2.0+.
- if (function_exists('md5_file')) {
- return md5_file($file);
+ /**
+ * @param string $XMLstring
+ *
+ * @return array|false
+ */
+ public static function XML2array($XMLstring) {
+ if (function_exists('simplexml_load_string') && function_exists('libxml_disable_entity_loader')) {
+ // http://websec.io/2012/08/27/Preventing-XEE-in-PHP.html
+ // https://core.trac.wordpress.org/changeset/29378
+ $loader = libxml_disable_entity_loader(true);
+ $XMLobject = simplexml_load_string($XMLstring, 'SimpleXMLElement', LIBXML_NOENT);
+ $return = self::SimpleXMLelement2array($XMLobject);
+ libxml_disable_entity_loader($loader);
+ return $return;
}
+ return false;
+ }
- if (GETID3_OS_ISWINDOWS) {
-
- $RequiredFiles = array('cygwin1.dll', 'md5sum.exe');
- foreach ($RequiredFiles as $required_file) {
- if (!is_readable(GETID3_HELPERAPPSDIR.$required_file)) {
- die(implode(' and ', $RequiredFiles).' are required in '.GETID3_HELPERAPPSDIR.' for getid3_lib::md5_file() to function under Windows in PHP < v4.2.0');
- }
- }
- $commandline = GETID3_HELPERAPPSDIR.'md5sum.exe "'.str_replace('/', DIRECTORY_SEPARATOR, $file).'"';
- if (ereg("^[\\]?([0-9a-f]{32})", strtolower(`$commandline`), $r)) {
- return $r[1];
- }
-
- } else {
-
- // The following works under UNIX only
- $file = str_replace('`', '\\`', $file);
- if (ereg("^([0-9a-f]{32})[ \t\n\r]", `md5sum "$file"`, $r)) {
- return $r[1];
- }
-
+ /**
+ * @param SimpleXMLElement|array|mixed $XMLobject
+ *
+ * @return mixed
+ */
+ public static function SimpleXMLelement2array($XMLobject) {
+ if (!is_object($XMLobject) && !is_array($XMLobject)) {
+ return $XMLobject;
}
- return false;
+ $XMLarray = $XMLobject instanceof SimpleXMLElement ? get_object_vars($XMLobject) : $XMLobject;
+ foreach ($XMLarray as $key => $value) {
+ $XMLarray[$key] = self::SimpleXMLelement2array($value);
+ }
+ return $XMLarray;
}
-
- function sha1_file($file) {
-
- // sha1_file() exists in PHP 4.3.0+.
- if (function_exists('sha1_file')) {
- return sha1_file($file);
+ /**
+ * Returns checksum for a file from starting position to absolute end position.
+ *
+ * @param string $file
+ * @param int $offset
+ * @param int $end
+ * @param string $algorithm
+ *
+ * @return string|false
+ * @throws getid3_exception
+ */
+ public static function hash_data($file, $offset, $end, $algorithm) {
+ if (!self::intValueSupported($end)) {
+ return false;
}
+ if (!in_array($algorithm, array('md5', 'sha1'))) {
+ throw new getid3_exception('Invalid algorithm ('.$algorithm.') in self::hash_data()');
+ }
- $file = str_replace('`', '\\`', $file);
+ $size = $end - $offset;
- if (GETID3_OS_ISWINDOWS) {
-
- $RequiredFiles = array('cygwin1.dll', 'sha1sum.exe');
- foreach ($RequiredFiles as $required_file) {
- if (!is_readable(GETID3_HELPERAPPSDIR.$required_file)) {
- die(implode(' and ', $RequiredFiles).' are required in '.GETID3_HELPERAPPSDIR.' for getid3_lib::sha1_file() to function under Windows in PHP < v4.3.0');
- }
- }
- $commandline = GETID3_HELPERAPPSDIR.'sha1sum.exe "'.str_replace('/', DIRECTORY_SEPARATOR, $file).'"';
- if (ereg("^sha1=([0-9a-f]{40})", strtolower(`$commandline`), $r)) {
- return $r[1];
- }
-
- } else {
-
- $commandline = 'sha1sum '.escapeshellarg($file).'';
- if (ereg("^([0-9a-f]{40})[ \t\n\r]", strtolower(`$commandline`), $r)) {
- return $r[1];
- }
-
+ $fp = fopen($file, 'rb');
+ fseek($fp, $offset);
+ $ctx = hash_init($algorithm);
+ while ($size > 0) {
+ $buffer = fread($fp, min($size, getID3::FREAD_BUFFER_SIZE));
+ hash_update($ctx, $buffer);
+ $size -= getID3::FREAD_BUFFER_SIZE;
}
+ $hash = hash_final($ctx);
+ fclose($fp);
- return false;
+ return $hash;
}
-
- // Allan Hansen <ahØartemis*dk>
- // getid3_lib::md5_data() - returns md5sum for a file from startuing position to absolute end position
- function hash_data($file, $offset, $end, $algorithm) {
-
- switch ($algorithm) {
- case 'md5':
- $hash_function = 'md5_file';
- $unix_call = 'md5sum';
- $windows_call = 'md5sum.exe';
- $hash_length = 32;
- break;
-
- case 'sha1':
- $hash_function = 'sha1_file';
- $unix_call = 'sha1sum';
- $windows_call = 'sha1sum.exe';
- $hash_length = 40;
- break;
-
- default:
- die('Invalid algorithm ('.$algorithm.') in getid3_lib::hash_data()');
- break;
+ /**
+ * @param string $filename_source
+ * @param string $filename_dest
+ * @param int $offset
+ * @param int $length
+ *
+ * @return bool
+ * @throws Exception
+ *
+ * @deprecated Unused, may be removed in future versions of getID3
+ */
+ public static function CopyFileParts($filename_source, $filename_dest, $offset, $length) {
+ if (!self::intValueSupported($offset + $length)) {
+ throw new Exception('cannot copy file portion, it extends beyond the '.round(PHP_INT_MAX / 1073741824).'GB limit');
}
- $size = $end - $offset;
- while (true) {
- if (GETID3_OS_ISWINDOWS) {
-
- // It seems that sha1sum.exe for Windows only works on physical files, does not accept piped data
- // Fall back to create-temp-file method:
- if ($algorithm == 'sha1') {
- break;
- }
-
- $RequiredFiles = array('cygwin1.dll', 'head.exe', 'tail.exe', $windows_call);
- foreach ($RequiredFiles as $required_file) {
- if (!is_readable(GETID3_HELPERAPPSDIR.$required_file)) {
- // helper apps not available - fall back to old method
- break;
+ if (is_readable($filename_source) && is_file($filename_source) && ($fp_src = fopen($filename_source, 'rb'))) {
+ if (($fp_dest = fopen($filename_dest, 'wb'))) {
+ if (fseek($fp_src, $offset) == 0) {
+ $byteslefttowrite = $length;
+ while (($byteslefttowrite > 0) && ($buffer = fread($fp_src, min($byteslefttowrite, getID3::FREAD_BUFFER_SIZE)))) {
+ $byteswritten = fwrite($fp_dest, $buffer, $byteslefttowrite);
+ $byteslefttowrite -= $byteswritten;
}
+ fclose($fp_dest);
+ return true;
+ } else {
+ fclose($fp_src);
+ throw new Exception('failed to seek to offset '.$offset.' in '.$filename_source);
}
- $commandline = GETID3_HELPERAPPSDIR.'head.exe -c '.$end.' "'.escapeshellarg(str_replace('/', DIRECTORY_SEPARATOR, $file)).'" | ';
- $commandline .= GETID3_HELPERAPPSDIR.'tail.exe -c '.$size.' | ';
- $commandline .= GETID3_HELPERAPPSDIR.$windows_call;
-
} else {
-
- $commandline = 'head -c'.$end.' '.escapeshellarg($file).' | ';
- $commandline .= 'tail -c'.$size.' | ';
- $commandline .= $unix_call;
-
+ throw new Exception('failed to create file for writing '.$filename_dest);
}
- if ((bool) ini_get('safe_mode')) {
- $ThisFileInfo['warning'][] = 'PHP running in Safe Mode - backtick operator not available, using slower non-system-call '.$algorithm.' algorithm';
- break;
- }
- return substr(`$commandline`, 0, $hash_length);
+ } else {
+ throw new Exception('failed to open file for reading '.$filename_source);
}
-
- // try to create a temporary file in the system temp directory - invalid dirname should force to system temp dir
- if (($data_filename = tempnam('*', 'getID3')) === false) {
- // can't find anywhere to create a temp file, just die
- return false;
- }
-
- // Init
- $result = false;
-
- // copy parts of file
- if ($fp = @fopen($file, 'rb')) {
-
- if ($fp_data = @fopen($data_filename, 'wb')) {
-
- fseek($fp, $offset, SEEK_SET);
- $byteslefttowrite = $end - $offset;
- while (($byteslefttowrite > 0) && ($buffer = fread($fp, GETID3_FREAD_BUFFER_SIZE))) {
- $byteswritten = fwrite($fp_data, $buffer, $byteslefttowrite);
- $byteslefttowrite -= $byteswritten;
- }
- fclose($fp_data);
- $result = getid3_lib::$hash_function($data_filename);
-
- }
- fclose($fp);
- }
- unlink($data_filename);
- return $result;
}
-
- function iconv_fallback_int_utf8($charval) {
+ /**
+ * @param int $charval
+ *
+ * @return string
+ */
+ public static function iconv_fallback_int_utf8($charval) {
if ($charval < 128) {
// 0bbbbbbb
$newcharstring = chr($charval);
} elseif ($charval < 2048) {
// 110bbbbb 10bbbbbb
- $newcharstring = chr(($charval >> 6) | 0xC0);
+ $newcharstring = chr(($charval >> 6) | 0xC0);
$newcharstring .= chr(($charval & 0x3F) | 0x80);
} elseif ($charval < 65536) {
// 1110bbbb 10bbbbbb 10bbbbbb
- $newcharstring = chr(($charval >> 12) | 0xE0);
- $newcharstring .= chr(($charval >> 6) | 0xC0);
+ $newcharstring = chr(($charval >> 12) | 0xE0);
+ $newcharstring .= chr(($charval >> 6) | 0xC0);
$newcharstring .= chr(($charval & 0x3F) | 0x80);
} else {
// 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
- $newcharstring = chr(($charval >> 18) | 0xF0);
- $newcharstring .= chr(($charval >> 12) | 0xC0);
- $newcharstring .= chr(($charval >> 6) | 0xC0);
+ $newcharstring = chr(($charval >> 18) | 0xF0);
+ $newcharstring .= chr(($charval >> 12) | 0xC0);
+ $newcharstring .= chr(($charval >> 6) | 0xC0);
$newcharstring .= chr(($charval & 0x3F) | 0x80);
}
return $newcharstring;
}
- // ISO-8859-1 => UTF-8
- function iconv_fallback_iso88591_utf8($string, $bom=false) {
+ /**
+ * ISO-8859-1 => UTF-8
+ *
+ * @param string $string
+ * @param bool $bom
+ *
+ * @return string
+ */
+ public static function iconv_fallback_iso88591_utf8($string, $bom=false) {
if (function_exists('utf8_encode')) {
return utf8_encode($string);
}
@@ -700,43 +865,69 @@
$newcharstring .= "\xEF\xBB\xBF";
}
for ($i = 0; $i < strlen($string); $i++) {
- $charval = ord($string{$i});
- $newcharstring .= getid3_lib::iconv_fallback_int_utf8($charval);
+ $charval = ord($string[$i]);
+ $newcharstring .= self::iconv_fallback_int_utf8($charval);
}
return $newcharstring;
}
- // ISO-8859-1 => UTF-16BE
- function iconv_fallback_iso88591_utf16be($string, $bom=false) {
+ /**
+ * ISO-8859-1 => UTF-16BE
+ *
+ * @param string $string
+ * @param bool $bom
+ *
+ * @return string
+ */
+ public static function iconv_fallback_iso88591_utf16be($string, $bom=false) {
$newcharstring = '';
if ($bom) {
$newcharstring .= "\xFE\xFF";
}
for ($i = 0; $i < strlen($string); $i++) {
- $newcharstring .= "\x00".$string{$i};
+ $newcharstring .= "\x00".$string[$i];
}
return $newcharstring;
}
- // ISO-8859-1 => UTF-16LE
- function iconv_fallback_iso88591_utf16le($string, $bom=false) {
+ /**
+ * ISO-8859-1 => UTF-16LE
+ *
+ * @param string $string
+ * @param bool $bom
+ *
+ * @return string
+ */
+ public static function iconv_fallback_iso88591_utf16le($string, $bom=false) {
$newcharstring = '';
if ($bom) {
$newcharstring .= "\xFF\xFE";
}
for ($i = 0; $i < strlen($string); $i++) {
- $newcharstring .= $string{$i}."\x00";
+ $newcharstring .= $string[$i]."\x00";
}
return $newcharstring;
}
- // ISO-8859-1 => UTF-16LE (BOM)
- function iconv_fallback_iso88591_utf16($string) {
- return getid3_lib::iconv_fallback_iso88591_utf16le($string, true);
+ /**
+ * ISO-8859-1 => UTF-16LE (BOM)
+ *
+ * @param string $string
+ *
+ * @return string
+ */
+ public static function iconv_fallback_iso88591_utf16($string) {
+ return self::iconv_fallback_iso88591_utf16le($string, true);
}
- // UTF-8 => ISO-8859-1
- function iconv_fallback_utf8_iso88591($string) {
+ /**
+ * UTF-8 => ISO-8859-1
+ *
+ * @param string $string
+ *
+ * @return string
+ */
+ public static function iconv_fallback_utf8_iso88591($string) {
if (function_exists('utf8_decode')) {
return utf8_decode($string);
}
@@ -745,27 +936,27 @@
$offset = 0;
$stringlength = strlen($string);
while ($offset < $stringlength) {
- if ((ord($string{$offset}) | 0x07) == 0xF7) {
+ if ((ord($string[$offset]) | 0x07) == 0xF7) {
// 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
- $charval = ((ord($string{($offset + 0)}) & 0x07) << 18) &
- ((ord($string{($offset + 1)}) & 0x3F) << 12) &
- ((ord($string{($offset + 2)}) & 0x3F) << 6) &
- (ord($string{($offset + 3)}) & 0x3F);
+ $charval = ((ord($string[($offset + 0)]) & 0x07) << 18) &
+ ((ord($string[($offset + 1)]) & 0x3F) << 12) &
+ ((ord($string[($offset + 2)]) & 0x3F) << 6) &
+ (ord($string[($offset + 3)]) & 0x3F);
$offset += 4;
- } elseif ((ord($string{$offset}) | 0x0F) == 0xEF) {
+ } elseif ((ord($string[$offset]) | 0x0F) == 0xEF) {
// 1110bbbb 10bbbbbb 10bbbbbb
- $charval = ((ord($string{($offset + 0)}) & 0x0F) << 12) &
- ((ord($string{($offset + 1)}) & 0x3F) << 6) &
- (ord($string{($offset + 2)}) & 0x3F);
+ $charval = ((ord($string[($offset + 0)]) & 0x0F) << 12) &
+ ((ord($string[($offset + 1)]) & 0x3F) << 6) &
+ (ord($string[($offset + 2)]) & 0x3F);
$offset += 3;
- } elseif ((ord($string{$offset}) | 0x1F) == 0xDF) {
+ } elseif ((ord($string[$offset]) | 0x1F) == 0xDF) {
// 110bbbbb 10bbbbbb
- $charval = ((ord($string{($offset + 0)}) & 0x1F) << 6) &
- (ord($string{($offset + 1)}) & 0x3F);
+ $charval = ((ord($string[($offset + 0)]) & 0x1F) << 6) &
+ (ord($string[($offset + 1)]) & 0x3F);
$offset += 2;
- } elseif ((ord($string{$offset}) | 0x7F) == 0x7F) {
+ } elseif ((ord($string[$offset]) | 0x7F) == 0x7F) {
// 0bbbbbbb
- $charval = ord($string{$offset});
+ $charval = ord($string[$offset]);
$offset += 1;
} else {
// error? throw some kind of warning here?
@@ -779,8 +970,15 @@
return $newcharstring;
}
- // UTF-8 => UTF-16BE
- function iconv_fallback_utf8_utf16be($string, $bom=false) {
+ /**
+ * UTF-8 => UTF-16BE
+ *
+ * @param string $string
+ * @param bool $bom
+ *
+ * @return string
+ */
+ public static function iconv_fallback_utf8_utf16be($string, $bom=false) {
$newcharstring = '';
if ($bom) {
$newcharstring .= "\xFE\xFF";
@@ -788,27 +986,27 @@
$offset = 0;
$stringlength = strlen($string);
while ($offset < $stringlength) {
- if ((ord($string{$offset}) | 0x07) == 0xF7) {
+ if ((ord($string[$offset]) | 0x07) == 0xF7) {
// 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
- $charval = ((ord($string{($offset + 0)}) & 0x07) << 18) &
- ((ord($string{($offset + 1)}) & 0x3F) << 12) &
- ((ord($string{($offset + 2)}) & 0x3F) << 6) &
- (ord($string{($offset + 3)}) & 0x3F);
+ $charval = ((ord($string[($offset + 0)]) & 0x07) << 18) &
+ ((ord($string[($offset + 1)]) & 0x3F) << 12) &
+ ((ord($string[($offset + 2)]) & 0x3F) << 6) &
+ (ord($string[($offset + 3)]) & 0x3F);
$offset += 4;
- } elseif ((ord($string{$offset}) | 0x0F) == 0xEF) {
+ } elseif ((ord($string[$offset]) | 0x0F) == 0xEF) {
// 1110bbbb 10bbbbbb 10bbbbbb
- $charval = ((ord($string{($offset + 0)}) & 0x0F) << 12) &
- ((ord($string{($offset + 1)}) & 0x3F) << 6) &
- (ord($string{($offset + 2)}) & 0x3F);
+ $charval = ((ord($string[($offset + 0)]) & 0x0F) << 12) &
+ ((ord($string[($offset + 1)]) & 0x3F) << 6) &
+ (ord($string[($offset + 2)]) & 0x3F);
$offset += 3;
- } elseif ((ord($string{$offset}) | 0x1F) == 0xDF) {
+ } elseif ((ord($string[$offset]) | 0x1F) == 0xDF) {
// 110bbbbb 10bbbbbb
- $charval = ((ord($string{($offset + 0)}) & 0x1F) << 6) &
- (ord($string{($offset + 1)}) & 0x3F);
+ $charval = ((ord($string[($offset + 0)]) & 0x1F) << 6) &
+ (ord($string[($offset + 1)]) & 0x3F);
$offset += 2;
- } elseif ((ord($string{$offset}) | 0x7F) == 0x7F) {
+ } elseif ((ord($string[$offset]) | 0x7F) == 0x7F) {
// 0bbbbbbb
- $charval = ord($string{$offset});
+ $charval = ord($string[$offset]);
$offset += 1;
} else {
// error? throw some kind of warning here?
@@ -816,14 +1014,21 @@
$offset += 1;
}
if ($charval !== false) {
- $newcharstring .= (($charval < 65536) ? getid3_lib::BigEndian2String($charval, 2) : "\x00".'?');
+ $newcharstring .= (($charval < 65536) ? self::BigEndian2String($charval, 2) : "\x00".'?');
}
}
return $newcharstring;
}
- // UTF-8 => UTF-16LE
- function iconv_fallback_utf8_utf16le($string, $bom=false) {
+ /**
+ * UTF-8 => UTF-16LE
+ *
+ * @param string $string
+ * @param bool $bom
+ *
+ * @return string
+ */
+ public static function iconv_fallback_utf8_utf16le($string, $bom=false) {
$newcharstring = '';
if ($bom) {
$newcharstring .= "\xFF\xFE";
@@ -831,27 +1036,27 @@
$offset = 0;
$stringlength = strlen($string);
while ($offset < $stringlength) {
- if ((ord($string{$offset}) | 0x07) == 0xF7) {
+ if ((ord($string[$offset]) | 0x07) == 0xF7) {
// 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
- $charval = ((ord($string{($offset + 0)}) & 0x07) << 18) &
- ((ord($string{($offset + 1)}) & 0x3F) << 12) &
- ((ord($string{($offset + 2)}) & 0x3F) << 6) &
- (ord($string{($offset + 3)}) & 0x3F);
+ $charval = ((ord($string[($offset + 0)]) & 0x07) << 18) &
+ ((ord($string[($offset + 1)]) & 0x3F) << 12) &
+ ((ord($string[($offset + 2)]) & 0x3F) << 6) &
+ (ord($string[($offset + 3)]) & 0x3F);
$offset += 4;
- } elseif ((ord($string{$offset}) | 0x0F) == 0xEF) {
+ } elseif ((ord($string[$offset]) | 0x0F) == 0xEF) {
// 1110bbbb 10bbbbbb 10bbbbbb
- $charval = ((ord($string{($offset + 0)}) & 0x0F) << 12) &
- ((ord($string{($offset + 1)}) & 0x3F) << 6) &
- (ord($string{($offset + 2)}) & 0x3F);
+ $charval = ((ord($string[($offset + 0)]) & 0x0F) << 12) &
+ ((ord($string[($offset + 1)]) & 0x3F) << 6) &
+ (ord($string[($offset + 2)]) & 0x3F);
$offset += 3;
- } elseif ((ord($string{$offset}) | 0x1F) == 0xDF) {
+ } elseif ((ord($string[$offset]) | 0x1F) == 0xDF) {
// 110bbbbb 10bbbbbb
- $charval = ((ord($string{($offset + 0)}) & 0x1F) << 6) &
- (ord($string{($offset + 1)}) & 0x3F);
+ $charval = ((ord($string[($offset + 0)]) & 0x1F) << 6) &
+ (ord($string[($offset + 1)]) & 0x3F);
$offset += 2;
- } elseif ((ord($string{$offset}) | 0x7F) == 0x7F) {
+ } elseif ((ord($string[$offset]) | 0x7F) == 0x7F) {
// 0bbbbbbb
- $charval = ord($string{$offset});
+ $charval = ord($string[$offset]);
$offset += 1;
} else {
// error? maybe throw some warning here?
@@ -859,19 +1064,31 @@
$offset += 1;
}
if ($charval !== false) {
- $newcharstring .= (($charval < 65536) ? getid3_lib::LittleEndian2String($charval, 2) : '?'."\x00");
+ $newcharstring .= (($charval < 65536) ? self::LittleEndian2String($charval, 2) : '?'."\x00");
}
}
return $newcharstring;
}
- // UTF-8 => UTF-16LE (BOM)
- function iconv_fallback_utf8_utf16($string) {
- return getid3_lib::iconv_fallback_utf8_utf16le($string, true);
+ /**
+ * UTF-8 => UTF-16LE (BOM)
+ *
+ * @param string $string
+ *
+ * @return string
+ */
+ public static function iconv_fallback_utf8_utf16($string) {
+ return self::iconv_fallback_utf8_utf16le($string, true);
}
- // UTF-16BE => UTF-8
- function iconv_fallback_utf16be_utf8($string) {
+ /**
+ * UTF-16BE => UTF-8
+ *
+ * @param string $string
+ *
+ * @return string
+ */
+ public static function iconv_fallback_utf16be_utf8($string) {
if (substr($string, 0, 2) == "\xFE\xFF") {
// strip BOM
$string = substr($string, 2);
@@ -878,14 +1095,20 @@
}
$newcharstring = '';
for ($i = 0; $i < strlen($string); $i += 2) {
- $charval = getid3_lib::BigEndian2Int(substr($string, $i, 2));
- $newcharstring .= getid3_lib::iconv_fallback_int_utf8($charval);
+ $charval = self::BigEndian2Int(substr($string, $i, 2));
+ $newcharstring .= self::iconv_fallback_int_utf8($charval);
}
return $newcharstring;
}
- // UTF-16LE => UTF-8
- function iconv_fallback_utf16le_utf8($string) {
+ /**
+ * UTF-16LE => UTF-8
+ *
+ * @param string $string
+ *
+ * @return string
+ */
+ public static function iconv_fallback_utf16le_utf8($string) {
if (substr($string, 0, 2) == "\xFF\xFE") {
// strip BOM
$string = substr($string, 2);
@@ -892,14 +1115,20 @@
}
$newcharstring = '';
for ($i = 0; $i < strlen($string); $i += 2) {
- $charval = getid3_lib::LittleEndian2Int(substr($string, $i, 2));
- $newcharstring .= getid3_lib::iconv_fallback_int_utf8($charval);
+ $charval = self::LittleEndian2Int(substr($string, $i, 2));
+ $newcharstring .= self::iconv_fallback_int_utf8($charval);
}
return $newcharstring;
}
- // UTF-16BE => ISO-8859-1
- function iconv_fallback_utf16be_iso88591($string) {
+ /**
+ * UTF-16BE => ISO-8859-1
+ *
+ * @param string $string
+ *
+ * @return string
+ */
+ public static function iconv_fallback_utf16be_iso88591($string) {
if (substr($string, 0, 2) == "\xFE\xFF") {
// strip BOM
$string = substr($string, 2);
@@ -906,14 +1135,20 @@
}
$newcharstring = '';
for ($i = 0; $i < strlen($string); $i += 2) {
- $charval = getid3_lib::BigEndian2Int(substr($string, $i, 2));
+ $charval = self::BigEndian2Int(substr($string, $i, 2));
$newcharstring .= (($charval < 256) ? chr($charval) : '?');
}
return $newcharstring;
}
- // UTF-16LE => ISO-8859-1
- function iconv_fallback_utf16le_iso88591($string) {
+ /**
+ * UTF-16LE => ISO-8859-1
+ *
+ * @param string $string
+ *
+ * @return string
+ */
+ public static function iconv_fallback_utf16le_iso88591($string) {
if (substr($string, 0, 2) == "\xFF\xFE") {
// strip BOM
$string = substr($string, 2);
@@ -920,162 +1155,207 @@
}
$newcharstring = '';
for ($i = 0; $i < strlen($string); $i += 2) {
- $charval = getid3_lib::LittleEndian2Int(substr($string, $i, 2));
+ $charval = self::LittleEndian2Int(substr($string, $i, 2));
$newcharstring .= (($charval < 256) ? chr($charval) : '?');
}
return $newcharstring;
}
- // UTF-16 (BOM) => ISO-8859-1
- function iconv_fallback_utf16_iso88591($string) {
+ /**
+ * UTF-16 (BOM) => ISO-8859-1
+ *
+ * @param string $string
+ *
+ * @return string
+ */
+ public static function iconv_fallback_utf16_iso88591($string) {
$bom = substr($string, 0, 2);
if ($bom == "\xFE\xFF") {
- return getid3_lib::iconv_fallback_utf16be_iso88591(substr($string, 2));
+ return self::iconv_fallback_utf16be_iso88591(substr($string, 2));
} elseif ($bom == "\xFF\xFE") {
- return getid3_lib::iconv_fallback_utf16le_iso88591(substr($string, 2));
+ return self::iconv_fallback_utf16le_iso88591(substr($string, 2));
}
return $string;
}
- // UTF-16 (BOM) => UTF-8
- function iconv_fallback_utf16_utf8($string) {
+ /**
+ * UTF-16 (BOM) => UTF-8
+ *
+ * @param string $string
+ *
+ * @return string
+ */
+ public static function iconv_fallback_utf16_utf8($string) {
$bom = substr($string, 0, 2);
if ($bom == "\xFE\xFF") {
- return getid3_lib::iconv_fallback_utf16be_utf8(substr($string, 2));
+ return self::iconv_fallback_utf16be_utf8(substr($string, 2));
} elseif ($bom == "\xFF\xFE") {
- return getid3_lib::iconv_fallback_utf16le_utf8(substr($string, 2));
+ return self::iconv_fallback_utf16le_utf8(substr($string, 2));
}
return $string;
}
- function iconv_fallback($in_charset, $out_charset, $string) {
+ /**
+ * @param string $in_charset
+ * @param string $out_charset
+ * @param string $string
+ *
+ * @return string
+ * @throws Exception
+ */
+ public static function iconv_fallback($in_charset, $out_charset, $string) {
if ($in_charset == $out_charset) {
return $string;
}
- static $iconv_broken_or_unavailable = array();
- if (is_null(@$iconv_broken_or_unavailable[$in_charset.'_'.$out_charset])) {
- $GETID3_ICONV_TEST_STRING = ' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ';
+ // mb_convert_encoding() available
+ if (function_exists('mb_convert_encoding')) {
+ if ((strtoupper($in_charset) == 'UTF-16') && (substr($string, 0, 2) != "\xFE\xFF") && (substr($string, 0, 2) != "\xFF\xFE")) {
+ // if BOM missing, mb_convert_encoding will mishandle the conversion, assume UTF-16BE and prepend appropriate BOM
+ $string = "\xFF\xFE".$string;
+ }
+ if ((strtoupper($in_charset) == 'UTF-16') && (strtoupper($out_charset) == 'UTF-8')) {
+ if (($string == "\xFF\xFE") || ($string == "\xFE\xFF")) {
+ // if string consists of only BOM, mb_convert_encoding will return the BOM unmodified
+ return '';
+ }
+ }
+ if ($converted_string = @mb_convert_encoding($string, $out_charset, $in_charset)) {
+ switch ($out_charset) {
+ case 'ISO-8859-1':
+ $converted_string = rtrim($converted_string, "\x00");
+ break;
+ }
+ return $converted_string;
+ }
+ return $string;
- // Check iconv()
- if (function_exists('iconv')) {
- if (@iconv($in_charset, 'ISO-8859-1', @iconv('ISO-8859-1', $in_charset, $GETID3_ICONV_TEST_STRING)) == $GETID3_ICONV_TEST_STRING) {
- if (@iconv($out_charset, 'ISO-8859-1', @iconv('ISO-8859-1', $out_charset, $GETID3_ICONV_TEST_STRING)) == $GETID3_ICONV_TEST_STRING) {
- // everything works, use iconv()
- $iconv_broken_or_unavailable[$in_charset.'_'.$out_charset] = false;
- } else {
- // iconv() available, but broken. Use getID3()'s iconv_fallback() conversions instead
- // known issue in PHP v4.1.x
- $iconv_broken_or_unavailable[$in_charset.'_'.$out_charset] = true;
- }
- } else {
- // iconv() available, but broken. Use getID3()'s iconv_fallback() conversions instead
- // known issue in PHP v4.1.x
- $iconv_broken_or_unavailable[$in_charset.'_'.$out_charset] = true;
+ // iconv() available
+ } elseif (function_exists('iconv')) {
+ if ($converted_string = @iconv($in_charset, $out_charset.'//TRANSLIT', $string)) {
+ switch ($out_charset) {
+ case 'ISO-8859-1':
+ $converted_string = rtrim($converted_string, "\x00");
+ break;
}
- } else {
- // iconv() unavailable, use getID3()'s iconv_fallback() conversions
- $iconv_broken_or_unavailable[$in_charset.'_'.$out_charset] = true;
+ return $converted_string;
}
+
+ // iconv() may sometimes fail with "illegal character in input string" error message
+ // and return an empty string, but returning the unconverted string is more useful
+ return $string;
}
- if ($iconv_broken_or_unavailable[$in_charset.'_'.$out_charset]) {
- static $ConversionFunctionList = array();
- if (empty($ConversionFunctionList)) {
- $ConversionFunctionList['ISO-8859-1']['UTF-8'] = 'iconv_fallback_iso88591_utf8';
- $ConversionFunctionList['ISO-8859-1']['UTF-16'] = 'iconv_fallback_iso88591_utf16';
- $ConversionFunctionList['ISO-8859-1']['UTF-16BE'] = 'iconv_fallback_iso88591_utf16be';
- $ConversionFunctionList['ISO-8859-1']['UTF-16LE'] = 'iconv_fallback_iso88591_utf16le';
- $ConversionFunctionList['UTF-8']['ISO-8859-1'] = 'iconv_fallback_utf8_iso88591';
- $ConversionFunctionList['UTF-8']['UTF-16'] = 'iconv_fallback_utf8_utf16';
- $ConversionFunctionList['UTF-8']['UTF-16BE'] = 'iconv_fallback_utf8_utf16be';
- $ConversionFunctionList['UTF-8']['UTF-16LE'] = 'iconv_fallback_utf8_utf16le';
- $ConversionFunctionList['UTF-16']['ISO-8859-1'] = 'iconv_fallback_utf16_iso88591';
- $ConversionFunctionList['UTF-16']['UTF-8'] = 'iconv_fallback_utf16_utf8';
- $ConversionFunctionList['UTF-16LE']['ISO-8859-1'] = 'iconv_fallback_utf16le_iso88591';
- $ConversionFunctionList['UTF-16LE']['UTF-8'] = 'iconv_fallback_utf16le_utf8';
- $ConversionFunctionList['UTF-16BE']['ISO-8859-1'] = 'iconv_fallback_utf16be_iso88591';
- $ConversionFunctionList['UTF-16BE']['UTF-8'] = 'iconv_fallback_utf16be_utf8';
- }
- if (isset($ConversionFunctionList[strtoupper($in_charset)][strtoupper($out_charset)])) {
- $ConversionFunction = $ConversionFunctionList[strtoupper($in_charset)][strtoupper($out_charset)];
- return getid3_lib::$ConversionFunction($string);
- }
- die('PHP does not have iconv() support - cannot convert from '.$in_charset.' to '.$out_charset);
+
+ // neither mb_convert_encoding or iconv() is available
+ static $ConversionFunctionList = array();
+ if (empty($ConversionFunctionList)) {
+ $ConversionFunctionList['ISO-8859-1']['UTF-8'] = 'iconv_fallback_iso88591_utf8';
+ $ConversionFunctionList['ISO-8859-1']['UTF-16'] = 'iconv_fallback_iso88591_utf16';
+ $ConversionFunctionList['ISO-8859-1']['UTF-16BE'] = 'iconv_fallback_iso88591_utf16be';
+ $ConversionFunctionList['ISO-8859-1']['UTF-16LE'] = 'iconv_fallback_iso88591_utf16le';
+ $ConversionFunctionList['UTF-8']['ISO-8859-1'] = 'iconv_fallback_utf8_iso88591';
+ $ConversionFunctionList['UTF-8']['UTF-16'] = 'iconv_fallback_utf8_utf16';
+ $ConversionFunctionList['UTF-8']['UTF-16BE'] = 'iconv_fallback_utf8_utf16be';
+ $ConversionFunctionList['UTF-8']['UTF-16LE'] = 'iconv_fallback_utf8_utf16le';
+ $ConversionFunctionList['UTF-16']['ISO-8859-1'] = 'iconv_fallback_utf16_iso88591';
+ $ConversionFunctionList['UTF-16']['UTF-8'] = 'iconv_fallback_utf16_utf8';
+ $ConversionFunctionList['UTF-16LE']['ISO-8859-1'] = 'iconv_fallback_utf16le_iso88591';
+ $ConversionFunctionList['UTF-16LE']['UTF-8'] = 'iconv_fallback_utf16le_utf8';
+ $ConversionFunctionList['UTF-16BE']['ISO-8859-1'] = 'iconv_fallback_utf16be_iso88591';
+ $ConversionFunctionList['UTF-16BE']['UTF-8'] = 'iconv_fallback_utf16be_utf8';
}
+ if (isset($ConversionFunctionList[strtoupper($in_charset)][strtoupper($out_charset)])) {
+ $ConversionFunction = $ConversionFunctionList[strtoupper($in_charset)][strtoupper($out_charset)];
+ return self::$ConversionFunction($string);
+ }
+ throw new Exception('PHP does not has mb_convert_encoding() or iconv() support - cannot convert from '.$in_charset.' to '.$out_charset);
+ }
- if ($converted_string = @iconv($in_charset, $out_charset.'//TRANSLIT', $string)) {
- switch ($out_charset) {
- case 'ISO-8859-1':
- $converted_string = rtrim($converted_string, "\x00");
- break;
+ /**
+ * @param mixed $data
+ * @param string $charset
+ *
+ * @return mixed
+ */
+ public static function recursiveMultiByteCharString2HTML($data, $charset='ISO-8859-1') {
+ if (is_string($data)) {
+ return self::MultiByteCharString2HTML($data, $charset);
+ } elseif (is_array($data)) {
+ $return_data = array();
+ foreach ($data as $key => $value) {
+ $return_data[$key] = self::recursiveMultiByteCharString2HTML($value, $charset);
}
- return $converted_string;
+ return $return_data;
}
-
- // iconv() may sometimes fail with "illegal character in input string" error message
- // and return an empty string, but returning the unconverted string is more useful
- return $string;
+ // integer, float, objects, resources, etc
+ return $data;
}
-
- function MultiByteCharString2HTML($string, $charset='ISO-8859-1') {
+ /**
+ * @param string|int|float $string
+ * @param string $charset
+ *
+ * @return string
+ */
+ public static function MultiByteCharString2HTML($string, $charset='ISO-8859-1') {
+ $string = (string) $string; // in case trying to pass a numeric (float, int) string, would otherwise return an empty string
$HTMLstring = '';
- switch ($charset) {
- case 'ISO-8859-1':
- case 'ISO8859-1':
- case 'ISO-8859-15':
- case 'ISO8859-15':
- case 'cp866':
- case 'ibm866':
+ switch (strtolower($charset)) {
+ case '1251':
+ case '1252':
case '866':
+ case '932':
+ case '936':
+ case '950':
+ case 'big5':
+ case 'big5-hkscs':
case 'cp1251':
- case 'Windows-1251':
- case 'win-1251':
- case '1251':
case 'cp1252':
- case 'Windows-1252':
- case '1252':
- case 'KOI8-R':
+ case 'cp866':
+ case 'euc-jp':
+ case 'eucjp':
+ case 'gb2312':
+ case 'ibm866':
+ case 'iso-8859-1':
+ case 'iso-8859-15':
+ case 'iso8859-1':
+ case 'iso8859-15':
+ case 'koi8-r':
case 'koi8-ru':
case 'koi8r':
- case 'BIG5':
- case '950':
- case 'GB2312':
- case '936':
- case 'BIG5-HKSCS':
- case 'Shift_JIS':
- case 'SJIS':
- case '932':
- case 'EUC-JP':
- case 'EUCJP':
+ case 'shift_jis':
+ case 'sjis':
+ case 'win-1251':
+ case 'windows-1251':
+ case 'windows-1252':
$HTMLstring = htmlentities($string, ENT_COMPAT, $charset);
break;
- case 'UTF-8':
+ case 'utf-8':
$strlen = strlen($string);
for ($i = 0; $i < $strlen; $i++) {
- $char_ord_val = ord($string{$i});
+ $char_ord_val = ord($string[$i]);
$charval = 0;
if ($char_ord_val < 0x80) {
$charval = $char_ord_val;
- } elseif ((($char_ord_val & 0xF0) >> 4) == 0x0F) {
+ } elseif ((($char_ord_val & 0xF0) >> 4) == 0x0F && $i+3 < $strlen) {
$charval = (($char_ord_val & 0x07) << 18);
- $charval += ((ord($string{++$i}) & 0x3F) << 12);
- $charval += ((ord($string{++$i}) & 0x3F) << 6);
- $charval += (ord($string{++$i}) & 0x3F);
- } elseif ((($char_ord_val & 0xE0) >> 5) == 0x07) {
+ $charval += ((ord($string[++$i]) & 0x3F) << 12);
+ $charval += ((ord($string[++$i]) & 0x3F) << 6);
+ $charval += (ord($string[++$i]) & 0x3F);
+ } elseif ((($char_ord_val & 0xE0) >> 5) == 0x07 && $i+2 < $strlen) {
$charval = (($char_ord_val & 0x0F) << 12);
- $charval += ((ord($string{++$i}) & 0x3F) << 6);
- $charval += (ord($string{++$i}) & 0x3F);
- } elseif ((($char_ord_val & 0xC0) >> 6) == 0x03) {
+ $charval += ((ord($string[++$i]) & 0x3F) << 6);
+ $charval += (ord($string[++$i]) & 0x3F);
+ } elseif ((($char_ord_val & 0xC0) >> 6) == 0x03 && $i+1 < $strlen) {
$charval = (($char_ord_val & 0x1F) << 6);
- $charval += (ord($string{++$i}) & 0x3F);
+ $charval += (ord($string[++$i]) & 0x3F);
}
if (($charval >= 32) && ($charval <= 127)) {
- $HTMLstring .= chr($charval);
+ $HTMLstring .= htmlentities(chr($charval));
} else {
$HTMLstring .= '&#'.$charval.';';
}
@@ -1082,9 +1362,9 @@
}
break;
- case 'UTF-16LE':
+ case 'utf-16le':
for ($i = 0; $i < strlen($string); $i += 2) {
- $charval = getid3_lib::LittleEndian2Int(substr($string, $i, 2));
+ $charval = self::LittleEndian2Int(substr($string, $i, 2));
if (($charval >= 32) && ($charval <= 127)) {
$HTMLstring .= chr($charval);
} else {
@@ -1093,9 +1373,9 @@
}
break;
- case 'UTF-16BE':
+ case 'utf-16be':
for ($i = 0; $i < strlen($string); $i += 2) {
- $charval = getid3_lib::BigEndian2Int(substr($string, $i, 2));
+ $charval = self::BigEndian2Int(substr($string, $i, 2));
if (($charval >= 32) && ($charval <= 127)) {
$HTMLstring .= chr($charval);
} else {
@@ -1111,9 +1391,12 @@
return $HTMLstring;
}
-
-
- function RGADnameLookup($namecode) {
+ /**
+ * @param int $namecode
+ *
+ * @return string
+ */
+ public static function RGADnameLookup($namecode) {
static $RGADname = array();
if (empty($RGADname)) {
$RGADname[0] = 'not set';
@@ -1124,8 +1407,12 @@
return (isset($RGADname[$namecode]) ? $RGADname[$namecode] : '');
}
-
- function RGADoriginatorLookup($originatorcode) {
+ /**
+ * @param int $originatorcode
+ *
+ * @return string
+ */
+ public static function RGADoriginatorLookup($originatorcode) {
static $RGADoriginator = array();
if (empty($RGADoriginator)) {
$RGADoriginator[0] = 'unspecified';
@@ -1137,17 +1424,28 @@
return (isset($RGADoriginator[$originatorcode]) ? $RGADoriginator[$originatorcode] : '');
}
-
- function RGADadjustmentLookup($rawadjustment, $signbit) {
- $adjustment = $rawadjustment / 10;
+ /**
+ * @param int $rawadjustment
+ * @param int $signbit
+ *
+ * @return float
+ */
+ public static function RGADadjustmentLookup($rawadjustment, $signbit) {
+ $adjustment = (float) $rawadjustment / 10;
if ($signbit == 1) {
$adjustment *= -1;
}
- return (float) $adjustment;
+ return $adjustment;
}
-
- function RGADgainString($namecode, $originatorcode, $replaygain) {
+ /**
+ * @param int $namecode
+ * @param int $originatorcode
+ * @param int $replaygain
+ *
+ * @return string
+ */
+ public static function RGADgainString($namecode, $originatorcode, $replaygain) {
if ($replaygain < 0) {
$signbit = '1';
} else {
@@ -1162,18 +1460,57 @@
return $gainstring;
}
- function RGADamplitude2dB($amplitude) {
+ /**
+ * @param float $amplitude
+ *
+ * @return float
+ */
+ public static function RGADamplitude2dB($amplitude) {
return 20 * log10($amplitude);
}
+ /**
+ * @param string $imgData
+ * @param array $imageinfo
+ *
+ * @return array|false
+ */
+ public static function GetDataImageSize($imgData, &$imageinfo=array()) {
+ if (PHP_VERSION_ID >= 50400) {
+ $GetDataImageSize = @getimagesizefromstring($imgData, $imageinfo);
+ if ($GetDataImageSize === false || !isset($GetDataImageSize[0], $GetDataImageSize[1])) {
+ return false;
+ }
+ $GetDataImageSize['height'] = $GetDataImageSize[0];
+ $GetDataImageSize['width'] = $GetDataImageSize[1];
+ return $GetDataImageSize;
+ }
+ static $tempdir = '';
+ if (empty($tempdir)) {
+ if (function_exists('sys_get_temp_dir')) {
+ $tempdir = sys_get_temp_dir(); // https://github.com/JamesHeinrich/getID3/issues/52
+ }
- function GetDataImageSize($imgData) {
+ // yes this is ugly, feel free to suggest a better way
+ if (include_once(dirname(__FILE__).'/getid3.php')) {
+ $getid3_temp = new getID3();
+ if ($getid3_temp_tempdir = $getid3_temp->tempdir) {
+ $tempdir = $getid3_temp_tempdir;
+ }
+ unset($getid3_temp, $getid3_temp_tempdir);
+ }
+ }
$GetDataImageSize = false;
- if ($tempfilename = tempnam('*', 'getID3')) {
- if ($tmp = @fopen($tempfilename, 'wb')) {
+ if ($tempfilename = tempnam($tempdir, 'gI3')) {
+ if (is_writable($tempfilename) && is_file($tempfilename) && ($tmp = fopen($tempfilename, 'wb'))) {
fwrite($tmp, $imgData);
fclose($tmp);
- $GetDataImageSize = @GetImageSize($tempfilename);
+ $GetDataImageSize = @getimagesize($tempfilename, $imageinfo);
+ if (($GetDataImageSize === false) || !isset($GetDataImageSize[0]) || !isset($GetDataImageSize[1])) {
+ return false;
+ }
+ $GetDataImageSize['height'] = $GetDataImageSize[0];
+ $GetDataImageSize['width'] = $GetDataImageSize[1];
}
unlink($tempfilename);
}
@@ -1180,31 +1517,32 @@
return $GetDataImageSize;
}
- function ImageTypesLookup($imagetypeid) {
- static $ImageTypesLookup = array();
- if (empty($ImageTypesLookup)) {
- $ImageTypesLookup[1] = 'gif';
- $ImageTypesLookup[2] = 'jpeg';
- $ImageTypesLookup[3] = 'png';
- $ImageTypesLookup[4] = 'swf';
- $ImageTypesLookup[5] = 'psd';
- $ImageTypesLookup[6] = 'bmp';
- $ImageTypesLookup[7] = 'tiff (little-endian)';
- $ImageTypesLookup[8] = 'tiff (big-endian)';
- $ImageTypesLookup[9] = 'jpc';
- $ImageTypesLookup[10] = 'jp2';
- $ImageTypesLookup[11] = 'jpx';
- $ImageTypesLookup[12] = 'jb2';
- $ImageTypesLookup[13] = 'swc';
- $ImageTypesLookup[14] = 'iff';
- }
- return (isset($ImageTypesLookup[$imagetypeid]) ? $ImageTypesLookup[$imagetypeid] : '');
+ /**
+ * @param string $mime_type
+ *
+ * @return string
+ */
+ public static function ImageExtFromMime($mime_type) {
+ // temporary way, works OK for now, but should be reworked in the future
+ return str_replace(array('image/', 'x-', 'jpeg'), array('', '', 'jpg'), $mime_type);
}
- function CopyTagsToComments(&$ThisFileInfo) {
-
- // Copy all entries from ['tags'] into common ['comments']
+ /**
+ * @param array $ThisFileInfo
+ * @param bool $option_tags_html default true (just as in the main getID3 class)
+ *
+ * @return bool
+ */
+ public static function CopyTagsToComments(&$ThisFileInfo, $option_tags_html=true) {
+ // Copy all entries from ['tags'] into common ['comments']
if (!empty($ThisFileInfo['tags'])) {
+ if (isset($ThisFileInfo['tags']['id3v1'])) {
+ // bubble ID3v1 to the end, if present to aid in detecting bad ID3v1 encodings
+ $ID3v1 = $ThisFileInfo['tags']['id3v1'];
+ unset($ThisFileInfo['tags']['id3v1']);
+ $ThisFileInfo['tags']['id3v1'] = $ID3v1;
+ unset($ID3v1);
+ }
foreach ($ThisFileInfo['tags'] as $tagtype => $tagarray) {
foreach ($tagarray as $tagname => $tagdata) {
foreach ($tagdata as $key => $value) {
@@ -1222,44 +1560,96 @@
// new value is identical but shorter-than (or equal-length to) one already in comments - skip
break 2;
}
+
+ if (function_exists('mb_convert_encoding')) {
+ if (trim($value) == trim(substr(mb_convert_encoding($existingvalue, $ThisFileInfo['id3v1']['encoding'], $ThisFileInfo['encoding']), 0, 30))) {
+ // value stored in ID3v1 appears to be probably the multibyte value transliterated (badly) into ISO-8859-1 in ID3v1.
+ // As an example, Foobar2000 will do this if you tag a file with Chinese or Arabic or Cyrillic or something that doesn't fit into ISO-8859-1 the ID3v1 will consist of mostly "?" characters, one per multibyte unrepresentable character
+ break 2;
+ }
+ }
}
- } else {
+ } elseif (!is_array($value)) {
$newvaluelength = strlen(trim($value));
foreach ($ThisFileInfo['comments'][$tagname] as $existingkey => $existingvalue) {
$oldvaluelength = strlen(trim($existingvalue));
- if (($newvaluelength > $oldvaluelength) && (substr(trim($value), 0, strlen($existingvalue)) == $existingvalue)) {
+ if ((strlen($existingvalue) > 10) && ($newvaluelength > $oldvaluelength) && (substr(trim($value), 0, strlen($existingvalue)) == $existingvalue)) {
$ThisFileInfo['comments'][$tagname][$existingkey] = trim($value);
- break 2;
+ break;
}
}
}
- if (empty($ThisFileInfo['comments'][$tagname]) || !in_array(trim($value), $ThisFileInfo['comments'][$tagname])) {
- $ThisFileInfo['comments'][$tagname][] = trim($value);
+ if (is_array($value) || empty($ThisFileInfo['comments'][$tagname]) || !in_array(trim($value), $ThisFileInfo['comments'][$tagname])) {
+ $value = (is_string($value) ? trim($value) : $value);
+ if (!is_int($key) && !ctype_digit($key)) {
+ $ThisFileInfo['comments'][$tagname][$key] = $value;
+ } else {
+ if (!isset($ThisFileInfo['comments'][$tagname])) {
+ $ThisFileInfo['comments'][$tagname] = array($value);
+ } else {
+ $ThisFileInfo['comments'][$tagname][] = $value;
+ }
+ }
}
}
}
}
}
-
- // Copy to ['comments_html']
- foreach ($ThisFileInfo['comments'] as $field => $values) {
- foreach ($values as $index => $value) {
- $ThisFileInfo['comments_html'][$field][$index] = str_replace('�', '', getid3_lib::MultiByteCharString2HTML($value, $ThisFileInfo['encoding']));
- }
- }
+
+ // attempt to standardize spelling of returned keys
+ $StandardizeFieldNames = array(
+ 'tracknumber' => 'track_number',
+ 'track' => 'track_number',
+ );
+ foreach ($StandardizeFieldNames as $badkey => $goodkey) {
+ if (array_key_exists($badkey, $ThisFileInfo['comments']) && !array_key_exists($goodkey, $ThisFileInfo['comments'])) {
+ $ThisFileInfo['comments'][$goodkey] = $ThisFileInfo['comments'][$badkey];
+ unset($ThisFileInfo['comments'][$badkey]);
+ }
+ }
+
+ if ($option_tags_html) {
+ // Copy ['comments'] to ['comments_html']
+ if (!empty($ThisFileInfo['comments'])) {
+ foreach ($ThisFileInfo['comments'] as $field => $values) {
+ if ($field == 'picture') {
+ // pictures can take up a lot of space, and we don't need multiple copies of them
+ // let there be a single copy in [comments][picture], and not elsewhere
+ continue;
+ }
+ foreach ($values as $index => $value) {
+ if (is_array($value)) {
+ $ThisFileInfo['comments_html'][$field][$index] = $value;
+ } else {
+ $ThisFileInfo['comments_html'][$field][$index] = str_replace('�', '', self::MultiByteCharString2HTML($value, $ThisFileInfo['encoding']));
+ }
+ }
+ }
+ }
+ }
+
}
+ return true;
}
+ /**
+ * @param string $key
+ * @param int $begin
+ * @param int $end
+ * @param string $file
+ * @param string $name
+ *
+ * @return string
+ */
+ public static function EmbeddedLookup($key, $begin, $end, $file, $name) {
- function EmbeddedLookup($key, $begin, $end, $file, $name) {
-
// Cached
static $cache;
if (isset($cache[$file][$name])) {
- return @$cache[$file][$name][$key];
+ return (isset($cache[$file][$name][$key]) ? $cache[$file][$name][$key] : '');
}
// Init
@@ -1289,20 +1679,30 @@
// METHOD B: cache all keys in this lookup - more memory but faster on next lookup of not-previously-looked-up key
//$cache[$file][$name][substr($line, 0, $keylength)] = trim(substr($line, $keylength + 1));
- @list($ThisKey, $ThisValue) = explode("\t", $line, 2);
+ $explodedLine = explode("\t", $line, 2);
+ $ThisKey = (isset($explodedLine[0]) ? $explodedLine[0] : '');
+ $ThisValue = (isset($explodedLine[1]) ? $explodedLine[1] : '');
$cache[$file][$name][$ThisKey] = trim($ThisValue);
}
// Close and return
fclose($fp);
- return @$cache[$file][$name][$key];
+ return (isset($cache[$file][$name][$key]) ? $cache[$file][$name][$key] : '');
}
- function IncludeDependency($filename, $sourcefile, $DieOnFailure=false) {
+ /**
+ * @param string $filename
+ * @param string $sourcefile
+ * @param bool $DieOnFailure
+ *
+ * @return bool
+ * @throws Exception
+ */
+ public static function IncludeDependency($filename, $sourcefile, $DieOnFailure=false) {
global $GETID3_ERRORARRAY;
if (file_exists($filename)) {
- if (@include_once($filename)) {
+ if (include_once($filename)) {
return true;
} else {
$diemessage = basename($sourcefile).' depends on '.$filename.', which has errors';
@@ -1311,7 +1711,7 @@
$diemessage = basename($sourcefile).' depends on '.$filename.', which is missing';
}
if ($DieOnFailure) {
- die($diemessage);
+ throw new Exception($diemessage);
} else {
$GETID3_ERRORARRAY[] = $diemessage;
}
@@ -1318,6 +1718,85 @@
return false;
}
+ /**
+ * @param string $string
+ *
+ * @return string
+ */
+ public static function trimNullByte($string) {
+ return trim($string, "\x00");
+ }
+
+ /**
+ * @param string $path
+ *
+ * @return float|bool
+ */
+ public static function getFileSizeSyscall($path) {
+ $filesize = false;
+
+ if (GETID3_OS_ISWINDOWS) {
+ if (class_exists('COM')) { // From PHP 5.3.15 and 5.4.5, COM and DOTNET is no longer built into the php core.you have to add COM support in php.ini:
+ $filesystem = new COM('Scripting.FileSystemObject');
+ $file = $filesystem->GetFile($path);
+ $filesize = $file->Size();
+ unset($filesystem, $file);
+ } else {
+ $commandline = 'for %I in ('.escapeshellarg($path).') do @echo %~zI';
+ }
+ } else {
+ $commandline = 'ls -l '.escapeshellarg($path).' | awk \'{print $5}\'';
+ }
+ if (isset($commandline)) {
+ $output = trim(`$commandline`);
+ if (ctype_digit($output)) {
+ $filesize = (float) $output;
+ }
+ }
+ return $filesize;
+ }
+
+ /**
+ * @param string $filename
+ *
+ * @return string|false
+ */
+ public static function truepath($filename) {
+ // 2017-11-08: this could use some improvement, patches welcome
+ if (preg_match('#^(\\\\\\\\|//)[a-z0-9]#i', $filename, $matches)) {
+ // PHP's built-in realpath function does not work on UNC Windows shares
+ $goodpath = array();
+ foreach (explode('/', str_replace('\\', '/', $filename)) as $part) {
+ if ($part == '.') {
+ continue;
+ }
+ if ($part == '..') {
+ if (count($goodpath)) {
+ array_pop($goodpath);
+ } else {
+ // cannot step above this level, already at top level
+ return false;
+ }
+ } else {
+ $goodpath[] = $part;
+ }
+ }
+ return implode(DIRECTORY_SEPARATOR, $goodpath);
+ }
+ return realpath($filename);
+ }
+
+ /**
+ * Workaround for Bug #37268 (https://bugs.php.net/bug.php?id=37268)
+ *
+ * @param string $path A path.
+ * @param string $suffix If the name component ends in suffix this will also be cut off.
+ *
+ * @return string
+ */
+ public static function mb_basename($path, $suffix = null) {
+ $splited = preg_split('#/#', rtrim($path, '/ '));
+ return substr(basename('X'.$splited[count($splited) - 1], $suffix), 1);
+ }
+
}
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/getid3.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/getid3.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/getid3.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,161 +1,406 @@
<?php
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
-/////////////////////////////////////////////////////////////////
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
// //
// Please see readme.txt for more information //
// ///
/////////////////////////////////////////////////////////////////
-// Defines
-define('GETID3_VERSION', '1.7.7');
-define('GETID3_FREAD_BUFFER_SIZE', 16384); // read buffer size in bytes
+// define a constant rather than looking up every time it is needed
+if (!defined('GETID3_OS_ISWINDOWS')) {
+ define('GETID3_OS_ISWINDOWS', (stripos(PHP_OS, 'WIN') === 0));
+}
+// Get base path of getID3() - ONCE
+if (!defined('GETID3_INCLUDEPATH')) {
+ define('GETID3_INCLUDEPATH', dirname(__FILE__).DIRECTORY_SEPARATOR);
+}
+// Workaround Bug #39923 (https://bugs.php.net/bug.php?id=39923)
+if (!defined('IMG_JPG') && defined('IMAGETYPE_JPEG')) {
+ define('IMG_JPG', IMAGETYPE_JPEG);
+}
+if (!defined('ENT_SUBSTITUTE')) { // PHP5.3 adds ENT_IGNORE, PHP5.4 adds ENT_SUBSTITUTE
+ define('ENT_SUBSTITUTE', (defined('ENT_IGNORE') ? ENT_IGNORE : 8));
+}
+/*
+https://www.getid3.org/phpBB3/viewtopic.php?t=2114
+If you are running into a the problem where filenames with special characters are being handled
+incorrectly by external helper programs (e.g. metaflac), notably with the special characters removed,
+and you are passing in the filename in UTF8 (typically via a HTML form), try uncommenting this line:
+*/
+//setlocale(LC_CTYPE, 'en_US.UTF-8');
+// attempt to define temp dir as something flexible but reliable
+$temp_dir = ini_get('upload_tmp_dir');
+if ($temp_dir && (!is_dir($temp_dir) || !is_readable($temp_dir))) {
+ $temp_dir = '';
+}
+if (!$temp_dir && function_exists('sys_get_temp_dir')) { // sys_get_temp_dir added in PHP v5.2.1
+ // sys_get_temp_dir() may give inaccessible temp dir, e.g. with open_basedir on virtual hosts
+ $temp_dir = sys_get_temp_dir();
+}
+$temp_dir = @realpath($temp_dir); // see https://github.com/JamesHeinrich/getID3/pull/10
+$open_basedir = ini_get('open_basedir');
+if ($open_basedir) {
+ // e.g. "/var/www/vhosts/getid3.org/httpdocs/:/tmp/"
+ $temp_dir = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $temp_dir);
+ $open_basedir = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $open_basedir);
+ if (substr($temp_dir, -1, 1) != DIRECTORY_SEPARATOR) {
+ $temp_dir .= DIRECTORY_SEPARATOR;
+ }
+ $found_valid_tempdir = false;
+ $open_basedirs = explode(PATH_SEPARATOR, $open_basedir);
+ foreach ($open_basedirs as $basedir) {
+ if (substr($basedir, -1, 1) != DIRECTORY_SEPARATOR) {
+ $basedir .= DIRECTORY_SEPARATOR;
+ }
+ if (preg_match('#^'.preg_quote($basedir).'#', $temp_dir)) {
+ $found_valid_tempdir = true;
+ break;
+ }
+ }
+ if (!$found_valid_tempdir) {
+ $temp_dir = '';
+ }
+ unset($open_basedirs, $found_valid_tempdir, $basedir);
+}
+if (!$temp_dir) {
+ $temp_dir = '*'; // invalid directory name should force tempnam() to use system default temp dir
+}
+// $temp_dir = '/something/else/'; // feel free to override temp dir here if it works better for your system
+if (!defined('GETID3_TEMP_DIR')) {
+ define('GETID3_TEMP_DIR', $temp_dir);
+}
+unset($open_basedir, $temp_dir);
+// End: Defines
+
+
class getID3
{
- // public: Settings
- var $encoding = 'ISO-8859-1'; // CASE SENSITIVE! - i.e. (must be supported by iconv())
- // Examples: ISO-8859-1 UTF-8 UTF-16 UTF-16BE
+ /*
+ * Settings
+ */
- var $encoding_id3v1 = 'ISO-8859-1'; // Should always be 'ISO-8859-1', but some tags may be written in other encodings such as 'EUC-CN'
+ /**
+ * CASE SENSITIVE! - i.e. (must be supported by iconv()). Examples: ISO-8859-1 UTF-8 UTF-16 UTF-16BE
+ *
+ * @var string
+ */
+ public $encoding = 'UTF-8';
- var $tempdir = '*'; // default '*' should use system temp dir
+ /**
+ * Should always be 'ISO-8859-1', but some tags may be written in other encodings such as 'EUC-CN' or 'CP1252'
+ *
+ * @var string
+ */
+ public $encoding_id3v1 = 'ISO-8859-1';
- // public: Optional tag checks - disable for speed.
- var $option_tag_id3v1 = true; // Read and process ID3v1 tags
- var $option_tag_id3v2 = true; // Read and process ID3v2 tags
- var $option_tag_lyrics3 = true; // Read and process Lyrics3 tags
- var $option_tag_apetag = true; // Read and process APE tags
- var $option_tags_process = true; // Copy tags to root key 'tags' and encode to $this->encoding
- var $option_tags_html = true; // Copy tags to root key 'tags_html' properly translated from various encodings to HTML entities
+ /**
+ * ID3v1 should always be 'ISO-8859-1', but some tags may be written in other encodings such as 'Windows-1251' or 'KOI8-R'. If true attempt to detect these encodings, but may return incorrect values for some tags actually in ISO-8859-1 encoding
+ *
+ * @var bool
+ */
+ public $encoding_id3v1_autodetect = false;
- // public: Optional tag/comment calucations
- var $option_extra_info = true; // Calculate additional info such as bitrate, channelmode etc
+ /*
+ * Optional tag checks - disable for speed.
+ */
- // public: Optional calculations
- var $option_md5_data = false; // Get MD5 sum of data part - slow
- var $option_md5_data_source = false; // Use MD5 of source file if availble - only FLAC and OptimFROG
- var $option_sha1_data = false; // Get SHA1 sum of data part - slow
- var $option_max_2gb_check = true; // Check whether file is larger than 2 Gb and thus not supported by PHP
+ /**
+ * Read and process ID3v1 tags
+ *
+ * @var bool
+ */
+ public $option_tag_id3v1 = true;
- // private
- var $filename;
+ /**
+ * Read and process ID3v2 tags
+ *
+ * @var bool
+ */
+ public $option_tag_id3v2 = true;
+ /**
+ * Read and process Lyrics3 tags
+ *
+ * @var bool
+ */
+ public $option_tag_lyrics3 = true;
- // public: constructor
- function getID3()
- {
+ /**
+ * Read and process APE tags
+ *
+ * @var bool
+ */
+ public $option_tag_apetag = true;
- $this->startup_error = '';
- $this->startup_warning = '';
+ /**
+ * Copy tags to root key 'tags' and encode to $this->encoding
+ *
+ * @var bool
+ */
+ public $option_tags_process = true;
- // Check for PHP version >= 4.1.0
- if (phpversion() < '4.1.0') {
- $this->startup_error .= 'getID3() requires PHP v4.1.0 or higher - you are running v'.phpversion();
+ /**
+ * Copy tags to root key 'tags_html' properly translated from various encodings to HTML entities
+ *
+ * @var bool
+ */
+ public $option_tags_html = true;
+
+ /*
+ * Optional tag/comment calculations
+ */
+
+ /**
+ * Calculate additional info such as bitrate, channelmode etc
+ *
+ * @var bool
+ */
+ public $option_extra_info = true;
+
+ /*
+ * Optional handling of embedded attachments (e.g. images)
+ */
+
+ /**
+ * Defaults to true (ATTACHMENTS_INLINE) for backward compatibility
+ *
+ * @var bool|string
+ */
+ public $option_save_attachments = true;
+
+ /*
+ * Optional calculations
+ */
+
+ /**
+ * Get MD5 sum of data part - slow
+ *
+ * @var bool
+ */
+ public $option_md5_data = false;
+
+ /**
+ * Use MD5 of source file if availble - only FLAC and OptimFROG
+ *
+ * @var bool
+ */
+ public $option_md5_data_source = false;
+
+ /**
+ * Get SHA1 sum of data part - slow
+ *
+ * @var bool
+ */
+ public $option_sha1_data = false;
+
+ /**
+ * Check whether file is larger than 2GB and thus not supported by 32-bit PHP (null: auto-detect based on
+ * PHP_INT_MAX)
+ *
+ * @var bool|null
+ */
+ public $option_max_2gb_check;
+
+ /**
+ * Read buffer size in bytes
+ *
+ * @var int
+ */
+ public $option_fread_buffer_size = 32768;
+
+ // Public variables
+
+ /**
+ * Filename of file being analysed.
+ *
+ * @var string
+ */
+ public $filename;
+
+ /**
+ * Filepointer to file being analysed.
+ *
+ * @var resource
+ */
+ public $fp;
+
+ /**
+ * Result array.
+ *
+ * @var array
+ */
+ public $info;
+
+ /**
+ * @var string
+ */
+ public $tempdir = GETID3_TEMP_DIR;
+
+ /**
+ * @var int
+ */
+ public $memory_limit = 0;
+
+ /**
+ * @var string
+ */
+ protected $startup_error = '';
+
+ /**
+ * @var string
+ */
+ protected $startup_warning = '';
+
+ const VERSION = '1.9.20-202006061653';
+ const FREAD_BUFFER_SIZE = 32768;
+
+ const ATTACHMENTS_NONE = false;
+ const ATTACHMENTS_INLINE = true;
+
+ public function __construct() {
+
+ // Check for PHP version
+ $required_php_version = '5.3.0';
+ if (version_compare(PHP_VERSION, $required_php_version, '<')) {
+ $this->startup_error .= 'getID3() requires PHP v'.$required_php_version.' or higher - you are running v'.PHP_VERSION."\n";
+ return;
}
// Check memory
- $memory_limit = ini_get('memory_limit');
- if (eregi('([0-9]+)M', $memory_limit, $matches)) {
+ $memoryLimit = ini_get('memory_limit');
+ if (preg_match('#([0-9]+) ?M#i', $memoryLimit, $matches)) {
// could be stored as "16M" rather than 16777216 for example
- $memory_limit = $matches[1] * 1048576;
+ $memoryLimit = $matches[1] * 1048576;
+ } elseif (preg_match('#([0-9]+) ?G#i', $memoryLimit, $matches)) { // The 'G' modifier is available since PHP 5.1.0
+ // could be stored as "2G" rather than 2147483648 for example
+ $memoryLimit = $matches[1] * 1073741824;
}
- if ($memory_limit <= 0) {
+ $this->memory_limit = $memoryLimit;
+
+ if ($this->memory_limit <= 0) {
// memory limits probably disabled
- } elseif ($memory_limit <= 3145728) {
- $this->startup_error .= 'PHP has less than 3MB available memory and will very likely run out. Increase memory_limit in php.ini';
- } elseif ($memory_limit <= 12582912) {
- $this->startup_warning .= 'PHP has less than 12MB available memory and might run out if all modules are loaded. Increase memory_limit in php.ini';
+ } elseif ($this->memory_limit <= 4194304) {
+ $this->startup_error .= 'PHP has less than 4MB available memory and will very likely run out. Increase memory_limit in php.ini'."\n";
+ } elseif ($this->memory_limit <= 12582912) {
+ $this->startup_warning .= 'PHP has less than 12MB available memory and might run out if all modules are loaded. Increase memory_limit in php.ini'."\n";
}
// Check safe_mode off
- if ((bool) ini_get('safe_mode')) {
- $this->warning('WARNING: Safe mode is on, shorten support disabled, md5data/sha1data for ogg vorbis disabled, ogg vorbos/flac tag writing disabled.');
+ if (preg_match('#(1|ON)#i', ini_get('safe_mode'))) {
+ $this->warning('WARNING: Safe mode is on, shorten support disabled, md5data/sha1data for ogg vorbis disabled, ogg vorbos/flac tag writing disabled.');
}
-
- // define a constant rather than looking up every time it is needed
- if (!defined('GETID3_OS_ISWINDOWS')) {
- if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
- define('GETID3_OS_ISWINDOWS', true);
- } else {
- define('GETID3_OS_ISWINDOWS', false);
- }
+ if (($mbstring_func_overload = (int) ini_get('mbstring.func_overload')) && ($mbstring_func_overload & 0x02)) {
+ // http://php.net/manual/en/mbstring.overload.php
+ // "mbstring.func_overload in php.ini is a positive value that represents a combination of bitmasks specifying the categories of functions to be overloaded. It should be set to 1 to overload the mail() function. 2 for string functions, 4 for regular expression functions"
+ // getID3 cannot run when string functions are overloaded. It doesn't matter if mail() or ereg* functions are overloaded since getID3 does not use those.
+ $this->startup_error .= 'WARNING: php.ini contains "mbstring.func_overload = '.ini_get('mbstring.func_overload').'", getID3 cannot run with this setting (bitmask 2 (string functions) cannot be set). Recommended to disable entirely.'."\n";
}
- // Get base path of getID3() - ONCE
- if (!defined('GETID3_INCLUDEPATH')) {
- foreach (get_included_files() as $key => $val) {
- if (basename($val) == 'getid3.php') {
- define('GETID3_INCLUDEPATH', dirname($val).DIRECTORY_SEPARATOR);
- break;
+ // check for magic quotes in PHP < 7.4.0 (when these functions became deprecated)
+ if (version_compare(PHP_VERSION, '7.4.0', '<')) {
+ // Check for magic_quotes_runtime
+ if (function_exists('get_magic_quotes_runtime')) {
+ if (get_magic_quotes_runtime()) {
+ $this->startup_error .= 'magic_quotes_runtime must be disabled before running getID3(). Surround getid3 block by set_magic_quotes_runtime(0) and set_magic_quotes_runtime(1).'."\n";
}
}
+ // Check for magic_quotes_gpc
+ if (function_exists('get_magic_quotes_gpc')) {
+ if (get_magic_quotes_gpc()) {
+ $this->startup_error .= 'magic_quotes_gpc must be disabled before running getID3(). Surround getid3 block by set_magic_quotes_gpc(0) and set_magic_quotes_gpc(1).'."\n";
+ }
+ }
}
// Load support library
if (!include_once(GETID3_INCLUDEPATH.'getid3.lib.php')) {
- $this->startup_error .= 'getid3.lib.php is missing or corrupt';
+ $this->startup_error .= 'getid3.lib.php is missing or corrupt'."\n";
}
+ if ($this->option_max_2gb_check === null) {
+ $this->option_max_2gb_check = (PHP_INT_MAX <= 2147483647);
+ }
+
// Needed for Windows only:
// Define locations of helper applications for Shorten, VorbisComment, MetaFLAC
- // as well as other helper functions such as head, tail, md5sum, etc
- // IMPORTANT: This path cannot have spaces in it. If neccesary, use the 8dot3 equivalent
- // ie for "C:/Program Files/Apache/" put "C:/PROGRA~1/APACHE/"
+ // as well as other helper functions such as head, etc
+ // This path cannot contain spaces, but the below code will attempt to get the
+ // 8.3-equivalent path automatically
// IMPORTANT: This path must include the trailing slash
if (GETID3_OS_ISWINDOWS && !defined('GETID3_HELPERAPPSDIR')) {
+
$helperappsdir = GETID3_INCLUDEPATH.'..'.DIRECTORY_SEPARATOR.'helperapps'; // must not have any space in this path
if (!is_dir($helperappsdir)) {
-
- $this->startup_error .= '"'.$helperappsdir.'" cannot be defined as GETID3_HELPERAPPSDIR because it does not exist';
-
+ $this->startup_warning .= '"'.$helperappsdir.'" cannot be defined as GETID3_HELPERAPPSDIR because it does not exist'."\n";
} elseif (strpos(realpath($helperappsdir), ' ') !== false) {
-
$DirPieces = explode(DIRECTORY_SEPARATOR, realpath($helperappsdir));
- $DirPieces8 = $DirPieces;
-
- $CLIdir = $DirPieces[0].' && cd \\';
- for ($i = 1; $i < count($DirPieces); $i++) {
- if (strpos($DirPieces[$i], ' ') === false) {
- $CLIdir .= ' && cd '.$DirPieces[$i];
- } else {
- ob_start();
- system($CLIdir.' && dir /ad /x');
- $subdirsraw = explode("\n", ob_get_contents());
- ob_end_clean();
- foreach ($subdirsraw as $dummy => $line) {
- if (eregi('^[0-9]{4}/[0-9]{2}/[0-9]{2} [0-9]{2}:[0-9]{2} [AP]M <DIR> ([^ ]{8}) '.preg_quote($DirPieces[$i]).'$', trim($line), $matches)) {
- $CLIdir .= ' && cd '.$matches[1];
- break;
- }
- }
- $DirPieces8[$i] = $matches[1];
- }
+ $path_so_far = array();
+ foreach ($DirPieces as $key => $value) {
+ if (strpos($value, ' ') !== false) {
+ if (!empty($path_so_far)) {
+ $commandline = 'dir /x '.escapeshellarg(implode(DIRECTORY_SEPARATOR, $path_so_far));
+ $dir_listing = `$commandline`;
+ $lines = explode("\n", $dir_listing);
+ foreach ($lines as $line) {
+ $line = trim($line);
+ if (preg_match('#^([0-9/]{10}) +([0-9:]{4,5}( [AP]M)?) +(<DIR>|[0-9,]+) +([^ ]{0,11}) +(.+)$#', $line, $matches)) {
+ list($dummy, $date, $time, $ampm, $filesize, $shortname, $filename) = $matches;
+ if ((strtoupper($filesize) == '<DIR>') && (strtolower($filename) == strtolower($value))) {
+ $value = $shortname;
+ }
+ }
+ }
+ } else {
+ $this->startup_warning .= 'GETID3_HELPERAPPSDIR must not have any spaces in it - use 8dot3 naming convention if neccesary. You can run "dir /x" from the commandline to see the correct 8.3-style names.'."\n";
+ }
+ }
+ $path_so_far[] = $value;
}
- $helperappsdir = implode(DIRECTORY_SEPARATOR, $DirPieces8);
-
+ $helperappsdir = implode(DIRECTORY_SEPARATOR, $path_so_far);
}
- define('GETID3_HELPERAPPSDIR', realpath($helperappsdir).DIRECTORY_SEPARATOR);
+ define('GETID3_HELPERAPPSDIR', $helperappsdir.DIRECTORY_SEPARATOR);
+ }
+ if (!empty($this->startup_error)) {
+ echo $this->startup_error;
+ throw new getid3_exception($this->startup_error);
}
+ }
+ /**
+ * @return string
+ */
+ public function version() {
+ return self::VERSION;
}
+ /**
+ * @return int
+ */
+ public function fread_buffer_size() {
+ return $this->option_fread_buffer_size;
+ }
- // public: setOption
- function setOption($optArray) {
+ /**
+ * @param array $optArray
+ *
+ * @return bool
+ */
+ public function setOption($optArray) {
if (!is_array($optArray) || empty($optArray)) {
return false;
}
foreach ($optArray as $opt => $val) {
- if (isset($this, $opt) === false) {
+ if (isset($this->$opt) === false) {
continue;
}
$this->$opt = $val;
@@ -163,262 +408,313 @@
return true;
}
+ /**
+ * @param string $filename
+ * @param int $filesize
+ * @param resource $fp
+ *
+ * @return bool
+ *
+ * @throws getid3_exception
+ */
+ public function openfile($filename, $filesize=null, $fp=null) {
+ try {
+ if (!empty($this->startup_error)) {
+ throw new getid3_exception($this->startup_error);
+ }
+ if (!empty($this->startup_warning)) {
+ foreach (explode("\n", $this->startup_warning) as $startup_warning) {
+ $this->warning($startup_warning);
+ }
+ }
- // public: analyze file - replaces GetAllFileInfo() and GetTagOnly()
- function analyze($filename) {
+ // init result array and set parameters
+ $this->filename = $filename;
+ $this->info = array();
+ $this->info['GETID3_VERSION'] = $this->version();
+ $this->info['php_memory_limit'] = (($this->memory_limit > 0) ? $this->memory_limit : false);
- if (!empty($this->startup_error)) {
- return $this->error($this->startup_error);
- }
- if (!empty($this->startup_warning)) {
- $this->warning($this->startup_warning);
- }
+ // remote files not supported
+ if (preg_match('#^(ht|f)tp://#', $filename)) {
+ throw new getid3_exception('Remote files are not supported - please copy the file locally first');
+ }
- // init result array and set parameters
- $this->info = array();
- $this->info['GETID3_VERSION'] = GETID3_VERSION;
+ $filename = str_replace('/', DIRECTORY_SEPARATOR, $filename);
+ //$filename = preg_replace('#(?<!gs:)('.preg_quote(DIRECTORY_SEPARATOR).'{2,})#', DIRECTORY_SEPARATOR, $filename);
- // Check encoding/iconv support
- if (!function_exists('iconv') && !in_array($this->encoding, array('ISO-8859-1', 'UTF-8', 'UTF-16LE', 'UTF-16BE', 'UTF-16'))) {
- $errormessage = 'iconv() support is needed for encodings other than ISO-8859-1, UTF-8, UTF-16LE, UTF16-BE, UTF-16. ';
- if (GETID3_OS_ISWINDOWS) {
- $errormessage .= 'PHP does not have iconv() support. Please enable php_iconv.dll in php.ini, and copy iconv.dll from c:/php/dlls to c:/windows/system32';
+ // open local file
+ //if (is_readable($filename) && is_file($filename) && ($this->fp = fopen($filename, 'rb'))) { // see https://www.getid3.org/phpBB3/viewtopic.php?t=1720
+ if (($fp != null) && ((get_resource_type($fp) == 'file') || (get_resource_type($fp) == 'stream'))) {
+ $this->fp = $fp;
+ } elseif ((is_readable($filename) || file_exists($filename)) && is_file($filename) && ($this->fp = fopen($filename, 'rb'))) {
+ // great
} else {
- $errormessage .= 'PHP is not compiled with iconv() support. Please recompile with the --with-iconv switch';
+ $errormessagelist = array();
+ if (!is_readable($filename)) {
+ $errormessagelist[] = '!is_readable';
+ }
+ if (!is_file($filename)) {
+ $errormessagelist[] = '!is_file';
+ }
+ if (!file_exists($filename)) {
+ $errormessagelist[] = '!file_exists';
+ }
+ if (empty($errormessagelist)) {
+ $errormessagelist[] = 'fopen failed';
+ }
+ throw new getid3_exception('Could not open "'.$filename.'" ('.implode('; ', $errormessagelist).')');
}
- return $this->error($errormessage);
- }
- // Disable magic_quotes_runtime, if neccesary
- $old_magic_quotes_runtime = get_magic_quotes_runtime(); // store current setting of magic_quotes_runtime
- if ($old_magic_quotes_runtime) {
- set_magic_quotes_runtime(0); // turn off magic_quotes_runtime
- if (get_magic_quotes_runtime()) {
- return $this->error('Could not disable magic_quotes_runtime - getID3() cannot work properly with this setting enabled');
- }
- }
+ $this->info['filesize'] = (!is_null($filesize) ? $filesize : filesize($filename));
+ // set redundant parameters - might be needed in some include file
+ // filenames / filepaths in getID3 are always expressed with forward slashes (unix-style) for both Windows and other to try and minimize confusion
+ $filename = str_replace('\\', '/', $filename);
+ $this->info['filepath'] = str_replace('\\', '/', realpath(dirname($filename)));
+ $this->info['filename'] = getid3_lib::mb_basename($filename);
+ $this->info['filenamepath'] = $this->info['filepath'].'/'.$this->info['filename'];
- // remote files not supported
- if (preg_match('/^(ht|f)tp:\/\//', $filename)) {
- return $this->error('Remote files are not supported in this version of getID3() - please copy the file locally first');
- }
+ // set more parameters
+ $this->info['avdataoffset'] = 0;
+ $this->info['avdataend'] = $this->info['filesize'];
+ $this->info['fileformat'] = ''; // filled in later
+ $this->info['audio']['dataformat'] = ''; // filled in later, unset if not used
+ $this->info['video']['dataformat'] = ''; // filled in later, unset if not used
+ $this->info['tags'] = array(); // filled in later, unset if not used
+ $this->info['error'] = array(); // filled in later, unset if not used
+ $this->info['warning'] = array(); // filled in later, unset if not used
+ $this->info['comments'] = array(); // filled in later, unset if not used
+ $this->info['encoding'] = $this->encoding; // required by id3v2 and iso modules - can be unset at the end if desired
- // open local file
- if (!$fp = @fopen($filename, 'rb')) {
- return $this->error('Could not open file "'.$filename.'"');
- }
+ // option_max_2gb_check
+ if ($this->option_max_2gb_check) {
+ // PHP (32-bit all, and 64-bit Windows) doesn't support integers larger than 2^31 (~2GB)
+ // filesize() simply returns (filesize % (pow(2, 32)), no matter the actual filesize
+ // ftell() returns 0 if seeking to the end is beyond the range of unsigned integer
+ $fseek = fseek($this->fp, 0, SEEK_END);
+ if (($fseek < 0) || (($this->info['filesize'] != 0) && (ftell($this->fp) == 0)) ||
+ ($this->info['filesize'] < 0) ||
+ (ftell($this->fp) < 0)) {
+ $real_filesize = getid3_lib::getFileSizeSyscall($this->info['filenamepath']);
- // set parameters
- $this->info['filesize'] = filesize($filename);
-
- // option_max_2gb_check
- if ($this->option_max_2gb_check) {
- // PHP doesn't support integers larger than 31-bit (~2GB)
- // filesize() simply returns (filesize % (pow(2, 32)), no matter the actual filesize
- // ftell() returns 0 if seeking to the end is beyond the range of unsigned integer
- fseek($fp, 0, SEEK_END);
- if ((($this->info['filesize'] != 0) && (ftell($fp) == 0)) ||
- ($this->info['filesize'] < 0) ||
- (ftell($fp) < 0)) {
- unset($this->info['filesize']);
- fclose($fp);
- return $this->error('File is most likely larger than 2GB and is not supported by PHP');
+ if ($real_filesize === false) {
+ unset($this->info['filesize']);
+ fclose($this->fp);
+ throw new getid3_exception('Unable to determine actual filesize. File is most likely larger than '.round(PHP_INT_MAX / 1073741824).'GB and is not supported by PHP.');
+ } elseif (getid3_lib::intValueSupported($real_filesize)) {
+ unset($this->info['filesize']);
+ fclose($this->fp);
+ throw new getid3_exception('PHP seems to think the file is larger than '.round(PHP_INT_MAX / 1073741824).'GB, but filesystem reports it as '.number_format($real_filesize / 1073741824, 3).'GB, please report to info at getid3.org');
+ }
+ $this->info['filesize'] = $real_filesize;
+ $this->warning('File is larger than '.round(PHP_INT_MAX / 1073741824).'GB (filesystem reports it as '.number_format($real_filesize / 1073741824, 3).'GB) and is not properly supported by PHP.');
+ }
}
- }
- // set more parameters
- $this->info['avdataoffset'] = 0;
- $this->info['avdataend'] = $this->info['filesize'];
- $this->info['fileformat'] = ''; // filled in later
- $this->info['audio']['dataformat'] = ''; // filled in later, unset if not used
- $this->info['video']['dataformat'] = ''; // filled in later, unset if not used
- $this->info['tags'] = array(); // filled in later, unset if not used
- $this->info['error'] = array(); // filled in later, unset if not used
- $this->info['warning'] = array(); // filled in later, unset if not used
- $this->info['comments'] = array(); // filled in later, unset if not used
- $this->info['encoding'] = $this->encoding; // required by id3v2 and iso modules - can be unset at the end if desired
+ return true;
- // set redundant parameters - might be needed in some include file
- $this->info['filename'] = basename($filename);
- $this->info['filepath'] = str_replace('\\', '/', realpath(dirname($filename)));
- $this->info['filenamepath'] = $this->info['filepath'].'/'.$this->info['filename'];
+ } catch (Exception $e) {
+ $this->error($e->getMessage());
+ }
+ return false;
+ }
+ /**
+ * analyze file
+ *
+ * @param string $filename
+ * @param int $filesize
+ * @param string $original_filename
+ * @param resource $fp
+ *
+ * @return array
+ */
+ public function analyze($filename, $filesize=null, $original_filename='', $fp=null) {
+ try {
+ if (!$this->openfile($filename, $filesize, $fp)) {
+ return $this->info;
+ }
- // handle ID3v2 tag - done first - already at beginning of file
- // ID3v2 detection (even if not parsing) is always done otherwise fileformat is much harder to detect
- if ($this->option_tag_id3v2) {
-
- $GETID3_ERRORARRAY = &$this->info['warning'];
- if (getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v2.php', __FILE__, false)) {
- $tag = new getid3_id3v2($fp, $this->info);
+ // Handle tags
+ foreach (array('id3v2'=>'id3v2', 'id3v1'=>'id3v1', 'apetag'=>'ape', 'lyrics3'=>'lyrics3') as $tag_name => $tag_key) {
+ $option_tag = 'option_tag_'.$tag_name;
+ if ($this->$option_tag) {
+ $this->include_module('tag.'.$tag_name);
+ try {
+ $tag_class = 'getid3_'.$tag_name;
+ $tag = new $tag_class($this);
+ $tag->Analyze();
+ }
+ catch (getid3_exception $e) {
+ throw $e;
+ }
+ }
}
+ if (isset($this->info['id3v2']['tag_offset_start'])) {
+ $this->info['avdataoffset'] = max($this->info['avdataoffset'], $this->info['id3v2']['tag_offset_end']);
+ }
+ foreach (array('id3v1'=>'id3v1', 'apetag'=>'ape', 'lyrics3'=>'lyrics3') as $tag_name => $tag_key) {
+ if (isset($this->info[$tag_key]['tag_offset_start'])) {
+ $this->info['avdataend'] = min($this->info['avdataend'], $this->info[$tag_key]['tag_offset_start']);
+ }
+ }
- } else {
-
- fseek($fp, 0, SEEK_SET);
- $header = fread($fp, 10);
- if (substr($header, 0, 3) == 'ID3') {
- $this->info['id3v2']['header'] = true;
- $this->info['id3v2']['majorversion'] = ord($header{3});
- $this->info['id3v2']['minorversion'] = ord($header{4});
- $this->info['id3v2']['headerlength'] = getid3_lib::BigEndian2Int(substr($header, 6, 4), 1) + 10; // length of ID3v2 tag in 10-byte header doesn't include 10-byte header length
-
- $this->info['id3v2']['tag_offset_start'] = 0;
- $this->info['id3v2']['tag_offset_end'] = $this->info['id3v2']['tag_offset_start'] + $this->info['id3v2']['headerlength'];
- $this->info['avdataoffset'] = $this->info['id3v2']['tag_offset_end'];
+ // ID3v2 detection (NOT parsing), even if ($this->option_tag_id3v2 == false) done to make fileformat easier
+ if (!$this->option_tag_id3v2) {
+ fseek($this->fp, 0);
+ $header = fread($this->fp, 10);
+ if ((substr($header, 0, 3) == 'ID3') && (strlen($header) == 10)) {
+ $this->info['id3v2']['header'] = true;
+ $this->info['id3v2']['majorversion'] = ord($header[3]);
+ $this->info['id3v2']['minorversion'] = ord($header[4]);
+ $this->info['avdataoffset'] += getid3_lib::BigEndian2Int(substr($header, 6, 4), 1) + 10; // length of ID3v2 tag in 10-byte header doesn't include 10-byte header length
+ }
}
- }
+ // read 32 kb file data
+ fseek($this->fp, $this->info['avdataoffset']);
+ $formattest = fread($this->fp, 32774);
+ // determine format
+ $determined_format = $this->GetFileFormat($formattest, ($original_filename ? $original_filename : $filename));
- // handle ID3v1 tag
- if ($this->option_tag_id3v1) {
- if (!@include_once(GETID3_INCLUDEPATH.'module.tag.id3v1.php')) {
- return $this->error('module.tag.id3v1.php is missing - you may disable option_tag_id3v1.');
+ // unable to determine file format
+ if (!$determined_format) {
+ fclose($this->fp);
+ return $this->error('unable to determine file format');
}
- $tag = new getid3_id3v1($fp, $this->info);
- }
- // handle APE tag
- if ($this->option_tag_apetag) {
- if (!@include_once(GETID3_INCLUDEPATH.'module.tag.apetag.php')) {
- return $this->error('module.tag.apetag.php is missing - you may disable option_tag_apetag.');
+ // check for illegal ID3 tags
+ if (isset($determined_format['fail_id3']) && (in_array('id3v1', $this->info['tags']) || in_array('id3v2', $this->info['tags']))) {
+ if ($determined_format['fail_id3'] === 'ERROR') {
+ fclose($this->fp);
+ return $this->error('ID3 tags not allowed on this file type.');
+ } elseif ($determined_format['fail_id3'] === 'WARNING') {
+ $this->warning('ID3 tags not allowed on this file type.');
+ }
}
- $tag = new getid3_apetag($fp, $this->info);
- }
- // handle lyrics3 tag
- if ($this->option_tag_lyrics3) {
- if (!@include_once(GETID3_INCLUDEPATH.'module.tag.lyrics3.php')) {
- return $this->error('module.tag.lyrics3.php is missing - you may disable option_tag_lyrics3.');
+ // check for illegal APE tags
+ if (isset($determined_format['fail_ape']) && in_array('ape', $this->info['tags'])) {
+ if ($determined_format['fail_ape'] === 'ERROR') {
+ fclose($this->fp);
+ return $this->error('APE tags not allowed on this file type.');
+ } elseif ($determined_format['fail_ape'] === 'WARNING') {
+ $this->warning('APE tags not allowed on this file type.');
+ }
}
- $tag = new getid3_lyrics3($fp, $this->info);
- }
- // read 32 kb file data
- fseek($fp, $this->info['avdataoffset'], SEEK_SET);
- $formattest = fread($fp, 32774);
+ // set mime type
+ $this->info['mime_type'] = $determined_format['mime_type'];
- // determine format
- $determined_format = $this->GetFileFormat($formattest, $filename);
-
- // unable to determine file format
- if (!$determined_format) {
- fclose($fp);
- return $this->error('unable to determine file format');
- }
-
- // check for illegal ID3 tags
- if (isset($determined_format['fail_id3']) && (in_array('id3v1', $this->info['tags']) || in_array('id3v2', $this->info['tags']))) {
- if ($determined_format['fail_id3'] === 'ERROR') {
- fclose($fp);
- return $this->error('ID3 tags not allowed on this file type.');
- } elseif ($determined_format['fail_id3'] === 'WARNING') {
- $this->info['warning'][] = 'ID3 tags not allowed on this file type.';
+ // supported format signature pattern detected, but module deleted
+ if (!file_exists(GETID3_INCLUDEPATH.$determined_format['include'])) {
+ fclose($this->fp);
+ return $this->error('Format not supported, module "'.$determined_format['include'].'" was removed.');
}
- }
- // check for illegal APE tags
- if (isset($determined_format['fail_ape']) && in_array('ape', $this->info['tags'])) {
- if ($determined_format['fail_ape'] === 'ERROR') {
- fclose($fp);
- return $this->error('APE tags not allowed on this file type.');
- } elseif ($determined_format['fail_ape'] === 'WARNING') {
- $this->info['warning'][] = 'APE tags not allowed on this file type.';
+ // module requires mb_convert_encoding/iconv support
+ // Check encoding/iconv support
+ if (!empty($determined_format['iconv_req']) && !function_exists('mb_convert_encoding') && !function_exists('iconv') && !in_array($this->encoding, array('ISO-8859-1', 'UTF-8', 'UTF-16LE', 'UTF-16BE', 'UTF-16'))) {
+ $errormessage = 'mb_convert_encoding() or iconv() support is required for this module ('.$determined_format['include'].') for encodings other than ISO-8859-1, UTF-8, UTF-16LE, UTF16-BE, UTF-16. ';
+ if (GETID3_OS_ISWINDOWS) {
+ $errormessage .= 'PHP does not have mb_convert_encoding() or iconv() support. Please enable php_mbstring.dll / php_iconv.dll in php.ini, and copy php_mbstring.dll / iconv.dll from c:/php/dlls to c:/windows/system32';
+ } else {
+ $errormessage .= 'PHP is not compiled with mb_convert_encoding() or iconv() support. Please recompile with the --enable-mbstring / --with-iconv switch';
+ }
+ return $this->error($errormessage);
}
- }
- // set mime type
- $this->info['mime_type'] = $determined_format['mime_type'];
+ // include module
+ include_once(GETID3_INCLUDEPATH.$determined_format['include']);
- // supported format signature pattern detected, but module deleted
- if (!file_exists(GETID3_INCLUDEPATH.$determined_format['include'])) {
- fclose($fp);
- return $this->error('Format not supported, module, '.$determined_format['include'].', was removed.');
- }
+ // instantiate module class
+ $class_name = 'getid3_'.$determined_format['module'];
+ if (!class_exists($class_name)) {
+ return $this->error('Format not supported, module "'.$determined_format['include'].'" is corrupt.');
+ }
+ $class = new $class_name($this);
+ $class->Analyze();
+ unset($class);
- // module requires iconv support
- if (!function_exists('iconv') && @$determined_format['iconv_req']) {
- return $this->error('iconv support is required for this module ('.$determined_format['include'].').');
- }
+ // close file
+ fclose($this->fp);
- // include module
- include_once(GETID3_INCLUDEPATH.$determined_format['include']);
+ // process all tags - copy to 'tags' and convert charsets
+ if ($this->option_tags_process) {
+ $this->HandleAllTags();
+ }
- // instantiate module class
- $class_name = 'getid3_'.$determined_format['module'];
- if (!class_exists($class_name)) {
- return $this->error('Format not supported, module, '.$determined_format['include'].', is corrupt.');
- }
- if (isset($determined_format['option'])) {
- $class = new $class_name($fp, $this->info, $determined_format['option']);
- } else {
- $class = new $class_name($fp, $this->info);
- }
+ // perform more calculations
+ if ($this->option_extra_info) {
+ $this->ChannelsBitratePlaytimeCalculations();
+ $this->CalculateCompressionRatioVideo();
+ $this->CalculateCompressionRatioAudio();
+ $this->CalculateReplayGain();
+ $this->ProcessAudioStreams();
+ }
- // close file
- fclose($fp);
+ // get the MD5 sum of the audio/video portion of the file - without ID3/APE/Lyrics3/etc header/footer tags
+ if ($this->option_md5_data) {
+ // do not calc md5_data if md5_data_source is present - set by flac only - future MPC/SV8 too
+ if (!$this->option_md5_data_source || empty($this->info['md5_data_source'])) {
+ $this->getHashdata('md5');
+ }
+ }
- // process all tags - copy to 'tags' and convert charsets
- if ($this->option_tags_process) {
- $this->HandleAllTags();
- }
+ // get the SHA1 sum of the audio/video portion of the file - without ID3/APE/Lyrics3/etc header/footer tags
+ if ($this->option_sha1_data) {
+ $this->getHashdata('sha1');
+ }
- // perform more calculations
- if ($this->option_extra_info) {
- $this->ChannelsBitratePlaytimeCalculations();
- $this->CalculateCompressionRatioVideo();
- $this->CalculateCompressionRatioAudio();
- $this->CalculateReplayGain();
- $this->ProcessAudioStreams();
- }
+ // remove undesired keys
+ $this->CleanUp();
- // get the MD5 sum of the audio/video portion of the file - without ID3/APE/Lyrics3/etc header/footer tags
- if ($this->option_md5_data) {
- // do not cald md5_data if md5_data_source is present - set by flac only - future MPC/SV8 too
- if (!$this->option_md5_data_source || empty($this->info['md5_data_source'])) {
- $this->getHashdata('md5');
- }
+ } catch (Exception $e) {
+ $this->error('Caught exception: '.$e->getMessage());
}
- // get the SHA1 sum of the audio/video portion of the file - without ID3/APE/Lyrics3/etc header/footer tags
- if ($this->option_sha1_data) {
- $this->getHashdata('sha1');
- }
-
- // remove undesired keys
- $this->CleanUp();
-
- // restore magic_quotes_runtime setting
- set_magic_quotes_runtime($old_magic_quotes_runtime);
-
// return info array
return $this->info;
}
- // private: error handling
- function error($message) {
-
+ /**
+ * Error handling.
+ *
+ * @param string $message
+ *
+ * @return array
+ */
+ public function error($message) {
$this->CleanUp();
-
+ if (!isset($this->info['error'])) {
+ $this->info['error'] = array();
+ }
$this->info['error'][] = $message;
return $this->info;
}
- // private: warning handling
- function warning($message) {
+ /**
+ * Warning handling.
+ *
+ * @param string $message
+ *
+ * @return bool
+ */
+ public function warning($message) {
$this->info['warning'][] = $message;
return true;
}
- // private: CleanUp
- function CleanUp() {
+ /**
+ * @return bool
+ */
+ private function CleanUp() {
// remove possible empty keys
- $AVpossibleEmptyKeys = array('dataformat', 'bits_per_sample', 'encoder_options', 'streams');
+ $AVpossibleEmptyKeys = array('dataformat', 'bits_per_sample', 'encoder_options', 'streams', 'bitrate');
foreach ($AVpossibleEmptyKeys as $dummy => $key) {
if (empty($this->info['audio'][$key]) && isset($this->info['audio'][$key])) {
unset($this->info['audio'][$key]);
@@ -446,11 +742,27 @@
unset($this->info['avdataend']);
}
}
+
+ // remove possible duplicated identical entries
+ if (!empty($this->info['error'])) {
+ $this->info['error'] = array_values(array_unique($this->info['error']));
+ }
+ if (!empty($this->info['warning'])) {
+ $this->info['warning'] = array_values(array_unique($this->info['warning']));
+ }
+
+ // remove "global variable" type keys
+ unset($this->info['php_memory_limit']);
+
+ return true;
}
-
- // return array containing information about all supported formats
- function GetFileFormatArray() {
+ /**
+ * Return array containing information about all supported formats.
+ *
+ * @return array
+ */
+ public function GetFileFormatArray() {
static $format_info = array();
if (empty($format_info)) {
$format_info = array(
@@ -459,7 +771,7 @@
// AC-3 - audio - Dolby AC-3 / Dolby Digital
'ac3' => array(
- 'pattern' => '^\x0B\x77',
+ 'pattern' => '^\\x0B\\x77',
'group' => 'audio',
'module' => 'ac3',
'mime_type' => 'audio/ac3',
@@ -470,19 +782,25 @@
'pattern' => '^ADIF',
'group' => 'audio',
'module' => 'aac',
- 'option' => 'adif',
- 'mime_type' => 'application/octet-stream',
+ 'mime_type' => 'audio/aac',
'fail_ape' => 'WARNING',
),
-
+/*
+ // AA - audio - Audible Audiobook
+ 'aa' => array(
+ 'pattern' => '^.{4}\\x57\\x90\\x75\\x36',
+ 'group' => 'audio',
+ 'module' => 'aa',
+ 'mime_type' => 'audio/audible',
+ ),
+*/
// AAC - audio - Advanced Audio Coding (AAC) - ADTS format (very similar to MP3)
'adts' => array(
- 'pattern' => '^\xFF[\xF0-\xF1\xF8-\xF9]',
+ 'pattern' => '^\\xFF[\\xF0-\\xF1\\xF8-\\xF9]',
'group' => 'audio',
'module' => 'aac',
- 'option' => 'adts',
- 'mime_type' => 'application/octet-stream',
+ 'mime_type' => 'audio/aac',
'fail_ape' => 'WARNING',
),
@@ -489,12 +807,20 @@
// AU - audio - NeXT/Sun AUdio (AU)
'au' => array(
- 'pattern' => '^\.snd',
+ 'pattern' => '^\\.snd',
'group' => 'audio',
'module' => 'au',
'mime_type' => 'audio/basic',
),
+ // AMR - audio - Adaptive Multi Rate
+ 'amr' => array(
+ 'pattern' => '^\\x23\\x21AMR\\x0A', // #!AMR[0A]
+ 'group' => 'audio',
+ 'module' => 'amr',
+ 'mime_type' => 'audio/amr',
+ ),
+
// AVR - audio - Audio Visual Research
'avr' => array(
'pattern' => '^2BIT',
@@ -505,18 +831,50 @@
// BONK - audio - Bonk v0.9+
'bonk' => array(
- 'pattern' => '^\x00(BONK|INFO|META| ID3)',
+ 'pattern' => '^\\x00(BONK|INFO|META| ID3)',
'group' => 'audio',
'module' => 'bonk',
'mime_type' => 'audio/xmms-bonk',
),
+ // DSF - audio - Direct Stream Digital (DSD) Storage Facility files (DSF) - https://en.wikipedia.org/wiki/Direct_Stream_Digital
+ 'dsf' => array(
+ 'pattern' => '^DSD ', // including trailing space: 44 53 44 20
+ 'group' => 'audio',
+ 'module' => 'dsf',
+ 'mime_type' => 'audio/dsd',
+ ),
+
+ // DSS - audio - Digital Speech Standard
+ 'dss' => array(
+ 'pattern' => '^[\\x02-\\x08]ds[s2]',
+ 'group' => 'audio',
+ 'module' => 'dss',
+ 'mime_type' => 'application/octet-stream',
+ ),
+
+ // DSDIFF - audio - Direct Stream Digital Interchange File Format
+ 'dsdiff' => array(
+ 'pattern' => '^FRM8',
+ 'group' => 'audio',
+ 'module' => 'dsdiff',
+ 'mime_type' => 'audio/dsd',
+ ),
+
+ // DTS - audio - Dolby Theatre System
+ 'dts' => array(
+ 'pattern' => '^\\x7F\\xFE\\x80\\x01',
+ 'group' => 'audio',
+ 'module' => 'dts',
+ 'mime_type' => 'audio/dts',
+ ),
+
// FLAC - audio - Free Lossless Audio Codec
'flac' => array(
'pattern' => '^fLaC',
'group' => 'audio',
'module' => 'flac',
- 'mime_type' => 'audio/x-flac',
+ 'mime_type' => 'audio/flac',
),
// LA - audio - Lossless Audio (LA)
@@ -548,17 +906,18 @@
'pattern' => '^MAC ',
'group' => 'audio',
'module' => 'monkey',
- 'mime_type' => 'application/octet-stream',
+ 'mime_type' => 'audio/x-monkeys-audio',
),
- // MOD - audio - MODule (assorted sub-formats)
- 'mod' => array(
- 'pattern' => '^.{1080}(M.K.|[5-9]CHN|[1-3][0-9]CH)',
- 'group' => 'audio',
- 'module' => 'mod',
- 'option' => 'mod',
- 'mime_type' => 'audio/mod',
- ),
+// has been known to produce false matches in random files (e.g. JPEGs), leave out until more precise matching available
+// // MOD - audio - MODule (assorted sub-formats)
+// 'mod' => array(
+// 'pattern' => '^.{1080}(M\\.K\\.|M!K!|FLT4|FLT8|[5-9]CHN|[1-3][0-9]CH)',
+// 'group' => 'audio',
+// 'module' => 'mod',
+// 'option' => 'mod',
+// 'mime_type' => 'audio/mod',
+// ),
// MOD - audio - MODule (Impulse Tracker)
'it' => array(
@@ -565,7 +924,7 @@
'pattern' => '^IMPM',
'group' => 'audio',
'module' => 'mod',
- 'option' => 'it',
+ //'option' => 'it',
'mime_type' => 'audio/it',
),
@@ -574,7 +933,7 @@
'pattern' => '^Extended Module',
'group' => 'audio',
'module' => 'mod',
- 'option' => 'xm',
+ //'option' => 'xm',
'mime_type' => 'audio/xm',
),
@@ -583,21 +942,21 @@
'pattern' => '^.{44}SCRM',
'group' => 'audio',
'module' => 'mod',
- 'option' => 's3m',
+ //'option' => 's3m',
'mime_type' => 'audio/s3m',
),
// MPC - audio - Musepack / MPEGplus
'mpc' => array(
- 'pattern' => '^(MP\+|[\x00\x01\x10\x11\x40\x41\x50\x51\x80\x81\x90\x91\xC0\xC1\xD0\xD1][\x20-37][\x00\x20\x40\x60\x80\xA0\xC0\xE0])',
+ 'pattern' => '^(MPCK|MP\\+|[\\x00\\x01\\x10\\x11\\x40\\x41\\x50\\x51\\x80\\x81\\x90\\x91\\xC0\\xC1\\xD0\\xD1][\\x20-\\x37][\\x00\\x20\\x40\\x60\\x80\\xA0\\xC0\\xE0])',
'group' => 'audio',
'module' => 'mpc',
- 'mime_type' => 'application/octet-stream',
+ 'mime_type' => 'audio/x-musepack',
),
// MP3 - audio - MPEG-audio Layer 3 (very similar to AAC-ADTS)
'mp3' => array(
- 'pattern' => '^\xFF[\xE2-\xE7\xF2-\xF7\xFA-\xFF][\x00-\xEB]',
+ 'pattern' => '^\\xFF[\\xE2-\\xE7\\xF2-\\xF7\\xFA-\\xFF][\\x00-\\x0B\\x10-\\x1B\\x20-\\x2B\\x30-\\x3B\\x40-\\x4B\\x50-\\x5B\\x60-\\x6B\\x70-\\x7B\\x80-\\x8B\\x90-\\x9B\\xA0-\\xAB\\xB0-\\xBB\\xC0-\\xCB\\xD0-\\xDB\\xE0-\\xEB\\xF0-\\xFB]',
'group' => 'audio',
'module' => 'mp3',
'mime_type' => 'audio/mpeg',
@@ -605,7 +964,7 @@
// OFR - audio - OptimFROG
'ofr' => array(
- 'pattern' => '^(\*RIFF|OFR)',
+ 'pattern' => '^(\\*RIFF|OFR)',
'group' => 'audio',
'module' => 'optimfrog',
'mime_type' => 'application/octet-stream',
@@ -629,9 +988,17 @@
'fail_ape' => 'ERROR',
),
+ // TAK - audio - Tom's lossless Audio Kompressor
+ 'tak' => array(
+ 'pattern' => '^tBaK',
+ 'group' => 'audio',
+ 'module' => 'tak',
+ 'mime_type' => 'application/octet-stream',
+ ),
+
// TTA - audio - TTA Lossless Audio Compressor (http://tta.corecodec.org)
'tta' => array(
- 'pattern' => '^TTA', // could also be '^TTA(\x01|\x02|\x03|2|1)'
+ 'pattern' => '^TTA', // could also be '^TTA(\\x01|\\x02|\\x03|2|1)'
'group' => 'audio',
'module' => 'tta',
'mime_type' => 'application/octet-stream',
@@ -666,7 +1033,7 @@
// ASF - audio/video - Advanced Streaming Format, Windows Media Video, Windows Media Audio
'asf' => array(
- 'pattern' => '^\x30\x26\xB2\x75\x8E\x66\xCF\x11\xA6\xD9\x00\xAA\x00\x62\xCE\x6C',
+ 'pattern' => '^\\x30\\x26\\xB2\\x75\\x8E\\x66\\xCF\\x11\\xA6\\xD9\\x00\\xAA\\x00\\x62\\xCE\\x6C',
'group' => 'audio-video',
'module' => 'asf',
'mime_type' => 'video/x-ms-asf',
@@ -683,23 +1050,31 @@
// FLV - audio/video - FLash Video
'flv' => array(
- 'pattern' => '^FLV\x01',
+ 'pattern' => '^FLV[\\x01]',
'group' => 'audio-video',
'module' => 'flv',
'mime_type' => 'video/x-flv',
),
+ // IVF - audio/video - IVF
+ 'ivf' => array(
+ 'pattern' => '^DKIF',
+ 'group' => 'audio-video',
+ 'module' => 'ivf',
+ 'mime_type' => 'video/x-ivf',
+ ),
+
// MKAV - audio/video - Mastroka
'matroska' => array(
- 'pattern' => '^\x1A\x45\xDF\xA3',
+ 'pattern' => '^\\x1A\\x45\\xDF\\xA3',
'group' => 'audio-video',
'module' => 'matroska',
- 'mime_type' => 'application/octet-stream',
+ 'mime_type' => 'video/x-matroska', // may also be audio/x-matroska
),
// MPEG - audio/video - MPEG (Moving Pictures Experts Group)
'mpeg' => array(
- 'pattern' => '^\x00\x00\x01(\xBA|\xB3)',
+ 'pattern' => '^\\x00\\x00\\x01[\\xB3\\xBA]',
'group' => 'audio-video',
'module' => 'mpeg',
'mime_type' => 'video/mpeg',
@@ -736,13 +1111,13 @@
'pattern' => '^(RIFF|SDSS|FORM)',
'group' => 'audio-video',
'module' => 'riff',
- 'mime_type' => 'audio/x-wave',
+ 'mime_type' => 'audio/wav',
'fail_ape' => 'WARNING',
),
// Real - audio/video - RealAudio, RealVideo
'real' => array(
- 'pattern' => '^(\.RMF|.ra)',
+ 'pattern' => '^\\.(RMF|ra)',
'group' => 'audio-video',
'module' => 'real',
'mime_type' => 'audio/x-realaudio',
@@ -756,7 +1131,23 @@
'mime_type' => 'application/x-shockwave-flash',
),
+ // TS - audio/video - MPEG-2 Transport Stream
+ 'ts' => array(
+ 'pattern' => '^(\\x47.{187}){10,}', // packets are 188 bytes long and start with 0x47 "G". Check for at least 10 packets matching this pattern
+ 'group' => 'audio-video',
+ 'module' => 'ts',
+ 'mime_type' => 'video/MP2T',
+ ),
+ // WTV - audio/video - Windows Recorded TV Show
+ 'wtv' => array(
+ 'pattern' => '^\\xB7\\xD8\\x00\\x20\\x37\\x49\\xDA\\x11\\xA6\\x4E\\x00\\x07\\xE9\\x5E\\xAD\\x8D',
+ 'group' => 'audio-video',
+ 'module' => 'wtv',
+ 'mime_type' => 'video/x-ms-wtv',
+ ),
+
+
// Still-Image formats
// BMP - still image - Bitmap (Windows, OS/2; uncompressed, RLE8, RLE4)
@@ -781,7 +1172,7 @@
// JPEG - still image - Joint Photographic Experts Group (JPEG)
'jpg' => array(
- 'pattern' => '^\xFF\xD8\xFF',
+ 'pattern' => '^\\xFF\\xD8\\xFF',
'group' => 'graphic',
'module' => 'jpg',
'mime_type' => 'image/jpeg',
@@ -791,7 +1182,7 @@
// PCD - still image - Kodak Photo CD
'pcd' => array(
- 'pattern' => '^.{2048}PCD_IPI\x00',
+ 'pattern' => '^.{2048}PCD_IPI\\x00',
'group' => 'graphic',
'module' => 'pcd',
'mime_type' => 'image/x-photo-cd',
@@ -802,7 +1193,7 @@
// PNG - still image - Portable Network Graphics (PNG)
'png' => array(
- 'pattern' => '^\x89\x50\x4E\x47\x0D\x0A\x1A\x0A',
+ 'pattern' => '^\\x89\\x50\\x4E\\x47\\x0D\\x0A\\x1A\\x0A',
'group' => 'graphic',
'module' => 'png',
'mime_type' => 'image/png',
@@ -811,9 +1202,20 @@
),
- // TIFF - still image - Tagged Information File Format (TIFF)
+ // SVG - still image - Scalable Vector Graphics (SVG)
+ 'svg' => array(
+ 'pattern' => '(<!DOCTYPE svg PUBLIC |xmlns="http://www\\.w3\\.org/2000/svg")',
+ 'group' => 'graphic',
+ 'module' => 'svg',
+ 'mime_type' => 'image/svg+xml',
+ 'fail_id3' => 'ERROR',
+ 'fail_ape' => 'ERROR',
+ ),
+
+
+ // TIFF - still image - Tagged Information File Format (TIFF)
'tiff' => array(
- 'pattern' => '^(II\x2A\x00|MM\x00\x2A)',
+ 'pattern' => '^(II\\x2A\\x00|MM\\x00\\x2A)',
'group' => 'graphic',
'module' => 'tiff',
'mime_type' => 'image/tiff',
@@ -822,6 +1224,17 @@
),
+ // EFAX - still image - eFax (TIFF derivative)
+ 'efax' => array(
+ 'pattern' => '^\\xDC\\xFE',
+ 'group' => 'graphic',
+ 'module' => 'efax',
+ 'mime_type' => 'image/efax',
+ 'fail_id3' => 'ERROR',
+ 'fail_ape' => 'ERROR',
+ ),
+
+
// Data formats
// ISO - data - International Standards Organization (ISO) CD-ROM Image
@@ -835,12 +1248,22 @@
'iconv_req' => false,
),
+ // HPK - data - HPK compressed data
+ 'hpk' => array(
+ 'pattern' => '^BPUL',
+ 'group' => 'archive',
+ 'module' => 'hpk',
+ 'mime_type' => 'application/octet-stream',
+ 'fail_id3' => 'ERROR',
+ 'fail_ape' => 'ERROR',
+ ),
+
// RAR - data - RAR compressed data
'rar' => array(
- 'pattern' => '^Rar\!',
+ 'pattern' => '^Rar\\!',
'group' => 'archive',
'module' => 'rar',
- 'mime_type' => 'application/octet-stream',
+ 'mime_type' => 'application/vnd.rar',
'fail_id3' => 'ERROR',
'fail_ape' => 'ERROR',
),
@@ -847,7 +1270,7 @@
// SZIP - audio/data - SZIP compressed data
'szip' => array(
- 'pattern' => '^SZ\x0A\x04',
+ 'pattern' => '^SZ\\x0A\\x04',
'group' => 'archive',
'module' => 'szip',
'mime_type' => 'application/octet-stream',
@@ -857,7 +1280,7 @@
// TAR - data - TAR compressed data
'tar' => array(
- 'pattern' => '^.{100}[0-9\x20]{7}\x00[0-9\x20]{7}\x00[0-9\x20]{7}\x00[0-9\x20\x00]{12}[0-9\x20\x00]{12}',
+ 'pattern' => '^.{100}[0-9\\x20]{7}\\x00[0-9\\x20]{7}\\x00[0-9\\x20]{7}\\x00[0-9\\x20\\x00]{12}[0-9\\x20\\x00]{12}',
'group' => 'archive',
'module' => 'tar',
'mime_type' => 'application/x-tar',
@@ -867,10 +1290,10 @@
// GZIP - data - GZIP compressed data
'gz' => array(
- 'pattern' => '^\x1F\x8B\x08',
+ 'pattern' => '^\\x1F\\x8B\\x08',
'group' => 'archive',
'module' => 'gzip',
- 'mime_type' => 'application/x-gzip',
+ 'mime_type' => 'application/gzip',
'fail_id3' => 'ERROR',
'fail_ape' => 'ERROR',
),
@@ -877,7 +1300,7 @@
// ZIP - data - ZIP compressed data
'zip' => array(
- 'pattern' => '^PK\x03\x04',
+ 'pattern' => '^PK\\x03\\x04',
'group' => 'archive',
'module' => 'zip',
'mime_type' => 'application/zip',
@@ -885,12 +1308,32 @@
'fail_ape' => 'ERROR',
),
+ // XZ - data - XZ compressed data
+ 'xz' => array(
+ 'pattern' => '^\\xFD7zXZ\\x00',
+ 'group' => 'archive',
+ 'module' => 'xz',
+ 'mime_type' => 'application/x-xz',
+ 'fail_id3' => 'ERROR',
+ 'fail_ape' => 'ERROR',
+ ),
+
// Misc other formats
- // PDF - data - ZIP compressed data
+ // PAR2 - data - Parity Volume Set Specification 2.0
+ 'par2' => array (
+ 'pattern' => '^PAR2\\x00PKT',
+ 'group' => 'misc',
+ 'module' => 'par2',
+ 'mime_type' => 'application/octet-stream',
+ 'fail_id3' => 'ERROR',
+ 'fail_ape' => 'ERROR',
+ ),
+
+ // PDF - data - Portable Document Format
'pdf' => array(
- 'pattern' => '^\x25PDF',
+ 'pattern' => '^\\x25PDF',
'group' => 'misc',
'module' => 'pdf',
'mime_type' => 'application/pdf',
@@ -898,9 +1341,9 @@
'fail_ape' => 'ERROR',
),
- // MSOFFICE - data - ZIP compressed data
+ // MSOFFICE - data - ZIP compressed data
'msoffice' => array(
- 'pattern' => '^\xD0\xCF\x11\xE0', // D0CF11E == DOCFILE == Microsoft Office Document
+ 'pattern' => '^\\xD0\\xCF\\x11\\xE0\\xA1\\xB1\\x1A\\xE1', // D0CF11E == DOCFILE == Microsoft Office Document
'group' => 'misc',
'module' => 'msoffice',
'mime_type' => 'application/octet-stream',
@@ -907,6 +1350,15 @@
'fail_id3' => 'ERROR',
'fail_ape' => 'ERROR',
),
+
+ // CUE - data - CUEsheet (index to single-file disc images)
+ 'cue' => array(
+ 'pattern' => '', // empty pattern means cannot be automatically detected, will fall through all other formats and match based on filename and very basic file contents
+ 'group' => 'misc',
+ 'module' => 'cue',
+ 'mime_type' => 'application/octet-stream',
+ ),
+
);
}
@@ -913,9 +1365,13 @@
return $format_info;
}
-
-
- function GetFileFormat(&$filedata, $filename='') {
+ /**
+ * @param string $filedata
+ * @param string $filename
+ *
+ * @return mixed|false
+ */
+ public function GetFileFormat(&$filedata, $filename='') {
// this function will determine the format of a file based on usually
// the first 2-4 bytes of the file (8 bytes for PNG, 16 bytes for JPG,
// and in the case of ISO CD image, 6 bytes offset 32kb from the start
@@ -923,10 +1379,9 @@
// Identify file format - loop through $format_info and detect with reg expr
foreach ($this->GetFileFormatArray() as $format_name => $info) {
- // Using preg_match() instead of ereg() - much faster
// The /s switch on preg_match() forces preg_match() NOT to treat
// newline (0x0A) characters as special chars but do a binary match
- if (preg_match('/'.$info['pattern'].'/s', $filedata)) {
+ if (!empty($info['pattern']) && preg_match('#'.$info['pattern'].'#s', $filedata)) {
$info['include'] = 'module.'.$info['group'].'.'.$info['module'].'.php';
return $info;
}
@@ -933,22 +1388,34 @@
}
- if (preg_match('/\.mp[123a]$/i', $filename)) {
- // Too many mp3 encoders on the market put gabage in front of mpeg files
+ if (preg_match('#\\.mp[123a]$#i', $filename)) {
+ // Too many mp3 encoders on the market put garbage in front of mpeg files
// use assume format on these if format detection failed
$GetFileFormatArray = $this->GetFileFormatArray();
$info = $GetFileFormatArray['mp3'];
$info['include'] = 'module.'.$info['group'].'.'.$info['module'].'.php';
return $info;
+ } elseif (preg_match('#\\.cue$#i', $filename) && preg_match('#FILE "[^"]+" (BINARY|MOTOROLA|AIFF|WAVE|MP3)#', $filedata)) {
+ // there's not really a useful consistent "magic" at the beginning of .cue files to identify them
+ // so until I think of something better, just go by filename if all other format checks fail
+ // and verify there's at least one instance of "TRACK xx AUDIO" in the file
+ $GetFileFormatArray = $this->GetFileFormatArray();
+ $info = $GetFileFormatArray['cue'];
+ $info['include'] = 'module.'.$info['group'].'.'.$info['module'].'.php';
+ return $info;
}
return false;
}
+ /**
+ * Converts array to $encoding charset from $this->encoding.
+ *
+ * @param array $array
+ * @param string $encoding
+ */
+ public function CharConvert(&$array, $encoding) {
- // converts array to $encoding charset from $this->encoding
- function CharConvert(&$array, $encoding) {
-
// identical encoding - end here
if ($encoding == $this->encoding) {
return;
@@ -969,9 +1436,11 @@
}
}
+ /**
+ * @return bool
+ */
+ public function HandleAllTags() {
- function HandleAllTags() {
-
// key name => array (tag name, character encoding)
static $tags;
if (empty($tags)) {
@@ -982,7 +1451,7 @@
'ogg' => array('vorbiscomment' , 'UTF-8'),
'png' => array('png' , 'UTF-8'),
'tiff' => array('tiff' , 'ISO-8859-1'),
- 'quicktime' => array('quicktime' , 'ISO-8859-1'),
+ 'quicktime' => array('quicktime' , 'UTF-8'),
'real' => array('real' , 'ISO-8859-1'),
'vqf' => array('vqf' , 'ISO-8859-1'),
'zip' => array('zip' , 'ISO-8859-1'),
@@ -990,11 +1459,17 @@
'lyrics3' => array('lyrics3' , 'ISO-8859-1'),
'id3v1' => array('id3v1' , $this->encoding_id3v1),
'id3v2' => array('id3v2' , 'UTF-8'), // not according to the specs (every frame can have a different encoding), but getID3() force-converts all encodings to UTF-8
- 'ape' => array('ape' , 'UTF-8')
+ 'ape' => array('ape' , 'UTF-8'),
+ 'cue' => array('cue' , 'ISO-8859-1'),
+ 'matroska' => array('matroska' , 'UTF-8'),
+ 'flac' => array('vorbiscomment' , 'UTF-8'),
+ 'divxtag' => array('divx' , 'ISO-8859-1'),
+ 'iptc' => array('iptc' , 'ISO-8859-1'),
+ 'dsdiff' => array('dsdiff' , 'ISO-8859-1'),
);
}
- // loop thru comments array
+ // loop through comments array
foreach ($tags as $comment_name => $tagname_encoding_array) {
list($tag_name, $encoding) = $tagname_encoding_array;
@@ -1005,13 +1480,23 @@
// copy comments if key name set
if (!empty($this->info[$comment_name]['comments'])) {
-
foreach ($this->info[$comment_name]['comments'] as $tag_key => $valuearray) {
foreach ($valuearray as $key => $value) {
- if (strlen(trim($value)) > 0) {
- $this->info['tags'][trim($tag_name)][trim($tag_key)][] = $value; // do not trim!! Unicode characters will get mangled if trailing nulls are removed!
+ if (is_string($value)) {
+ $value = trim($value, " \r\n\t"); // do not trim nulls from $value!! Unicode characters will get mangled if trailing nulls are removed!
}
+ if ($value) {
+ if (!is_numeric($key)) {
+ $this->info['tags'][trim($tag_name)][trim($tag_key)][$key] = $value;
+ } else {
+ $this->info['tags'][trim($tag_name)][trim($tag_key)][] = $value;
+ }
+ }
}
+ if ($tag_key == 'picture') {
+ // pictures can take up a lot of space, and we don't need multiple copies of them; let there be a single copy in [comments][picture], and not elsewhere
+ unset($this->info[$comment_name]['comments'][$tag_key]);
+ }
}
if (!isset($this->info['tags'][$tag_name])) {
@@ -1019,28 +1504,86 @@
continue;
}
+ $this->CharConvert($this->info['tags'][$tag_name], $this->info[$comment_name]['encoding']); // only copy gets converted!
+
if ($this->option_tags_html) {
foreach ($this->info['tags'][$tag_name] as $tag_key => $valuearray) {
- foreach ($valuearray as $key => $value) {
- if (is_string($value)) {
- //$this->info['tags_html'][$tag_name][$tag_key][$key] = getid3_lib::MultiByteCharString2HTML($value, $encoding);
- $this->info['tags_html'][$tag_name][$tag_key][$key] = str_replace('�', '', getid3_lib::MultiByteCharString2HTML($value, $encoding));
- } else {
- $this->info['tags_html'][$tag_name][$tag_key][$key] = $value;
- }
+ if ($tag_key == 'picture') {
+ // Do not to try to convert binary picture data to HTML
+ // https://github.com/JamesHeinrich/getID3/issues/178
+ continue;
}
+ $this->info['tags_html'][$tag_name][$tag_key] = getid3_lib::recursiveMultiByteCharString2HTML($valuearray, $this->info[$comment_name]['encoding']);
}
}
- $this->CharConvert($this->info['tags'][$tag_name], $encoding); // only copy gets converted!
}
}
+
+ // pictures can take up a lot of space, and we don't need multiple copies of them; let there be a single copy in [comments][picture], and not elsewhere
+ if (!empty($this->info['tags'])) {
+ $unset_keys = array('tags', 'tags_html');
+ foreach ($this->info['tags'] as $tagtype => $tagarray) {
+ foreach ($tagarray as $tagname => $tagdata) {
+ if ($tagname == 'picture') {
+ foreach ($tagdata as $key => $tagarray) {
+ $this->info['comments']['picture'][] = $tagarray;
+ if (isset($tagarray['data']) && isset($tagarray['image_mime'])) {
+ if (isset($this->info['tags'][$tagtype][$tagname][$key])) {
+ unset($this->info['tags'][$tagtype][$tagname][$key]);
+ }
+ if (isset($this->info['tags_html'][$tagtype][$tagname][$key])) {
+ unset($this->info['tags_html'][$tagtype][$tagname][$key]);
+ }
+ }
+ }
+ }
+ }
+ foreach ($unset_keys as $unset_key) {
+ // remove possible empty keys from (e.g. [tags][id3v2][picture])
+ if (empty($this->info[$unset_key][$tagtype]['picture'])) {
+ unset($this->info[$unset_key][$tagtype]['picture']);
+ }
+ if (empty($this->info[$unset_key][$tagtype])) {
+ unset($this->info[$unset_key][$tagtype]);
+ }
+ if (empty($this->info[$unset_key])) {
+ unset($this->info[$unset_key]);
+ }
+ }
+ // remove duplicate copy of picture data from (e.g. [id3v2][comments][picture])
+ if (isset($this->info[$tagtype]['comments']['picture'])) {
+ unset($this->info[$tagtype]['comments']['picture']);
+ }
+ if (empty($this->info[$tagtype]['comments'])) {
+ unset($this->info[$tagtype]['comments']);
+ }
+ if (empty($this->info[$tagtype])) {
+ unset($this->info[$tagtype]);
+ }
+ }
+ }
return true;
}
+ /**
+ * Calls getid3_lib::CopyTagsToComments() but passes in the option_tags_html setting from this instance of getID3
+ *
+ * @param array $ThisFileInfo
+ *
+ * @return bool
+ */
+ public function CopyTagsToComments(&$ThisFileInfo) {
+ return getid3_lib::CopyTagsToComments($ThisFileInfo, $this->option_tags_html);
+ }
- function getHashdata($algorithm) {
+ /**
+ * @param string $algorithm
+ *
+ * @return array|bool
+ */
+ public function getHashdata($algorithm) {
switch ($algorithm) {
case 'md5':
case 'sha1':
@@ -1048,10 +1591,9 @@
default:
return $this->error('bad algorithm "'.$algorithm.'" in getHashdata()');
- break;
}
- if ((@$this->info['fileformat'] == 'ogg') && (@$this->info['audio']['dataformat'] == 'vorbis')) {
+ if (!empty($this->info['fileformat']) && !empty($this->info['dataformat']) && ($this->info['fileformat'] == 'ogg') && ($this->info['audio']['dataformat'] == 'vorbis')) {
// We cannot get an identical md5_data value for Ogg files where the comments
// span more than 1 Ogg page (compared to the same audio data with smaller
@@ -1071,10 +1613,10 @@
// page sequence numbers likely happens for OggSpeex and OggFLAC as well, but
// currently vorbiscomment only works on OggVorbis files.
- if ((bool) ini_get('safe_mode')) {
+ if (preg_match('#(1|ON)#i', ini_get('safe_mode'))) {
- $this->info['warning'][] = 'Failed making system call to vorbiscomment.exe - '.$algorithm.'_data is incorrect - error returned: PHP running in Safe Mode (backtick operator not available)';
- $this->info[$algorithm.'_data'] = false;
+ $this->warning('Failed making system call to vorbiscomment.exe - '.$algorithm.'_data is incorrect - error returned: PHP running in Safe Mode (backtick operator not available)');
+ $this->info[$algorithm.'_data'] = false;
} else {
@@ -1082,12 +1624,11 @@
$old_abort = ignore_user_abort(true);
// Create empty file
- $empty = tempnam('*', 'getID3');
+ $empty = tempnam(GETID3_TEMP_DIR, 'getID3');
touch($empty);
-
// Use vorbiscomment to make temp file without comments
- $temp = tempnam('*', 'getID3');
+ $temp = tempnam(GETID3_TEMP_DIR, 'getID3');
$file = $this->info['filenamepath'];
if (GETID3_OS_ISWINDOWS) {
@@ -1105,7 +1646,6 @@
} else {
- $commandline = 'vorbiscomment -w -c "'.$empty.'" "'.$file.'" "'.$temp.'" 2>&1';
$commandline = 'vorbiscomment -w -c '.escapeshellarg($empty).' '.escapeshellarg($file).' '.escapeshellarg($temp).' 2>&1';
$VorbisCommentError = `$commandline`;
@@ -1113,8 +1653,8 @@
if (!empty($VorbisCommentError)) {
- $this->info['warning'][] = 'Failed making system call to vorbiscomment(.exe) - '.$algorithm.'_data will be incorrect. If vorbiscomment is unavailable, please download from http://www.vorbis.com/download.psp and put in the getID3() directory. Error returned: '.$VorbisCommentError;
- $this->info[$algorithm.'_data'] = false;
+ $this->warning('Failed making system call to vorbiscomment(.exe) - '.$algorithm.'_data will be incorrect. If vorbiscomment is unavailable, please download from http://www.vorbis.com/download.psp and put in the getID3() directory. Error returned: '.$VorbisCommentError);
+ $this->info[$algorithm.'_data'] = false;
} else {
@@ -1121,11 +1661,11 @@
// Get hash of newly created file
switch ($algorithm) {
case 'md5':
- $this->info[$algorithm.'_data'] = getid3_lib::md5_file($temp);
+ $this->info[$algorithm.'_data'] = md5_file($temp);
break;
case 'sha1':
- $this->info[$algorithm.'_data'] = getid3_lib::sha1_file($temp);
+ $this->info[$algorithm.'_data'] = sha1_file($temp);
break;
}
}
@@ -1151,11 +1691,11 @@
// get hash from whole file
switch ($algorithm) {
case 'md5':
- $this->info[$algorithm.'_data'] = getid3_lib::md5_file($this->info['filenamepath']);
+ $this->info[$algorithm.'_data'] = md5_file($this->info['filenamepath']);
break;
case 'sha1':
- $this->info[$algorithm.'_data'] = getid3_lib::sha1_file($this->info['filenamepath']);
+ $this->info[$algorithm.'_data'] = sha1_file($this->info['filenamepath']);
break;
}
}
@@ -1164,13 +1704,14 @@
return true;
}
+ public function ChannelsBitratePlaytimeCalculations() {
- function ChannelsBitratePlaytimeCalculations() {
-
// set channelmode on audio
- if (@$this->info['audio']['channels'] == '1') {
+ if (!empty($this->info['audio']['channelmode']) || !isset($this->info['audio']['channels'])) {
+ // ignore
+ } elseif ($this->info['audio']['channels'] == 1) {
$this->info['audio']['channelmode'] = 'mono';
- } elseif (@$this->info['audio']['channels'] == '2') {
+ } elseif ($this->info['audio']['channels'] == 2) {
$this->info['audio']['channelmode'] = 'stereo';
}
@@ -1187,10 +1728,40 @@
// unset($this->info['bitrate']);
//}
- if (!isset($this->info['playtime_seconds']) && !empty($this->info['bitrate'])) {
+ // video bitrate undetermined, but calculable
+ if (isset($this->info['video']['dataformat']) && $this->info['video']['dataformat'] && (!isset($this->info['video']['bitrate']) || ($this->info['video']['bitrate'] == 0))) {
+ // if video bitrate not set
+ if (isset($this->info['audio']['bitrate']) && ($this->info['audio']['bitrate'] > 0) && ($this->info['audio']['bitrate'] == $this->info['bitrate'])) {
+ // AND if audio bitrate is set to same as overall bitrate
+ if (isset($this->info['playtime_seconds']) && ($this->info['playtime_seconds'] > 0)) {
+ // AND if playtime is set
+ if (isset($this->info['avdataend']) && isset($this->info['avdataoffset'])) {
+ // AND if AV data offset start/end is known
+ // THEN we can calculate the video bitrate
+ $this->info['bitrate'] = round((($this->info['avdataend'] - $this->info['avdataoffset']) * 8) / $this->info['playtime_seconds']);
+ $this->info['video']['bitrate'] = $this->info['bitrate'] - $this->info['audio']['bitrate'];
+ }
+ }
+ }
+ }
+
+ if ((!isset($this->info['playtime_seconds']) || ($this->info['playtime_seconds'] <= 0)) && !empty($this->info['bitrate'])) {
$this->info['playtime_seconds'] = (($this->info['avdataend'] - $this->info['avdataoffset']) * 8) / $this->info['bitrate'];
}
+ if (!isset($this->info['bitrate']) && !empty($this->info['playtime_seconds'])) {
+ $this->info['bitrate'] = (($this->info['avdataend'] - $this->info['avdataoffset']) * 8) / $this->info['playtime_seconds'];
+ }
+ if (isset($this->info['bitrate']) && empty($this->info['audio']['bitrate']) && empty($this->info['video']['bitrate'])) {
+ if (isset($this->info['audio']['dataformat']) && empty($this->info['video']['resolution_x'])) {
+ // audio only
+ $this->info['audio']['bitrate'] = $this->info['bitrate'];
+ } elseif (isset($this->info['video']['resolution_x']) && empty($this->info['audio']['dataformat'])) {
+ // video only
+ $this->info['video']['bitrate'] = $this->info['bitrate'];
+ }
+ }
+
// Set playtime string
if (!empty($this->info['playtime_seconds']) && empty($this->info['playtime_string'])) {
$this->info['playtime_string'] = getid3_lib::PlaytimeString($this->info['playtime_seconds']);
@@ -1197,8 +1768,10 @@
}
}
-
- function CalculateCompressionRatioVideo() {
+ /**
+ * @return bool
+ */
+ public function CalculateCompressionRatioVideo() {
if (empty($this->info['video'])) {
return false;
}
@@ -1245,9 +1818,11 @@
return true;
}
-
- function CalculateCompressionRatioAudio() {
- if (empty($this->info['audio']['bitrate']) || empty($this->info['audio']['channels']) || empty($this->info['audio']['sample_rate'])) {
+ /**
+ * @return bool
+ */
+ public function CalculateCompressionRatioAudio() {
+ if (empty($this->info['audio']['bitrate']) || empty($this->info['audio']['channels']) || empty($this->info['audio']['sample_rate']) || !is_numeric($this->info['audio']['sample_rate'])) {
return false;
}
$this->info['audio']['compression_ratio'] = $this->info['audio']['bitrate'] / ($this->info['audio']['channels'] * $this->info['audio']['sample_rate'] * (!empty($this->info['audio']['bits_per_sample']) ? $this->info['audio']['bits_per_sample'] : 16));
@@ -1262,10 +1837,14 @@
return true;
}
-
- function CalculateReplayGain() {
+ /**
+ * @return bool
+ */
+ public function CalculateReplayGain() {
if (isset($this->info['replay_gain'])) {
- $this->info['replay_gain']['reference_volume'] = 89;
+ if (!isset($this->info['replay_gain']['reference_volume'])) {
+ $this->info['replay_gain']['reference_volume'] = 89.0;
+ }
if (isset($this->info['replay_gain']['track']['adjustment'])) {
$this->info['replay_gain']['track']['volume'] = $this->info['replay_gain']['reference_volume'] - $this->info['replay_gain']['track']['adjustment'];
}
@@ -1283,7 +1862,10 @@
return true;
}
- function ProcessAudioStreams() {
+ /**
+ * @return bool
+ */
+ public function ProcessAudioStreams() {
if (!empty($this->info['audio']['bitrate']) || !empty($this->info['audio']['channels']) || !empty($this->info['audio']['sample_rate'])) {
if (!isset($this->info['audio']['streams'])) {
foreach ($this->info['audio'] as $key => $value) {
@@ -1296,10 +1878,421 @@
return true;
}
- function getid3_tempnam() {
+ /**
+ * @return string|bool
+ */
+ public function getid3_tempnam() {
return tempnam($this->tempdir, 'gI3');
}
+ /**
+ * @param string $name
+ *
+ * @return bool
+ *
+ * @throws getid3_exception
+ */
+ public function include_module($name) {
+ //if (!file_exists($this->include_path.'module.'.$name.'.php')) {
+ if (!file_exists(GETID3_INCLUDEPATH.'module.'.$name.'.php')) {
+ throw new getid3_exception('Required module.'.$name.'.php is missing.');
+ }
+ include_once(GETID3_INCLUDEPATH.'module.'.$name.'.php');
+ return true;
+ }
+
+ /**
+ * @param string $filename
+ *
+ * @return bool
+ */
+ public static function is_writable ($filename) {
+ $ret = is_writable($filename);
+ if (!$ret) {
+ $perms = fileperms($filename);
+ $ret = ($perms & 0x0080) || ($perms & 0x0010) || ($perms & 0x0002);
+ }
+ return $ret;
+ }
+
}
-?>
\ No newline at end of file
+
+abstract class getid3_handler
+{
+
+ /**
+ * @var getID3
+ */
+ protected $getid3; // pointer
+
+ /**
+ * Analyzing filepointer or string.
+ *
+ * @var bool
+ */
+ protected $data_string_flag = false;
+
+ /**
+ * String to analyze.
+ *
+ * @var string
+ */
+ protected $data_string = '';
+
+ /**
+ * Seek position in string.
+ *
+ * @var int
+ */
+ protected $data_string_position = 0;
+
+ /**
+ * String length.
+ *
+ * @var int
+ */
+ protected $data_string_length = 0;
+
+ /**
+ * @var string
+ */
+ private $dependency_to;
+
+ /**
+ * getid3_handler constructor.
+ *
+ * @param getID3 $getid3
+ * @param string $call_module
+ */
+ public function __construct(getID3 $getid3, $call_module=null) {
+ $this->getid3 = $getid3;
+
+ if ($call_module) {
+ $this->dependency_to = str_replace('getid3_', '', $call_module);
+ }
+ }
+
+ /**
+ * Analyze from file pointer.
+ *
+ * @return bool
+ */
+ abstract public function Analyze();
+
+ /**
+ * Analyze from string instead.
+ *
+ * @param string $string
+ */
+ public function AnalyzeString($string) {
+ // Enter string mode
+ $this->setStringMode($string);
+
+ // Save info
+ $saved_avdataoffset = $this->getid3->info['avdataoffset'];
+ $saved_avdataend = $this->getid3->info['avdataend'];
+ $saved_filesize = (isset($this->getid3->info['filesize']) ? $this->getid3->info['filesize'] : null); // may be not set if called as dependency without openfile() call
+
+ // Reset some info
+ $this->getid3->info['avdataoffset'] = 0;
+ $this->getid3->info['avdataend'] = $this->getid3->info['filesize'] = $this->data_string_length;
+
+ // Analyze
+ $this->Analyze();
+
+ // Restore some info
+ $this->getid3->info['avdataoffset'] = $saved_avdataoffset;
+ $this->getid3->info['avdataend'] = $saved_avdataend;
+ $this->getid3->info['filesize'] = $saved_filesize;
+
+ // Exit string mode
+ $this->data_string_flag = false;
+ }
+
+ /**
+ * @param string $string
+ */
+ public function setStringMode($string) {
+ $this->data_string_flag = true;
+ $this->data_string = $string;
+ $this->data_string_length = strlen($string);
+ }
+
+ /**
+ * @return int|bool
+ */
+ protected function ftell() {
+ if ($this->data_string_flag) {
+ return $this->data_string_position;
+ }
+ return ftell($this->getid3->fp);
+ }
+
+ /**
+ * @param int $bytes
+ *
+ * @return string|false
+ *
+ * @throws getid3_exception
+ */
+ protected function fread($bytes) {
+ if ($this->data_string_flag) {
+ $this->data_string_position += $bytes;
+ return substr($this->data_string, $this->data_string_position - $bytes, $bytes);
+ }
+ $pos = $this->ftell() + $bytes;
+ if (!getid3_lib::intValueSupported($pos)) {
+ throw new getid3_exception('cannot fread('.$bytes.' from '.$this->ftell().') because beyond PHP filesystem limit', 10);
+ }
+
+ //return fread($this->getid3->fp, $bytes);
+ /*
+ * https://www.getid3.org/phpBB3/viewtopic.php?t=1930
+ * "I found out that the root cause for the problem was how getID3 uses the PHP system function fread().
+ * It seems to assume that fread() would always return as many bytes as were requested.
+ * However, according the PHP manual (http://php.net/manual/en/function.fread.php), this is the case only with regular local files, but not e.g. with Linux pipes.
+ * The call may return only part of the requested data and a new call is needed to get more."
+ */
+ $contents = '';
+ do {
+ //if (($this->getid3->memory_limit > 0) && ($bytes > $this->getid3->memory_limit)) {
+ if (($this->getid3->memory_limit > 0) && (($bytes / $this->getid3->memory_limit) > 0.99)) { // enable a more-fuzzy match to prevent close misses generating errors like "PHP Fatal error: Allowed memory size of 33554432 bytes exhausted (tried to allocate 33554464 bytes)"
+ throw new getid3_exception('cannot fread('.$bytes.' from '.$this->ftell().') that is more than available PHP memory ('.$this->getid3->memory_limit.')', 10);
+ }
+ $part = fread($this->getid3->fp, $bytes);
+ $partLength = strlen($part);
+ $bytes -= $partLength;
+ $contents .= $part;
+ } while (($bytes > 0) && ($partLength > 0));
+ return $contents;
+ }
+
+ /**
+ * @param int $bytes
+ * @param int $whence
+ *
+ * @return int
+ *
+ * @throws getid3_exception
+ */
+ protected function fseek($bytes, $whence=SEEK_SET) {
+ if ($this->data_string_flag) {
+ switch ($whence) {
+ case SEEK_SET:
+ $this->data_string_position = $bytes;
+ break;
+
+ case SEEK_CUR:
+ $this->data_string_position += $bytes;
+ break;
+
+ case SEEK_END:
+ $this->data_string_position = $this->data_string_length + $bytes;
+ break;
+ }
+ return 0;
+ } else {
+ $pos = $bytes;
+ if ($whence == SEEK_CUR) {
+ $pos = $this->ftell() + $bytes;
+ } elseif ($whence == SEEK_END) {
+ $pos = $this->getid3->info['filesize'] + $bytes;
+ }
+ if (!getid3_lib::intValueSupported($pos)) {
+ throw new getid3_exception('cannot fseek('.$pos.') because beyond PHP filesystem limit', 10);
+ }
+ }
+ return fseek($this->getid3->fp, $bytes, $whence);
+ }
+
+ /**
+ * @return string|false
+ *
+ * @throws getid3_exception
+ */
+ protected function fgets() {
+ // must be able to handle CR/LF/CRLF but not read more than one lineend
+ $buffer = ''; // final string we will return
+ $prevchar = ''; // save previously-read character for end-of-line checking
+ if ($this->data_string_flag) {
+ while (true) {
+ $thischar = substr($this->data_string, $this->data_string_position++, 1);
+ if (($prevchar == "\r") && ($thischar != "\n")) {
+ // read one byte too many, back up
+ $this->data_string_position--;
+ break;
+ }
+ $buffer .= $thischar;
+ if ($thischar == "\n") {
+ break;
+ }
+ if ($this->data_string_position >= $this->data_string_length) {
+ // EOF
+ break;
+ }
+ $prevchar = $thischar;
+ }
+
+ } else {
+
+ // Ideally we would just use PHP's fgets() function, however...
+ // it does not behave consistently with regards to mixed line endings, may be system-dependent
+ // and breaks entirely when given a file with mixed \r vs \n vs \r\n line endings (e.g. some PDFs)
+ //return fgets($this->getid3->fp);
+ while (true) {
+ $thischar = fgetc($this->getid3->fp);
+ if (($prevchar == "\r") && ($thischar != "\n")) {
+ // read one byte too many, back up
+ fseek($this->getid3->fp, -1, SEEK_CUR);
+ break;
+ }
+ $buffer .= $thischar;
+ if ($thischar == "\n") {
+ break;
+ }
+ if (feof($this->getid3->fp)) {
+ break;
+ }
+ $prevchar = $thischar;
+ }
+
+ }
+ return $buffer;
+ }
+
+ /**
+ * @return bool
+ */
+ protected function feof() {
+ if ($this->data_string_flag) {
+ return $this->data_string_position >= $this->data_string_length;
+ }
+ return feof($this->getid3->fp);
+ }
+
+ /**
+ * @param string $module
+ *
+ * @return bool
+ */
+ final protected function isDependencyFor($module) {
+ return $this->dependency_to == $module;
+ }
+
+ /**
+ * @param string $text
+ *
+ * @return bool
+ */
+ protected function error($text) {
+ $this->getid3->info['error'][] = $text;
+
+ return false;
+ }
+
+ /**
+ * @param string $text
+ *
+ * @return bool
+ */
+ protected function warning($text) {
+ return $this->getid3->warning($text);
+ }
+
+ /**
+ * @param string $text
+ */
+ protected function notice($text) {
+ // does nothing for now
+ }
+
+ /**
+ * @param string $name
+ * @param int $offset
+ * @param int $length
+ * @param string $image_mime
+ *
+ * @return string|null
+ *
+ * @throws Exception
+ * @throws getid3_exception
+ */
+ public function saveAttachment($name, $offset, $length, $image_mime=null) {
+ try {
+
+ // do not extract at all
+ if ($this->getid3->option_save_attachments === getID3::ATTACHMENTS_NONE) {
+
+ $attachment = null; // do not set any
+
+ // extract to return array
+ } elseif ($this->getid3->option_save_attachments === getID3::ATTACHMENTS_INLINE) {
+
+ $this->fseek($offset);
+ $attachment = $this->fread($length); // get whole data in one pass, till it is anyway stored in memory
+ if ($attachment === false || strlen($attachment) != $length) {
+ throw new Exception('failed to read attachment data');
+ }
+
+ // assume directory path is given
+ } else {
+
+ // set up destination path
+ $dir = rtrim(str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $this->getid3->option_save_attachments), DIRECTORY_SEPARATOR);
+ if (!is_dir($dir) || !getID3::is_writable($dir)) { // check supplied directory
+ throw new Exception('supplied path ('.$dir.') does not exist, or is not writable');
+ }
+ $dest = $dir.DIRECTORY_SEPARATOR.$name.($image_mime ? '.'.getid3_lib::ImageExtFromMime($image_mime) : '');
+
+ // create dest file
+ if (($fp_dest = fopen($dest, 'wb')) == false) {
+ throw new Exception('failed to create file '.$dest);
+ }
+
+ // copy data
+ $this->fseek($offset);
+ $buffersize = ($this->data_string_flag ? $length : $this->getid3->fread_buffer_size());
+ $bytesleft = $length;
+ while ($bytesleft > 0) {
+ if (($buffer = $this->fread(min($buffersize, $bytesleft))) === false || ($byteswritten = fwrite($fp_dest, $buffer)) === false || ($byteswritten === 0)) {
+ throw new Exception($buffer === false ? 'not enough data to read' : 'failed to write to destination file, may be not enough disk space');
+ }
+ $bytesleft -= $byteswritten;
+ }
+
+ fclose($fp_dest);
+ $attachment = $dest;
+
+ }
+
+ } catch (Exception $e) {
+
+ // close and remove dest file if created
+ if (isset($fp_dest) && is_resource($fp_dest)) {
+ fclose($fp_dest);
+ }
+
+ if (isset($dest) && file_exists($dest)) {
+ unlink($dest);
+ }
+
+ // do not set any is case of error
+ $attachment = null;
+ $this->warning('Failed to extract attachment '.$name.': '.$e->getMessage());
+
+ }
+
+ // seek to the end of attachment
+ $this->fseek($offset + $length);
+
+ return $attachment;
+ }
+
+}
+
+
+class getid3_exception extends Exception
+{
+ public $message;
+}
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.archive.gzip.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.archive.gzip.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.archive.gzip.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,36 +1,62 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.archive.gzip.php //
-// written by Mike Mozolin <teddybearØmail*ru> //
// module for analyzing GZIP files //
// dependencies: NONE //
// ///
/////////////////////////////////////////////////////////////////
+// //
+// Module originally written by //
+// Mike Mozolin <teddybearØmail*ru> //
+// //
+/////////////////////////////////////////////////////////////////
-class getid3_gzip {
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
- // public: Optional file list - disable for speed.
- var $option_gzip_parse_contents = false; // decode gzipped files, if possible, and parse recursively (.tar.gz for example)
+class getid3_gzip extends getid3_handler
+{
+ /**
+ * Optional file list - disable for speed.
+ *
+ * Decode gzipped files, if possible, and parse recursively (.tar.gz for example).
+ *
+ * @var bool
+ */
+ public $option_gzip_parse_contents = false;
- function getid3_gzip(&$fd, &$ThisFileInfo) {
- $ThisFileInfo['fileformat'] = 'gzip';
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
+ $info['fileformat'] = 'gzip';
+
$start_length = 10;
$unpack_header = 'a1id1/a1id2/a1cmethod/a1flags/a4mtime/a1xflags/a1os';
//+---+---+---+---+---+---+---+---+---+---+
//|ID1|ID2|CM |FLG| MTIME |XFL|OS |
//+---+---+---+---+---+---+---+---+---+---+
- @fseek($fd, 0);
- $buffer = @fread($fd, $ThisFileInfo['filesize']);
+ if ($info['php_memory_limit'] && ($info['filesize'] > $info['php_memory_limit'])) {
+ $this->error('File is too large ('.number_format($info['filesize']).' bytes) to read into memory (limit: '.number_format($info['php_memory_limit'] / 1048576).'MB)');
+ return false;
+ }
+ $this->fseek(0);
+ $buffer = $this->fread($info['filesize']);
+
$arr_members = explode("\x1F\x8B\x08", $buffer);
+ $num_members = 0;
while (true) {
$is_wrong_members = false;
$num_members = intval(count($arr_members));
@@ -43,7 +69,7 @@
$attr = unpack($unpack_header, substr($buf, 0, $start_length));
if (!$this->get_os_type(ord($attr['os']))) {
// Merge member with previous if wrong OS type
- $arr_members[$i - 1] .= $buf;
+ $arr_members[($i - 1)] .= $buf;
$arr_members[$i] = '';
$is_wrong_members = true;
continue;
@@ -54,7 +80,7 @@
}
}
- $ThisFileInfo['gzip']['files'] = array();
+ $info['gzip']['files'] = array();
$fpointer = 0;
$idx = 0;
@@ -62,29 +88,29 @@
if (strlen($arr_members[$i]) == 0) {
continue;
}
- $thisThisFileInfo = &$ThisFileInfo['gzip']['member_header'][++$idx];
+ $thisInfo = &$info['gzip']['member_header'][++$idx];
$buff = "\x1F\x8B\x08".$arr_members[$i];
$attr = unpack($unpack_header, substr($buff, 0, $start_length));
- $thisThisFileInfo['filemtime'] = getid3_lib::LittleEndian2Int($attr['mtime']);
- $thisThisFileInfo['raw']['id1'] = ord($attr['cmethod']);
- $thisThisFileInfo['raw']['id2'] = ord($attr['cmethod']);
- $thisThisFileInfo['raw']['cmethod'] = ord($attr['cmethod']);
- $thisThisFileInfo['raw']['os'] = ord($attr['os']);
- $thisThisFileInfo['raw']['xflags'] = ord($attr['xflags']);
- $thisThisFileInfo['raw']['flags'] = ord($attr['flags']);
+ $thisInfo['filemtime'] = getid3_lib::LittleEndian2Int($attr['mtime']);
+ $thisInfo['raw']['id1'] = ord($attr['cmethod']);
+ $thisInfo['raw']['id2'] = ord($attr['cmethod']);
+ $thisInfo['raw']['cmethod'] = ord($attr['cmethod']);
+ $thisInfo['raw']['os'] = ord($attr['os']);
+ $thisInfo['raw']['xflags'] = ord($attr['xflags']);
+ $thisInfo['raw']['flags'] = ord($attr['flags']);
- $thisThisFileInfo['flags']['crc16'] = (bool) ($thisThisFileInfo['raw']['flags'] & 0x02);
- $thisThisFileInfo['flags']['extra'] = (bool) ($thisThisFileInfo['raw']['flags'] & 0x04);
- $thisThisFileInfo['flags']['filename'] = (bool) ($thisThisFileInfo['raw']['flags'] & 0x08);
- $thisThisFileInfo['flags']['comment'] = (bool) ($thisThisFileInfo['raw']['flags'] & 0x10);
+ $thisInfo['flags']['crc16'] = (bool) ($thisInfo['raw']['flags'] & 0x02);
+ $thisInfo['flags']['extra'] = (bool) ($thisInfo['raw']['flags'] & 0x04);
+ $thisInfo['flags']['filename'] = (bool) ($thisInfo['raw']['flags'] & 0x08);
+ $thisInfo['flags']['comment'] = (bool) ($thisInfo['raw']['flags'] & 0x10);
- $thisThisFileInfo['compression'] = $this->get_xflag_type($thisThisFileInfo['raw']['xflags']);
+ $thisInfo['compression'] = $this->get_xflag_type($thisInfo['raw']['xflags']);
- $thisThisFileInfo['os'] = $this->get_os_type($thisThisFileInfo['raw']['os']);
- if (!$thisThisFileInfo['os']) {
- $ThisFileInfo['error'][] = 'Read error on gzip file';
+ $thisInfo['os'] = $this->get_os_type($thisInfo['raw']['os']);
+ if (!$thisInfo['os']) {
+ $this->error('Read error on gzip file');
return false;
}
@@ -94,12 +120,12 @@
//+---+---+=================================+
//| XLEN |...XLEN bytes of "extra field"...|
//+---+---+=================================+
- if ($thisThisFileInfo['flags']['extra']) {
+ if ($thisInfo['flags']['extra']) {
$w_xlen = substr($buff, $fpointer, 2);
$xlen = getid3_lib::LittleEndian2Int($w_xlen);
$fpointer += 2;
- $thisThisFileInfo['raw']['xfield'] = substr($buff, $fpointer, $xlen);
+ $thisInfo['raw']['xfield'] = substr($buff, $fpointer, $xlen);
// Extra SubFields
//+---+---+---+---+==================================+
//|SI1|SI2| LEN |... LEN bytes of subfield data ...|
@@ -112,10 +138,10 @@
$si1 = ord(substr($buff, $fpointer + $idx++, 1));
$si2 = ord(substr($buff, $fpointer + $idx++, 1));
if (($si1 == 0x41) && ($si2 == 0x70)) {
- $w_xsublen = substr($buff, $fpointer+$idx, 2);
+ $w_xsublen = substr($buff, $fpointer + $idx, 2);
$xsublen = getid3_lib::LittleEndian2Int($w_xsublen);
$idx += 2;
- $arr_xsubfield[] = substr($buff, $fpointer+$idx, $xsublen);
+ $arr_xsubfield[] = substr($buff, $fpointer + $idx, $xsublen);
$idx += $xsublen;
} else {
break;
@@ -128,14 +154,15 @@
//|...original file name, zero-terminated...|
//+=========================================+
// GZIP files may have only one file, with no filename, so assume original filename is current filename without .gz
- $thisThisFileInfo['filename'] = eregi_replace('.gz$', '', $ThisFileInfo['filename']);
- if ($thisThisFileInfo['flags']['filename']) {
+ $thisInfo['filename'] = preg_replace('#\\.gz$#i', '', $info['filename']);
+ if ($thisInfo['flags']['filename']) {
+ $thisInfo['filename'] = '';
while (true) {
if (ord($buff[$fpointer]) == 0) {
$fpointer++;
break;
}
- $thisThisFileInfo['filename'] .= $buff[$fpointer];
+ $thisInfo['filename'] .= $buff[$fpointer];
$fpointer++;
}
}
@@ -143,13 +170,13 @@
//+===================================+
//|...file comment, zero-terminated...|
//+===================================+
- if ($thisThisFileInfo['flags']['comment']) {
+ if ($thisInfo['flags']['comment']) {
while (true) {
if (ord($buff[$fpointer]) == 0) {
$fpointer++;
break;
}
- $thisThisFileInfo['comment'] .= $buff[$fpointer];
+ $thisInfo['comment'] .= $buff[$fpointer];
$fpointer++;
}
}
@@ -157,21 +184,21 @@
//+---+---+
//| CRC16 |
//+---+---+
- if ($thisThisFileInfo['flags']['crc16']) {
+ if ($thisInfo['flags']['crc16']) {
$w_crc = substr($buff, $fpointer, 2);
- $thisThisFileInfo['crc16'] = getid3_lib::LittleEndian2Int($w_crc);
+ $thisInfo['crc16'] = getid3_lib::LittleEndian2Int($w_crc);
$fpointer += 2;
}
// bit 0 - FLG.FTEXT
- //if ($thisThisFileInfo['raw']['flags'] & 0x01) {
+ //if ($thisInfo['raw']['flags'] & 0x01) {
// Ignored...
//}
// bits 5, 6, 7 - reserved
- $thisThisFileInfo['crc32'] = getid3_lib::LittleEndian2Int(substr($buff, strlen($buff) - 8, 4));
- $thisThisFileInfo['filesize'] = getid3_lib::LittleEndian2Int(substr($buff, strlen($buff) - 4));
+ $thisInfo['crc32'] = getid3_lib::LittleEndian2Int(substr($buff, strlen($buff) - 8, 4));
+ $thisInfo['filesize'] = getid3_lib::LittleEndian2Int(substr($buff, strlen($buff) - 4));
- $ThisFileInfo['gzip']['files'] = getid3_lib::array_merge_clobber($ThisFileInfo['gzip']['files'], getid3_lib::CreateDeepArray($thisThisFileInfo['filename'], '/', $thisThisFileInfo['filesize']));
+ $info['gzip']['files'] = getid3_lib::array_merge_clobber($info['gzip']['files'], getid3_lib::CreateDeepArray($thisInfo['filename'], '/', $thisInfo['filesize']));
if ($this->option_gzip_parse_contents) {
// Try to inflate GZip
@@ -185,28 +212,49 @@
$inflated = gzinflate($cdata);
// Calculate CRC32 for inflated content
- $thisThisFileInfo['crc32_valid'] = (bool) (sprintf('%u', crc32($inflated)) == $thisThisFileInfo['crc32']);
+ $thisInfo['crc32_valid'] = sprintf('%u', crc32($inflated)) == $thisInfo['crc32'];
// determine format
$formattest = substr($inflated, 0, 32774);
- $newgetID3 = new getID3();
- $determined_format = $newgetID3->GetFileFormat($formattest);
- unset($newgetID3);
+ $getid3_temp = new getID3();
+ $determined_format = $getid3_temp->GetFileFormat($formattest);
+ unset($getid3_temp);
- // file format is determined
- switch (@$determined_format['module']) {
- case 'tar':
+ // file format is determined
+ $determined_format['module'] = (isset($determined_format['module']) ? $determined_format['module'] : '');
+ switch ($determined_format['module']) {
+ case 'tar':
// view TAR-file info
- if (file_exists(GETID3_INCLUDEPATH.$determined_format['include']) && @lt_include(GETID3_INCLUDEPATH.$determined_format['include'])) {
- getid3_tar::read_tar($inflated, $ThisFileInfo['gzip']['member_header'][$idx]);
+ if (file_exists(GETID3_INCLUDEPATH.$determined_format['include']) && include_once(GETID3_INCLUDEPATH.$determined_format['include'])) {
+ if (($temp_tar_filename = tempnam(GETID3_TEMP_DIR, 'getID3')) === false) {
+ // can't find anywhere to create a temp file, abort
+ $this->error('Unable to create temp file to parse TAR inside GZIP file');
+ break;
+ }
+ if ($fp_temp_tar = fopen($temp_tar_filename, 'w+b')) {
+ fwrite($fp_temp_tar, $inflated);
+ fclose($fp_temp_tar);
+ $getid3_temp = new getID3();
+ $getid3_temp->openfile($temp_tar_filename);
+ $getid3_tar = new getid3_tar($getid3_temp);
+ $getid3_tar->Analyze();
+ $info['gzip']['member_header'][$idx]['tar'] = $getid3_temp->info['tar'];
+ unset($getid3_temp, $getid3_tar);
+ unlink($temp_tar_filename);
+ } else {
+ $this->error('Unable to fopen() temp file to parse TAR inside GZIP file');
+ break;
+ }
}
break;
- case '':
- default:
- // unknown or unhandled format
- break;
+ case '':
+ default:
+ // unknown or unhandled format
+ break;
}
+ } else {
+ $this->warning('PHP is not compiled with gzinflate() support. Please enable PHP Zlib extension or recompile with the --with-zlib switch');
}
}
}
@@ -213,8 +261,14 @@
return true;
}
- // Converts the OS type
- function get_os_type($key) {
+ /**
+ * Converts the OS type.
+ *
+ * @param string $key
+ *
+ * @return string
+ */
+ public function get_os_type($key) {
static $os_type = array(
'0' => 'FAT filesystem (MS-DOS, OS/2, NT/Win32)',
'1' => 'Amiga',
@@ -232,18 +286,23 @@
'13' => 'Acorn RISCOS',
'255' => 'unknown'
);
- return @$os_type[$key];
+ return (isset($os_type[$key]) ? $os_type[$key] : '');
}
- // Converts the eXtra FLags
- function get_xflag_type($key) {
+ /**
+ * Converts the eXtra FLags.
+ *
+ * @param string $key
+ *
+ * @return string
+ */
+ public function get_xflag_type($key) {
static $xflag_type = array(
'0' => 'unknown',
'2' => 'maximum compression',
'4' => 'fastest algorithm'
);
- return @$xflag_type[$key];
+ return (isset($xflag_type[$key]) ? $xflag_type[$key] : '');
}
}
-?>
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.archive.rar.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.archive.rar.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.archive.rar.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.archive.rar.php //
// module for analyzing RAR files //
@@ -13,20 +14,46 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_rar
+class getid3_rar extends getid3_handler
{
+ /**
+ * @var bool
+ */
+ public $option_use_rar_extension = false;
- function getid3_rar(&$fd, &$ThisFileInfo) {
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- $ThisFileInfo['fileformat'] = 'rar';
+ $info['fileformat'] = 'rar';
- $ThisFileInfo['error'][] = 'RAR parsing not enabled in this version of getID3()';
+ if ($this->option_use_rar_extension === true) {
+ if (function_exists('rar_open')) {
+ if ($rp = rar_open($info['filenamepath'])) {
+ $info['rar']['files'] = array();
+ $entries = rar_list($rp);
+ foreach ($entries as $entry) {
+ $info['rar']['files'] = getid3_lib::array_merge_clobber($info['rar']['files'], getid3_lib::CreateDeepArray($entry->getName(), '/', $entry->getUnpackedSize()));
+ }
+ rar_close($rp);
+ return true;
+ } else {
+ $this->error('failed to rar_open('.$info['filename'].')');
+ }
+ } else {
+ $this->error('RAR support does not appear to be available in this PHP installation');
+ }
+ } else {
+ $this->error('PHP-RAR processing has been disabled (set $getid3_rar->option_use_rar_extension=true to enable)');
+ }
return false;
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.archive.szip.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.archive.szip.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.archive.szip.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.archive.szip.php //
// module for analyzing SZIP compressed files //
@@ -13,37 +14,43 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_szip
+class getid3_szip extends getid3_handler
{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- function getid3_szip(&$fd, &$ThisFileInfo) {
-
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
- $SZIPHeader = fread($fd, 6);
- if (substr($SZIPHeader, 0, 4) != 'SZ'."\x0A\x04") {
- $ThisFileInfo['error'][] = 'Expecting "SZ[x0A][x04]" at offset '.$ThisFileInfo['avdataoffset'].', found "'.substr($SZIPHeader, 0, 4).'"';
+ $this->fseek($info['avdataoffset']);
+ $SZIPHeader = $this->fread(6);
+ if (substr($SZIPHeader, 0, 4) != "SZ\x0A\x04") {
+ $this->error('Expecting "53 5A 0A 04" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes(substr($SZIPHeader, 0, 4)).'"');
return false;
}
+ $info['fileformat'] = 'szip';
+ $info['szip']['major_version'] = getid3_lib::BigEndian2Int(substr($SZIPHeader, 4, 1));
+ $info['szip']['minor_version'] = getid3_lib::BigEndian2Int(substr($SZIPHeader, 5, 1));
+ $this->error('SZIP parsing not enabled in this version of getID3() ['.$this->getid3->version().']');
+ return false;
- $ThisFileInfo['fileformat'] = 'szip';
-
- $ThisFileInfo['szip']['major_version'] = getid3_lib::BigEndian2Int(substr($SZIPHeader, 4, 1));
- $ThisFileInfo['szip']['minor_version'] = getid3_lib::BigEndian2Int(substr($SZIPHeader, 5, 1));
-
- while (!feof($fd)) {
- $NextBlockID = fread($fd, 2);
+ while (!$this->feof()) {
+ $NextBlockID = $this->fread(2);
switch ($NextBlockID) {
case 'SZ':
// Note that szip files can be concatenated, this has the same effect as
// concatenating the files. this also means that global header blocks
// might be present between directory/data blocks.
- fseek($fd, 4, SEEK_CUR);
+ $this->fseek(4, SEEK_CUR);
break;
case 'BH':
- $BHheaderbytes = getid3_lib::BigEndian2Int(fread($fd, 3));
- $BHheaderdata = fread($fd, $BHheaderbytes);
+ $BHheaderbytes = getid3_lib::BigEndian2Int($this->fread(3));
+ $BHheaderdata = $this->fread($BHheaderbytes);
$BHheaderoffset = 0;
while (strpos($BHheaderdata, "\x00", $BHheaderoffset) > 0) {
//filename as \0 terminated string (empty string indicates end)
@@ -79,7 +86,7 @@
$BHdataArray['access_time'] = getid3_lib::BigEndian2Int(substr($BHheaderdata, $BHheaderoffset, 4));
$BHheaderoffset += 4;
- $ThisFileInfo['szip']['BH'][] = $BHdataArray;
+ $info['szip']['BH'][] = $BHdataArray;
}
break;
@@ -93,5 +100,3 @@
}
}
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.archive.tar.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.archive.tar.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.archive.tar.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,60 +1,77 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.archive.tar.php //
-// written by Mike Mozolin <teddybearØmail*ru> //
// module for analyzing TAR files //
// dependencies: NONE //
// ///
/////////////////////////////////////////////////////////////////
+// //
+// Module originally written by //
+// Mike Mozolin <teddybearØmail*ru> //
+// //
+/////////////////////////////////////////////////////////////////
-class getid3_tar {
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
- function getid3_tar(&$fd, &$ThisFileInfo) {
- $ThisFileInfo['fileformat'] = 'tar';
- $ThisFileInfo['tar']['files'] = array();
+class getid3_tar extends getid3_handler
+{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- $unpack_header = 'a100fname/a8mode/a8uid/a8gid/a12size/a12mtime/a8chksum/a1typflag/a100lnkname/a6magic/a2ver/a32uname/a32gname/a8devmaj/a8devmin/a155/prefix';
- $null_512k = str_repeat("\0", 512); // end-of-file marker
+ $info['fileformat'] = 'tar';
+ $info['tar']['files'] = array();
- @fseek($fd, 0);
- while (!feof($fd)) {
- $buffer = fread($fd, 512);
+ $unpack_header = 'a100fname/a8mode/a8uid/a8gid/a12size/a12mtime/a8chksum/a1typflag/a100lnkname/a6magic/a2ver/a32uname/a32gname/a8devmaj/a8devmin/a155prefix';
+ $null_512k = str_repeat("\x00", 512); // end-of-file marker
+ $this->fseek(0);
+ while (!feof($this->getid3->fp)) {
+ $buffer = $this->fread(512);
+ if (strlen($buffer) < 512) {
+ break;
+ }
+
// check the block
$checksum = 0;
for ($i = 0; $i < 148; $i++) {
- $checksum += ord($buffer{$i});
+ $checksum += ord($buffer[$i]);
}
for ($i = 148; $i < 156; $i++) {
$checksum += ord(' ');
}
for ($i = 156; $i < 512; $i++) {
- $checksum += ord($buffer{$i});
+ $checksum += ord($buffer[$i]);
}
$attr = unpack($unpack_header, $buffer);
- $name = trim(@$attr['fname']);
- $mode = octdec(trim(@$attr['mode']));
- $uid = octdec(trim(@$attr['uid']));
- $gid = octdec(trim(@$attr['gid']));
- $size = octdec(trim(@$attr['size']));
- $mtime = octdec(trim(@$attr['mtime']));
- $chksum = octdec(trim(@$attr['chksum']));
- $typflag = trim(@$attr['typflag']);
- $lnkname = trim(@$attr['lnkname']);
- $magic = trim(@$attr['magic']);
- $ver = trim(@$attr['ver']);
- $uname = trim(@$attr['uname']);
- $gname = trim(@$attr['gname']);
- $devmaj = octdec(trim(@$attr['devmaj']));
- $devmin = octdec(trim(@$attr['devmin']));
- $prefix = trim(@$attr['prefix']);
+ $name = (isset($attr['fname'] ) ? trim($attr['fname'] ) : '');
+ $mode = octdec(isset($attr['mode'] ) ? trim($attr['mode'] ) : '');
+ $uid = octdec(isset($attr['uid'] ) ? trim($attr['uid'] ) : '');
+ $gid = octdec(isset($attr['gid'] ) ? trim($attr['gid'] ) : '');
+ $size = octdec(isset($attr['size'] ) ? trim($attr['size'] ) : '');
+ $mtime = octdec(isset($attr['mtime'] ) ? trim($attr['mtime'] ) : '');
+ $chksum = octdec(isset($attr['chksum'] ) ? trim($attr['chksum'] ) : '');
+ $typflag = (isset($attr['typflag']) ? trim($attr['typflag']) : '');
+ $lnkname = (isset($attr['lnkname']) ? trim($attr['lnkname']) : '');
+ $magic = (isset($attr['magic'] ) ? trim($attr['magic'] ) : '');
+ $ver = (isset($attr['ver'] ) ? trim($attr['ver'] ) : '');
+ $uname = (isset($attr['uname'] ) ? trim($attr['uname'] ) : '');
+ $gname = (isset($attr['gname'] ) ? trim($attr['gname'] ) : '');
+ $devmaj = octdec(isset($attr['devmaj'] ) ? trim($attr['devmaj'] ) : '');
+ $devmin = octdec(isset($attr['devmin'] ) ? trim($attr['devmin'] ) : '');
+ $prefix = (isset($attr['prefix'] ) ? trim($attr['prefix'] ) : '');
if (($checksum == 256) && ($chksum == 0)) {
// EOF Found
break;
@@ -71,27 +88,27 @@
}
// Read to the next chunk
- fseek($fd, $size, SEEK_CUR);
+ $this->fseek($size, SEEK_CUR);
$diff = $size % 512;
if ($diff != 0) {
// Padding, throw away
- fseek($fd, (512 - $diff), SEEK_CUR);
+ $this->fseek((512 - $diff), SEEK_CUR);
}
// Protect against tar-files with garbage at the end
if ($name == '') {
break;
}
- $ThisFileInfo['tar']['file_details'][$name] = array (
+ $info['tar']['file_details'][$name] = array (
'name' => $name,
'mode_raw' => $mode,
- 'mode' => getid3_tar::display_perms($mode),
+ 'mode' => self::display_perms($mode),
'uid' => $uid,
'gid' => $gid,
'size' => $size,
'mtime' => $mtime,
'chksum' => $chksum,
- 'typeflag' => getid3_tar::get_flag_type($typflag),
+ 'typeflag' => self::get_flag_type($typflag),
'linkname' => $lnkname,
'magic' => $magic,
'version' => $ver,
@@ -100,13 +117,19 @@
'devmajor' => $devmaj,
'devminor' => $devmin
);
- $ThisFileInfo['tar']['files'] = getid3_lib::array_merge_clobber($ThisFileInfo['tar']['files'], getid3_lib::CreateDeepArray($ThisFileInfo['tar']['file_details'][$name]['name'], '/', $size));
+ $info['tar']['files'] = getid3_lib::array_merge_clobber($info['tar']['files'], getid3_lib::CreateDeepArray($info['tar']['file_details'][$name]['name'], '/', $size));
}
return true;
}
- // Parses the file mode to file permissions
- function display_perms($mode) {
+ /**
+ * Parses the file mode to file permissions.
+ *
+ * @param int $mode
+ *
+ * @return string
+ */
+ public function display_perms($mode) {
// Determine Type
if ($mode & 0x1000) $type='p'; // FIFO pipe
elseif ($mode & 0x2000) $type='c'; // Character special
@@ -140,8 +163,14 @@
return $s;
}
- // Converts the file type
- function get_flag_type($typflag) {
+ /**
+ * Converts the file type.
+ *
+ * @param string $typflag
+ *
+ * @return mixed|string
+ */
+ public function get_flag_type($typflag) {
static $flag_types = array(
'0' => 'LF_NORMAL',
'1' => 'LF_LINK',
@@ -159,9 +188,7 @@
'S' => 'LF_SPARSE',
'V' => 'LF_VOLHDR'
);
- return @$flag_types[$typflag];
+ return (isset($flag_types[$typflag]) ? $flag_types[$typflag] : '');
}
}
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.archive.zip.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.archive.zip.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.archive.zip.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.archive.zip.php //
// module for analyzing pkZip files //
@@ -13,153 +14,213 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_zip
+class getid3_zip extends getid3_handler
{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- function getid3_zip(&$fd, &$ThisFileInfo) {
+ $info['fileformat'] = 'zip';
+ $info['zip']['encoding'] = 'ISO-8859-1';
+ $info['zip']['files'] = array();
- $ThisFileInfo['fileformat'] = 'zip';
- $ThisFileInfo['zip']['encoding'] = 'ISO-8859-1';
- $ThisFileInfo['zip']['files'] = array();
+ $info['zip']['compressed_size'] = 0;
+ $info['zip']['uncompressed_size'] = 0;
+ $info['zip']['entries_count'] = 0;
- $ThisFileInfo['zip']['compressed_size'] = 0;
- $ThisFileInfo['zip']['uncompressed_size'] = 0;
- $ThisFileInfo['zip']['entries_count'] = 0;
+ if (!getid3_lib::intValueSupported($info['filesize'])) {
+ $this->error('File is larger than '.round(PHP_INT_MAX / 1073741824).'GB, not supported by PHP');
+ return false;
+ } else {
+ $EOCDsearchData = '';
+ $EOCDsearchCounter = 0;
+ while ($EOCDsearchCounter++ < 512) {
- $EOCDsearchData = '';
- $EOCDsearchCounter = 0;
- while ($EOCDsearchCounter++ < 512) {
+ $this->fseek(-128 * $EOCDsearchCounter, SEEK_END);
+ $EOCDsearchData = $this->fread(128).$EOCDsearchData;
- fseek($fd, -128 * $EOCDsearchCounter, SEEK_END);
- $EOCDsearchData = fread($fd, 128).$EOCDsearchData;
+ if (strstr($EOCDsearchData, 'PK'."\x05\x06")) {
- if (strstr($EOCDsearchData, 'PK'."\x05\x06")) {
+ $EOCDposition = strpos($EOCDsearchData, 'PK'."\x05\x06");
+ $this->fseek((-128 * $EOCDsearchCounter) + $EOCDposition, SEEK_END);
+ $info['zip']['end_central_directory'] = $this->ZIPparseEndOfCentralDirectory();
- $EOCDposition = strpos($EOCDsearchData, 'PK'."\x05\x06");
- fseek($fd, (-128 * $EOCDsearchCounter) + $EOCDposition, SEEK_END);
- $ThisFileInfo['zip']['end_central_directory'] = $this->ZIPparseEndOfCentralDirectory($fd);
+ $this->fseek($info['zip']['end_central_directory']['directory_offset']);
+ $info['zip']['entries_count'] = 0;
+ while ($centraldirectoryentry = $this->ZIPparseCentralDirectory()) {
+ $info['zip']['central_directory'][] = $centraldirectoryentry;
+ $info['zip']['entries_count']++;
+ $info['zip']['compressed_size'] += $centraldirectoryentry['compressed_size'];
+ $info['zip']['uncompressed_size'] += $centraldirectoryentry['uncompressed_size'];
- fseek($fd, $ThisFileInfo['zip']['end_central_directory']['directory_offset'], SEEK_SET);
- $ThisFileInfo['zip']['entries_count'] = 0;
- while ($centraldirectoryentry = $this->ZIPparseCentralDirectory($fd)) {
- $ThisFileInfo['zip']['central_directory'][] = $centraldirectoryentry;
- $ThisFileInfo['zip']['entries_count']++;
- $ThisFileInfo['zip']['compressed_size'] += $centraldirectoryentry['compressed_size'];
- $ThisFileInfo['zip']['uncompressed_size'] += $centraldirectoryentry['uncompressed_size'];
+ //if ($centraldirectoryentry['uncompressed_size'] > 0) { zero-byte files are valid
+ if (!empty($centraldirectoryentry['filename'])) {
+ $info['zip']['files'] = getid3_lib::array_merge_clobber($info['zip']['files'], getid3_lib::CreateDeepArray($centraldirectoryentry['filename'], '/', $centraldirectoryentry['uncompressed_size']));
+ }
+ }
- if ($centraldirectoryentry['uncompressed_size'] > 0) {
- $ThisFileInfo['zip']['files'] = getid3_lib::array_merge_clobber($ThisFileInfo['zip']['files'], getid3_lib::CreateDeepArray($centraldirectoryentry['filename'], '/', $centraldirectoryentry['uncompressed_size']));
+ if ($info['zip']['entries_count'] == 0) {
+ $this->error('No Central Directory entries found (truncated file?)');
+ return false;
}
- }
- if ($ThisFileInfo['zip']['entries_count'] == 0) {
- $ThisFileInfo['error'][] = 'No Central Directory entries found (truncated file?)';
- return false;
- }
+ if (!empty($info['zip']['end_central_directory']['comment'])) {
+ $info['zip']['comments']['comment'][] = $info['zip']['end_central_directory']['comment'];
+ }
- if (!empty($ThisFileInfo['zip']['end_central_directory']['comment'])) {
- $ThisFileInfo['zip']['comments']['comment'][] = $ThisFileInfo['zip']['end_central_directory']['comment'];
- }
+ if (isset($info['zip']['central_directory'][0]['compression_method'])) {
+ $info['zip']['compression_method'] = $info['zip']['central_directory'][0]['compression_method'];
+ }
+ if (isset($info['zip']['central_directory'][0]['flags']['compression_speed'])) {
+ $info['zip']['compression_speed'] = $info['zip']['central_directory'][0]['flags']['compression_speed'];
+ }
+ if (isset($info['zip']['compression_method']) && ($info['zip']['compression_method'] == 'store') && !isset($info['zip']['compression_speed'])) {
+ $info['zip']['compression_speed'] = 'store';
+ }
- if (isset($ThisFileInfo['zip']['central_directory'][0]['compression_method'])) {
- $ThisFileInfo['zip']['compression_method'] = $ThisFileInfo['zip']['central_directory'][0]['compression_method'];
- }
- if (isset($ThisFileInfo['zip']['central_directory'][0]['flags']['compression_speed'])) {
- $ThisFileInfo['zip']['compression_speed'] = $ThisFileInfo['zip']['central_directory'][0]['flags']['compression_speed'];
- }
- if (isset($ThisFileInfo['zip']['compression_method']) && ($ThisFileInfo['zip']['compression_method'] == 'store') && !isset($ThisFileInfo['zip']['compression_speed'])) {
- $ThisFileInfo['zip']['compression_speed'] = 'store';
- }
+ // secondary check - we (should) already have all the info we NEED from the Central Directory above, but scanning each
+ // Local File Header entry will
+ foreach ($info['zip']['central_directory'] as $central_directory_entry) {
+ $this->fseek($central_directory_entry['entry_offset']);
+ if ($fileentry = $this->ZIPparseLocalFileHeader()) {
+ $info['zip']['entries'][] = $fileentry;
+ } else {
+ $this->warning('Error parsing Local File Header at offset '.$central_directory_entry['entry_offset']);
+ }
+ }
- return true;
+ // check for EPUB files
+ if (!empty($info['zip']['entries'][0]['filename']) &&
+ ($info['zip']['entries'][0]['filename'] == 'mimetype') &&
+ ($info['zip']['entries'][0]['compression_method'] == 'store') &&
+ ($info['zip']['entries'][0]['uncompressed_size'] == 20) &&
+ isset($info['zip']['entries'][0]['data_offset'])) {
+ // http://idpf.org/epub/30/spec/epub30-ocf.html
+ // "3.3 OCF ZIP Container Media Type Identification
+ // OCF ZIP Containers must include a mimetype file as the first file in the Container, and the contents of this file must be the MIME type string application/epub+zip.
+ // The contents of the mimetype file must not contain any leading padding or whitespace, must not begin with the Unicode signature (or Byte Order Mark),
+ // and the case of the MIME type string must be exactly as presented above. The mimetype file additionally must be neither compressed nor encrypted,
+ // and there must not be an extra field in its ZIP header."
+ $this->fseek($info['zip']['entries'][0]['data_offset']);
+ if ($this->fread(20) == 'application/epub+zip') {
+ $info['fileformat'] = 'zip.epub';
+ $info['mime_type'] = 'application/epub+zip';
+ }
+ }
+ // check for Office Open XML files (e.g. .docx, .xlsx)
+ if (!empty($info['zip']['files']['[Content_Types].xml']) &&
+ !empty($info['zip']['files']['_rels']['.rels']) &&
+ !empty($info['zip']['files']['docProps']['app.xml']) &&
+ !empty($info['zip']['files']['docProps']['core.xml'])) {
+ // http://technet.microsoft.com/en-us/library/cc179224.aspx
+ $info['fileformat'] = 'zip.msoffice';
+ if (!empty($ThisFileInfo['zip']['files']['ppt'])) {
+ $info['mime_type'] = 'application/vnd.openxmlformats-officedocument.presentationml.presentation';
+ } elseif (!empty($ThisFileInfo['zip']['files']['xl'])) {
+ $info['mime_type'] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+ } elseif (!empty($ThisFileInfo['zip']['files']['word'])) {
+ $info['mime_type'] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
+ }
+ }
+
+ return true;
+ }
}
-
}
- if ($this->getZIPentriesFilepointer($fd, $ThisFileInfo)) {
-
- // central directory couldn't be found and/or parsed
- // scan through actual file data entries, recover as much as possible from probable trucated file
- if ($ThisFileInfo['zip']['compressed_size'] > ($ThisFileInfo['filesize'] - 46 - 22)) {
- $ThisFileInfo['error'][] = 'Warning: Truncated file! - Total compressed file sizes ('.$ThisFileInfo['zip']['compressed_size'].' bytes) is greater than filesize minus Central Directory and End Of Central Directory structures ('.($ThisFileInfo['filesize'] - 46 - 22).' bytes)';
- }
- $ThisFileInfo['error'][] = 'Cannot find End Of Central Directory - returned list of files in [zip][entries] array may not be complete';
- foreach ($ThisFileInfo['zip']['entries'] as $key => $valuearray) {
- $ThisFileInfo['zip']['files'][$valuearray['filename']] = $valuearray['uncompressed_size'];
- }
- return true;
-
- } else {
-
- unset($ThisFileInfo['zip']);
- $ThisFileInfo['fileformat'] = '';
- $ThisFileInfo['error'][] = 'Cannot find End Of Central Directory (truncated file?)';
+ if (!$this->getZIPentriesFilepointer()) {
+ unset($info['zip']);
+ $info['fileformat'] = '';
+ $this->error('Cannot find End Of Central Directory (truncated file?)');
return false;
+ }
+ // central directory couldn't be found and/or parsed
+ // scan through actual file data entries, recover as much as possible from probable trucated file
+ if ($info['zip']['compressed_size'] > ($info['filesize'] - 46 - 22)) {
+ $this->error('Warning: Truncated file! - Total compressed file sizes ('.$info['zip']['compressed_size'].' bytes) is greater than filesize minus Central Directory and End Of Central Directory structures ('.($info['filesize'] - 46 - 22).' bytes)');
}
+ $this->error('Cannot find End Of Central Directory - returned list of files in [zip][entries] array may not be complete');
+ foreach ($info['zip']['entries'] as $key => $valuearray) {
+ $info['zip']['files'][$valuearray['filename']] = $valuearray['uncompressed_size'];
+ }
+ return true;
}
+ /**
+ * @return bool
+ */
+ public function getZIPHeaderFilepointerTopDown() {
+ $info = &$this->getid3->info;
- function getZIPHeaderFilepointerTopDown(&$fd, &$ThisFileInfo) {
- $ThisFileInfo['fileformat'] = 'zip';
+ $info['fileformat'] = 'zip';
- $ThisFileInfo['zip']['compressed_size'] = 0;
- $ThisFileInfo['zip']['uncompressed_size'] = 0;
- $ThisFileInfo['zip']['entries_count'] = 0;
+ $info['zip']['compressed_size'] = 0;
+ $info['zip']['uncompressed_size'] = 0;
+ $info['zip']['entries_count'] = 0;
- rewind($fd);
- while ($fileentry = $this->ZIPparseLocalFileHeader($fd)) {
- $ThisFileInfo['zip']['entries'][] = $fileentry;
- $ThisFileInfo['zip']['entries_count']++;
+ rewind($this->getid3->fp);
+ while ($fileentry = $this->ZIPparseLocalFileHeader()) {
+ $info['zip']['entries'][] = $fileentry;
+ $info['zip']['entries_count']++;
}
- if ($ThisFileInfo['zip']['entries_count'] == 0) {
- $ThisFileInfo['error'][] = 'No Local File Header entries found';
+ if ($info['zip']['entries_count'] == 0) {
+ $this->error('No Local File Header entries found');
return false;
}
- $ThisFileInfo['zip']['entries_count'] = 0;
- while ($centraldirectoryentry = $this->ZIPparseCentralDirectory($fd)) {
- $ThisFileInfo['zip']['central_directory'][] = $centraldirectoryentry;
- $ThisFileInfo['zip']['entries_count']++;
- $ThisFileInfo['zip']['compressed_size'] += $centraldirectoryentry['compressed_size'];
- $ThisFileInfo['zip']['uncompressed_size'] += $centraldirectoryentry['uncompressed_size'];
+ $info['zip']['entries_count'] = 0;
+ while ($centraldirectoryentry = $this->ZIPparseCentralDirectory()) {
+ $info['zip']['central_directory'][] = $centraldirectoryentry;
+ $info['zip']['entries_count']++;
+ $info['zip']['compressed_size'] += $centraldirectoryentry['compressed_size'];
+ $info['zip']['uncompressed_size'] += $centraldirectoryentry['uncompressed_size'];
}
- if ($ThisFileInfo['zip']['entries_count'] == 0) {
- $ThisFileInfo['error'][] = 'No Central Directory entries found (truncated file?)';
+ if ($info['zip']['entries_count'] == 0) {
+ $this->error('No Central Directory entries found (truncated file?)');
return false;
}
- if ($EOCD = $this->ZIPparseEndOfCentralDirectory($fd)) {
- $ThisFileInfo['zip']['end_central_directory'] = $EOCD;
+ if ($EOCD = $this->ZIPparseEndOfCentralDirectory()) {
+ $info['zip']['end_central_directory'] = $EOCD;
} else {
- $ThisFileInfo['error'][] = 'No End Of Central Directory entry found (truncated file?)';
+ $this->error('No End Of Central Directory entry found (truncated file?)');
return false;
}
- if (!empty($ThisFileInfo['zip']['end_central_directory']['comment'])) {
- $ThisFileInfo['zip']['comments']['comment'][] = $ThisFileInfo['zip']['end_central_directory']['comment'];
+ if (!empty($info['zip']['end_central_directory']['comment'])) {
+ $info['zip']['comments']['comment'][] = $info['zip']['end_central_directory']['comment'];
}
return true;
}
+ /**
+ * @return bool
+ */
+ public function getZIPentriesFilepointer() {
+ $info = &$this->getid3->info;
- function getZIPentriesFilepointer(&$fd, &$ThisFileInfo) {
- $ThisFileInfo['zip']['compressed_size'] = 0;
- $ThisFileInfo['zip']['uncompressed_size'] = 0;
- $ThisFileInfo['zip']['entries_count'] = 0;
+ $info['zip']['compressed_size'] = 0;
+ $info['zip']['uncompressed_size'] = 0;
+ $info['zip']['entries_count'] = 0;
- rewind($fd);
- while ($fileentry = $this->ZIPparseLocalFileHeader($fd)) {
- $ThisFileInfo['zip']['entries'][] = $fileentry;
- $ThisFileInfo['zip']['entries_count']++;
- $ThisFileInfo['zip']['compressed_size'] += $fileentry['compressed_size'];
- $ThisFileInfo['zip']['uncompressed_size'] += $fileentry['uncompressed_size'];
+ rewind($this->getid3->fp);
+ while ($fileentry = $this->ZIPparseLocalFileHeader()) {
+ $info['zip']['entries'][] = $fileentry;
+ $info['zip']['entries_count']++;
+ $info['zip']['compressed_size'] += $fileentry['compressed_size'];
+ $info['zip']['uncompressed_size'] += $fileentry['uncompressed_size'];
}
- if ($ThisFileInfo['zip']['entries_count'] == 0) {
- $ThisFileInfo['error'][] = 'No Local File Header entries found';
+ if ($info['zip']['entries_count'] == 0) {
+ $this->error('No Local File Header entries found');
return false;
}
@@ -166,16 +227,18 @@
return true;
}
+ /**
+ * @return array|false
+ */
+ public function ZIPparseLocalFileHeader() {
+ $LocalFileHeader['offset'] = $this->ftell();
- function ZIPparseLocalFileHeader(&$fd) {
- $LocalFileHeader['offset'] = ftell($fd);
+ $ZIPlocalFileHeader = $this->fread(30);
- $ZIPlocalFileHeader = fread($fd, 30);
-
$LocalFileHeader['raw']['signature'] = getid3_lib::LittleEndian2Int(substr($ZIPlocalFileHeader, 0, 4));
- if ($LocalFileHeader['raw']['signature'] != 0x04034B50) {
+ if ($LocalFileHeader['raw']['signature'] != 0x04034B50) { // "PK\x03\x04"
// invalid Local File Header Signature
- fseek($fd, $LocalFileHeader['offset'], SEEK_SET); // seek back to where filepointer originally was so it can be handled properly
+ $this->fseek($LocalFileHeader['offset']); // seek back to where filepointer originally was so it can be handled properly
return false;
}
$LocalFileHeader['raw']['extract_version'] = getid3_lib::LittleEndian2Int(substr($ZIPlocalFileHeader, 4, 2));
@@ -199,7 +262,7 @@
$FilenameExtrafieldLength = $LocalFileHeader['raw']['filename_length'] + $LocalFileHeader['raw']['extra_field_length'];
if ($FilenameExtrafieldLength > 0) {
- $ZIPlocalFileHeader .= fread($fd, $FilenameExtrafieldLength);
+ $ZIPlocalFileHeader .= $this->fread($FilenameExtrafieldLength);
if ($LocalFileHeader['raw']['filename_length'] > 0) {
$LocalFileHeader['filename'] = substr($ZIPlocalFileHeader, 30, $LocalFileHeader['raw']['filename_length']);
@@ -209,30 +272,71 @@
}
}
- $LocalFileHeader['data_offset'] = ftell($fd);
- //$LocalFileHeader['compressed_data'] = fread($fd, $LocalFileHeader['raw']['compressed_size']);
- fseek($fd, $LocalFileHeader['raw']['compressed_size'], SEEK_CUR);
+ if ($LocalFileHeader['compressed_size'] == 0) {
+ // *Could* be a zero-byte file
+ // But could also be a file written on the fly that didn't know compressed filesize beforehand.
+ // Correct compressed filesize should be in the data_descriptor located after this file data, and also in Central Directory (at end of zip file)
+ if (!empty($this->getid3->info['zip']['central_directory'])) {
+ foreach ($this->getid3->info['zip']['central_directory'] as $central_directory_entry) {
+ if ($central_directory_entry['entry_offset'] == $LocalFileHeader['offset']) {
+ if ($central_directory_entry['compressed_size'] > 0) {
+ // overwrite local zero value (but not ['raw']'compressed_size']) so that seeking for data_descriptor (and next file entry) works correctly
+ $LocalFileHeader['compressed_size'] = $central_directory_entry['compressed_size'];
+ }
+ break;
+ }
+ }
+ }
+ }
+ $LocalFileHeader['data_offset'] = $this->ftell();
+ $this->fseek($LocalFileHeader['compressed_size'], SEEK_CUR); // this should (but may not) match value in $LocalFileHeader['raw']['compressed_size'] -- $LocalFileHeader['compressed_size'] could have been overwritten above with value from Central Directory
+
if ($LocalFileHeader['flags']['data_descriptor_used']) {
- $DataDescriptor = fread($fd, 12);
- $LocalFileHeader['data_descriptor']['crc_32'] = getid3_lib::LittleEndian2Int(substr($DataDescriptor, 0, 4));
- $LocalFileHeader['data_descriptor']['compressed_size'] = getid3_lib::LittleEndian2Int(substr($DataDescriptor, 4, 4));
- $LocalFileHeader['data_descriptor']['uncompressed_size'] = getid3_lib::LittleEndian2Int(substr($DataDescriptor, 8, 4));
+ $DataDescriptor = $this->fread(16);
+ $LocalFileHeader['data_descriptor']['signature'] = getid3_lib::LittleEndian2Int(substr($DataDescriptor, 0, 4));
+ if ($LocalFileHeader['data_descriptor']['signature'] != 0x08074B50) { // "PK\x07\x08"
+ $this->getid3->warning('invalid Local File Header Data Descriptor Signature at offset '.($this->ftell() - 16).' - expecting 08 07 4B 50, found '.getid3_lib::PrintHexBytes($LocalFileHeader['data_descriptor']['signature']));
+ $this->fseek($LocalFileHeader['offset']); // seek back to where filepointer originally was so it can be handled properly
+ return false;
+ }
+ $LocalFileHeader['data_descriptor']['crc_32'] = getid3_lib::LittleEndian2Int(substr($DataDescriptor, 4, 4));
+ $LocalFileHeader['data_descriptor']['compressed_size'] = getid3_lib::LittleEndian2Int(substr($DataDescriptor, 8, 4));
+ $LocalFileHeader['data_descriptor']['uncompressed_size'] = getid3_lib::LittleEndian2Int(substr($DataDescriptor, 12, 4));
+ if (!$LocalFileHeader['raw']['compressed_size'] && $LocalFileHeader['data_descriptor']['compressed_size']) {
+ foreach ($this->getid3->info['zip']['central_directory'] as $central_directory_entry) {
+ if ($central_directory_entry['entry_offset'] == $LocalFileHeader['offset']) {
+ if ($LocalFileHeader['data_descriptor']['compressed_size'] == $central_directory_entry['compressed_size']) {
+ // $LocalFileHeader['compressed_size'] already set from Central Directory
+ } else {
+ $this->warning('conflicting compressed_size from data_descriptor ('.$LocalFileHeader['data_descriptor']['compressed_size'].') vs Central Directory ('.$central_directory_entry['compressed_size'].') for file at offset '.$LocalFileHeader['offset']);
+ }
+
+ if ($LocalFileHeader['data_descriptor']['uncompressed_size'] == $central_directory_entry['uncompressed_size']) {
+ $LocalFileHeader['uncompressed_size'] = $LocalFileHeader['data_descriptor']['uncompressed_size'];
+ } else {
+ $this->warning('conflicting uncompressed_size from data_descriptor ('.$LocalFileHeader['data_descriptor']['uncompressed_size'].') vs Central Directory ('.$central_directory_entry['uncompressed_size'].') for file at offset '.$LocalFileHeader['offset']);
+ }
+ break;
+ }
+ }
+ }
}
-
return $LocalFileHeader;
}
+ /**
+ * @return array|false
+ */
+ public function ZIPparseCentralDirectory() {
+ $CentralDirectory['offset'] = $this->ftell();
- function ZIPparseCentralDirectory(&$fd) {
- $CentralDirectory['offset'] = ftell($fd);
+ $ZIPcentralDirectory = $this->fread(46);
- $ZIPcentralDirectory = fread($fd, 46);
-
$CentralDirectory['raw']['signature'] = getid3_lib::LittleEndian2Int(substr($ZIPcentralDirectory, 0, 4));
if ($CentralDirectory['raw']['signature'] != 0x02014B50) {
// invalid Central Directory Signature
- fseek($fd, $CentralDirectory['offset'], SEEK_SET); // seek back to where filepointer originally was so it can be handled properly
+ $this->fseek($CentralDirectory['offset']); // seek back to where filepointer originally was so it can be handled properly
return false;
}
$CentralDirectory['raw']['create_version'] = getid3_lib::LittleEndian2Int(substr($ZIPcentralDirectory, 4, 2));
@@ -264,7 +368,7 @@
$FilenameExtrafieldCommentLength = $CentralDirectory['raw']['filename_length'] + $CentralDirectory['raw']['extra_field_length'] + $CentralDirectory['raw']['file_comment_length'];
if ($FilenameExtrafieldCommentLength > 0) {
- $FilenameExtrafieldComment = fread($fd, $FilenameExtrafieldCommentLength);
+ $FilenameExtrafieldComment = $this->fread($FilenameExtrafieldCommentLength);
if ($CentralDirectory['raw']['filename_length'] > 0) {
$CentralDirectory['filename'] = substr($FilenameExtrafieldComment, 0, $CentralDirectory['raw']['filename_length']);
@@ -280,15 +384,18 @@
return $CentralDirectory;
}
- function ZIPparseEndOfCentralDirectory(&$fd) {
- $EndOfCentralDirectory['offset'] = ftell($fd);
+ /**
+ * @return array|false
+ */
+ public function ZIPparseEndOfCentralDirectory() {
+ $EndOfCentralDirectory['offset'] = $this->ftell();
- $ZIPendOfCentralDirectory = fread($fd, 22);
+ $ZIPendOfCentralDirectory = $this->fread(22);
$EndOfCentralDirectory['signature'] = getid3_lib::LittleEndian2Int(substr($ZIPendOfCentralDirectory, 0, 4));
if ($EndOfCentralDirectory['signature'] != 0x06054B50) {
// invalid End Of Central Directory Signature
- fseek($fd, $EndOfCentralDirectory['offset'], SEEK_SET); // seek back to where filepointer originally was so it can be handled properly
+ $this->fseek($EndOfCentralDirectory['offset']); // seek back to where filepointer originally was so it can be handled properly
return false;
}
$EndOfCentralDirectory['disk_number_current'] = getid3_lib::LittleEndian2Int(substr($ZIPendOfCentralDirectory, 4, 2));
@@ -300,16 +407,38 @@
$EndOfCentralDirectory['comment_length'] = getid3_lib::LittleEndian2Int(substr($ZIPendOfCentralDirectory, 20, 2));
if ($EndOfCentralDirectory['comment_length'] > 0) {
- $EndOfCentralDirectory['comment'] = fread($fd, $EndOfCentralDirectory['comment_length']);
+ $EndOfCentralDirectory['comment'] = $this->fread($EndOfCentralDirectory['comment_length']);
}
return $EndOfCentralDirectory;
}
+ /**
+ * @param int $flagbytes
+ * @param int $compressionmethod
+ *
+ * @return array
+ */
+ public static function ZIPparseGeneralPurposeFlags($flagbytes, $compressionmethod) {
+ // https://users.cs.jmu.edu/buchhofp/forensics/formats/pkzip-printable.html
+ $ParsedFlags = array();
+ $ParsedFlags['encrypted'] = (bool) ($flagbytes & 0x0001);
+ // 0x0002 -- see below
+ // 0x0004 -- see below
+ $ParsedFlags['data_descriptor_used'] = (bool) ($flagbytes & 0x0008);
+ $ParsedFlags['enhanced_deflation'] = (bool) ($flagbytes & 0x0010);
+ $ParsedFlags['compressed_patched_data'] = (bool) ($flagbytes & 0x0020);
+ $ParsedFlags['strong_encryption'] = (bool) ($flagbytes & 0x0040);
+ // 0x0080 - unused
+ // 0x0100 - unused
+ // 0x0200 - unused
+ // 0x0400 - unused
+ $ParsedFlags['language_encoding'] = (bool) ($flagbytes & 0x0800);
+ // 0x1000 - reserved
+ $ParsedFlags['mask_header_values'] = (bool) ($flagbytes & 0x2000);
+ // 0x4000 - reserved
+ // 0x8000 - reserved
- function ZIPparseGeneralPurposeFlags($flagbytes, $compressionmethod) {
- $ParsedFlags['encrypted'] = (bool) ($flagbytes & 0x0001);
-
switch ($compressionmethod) {
case 6:
$ParsedFlags['dictionary_size'] = (($flagbytes & 0x0002) ? 8192 : 4096);
@@ -334,13 +463,16 @@
}
break;
}
- $ParsedFlags['data_descriptor_used'] = (bool) ($flagbytes & 0x0008);
return $ParsedFlags;
}
-
- function ZIPversionOSLookup($index) {
+ /**
+ * @param int $index
+ *
+ * @return string
+ */
+ public static function ZIPversionOSLookup($index) {
static $ZIPversionOSLookup = array(
0 => 'MS-DOS and OS/2 (FAT / VFAT / FAT32 file systems)',
1 => 'Amiga',
@@ -359,13 +491,21 @@
14 => 'VFAT',
15 => 'Alternate MVS',
16 => 'BeOS',
- 17 => 'Tandem'
+ 17 => 'Tandem',
+ 18 => 'OS/400',
+ 19 => 'OS/X (Darwin)',
);
return (isset($ZIPversionOSLookup[$index]) ? $ZIPversionOSLookup[$index] : '[unknown]');
}
- function ZIPcompressionMethodLookup($index) {
+ /**
+ * @param int $index
+ *
+ * @return string
+ */
+ public static function ZIPcompressionMethodLookup($index) {
+ // http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/ZIP.html
static $ZIPcompressionMethodLookup = array(
0 => 'store',
1 => 'shrink',
@@ -377,13 +517,31 @@
7 => 'tokenize',
8 => 'deflate',
9 => 'deflate64',
- 10 => 'PKWARE Date Compression Library Imploding'
+ 10 => 'Imploded (old IBM TERSE)',
+ 11 => 'RESERVED[11]',
+ 12 => 'BZIP2',
+ 13 => 'RESERVED[13]',
+ 14 => 'LZMA (EFS)',
+ 15 => 'RESERVED[15]',
+ 16 => 'RESERVED[16]',
+ 17 => 'RESERVED[17]',
+ 18 => 'IBM TERSE (new)',
+ 19 => 'IBM LZ77 z Architecture (PFS)',
+ 96 => 'JPEG recompressed',
+ 97 => 'WavPack compressed',
+ 98 => 'PPMd version I, Rev 1',
);
return (isset($ZIPcompressionMethodLookup[$index]) ? $ZIPcompressionMethodLookup[$index] : '[unknown]');
}
- function DOStime2UNIXtime($DOSdate, $DOStime) {
+ /**
+ * @param int $DOSdate
+ * @param int $DOStime
+ *
+ * @return int
+ */
+ public static function DOStime2UNIXtime($DOSdate, $DOStime) {
// wFatDate
// Specifies the MS-DOS date. The date is a packed 16-bit value with the following format:
// Bits Contents
@@ -410,6 +568,3 @@
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.asf.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.asf.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.asf.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,11 @@
<?php
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio-video.asf.php //
// module for analyzing ASF, WMA and WMV files //
@@ -13,26 +13,39 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, true);
-$GUIDarray = getid3_asf::KnownGUIDs();
-foreach ($GUIDarray as $GUIDname => $hexstringvalue) {
- // initialize all GUID constants
- define($GUIDname, getid3_asf::GUIDtoBytestring($hexstringvalue));
-}
+class getid3_asf extends getid3_handler
+{
+ /**
+ * @param getID3 $getid3
+ */
+ public function __construct(getID3 $getid3) {
+ parent::__construct($getid3); // extends getid3_handler::__construct()
+ // initialize all GUID constants
+ $GUIDarray = $this->KnownGUIDs();
+ foreach ($GUIDarray as $GUIDname => $hexstringvalue) {
+ if (!defined($GUIDname)) {
+ define($GUIDname, $this->GUIDtoBytestring($hexstringvalue));
+ }
+ }
+ }
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
-class getid3_asf
-{
-
- function getid3_asf(&$fd, &$ThisFileInfo) {
-
// Shortcuts
- $thisfile_audio = &$ThisFileInfo['audio'];
- $thisfile_video = &$ThisFileInfo['video'];
- $ThisFileInfo['asf'] = array();
- $thisfile_asf = &$ThisFileInfo['asf'];
+ $thisfile_audio = &$info['audio'];
+ $thisfile_video = &$info['video'];
+ $info['asf'] = array();
+ $thisfile_asf = &$info['asf'];
$thisfile_asf['comments'] = array();
$thisfile_asf_comments = &$thisfile_asf['comments'];
$thisfile_asf['header_object'] = array();
@@ -59,19 +72,16 @@
// Reserved1 BYTE 8 // hardcoded: 0x01
// Reserved2 BYTE 8 // hardcoded: 0x02
- $ThisFileInfo['fileformat'] = 'asf';
+ $info['fileformat'] = 'asf';
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
- $HeaderObjectData = fread($fd, 30);
+ $this->fseek($info['avdataoffset']);
+ $HeaderObjectData = $this->fread(30);
$thisfile_asf_headerobject['objectid'] = substr($HeaderObjectData, 0, 16);
$thisfile_asf_headerobject['objectid_guid'] = $this->BytestringToGUID($thisfile_asf_headerobject['objectid']);
if ($thisfile_asf_headerobject['objectid'] != GETID3_ASF_Header_Object) {
- $ThisFileInfo['warning'][] = 'ASF header GUID {'.$this->BytestringToGUID($thisfile_asf_headerobject['objectid']).'} does not match expected "GETID3_ASF_Header_Object" GUID {'.$this->BytestringToGUID(GETID3_ASF_Header_Object).'}';
- unset($ThisFileInfo['fileformat']);
- unset($ThisFileInfo['asf']);
- return false;
- break;
+ unset($info['fileformat'], $info['asf']);
+ return $this->error('ASF header GUID {'.$this->BytestringToGUID($thisfile_asf_headerobject['objectid']).'} does not match expected "GETID3_ASF_Header_Object" GUID {'.$this->BytestringToGUID(GETID3_ASF_Header_Object).'}');
}
$thisfile_asf_headerobject['objectsize'] = getid3_lib::LittleEndian2Int(substr($HeaderObjectData, 16, 8));
$thisfile_asf_headerobject['headerobjects'] = getid3_lib::LittleEndian2Int(substr($HeaderObjectData, 24, 4));
@@ -78,13 +88,14 @@
$thisfile_asf_headerobject['reserved1'] = getid3_lib::LittleEndian2Int(substr($HeaderObjectData, 28, 1));
$thisfile_asf_headerobject['reserved2'] = getid3_lib::LittleEndian2Int(substr($HeaderObjectData, 29, 1));
- //$ASFHeaderData = $HeaderObjectData;
- $ASFHeaderData = fread($fd, $thisfile_asf_headerobject['objectsize'] - 30);
- //$offset = 30;
+ $NextObjectOffset = $this->ftell();
+ $ASFHeaderData = $this->fread($thisfile_asf_headerobject['objectsize'] - 30);
$offset = 0;
+ $thisfile_asf_streambitratepropertiesobject = array();
+ $thisfile_asf_codeclistobject = array();
for ($HeaderObjectsCounter = 0; $HeaderObjectsCounter < $thisfile_asf_headerobject['headerobjects']; $HeaderObjectsCounter++) {
- $NextObjectGUID = substr($ASFHeaderData, $offset, 16);
+ $NextObjectGUID = substr($ASFHeaderData, $offset, 16);
$offset += 16;
$NextObjectGUIDtext = $this->BytestringToGUID($NextObjectGUID);
$NextObjectSize = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 8));
@@ -115,6 +126,7 @@
$thisfile_asf['file_properties_object'] = array();
$thisfile_asf_filepropertiesobject = &$thisfile_asf['file_properties_object'];
+ $thisfile_asf_filepropertiesobject['offset'] = $NextObjectOffset + $offset;
$thisfile_asf_filepropertiesobject['objectid'] = $NextObjectGUID;
$thisfile_asf_filepropertiesobject['objectid_guid'] = $NextObjectGUIDtext;
$thisfile_asf_filepropertiesobject['objectsize'] = $NextObjectSize;
@@ -134,7 +146,6 @@
$offset += 8;
$thisfile_asf_filepropertiesobject['preroll'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 8));
$offset += 8;
- $ThisFileInfo['playtime_seconds'] = ($thisfile_asf_filepropertiesobject['play_duration'] / 10000000) - ($thisfile_asf_filepropertiesobject['preroll'] / 1000);
$thisfile_asf_filepropertiesobject['flags_raw'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 4));
$offset += 4;
$thisfile_asf_filepropertiesobject['flags']['broadcast'] = (bool) ($thisfile_asf_filepropertiesobject['flags_raw'] & 0x0001);
@@ -146,8 +157,25 @@
$offset += 4;
$thisfile_asf_filepropertiesobject['max_bitrate'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 4));
$offset += 4;
- //$ThisFileInfo['bitrate'] = $thisfile_asf_filepropertiesobject['max_bitrate'];
- $ThisFileInfo['bitrate'] = ($thisfile_asf_filepropertiesobject['filesize'] * 8) / $ThisFileInfo['playtime_seconds'];
+
+ if ($thisfile_asf_filepropertiesobject['flags']['broadcast']) {
+
+ // broadcast flag is set, some values invalid
+ unset($thisfile_asf_filepropertiesobject['filesize']);
+ unset($thisfile_asf_filepropertiesobject['data_packets']);
+ unset($thisfile_asf_filepropertiesobject['play_duration']);
+ unset($thisfile_asf_filepropertiesobject['send_duration']);
+ unset($thisfile_asf_filepropertiesobject['min_packet_size']);
+ unset($thisfile_asf_filepropertiesobject['max_packet_size']);
+
+ } else {
+
+ // broadcast flag NOT set, perform calculations
+ $info['playtime_seconds'] = ($thisfile_asf_filepropertiesobject['play_duration'] / 10000000) - ($thisfile_asf_filepropertiesobject['preroll'] / 1000);
+
+ //$info['bitrate'] = $thisfile_asf_filepropertiesobject['max_bitrate'];
+ $info['bitrate'] = ((isset($thisfile_asf_filepropertiesobject['filesize']) ? $thisfile_asf_filepropertiesobject['filesize'] : $info['filesize']) * 8) / $info['playtime_seconds'];
+ }
break;
case GETID3_ASF_Stream_Properties_Object:
@@ -172,6 +200,7 @@
// stream number isn't known until halfway through decoding the structure, hence it
// it is decoded to a temporary variable and then stuck in the appropriate index later
+ $StreamPropertiesObjectData['offset'] = $NextObjectOffset + $offset;
$StreamPropertiesObjectData['objectid'] = $NextObjectGUID;
$StreamPropertiesObjectData['objectid_guid'] = $NextObjectGUIDtext;
$StreamPropertiesObjectData['objectsize'] = $NextObjectSize;
@@ -204,7 +233,7 @@
$thisfile_audio['dataformat'] = (!empty($thisfile_audio['dataformat']) ? $thisfile_audio['dataformat'] : 'asf');
$thisfile_audio['bitrate_mode'] = (!empty($thisfile_audio['bitrate_mode']) ? $thisfile_audio['bitrate_mode'] : 'cbr');
- $audiodata = getid3_riff::RIFFparseWAVEFORMATex(substr($StreamPropertiesObjectData['type_specific_data'], 0, 16));
+ $audiodata = getid3_riff::parseWAVEFORMATex(substr($StreamPropertiesObjectData['type_specific_data'], 0, 16));
unset($audiodata['raw']);
$thisfile_audio = getid3_lib::array_merge_noclobber($audiodata, $thisfile_audio);
break;
@@ -239,6 +268,7 @@
$thisfile_asf['header_extension_object'] = array();
$thisfile_asf_headerextensionobject = &$thisfile_asf['header_extension_object'];
+ $thisfile_asf_headerextensionobject['offset'] = $NextObjectOffset + $offset;
$thisfile_asf_headerextensionobject['objectid'] = $NextObjectGUID;
$thisfile_asf_headerextensionobject['objectid_guid'] = $NextObjectGUIDtext;
$thisfile_asf_headerextensionobject['objectsize'] = $NextObjectSize;
@@ -246,7 +276,7 @@
$offset += 16;
$thisfile_asf_headerextensionobject['reserved_1_guid'] = $this->BytestringToGUID($thisfile_asf_headerextensionobject['reserved_1']);
if ($thisfile_asf_headerextensionobject['reserved_1'] != GETID3_ASF_Reserved_1) {
- $ThisFileInfo['warning'][] = 'header_extension_object.reserved_1 GUID ('.$this->BytestringToGUID($thisfile_asf_headerextensionobject['reserved_1']).') does not match expected "GETID3_ASF_Reserved_1" GUID ('.$this->BytestringToGUID(GETID3_ASF_Reserved_1).')';
+ $this->warning('header_extension_object.reserved_1 GUID ('.$this->BytestringToGUID($thisfile_asf_headerextensionobject['reserved_1']).') does not match expected "GETID3_ASF_Reserved_1" GUID ('.$this->BytestringToGUID(GETID3_ASF_Reserved_1).')');
//return false;
break;
}
@@ -253,7 +283,7 @@
$thisfile_asf_headerextensionobject['reserved_2'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
$offset += 2;
if ($thisfile_asf_headerextensionobject['reserved_2'] != 6) {
- $ThisFileInfo['warning'][] = 'header_extension_object.reserved_2 ('.getid3_lib::PrintHexBytes($thisfile_asf_headerextensionobject['reserved_2']).') does not match expected value of "6"';
+ $this->warning('header_extension_object.reserved_2 ('.getid3_lib::PrintHexBytes($thisfile_asf_headerextensionobject['reserved_2']).') does not match expected value of "6"');
//return false;
break;
}
@@ -260,6 +290,11 @@
$thisfile_asf_headerextensionobject['extension_data_size'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 4));
$offset += 4;
$thisfile_asf_headerextensionobject['extension_data'] = substr($ASFHeaderData, $offset, $thisfile_asf_headerextensionobject['extension_data_size']);
+ $unhandled_sections = 0;
+ $thisfile_asf_headerextensionobject['extension_data_parsed'] = $this->HeaderExtensionObjectDataParse($thisfile_asf_headerextensionobject['extension_data'], $unhandled_sections);
+ if ($unhandled_sections === 0) {
+ unset($thisfile_asf_headerextensionobject['extension_data']);
+ }
$offset += $thisfile_asf_headerextensionobject['extension_data_size'];
break;
@@ -283,6 +318,7 @@
$thisfile_asf['codec_list_object'] = array();
$thisfile_asf_codeclistobject = &$thisfile_asf['codec_list_object'];
+ $thisfile_asf_codeclistobject['offset'] = $NextObjectOffset + $offset;
$thisfile_asf_codeclistobject['objectid'] = $NextObjectGUID;
$thisfile_asf_codeclistobject['objectid_guid'] = $NextObjectGUIDtext;
$thisfile_asf_codeclistobject['objectsize'] = $NextObjectSize;
@@ -290,7 +326,7 @@
$offset += 16;
$thisfile_asf_codeclistobject['reserved_guid'] = $this->BytestringToGUID($thisfile_asf_codeclistobject['reserved']);
if ($thisfile_asf_codeclistobject['reserved'] != $this->GUIDtoBytestring('86D15241-311D-11D0-A3A4-00A0C90348F6')) {
- $ThisFileInfo['warning'][] = 'codec_list_object.reserved GUID {'.$this->BytestringToGUID($thisfile_asf_codeclistobject['reserved']).'} does not match expected "GETID3_ASF_Reserved_1" GUID {86D15241-311D-11D0-A3A4-00A0C90348F6}';
+ $this->warning('codec_list_object.reserved GUID {'.$this->BytestringToGUID($thisfile_asf_codeclistobject['reserved']).'} does not match expected "GETID3_ASF_Reserved_1" GUID {86D15241-311D-11D0-A3A4-00A0C90348F6}');
//return false;
break;
}
@@ -303,7 +339,7 @@
$thisfile_asf_codeclistobject_codecentries_current['type_raw'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
$offset += 2;
- $thisfile_asf_codeclistobject_codecentries_current['type'] = $this->ASFCodecListObjectTypeLookup($thisfile_asf_codeclistobject_codecentries_current['type_raw']);
+ $thisfile_asf_codeclistobject_codecentries_current['type'] = self::codecListObjectTypeLookup($thisfile_asf_codeclistobject_codecentries_current['type_raw']);
$CodecNameLength = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2)) * 2; // 2 bytes per character
$offset += 2;
@@ -320,83 +356,84 @@
$thisfile_asf_codeclistobject_codecentries_current['information'] = substr($ASFHeaderData, $offset, $CodecInformationLength);
$offset += $CodecInformationLength;
- if ($thisfile_asf_codeclistobject_codecentries_current['type_raw'] == 2) {
- // audio codec
+ if ($thisfile_asf_codeclistobject_codecentries_current['type_raw'] == 2) { // audio codec
+
if (strpos($thisfile_asf_codeclistobject_codecentries_current['description'], ',') === false) {
- $ThisFileInfo['error'][] = '[asf][codec_list_object][codec_entries]['.$CodecEntryCounter.'][description] expected to contain comma-seperated list of parameters: "'.$thisfile_asf_codeclistobject_codecentries_current['description'].'"';
- return false;
- }
- list($AudioCodecBitrate, $AudioCodecFrequency, $AudioCodecChannels) = explode(',', $this->TrimConvert($thisfile_asf_codeclistobject_codecentries_current['description']));
- $thisfile_audio['codec'] = $this->TrimConvert($thisfile_asf_codeclistobject_codecentries_current['name']);
+ $this->warning('[asf][codec_list_object][codec_entries]['.$CodecEntryCounter.'][description] expected to contain comma-separated list of parameters: "'.$thisfile_asf_codeclistobject_codecentries_current['description'].'"');
+ } else {
- if (!isset($thisfile_audio['bitrate']) && strstr($AudioCodecBitrate, 'kbps')) {
- $thisfile_audio['bitrate'] = (int) (trim(str_replace('kbps', '', $AudioCodecBitrate)) * 1000);
- }
- //if (!isset($thisfile_video['bitrate']) && isset($thisfile_audio['bitrate']) && isset($thisfile_asf['file_properties_object']['max_bitrate']) && ($thisfile_asf_codeclistobject['codec_entries_count'] > 1)) {
- if (!@$thisfile_video['bitrate'] && @$thisfile_audio['bitrate'] && @$ThisFileInfo['bitrate']) {
- //$thisfile_video['bitrate'] = $thisfile_asf['file_properties_object']['max_bitrate'] - $thisfile_audio['bitrate'];
- $thisfile_video['bitrate'] = $ThisFileInfo['bitrate'] - $thisfile_audio['bitrate'];
- }
+ list($AudioCodecBitrate, $AudioCodecFrequency, $AudioCodecChannels) = explode(',', $this->TrimConvert($thisfile_asf_codeclistobject_codecentries_current['description']));
+ $thisfile_audio['codec'] = $this->TrimConvert($thisfile_asf_codeclistobject_codecentries_current['name']);
- $AudioCodecFrequency = (int) trim(str_replace('kHz', '', $AudioCodecFrequency));
- switch ($AudioCodecFrequency) {
- case 8:
- case 8000:
- $thisfile_audio['sample_rate'] = 8000;
- break;
+ if (!isset($thisfile_audio['bitrate']) && strstr($AudioCodecBitrate, 'kbps')) {
+ $thisfile_audio['bitrate'] = (int) trim(str_replace('kbps', '', $AudioCodecBitrate)) * 1000;
+ }
+ //if (!isset($thisfile_video['bitrate']) && isset($thisfile_audio['bitrate']) && isset($thisfile_asf['file_properties_object']['max_bitrate']) && ($thisfile_asf_codeclistobject['codec_entries_count'] > 1)) {
+ if (empty($thisfile_video['bitrate']) && !empty($thisfile_audio['bitrate']) && !empty($info['bitrate'])) {
+ //$thisfile_video['bitrate'] = $thisfile_asf['file_properties_object']['max_bitrate'] - $thisfile_audio['bitrate'];
+ $thisfile_video['bitrate'] = $info['bitrate'] - $thisfile_audio['bitrate'];
+ }
- case 11:
- case 11025:
- $thisfile_audio['sample_rate'] = 11025;
- break;
+ $AudioCodecFrequency = (int) trim(str_replace('kHz', '', $AudioCodecFrequency));
+ switch ($AudioCodecFrequency) {
+ case 8:
+ case 8000:
+ $thisfile_audio['sample_rate'] = 8000;
+ break;
- case 12:
- case 12000:
- $thisfile_audio['sample_rate'] = 12000;
- break;
+ case 11:
+ case 11025:
+ $thisfile_audio['sample_rate'] = 11025;
+ break;
- case 16:
- case 16000:
- $thisfile_audio['sample_rate'] = 16000;
- break;
+ case 12:
+ case 12000:
+ $thisfile_audio['sample_rate'] = 12000;
+ break;
- case 22:
- case 22050:
- $thisfile_audio['sample_rate'] = 22050;
- break;
+ case 16:
+ case 16000:
+ $thisfile_audio['sample_rate'] = 16000;
+ break;
- case 24:
- case 24000:
- $thisfile_audio['sample_rate'] = 24000;
- break;
+ case 22:
+ case 22050:
+ $thisfile_audio['sample_rate'] = 22050;
+ break;
- case 32:
- case 32000:
- $thisfile_audio['sample_rate'] = 32000;
- break;
+ case 24:
+ case 24000:
+ $thisfile_audio['sample_rate'] = 24000;
+ break;
- case 44:
- case 441000:
- $thisfile_audio['sample_rate'] = 44100;
- break;
+ case 32:
+ case 32000:
+ $thisfile_audio['sample_rate'] = 32000;
+ break;
- case 48:
- case 48000:
- $thisfile_audio['sample_rate'] = 48000;
- break;
+ case 44:
+ case 441000:
+ $thisfile_audio['sample_rate'] = 44100;
+ break;
- default:
- $ThisFileInfo['warning'][] = 'unknown frequency: "'.$AudioCodecFrequency.'" ('.$this->TrimConvert($thisfile_asf_codeclistobject_codecentries_current['description']).')';
- // return false;
- break;
- }
+ case 48:
+ case 48000:
+ $thisfile_audio['sample_rate'] = 48000;
+ break;
- if (!isset($thisfile_audio['channels'])) {
- if (strstr($AudioCodecChannels, 'stereo')) {
- $thisfile_audio['channels'] = 2;
- } elseif (strstr($AudioCodecChannels, 'mono')) {
- $thisfile_audio['channels'] = 1;
+ default:
+ $this->warning('unknown frequency: "'.$AudioCodecFrequency.'" ('.$this->TrimConvert($thisfile_asf_codeclistobject_codecentries_current['description']).')');
+ break;
}
+
+ if (!isset($thisfile_audio['channels'])) {
+ if (strstr($AudioCodecChannels, 'stereo')) {
+ $thisfile_audio['channels'] = 2;
+ } elseif (strstr($AudioCodecChannels, 'mono')) {
+ $thisfile_audio['channels'] = 1;
+ }
+ }
+
}
}
}
@@ -423,6 +460,7 @@
$thisfile_asf['script_command_object'] = array();
$thisfile_asf_scriptcommandobject = &$thisfile_asf['script_command_object'];
+ $thisfile_asf_scriptcommandobject['offset'] = $NextObjectOffset + $offset;
$thisfile_asf_scriptcommandobject['objectid'] = $NextObjectGUID;
$thisfile_asf_scriptcommandobject['objectid_guid'] = $NextObjectGUIDtext;
$thisfile_asf_scriptcommandobject['objectsize'] = $NextObjectSize;
@@ -430,7 +468,7 @@
$offset += 16;
$thisfile_asf_scriptcommandobject['reserved_guid'] = $this->BytestringToGUID($thisfile_asf_scriptcommandobject['reserved']);
if ($thisfile_asf_scriptcommandobject['reserved'] != $this->GUIDtoBytestring('4B1ACBE3-100B-11D0-A39B-00A0C90348F6')) {
- $ThisFileInfo['warning'][] = 'script_command_object.reserved GUID {'.$this->BytestringToGUID($thisfile_asf_scriptcommandobject['reserved']).'} does not match expected "GETID3_ASF_Reserved_1" GUID {4B1ACBE3-100B-11D0-A39B-00A0C90348F6}';
+ $this->warning('script_command_object.reserved GUID {'.$this->BytestringToGUID($thisfile_asf_scriptcommandobject['reserved']).'} does not match expected "GETID3_ASF_Reserved_1" GUID {4B1ACBE3-100B-11D0-A39B-00A0C90348F6}');
//return false;
break;
}
@@ -481,6 +519,7 @@
$thisfile_asf['marker_object'] = array();
$thisfile_asf_markerobject = &$thisfile_asf['marker_object'];
+ $thisfile_asf_markerobject['offset'] = $NextObjectOffset + $offset;
$thisfile_asf_markerobject['objectid'] = $NextObjectGUID;
$thisfile_asf_markerobject['objectid_guid'] = $NextObjectGUIDtext;
$thisfile_asf_markerobject['objectsize'] = $NextObjectSize;
@@ -488,7 +527,7 @@
$offset += 16;
$thisfile_asf_markerobject['reserved_guid'] = $this->BytestringToGUID($thisfile_asf_markerobject['reserved']);
if ($thisfile_asf_markerobject['reserved'] != $this->GUIDtoBytestring('4CFEDB20-75F6-11CF-9C0F-00A0C90349CB')) {
- $ThisFileInfo['warning'][] = 'marker_object.reserved GUID {'.$this->BytestringToGUID($thisfile_asf_markerobject['reserved_1']).'} does not match expected "GETID3_ASF_Reserved_1" GUID {4CFEDB20-75F6-11CF-9C0F-00A0C90349CB}';
+ $this->warning('marker_object.reserved GUID {'.$this->BytestringToGUID($thisfile_asf_markerobject['reserved_1']).'} does not match expected "GETID3_ASF_Reserved_1" GUID {4CFEDB20-75F6-11CF-9C0F-00A0C90349CB}');
break;
}
$thisfile_asf_markerobject['markers_count'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 4));
@@ -496,7 +535,7 @@
$thisfile_asf_markerobject['reserved_2'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
$offset += 2;
if ($thisfile_asf_markerobject['reserved_2'] != 0) {
- $ThisFileInfo['warning'][] = 'marker_object.reserved_2 ('.getid3_lib::PrintHexBytes($thisfile_asf_markerobject['reserved_2']).') does not match expected value of "0"';
+ $this->warning('marker_object.reserved_2 ('.getid3_lib::PrintHexBytes($thisfile_asf_markerobject['reserved_2']).') does not match expected value of "0"');
break;
}
$thisfile_asf_markerobject['name_length'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
@@ -539,6 +578,7 @@
$thisfile_asf['bitrate_mutual_exclusion_object'] = array();
$thisfile_asf_bitratemutualexclusionobject = &$thisfile_asf['bitrate_mutual_exclusion_object'];
+ $thisfile_asf_bitratemutualexclusionobject['offset'] = $NextObjectOffset + $offset;
$thisfile_asf_bitratemutualexclusionobject['objectid'] = $NextObjectGUID;
$thisfile_asf_bitratemutualexclusionobject['objectid_guid'] = $NextObjectGUIDtext;
$thisfile_asf_bitratemutualexclusionobject['objectsize'] = $NextObjectSize;
@@ -546,7 +586,7 @@
$thisfile_asf_bitratemutualexclusionobject['reserved_guid'] = $this->BytestringToGUID($thisfile_asf_bitratemutualexclusionobject['reserved']);
$offset += 16;
if (($thisfile_asf_bitratemutualexclusionobject['reserved'] != GETID3_ASF_Mutex_Bitrate) && ($thisfile_asf_bitratemutualexclusionobject['reserved'] != GETID3_ASF_Mutex_Unknown)) {
- $ThisFileInfo['warning'][] = 'bitrate_mutual_exclusion_object.reserved GUID {'.$this->BytestringToGUID($thisfile_asf_bitratemutualexclusionobject['reserved']).'} does not match expected "GETID3_ASF_Mutex_Bitrate" GUID {'.$this->BytestringToGUID(GETID3_ASF_Mutex_Bitrate).'} or "GETID3_ASF_Mutex_Unknown" GUID {'.$this->BytestringToGUID(GETID3_ASF_Mutex_Unknown).'}';
+ $this->warning('bitrate_mutual_exclusion_object.reserved GUID {'.$this->BytestringToGUID($thisfile_asf_bitratemutualexclusionobject['reserved']).'} does not match expected "GETID3_ASF_Mutex_Bitrate" GUID {'.$this->BytestringToGUID(GETID3_ASF_Mutex_Bitrate).'} or "GETID3_ASF_Mutex_Unknown" GUID {'.$this->BytestringToGUID(GETID3_ASF_Mutex_Unknown).'}');
//return false;
break;
}
@@ -571,6 +611,7 @@
$thisfile_asf['error_correction_object'] = array();
$thisfile_asf_errorcorrectionobject = &$thisfile_asf['error_correction_object'];
+ $thisfile_asf_errorcorrectionobject['offset'] = $NextObjectOffset + $offset;
$thisfile_asf_errorcorrectionobject['objectid'] = $NextObjectGUID;
$thisfile_asf_errorcorrectionobject['objectid_guid'] = $NextObjectGUIDtext;
$thisfile_asf_errorcorrectionobject['objectsize'] = $NextObjectSize;
@@ -606,7 +647,7 @@
break;
default:
- $ThisFileInfo['warning'][] = 'error_correction_object.error_correction_type GUID {'.$this->BytestringToGUID($thisfile_asf_errorcorrectionobject['reserved']).'} does not match expected "GETID3_ASF_No_Error_Correction" GUID {'.$this->BytestringToGUID(GETID3_ASF_No_Error_Correction).'} or "GETID3_ASF_Audio_Spread" GUID {'.$this->BytestringToGUID(GETID3_ASF_Audio_Spread).'}';
+ $this->warning('error_correction_object.error_correction_type GUID {'.$this->BytestringToGUID($thisfile_asf_errorcorrectionobject['reserved']).'} does not match expected "GETID3_ASF_No_Error_Correction" GUID {'.$this->BytestringToGUID(GETID3_ASF_No_Error_Correction).'} or "GETID3_ASF_Audio_Spread" GUID {'.$this->BytestringToGUID(GETID3_ASF_Audio_Spread).'}');
//return false;
break;
}
@@ -633,6 +674,7 @@
$thisfile_asf['content_description_object'] = array();
$thisfile_asf_contentdescriptionobject = &$thisfile_asf['content_description_object'];
+ $thisfile_asf_contentdescriptionobject['offset'] = $NextObjectOffset + $offset;
$thisfile_asf_contentdescriptionobject['objectid'] = $NextObjectGUID;
$thisfile_asf_contentdescriptionobject['objectid_guid'] = $NextObjectGUIDtext;
$thisfile_asf_contentdescriptionobject['objectsize'] = $NextObjectSize;
@@ -688,6 +730,7 @@
$thisfile_asf['extended_content_description_object'] = array();
$thisfile_asf_extendedcontentdescriptionobject = &$thisfile_asf['extended_content_description_object'];
+ $thisfile_asf_extendedcontentdescriptionobject['offset'] = $NextObjectOffset + $offset;
$thisfile_asf_extendedcontentdescriptionobject['objectid'] = $NextObjectGUID;
$thisfile_asf_extendedcontentdescriptionobject['objectid_guid'] = $NextObjectGUIDtext;
$thisfile_asf_extendedcontentdescriptionobject['objectsize'] = $NextObjectSize;
@@ -696,7 +739,7 @@
for ($ExtendedContentDescriptorsCounter = 0; $ExtendedContentDescriptorsCounter < $thisfile_asf_extendedcontentdescriptionobject['content_descriptors_count']; $ExtendedContentDescriptorsCounter++) {
// shortcut
$thisfile_asf_extendedcontentdescriptionobject['content_descriptors'][$ExtendedContentDescriptorsCounter] = array();
- $thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current = &$thisfile_asf_extendedcontentdescriptionobject['content_descriptors'][$ExtendedContentDescriptorsCounter];
+ $thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current = &$thisfile_asf_extendedcontentdescriptionobject['content_descriptors'][$ExtendedContentDescriptorsCounter];
$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['base_offset'] = $offset + 30;
$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['name_length'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
@@ -728,7 +771,7 @@
break;
default:
- $ThisFileInfo['warning'][] = 'extended_content_description.content_descriptors.'.$ExtendedContentDescriptorsCounter.'.value_type is invalid ('.$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value_type'].')';
+ $this->warning('extended_content_description.content_descriptors.'.$ExtendedContentDescriptorsCounter.'.value_type is invalid ('.$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value_type'].')');
//return false;
break;
}
@@ -736,7 +779,8 @@
case 'wm/albumartist':
case 'artist':
- $thisfile_asf_comments['artist'] = array($this->TrimTerm($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']));
+ // Note: not 'artist', that comes from 'author' tag
+ $thisfile_asf_comments['albumartist'] = array($this->TrimTerm($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']));
break;
case 'wm/albumtitle':
@@ -749,14 +793,24 @@
$thisfile_asf_comments['genre'] = array($this->TrimTerm($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']));
break;
+ case 'wm/partofset':
+ $thisfile_asf_comments['partofset'] = array($this->TrimTerm($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']));
+ break;
+
case 'wm/tracknumber':
case 'tracknumber':
- $thisfile_asf_comments['track'] = array(intval($this->TrimTerm($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value'])));
+ // be careful casting to int: casting unicode strings to int gives unexpected results (stops parsing at first non-numeric character)
+ $thisfile_asf_comments['track_number'] = array($this->TrimTerm($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']));
+ foreach ($thisfile_asf_comments['track_number'] as $key => $value) {
+ if (preg_match('/^[0-9\x00]+$/', $value)) {
+ $thisfile_asf_comments['track_number'][$key] = intval(str_replace("\x00", '', $value));
+ }
+ }
break;
case 'wm/track':
- if (empty($thisfile_asf_comments['track'])) {
- $thisfile_asf_comments['track'] = array(1 + $this->TrimConvert($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']));
+ if (empty($thisfile_asf_comments['track_number'])) {
+ $thisfile_asf_comments['track_number'] = array(1 + (int) $this->TrimConvert($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']));
}
break;
@@ -779,20 +833,14 @@
break;
case 'id3':
- // id3v2 module might not be loaded
- if (class_exists('getid3_id3v2')) {
- $tempfile = tempnam('*', 'getID3');
- $tempfilehandle = fopen($tempfile, "wb");
- $tempThisfileInfo = array('encoding'=>$ThisFileInfo['encoding']);
- fwrite($tempfilehandle, $thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']);
- fclose($tempfilehandle);
+ $this->getid3->include_module('tag.id3v2');
- $tempfilehandle = fopen($tempfile, "rb");
- $id3 = new getid3_id3v2($tempfilehandle, $tempThisfileInfo);
- fclose($tempfilehandle);
- unlink($tempfile);
+ $getid3_id3v2 = new getid3_id3v2($this->getid3);
+ $getid3_id3v2->AnalyzeString($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']);
+ unset($getid3_id3v2);
- $ThisFileInfo['id3v2'] = $tempThisfileInfo['id3v2'];
+ if ($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value_length'] > 1024) {
+ $thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value'] = '<value too large to display>';
}
break;
@@ -802,18 +850,16 @@
break;
case 'wm/picture':
- //typedef struct _WMPicture{
- // LPWSTR pwszMIMEType;
- // BYTE bPictureType;
- // LPWSTR pwszDescription;
- // DWORD dwDataLen;
- // BYTE* pbData;
- //} WM_PICTURE;
-
+ $WMpicture = $this->ASF_WMpicture($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']);
+ foreach ($WMpicture as $key => $value) {
+ $thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current[$key] = $value;
+ }
+ unset($WMpicture);
+/*
$wm_picture_offset = 0;
$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['image_type_id'] = getid3_lib::LittleEndian2Int(substr($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value'], $wm_picture_offset, 1));
$wm_picture_offset += 1;
- $thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['image_type'] = $this->WMpictureTypeLookup($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['image_type_id']);
+ $thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['image_type'] = self::WMpictureTypeLookup($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['image_type_id']);
$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['image_size'] = getid3_lib::LittleEndian2Int(substr($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value'], $wm_picture_offset, 4));
$wm_picture_offset += 4;
@@ -835,6 +881,18 @@
$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['data'] = substr($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value'], $wm_picture_offset);
unset($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']);
+ $imageinfo = array();
+ $thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['image_mime'] = '';
+ $imagechunkcheck = getid3_lib::GetDataImageSize($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['data'], $imageinfo);
+ unset($imageinfo);
+ if (!empty($imagechunkcheck)) {
+ $thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['image_mime'] = image_type_to_mime_type($imagechunkcheck[2]);
+ }
+ if (!isset($thisfile_asf_comments['picture'])) {
+ $thisfile_asf_comments['picture'] = array();
+ }
+ $thisfile_asf_comments['picture'][] = array('data'=>$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['data'], 'image_mime'=>$thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['image_mime']);
+*/
break;
default:
@@ -870,6 +928,7 @@
$thisfile_asf['stream_bitrate_properties_object'] = array();
$thisfile_asf_streambitratepropertiesobject = &$thisfile_asf['stream_bitrate_properties_object'];
+ $thisfile_asf_streambitratepropertiesobject['offset'] = $NextObjectOffset + $offset;
$thisfile_asf_streambitratepropertiesobject['objectid'] = $NextObjectGUID;
$thisfile_asf_streambitratepropertiesobject['objectid_guid'] = $NextObjectGUIDtext;
$thisfile_asf_streambitratepropertiesobject['objectsize'] = $NextObjectSize;
@@ -895,11 +954,13 @@
$thisfile_asf['padding_object'] = array();
$thisfile_asf_paddingobject = &$thisfile_asf['padding_object'];
+ $thisfile_asf_paddingobject['offset'] = $NextObjectOffset + $offset;
$thisfile_asf_paddingobject['objectid'] = $NextObjectGUID;
$thisfile_asf_paddingobject['objectid_guid'] = $NextObjectGUIDtext;
$thisfile_asf_paddingobject['objectsize'] = $NextObjectSize;
$thisfile_asf_paddingobject['padding_length'] = $thisfile_asf_paddingobject['objectsize'] - 16 - 8;
$thisfile_asf_paddingobject['padding'] = substr($ASFHeaderData, $offset, $thisfile_asf_paddingobject['padding_length']);
+ $offset += ($NextObjectSize - 16 - 8);
break;
case GETID3_ASF_Extended_Content_Encryption_Object:
@@ -911,26 +972,26 @@
default:
// Implementations shall ignore any standard or non-standard object that they do not know how to handle.
if ($this->GUIDname($NextObjectGUIDtext)) {
- $ThisFileInfo['warning'][] = 'unhandled GUID "'.$this->GUIDname($NextObjectGUIDtext).'" {'.$NextObjectGUIDtext.'} in ASF header at offset '.($offset - 16 - 8);
+ $this->warning('unhandled GUID "'.$this->GUIDname($NextObjectGUIDtext).'" {'.$NextObjectGUIDtext.'} in ASF header at offset '.($offset - 16 - 8));
} else {
- $ThisFileInfo['warning'][] = 'unknown GUID {'.$NextObjectGUIDtext.'} in ASF header at offset '.($offset - 16 - 8);
+ $this->warning('unknown GUID {'.$NextObjectGUIDtext.'} in ASF header at offset '.($offset - 16 - 8));
}
$offset += ($NextObjectSize - 16 - 8);
break;
}
}
- if (isset($thisfile_asf_streambitrateproperties['bitrate_records_count'])) {
+ if (isset($thisfile_asf_streambitratepropertiesobject['bitrate_records_count'])) {
$ASFbitrateAudio = 0;
$ASFbitrateVideo = 0;
- for ($BitrateRecordsCounter = 0; $BitrateRecordsCounter < $thisfile_asf_streambitrateproperties['bitrate_records_count']; $BitrateRecordsCounter++) {
+ for ($BitrateRecordsCounter = 0; $BitrateRecordsCounter < $thisfile_asf_streambitratepropertiesobject['bitrate_records_count']; $BitrateRecordsCounter++) {
if (isset($thisfile_asf_codeclistobject['codec_entries'][$BitrateRecordsCounter])) {
switch ($thisfile_asf_codeclistobject['codec_entries'][$BitrateRecordsCounter]['type_raw']) {
case 1:
- $ASFbitrateVideo += $thisfile_asf_streambitrateproperties['bitrate_records'][$BitrateRecordsCounter]['bitrate'];
+ $ASFbitrateVideo += $thisfile_asf_streambitratepropertiesobject['bitrate_records'][$BitrateRecordsCounter]['bitrate'];
break;
case 2:
- $ASFbitrateAudio += $thisfile_asf_streambitrateproperties['bitrate_records'][$BitrateRecordsCounter]['bitrate'];
+ $ASFbitrateAudio += $thisfile_asf_streambitratepropertiesobject['bitrate_records'][$BitrateRecordsCounter]['bitrate'];
break;
default:
@@ -971,7 +1032,7 @@
$audiomediaoffset = 0;
- $thisfile_asf_audiomedia_currentstream = getid3_riff::RIFFparseWAVEFORMATex(substr($streamdata['type_specific_data'], $audiomediaoffset, 16));
+ $thisfile_asf_audiomedia_currentstream = getid3_riff::parseWAVEFORMATex(substr($streamdata['type_specific_data'], $audiomediaoffset, 16));
$audiomediaoffset += 16;
$thisfile_audio['lossless'] = false;
@@ -984,7 +1045,7 @@
if (!empty($thisfile_asf['stream_bitrate_properties_object']['bitrate_records'])) {
foreach ($thisfile_asf['stream_bitrate_properties_object']['bitrate_records'] as $dummy => $dataarray) {
- if (@$dataarray['flags']['stream_number'] == $streamnumber) {
+ if (isset($dataarray['flags']['stream_number']) && ($dataarray['flags']['stream_number'] == $streamnumber)) {
$thisfile_asf_audiomedia_currentstream['bitrate'] = $dataarray['bitrate'];
$thisfile_audio['bitrate'] += $dataarray['bitrate'];
break;
@@ -991,9 +1052,9 @@
}
}
} else {
- if (@$thisfile_asf_audiomedia_currentstream['bytes_sec']) {
+ if (!empty($thisfile_asf_audiomedia_currentstream['bytes_sec'])) {
$thisfile_audio['bitrate'] += $thisfile_asf_audiomedia_currentstream['bytes_sec'] * 8;
- } elseif (@$thisfile_asf_audiomedia_currentstream['bitrate']) {
+ } elseif (!empty($thisfile_asf_audiomedia_currentstream['bitrate'])) {
$thisfile_audio['bitrate'] += $thisfile_asf_audiomedia_currentstream['bitrate'];
}
}
@@ -1001,6 +1062,7 @@
$thisfile_audio['streams'][$streamnumber]['wformattag'] = $thisfile_asf_audiomedia_currentstream['raw']['wFormatTag'];
$thisfile_audio['streams'][$streamnumber]['lossless'] = $thisfile_audio['lossless'];
$thisfile_audio['streams'][$streamnumber]['bitrate'] = $thisfile_audio['bitrate'];
+ $thisfile_audio['streams'][$streamnumber]['dataformat'] = 'wma';
unset($thisfile_audio['streams'][$streamnumber]['raw']);
$thisfile_asf_audiomedia_currentstream['codec_data_size'] = getid3_lib::LittleEndian2Int(substr($streamdata['type_specific_data'], $audiomediaoffset, 2));
@@ -1069,9 +1131,9 @@
if (!empty($thisfile_asf['stream_bitrate_properties_object']['bitrate_records'])) {
foreach ($thisfile_asf['stream_bitrate_properties_object']['bitrate_records'] as $dummy => $dataarray) {
- if (@$dataarray['flags']['stream_number'] == $streamnumber) {
+ if (isset($dataarray['flags']['stream_number']) && ($dataarray['flags']['stream_number'] == $streamnumber)) {
$thisfile_asf_videomedia_currentstream['bitrate'] = $dataarray['bitrate'];
- $thisfile_video['streams'][$streamnumber]['bitrate'] = $dataarray['bitrate'];
+ $thisfile_video['streams'][$streamnumber]['bitrate'] = $dataarray['bitrate'];
$thisfile_video['bitrate'] += $dataarray['bitrate'];
break;
}
@@ -1078,7 +1140,7 @@
}
}
- $thisfile_asf_videomedia_currentstream['format_data']['codec'] = getid3_riff::RIFFfourccLookup($thisfile_asf_videomedia_currentstream['format_data']['codec_fourcc']);
+ $thisfile_asf_videomedia_currentstream['format_data']['codec'] = getid3_riff::fourccLookup($thisfile_asf_videomedia_currentstream['format_data']['codec_fourcc']);
$thisfile_video['streams'][$streamnumber]['fourcc'] = $thisfile_asf_videomedia_currentstream['format_data']['codec_fourcc'];
$thisfile_video['streams'][$streamnumber]['codec'] = $thisfile_asf_videomedia_currentstream['format_data']['codec'];
@@ -1093,8 +1155,8 @@
}
}
- while (ftell($fd) < $ThisFileInfo['avdataend']) {
- $NextObjectDataHeader = fread($fd, 24);
+ while ($this->ftell() < $info['avdataend']) {
+ $NextObjectDataHeader = $this->fread(24);
$offset = 0;
$NextObjectGUID = substr($NextObjectDataHeader, 0, 16);
$offset += 16;
@@ -1116,7 +1178,7 @@
$thisfile_asf['data_object'] = array();
$thisfile_asf_dataobject = &$thisfile_asf['data_object'];
- $DataObjectData = $NextObjectDataHeader.fread($fd, 50 - 24);
+ $DataObjectData = $NextObjectDataHeader.$this->fread(50 - 24);
$offset = 24;
$thisfile_asf_dataobject['objectid'] = $NextObjectGUID;
@@ -1131,7 +1193,7 @@
$thisfile_asf_dataobject['reserved'] = getid3_lib::LittleEndian2Int(substr($DataObjectData, $offset, 2));
$offset += 2;
if ($thisfile_asf_dataobject['reserved'] != 0x0101) {
- $ThisFileInfo['warning'][] = 'data_object.reserved ('.getid3_lib::PrintHexBytes($thisfile_asf_dataobject['reserved']).') does not match expected value of "0x0101"';
+ $this->warning('data_object.reserved ('.getid3_lib::PrintHexBytes($thisfile_asf_dataobject['reserved']).') does not match expected value of "0x0101"');
//return false;
break;
}
@@ -1144,9 +1206,9 @@
// * * Error Correction Present bits 1 // If set, use Opaque Data Packet structure, else use Payload structure
// * Error Correction Data
- $ThisFileInfo['avdataoffset'] = ftell($fd);
- fseek($fd, ($thisfile_asf_dataobject['objectsize'] - 50), SEEK_CUR); // skip actual audio/video data
- $ThisFileInfo['avdataend'] = ftell($fd);
+ $info['avdataoffset'] = $this->ftell();
+ $this->fseek(($thisfile_asf_dataobject['objectsize'] - 50), SEEK_CUR); // skip actual audio/video data
+ $info['avdataend'] = $this->ftell();
break;
case GETID3_ASF_Simple_Index_Object:
@@ -1166,7 +1228,7 @@
$thisfile_asf['simple_index_object'] = array();
$thisfile_asf_simpleindexobject = &$thisfile_asf['simple_index_object'];
- $SimpleIndexObjectData = $NextObjectDataHeader.fread($fd, 56 - 24);
+ $SimpleIndexObjectData = $NextObjectDataHeader.$this->fread(56 - 24);
$offset = 24;
$thisfile_asf_simpleindexobject['objectid'] = $NextObjectGUID;
@@ -1183,7 +1245,7 @@
$thisfile_asf_simpleindexobject['index_entries_count'] = getid3_lib::LittleEndian2Int(substr($SimpleIndexObjectData, $offset, 4));
$offset += 4;
- $IndexEntriesData = $SimpleIndexObjectData.fread($fd, 6 * $thisfile_asf_simpleindexobject['index_entries_count']);
+ $IndexEntriesData = $SimpleIndexObjectData.$this->fread(6 * $thisfile_asf_simpleindexobject['index_entries_count']);
for ($IndexEntriesCounter = 0; $IndexEntriesCounter < $thisfile_asf_simpleindexobject['index_entries_count']; $IndexEntriesCounter++) {
$thisfile_asf_simpleindexobject['index_entries'][$IndexEntriesCounter]['packet_number'] = getid3_lib::LittleEndian2Int(substr($IndexEntriesData, $offset, 4));
$offset += 4;
@@ -1220,7 +1282,7 @@
$thisfile_asf['asf_index_object'] = array();
$thisfile_asf_asfindexobject = &$thisfile_asf['asf_index_object'];
- $ASFIndexObjectData = $NextObjectDataHeader.fread($fd, 34 - 24);
+ $ASFIndexObjectData = $NextObjectDataHeader.$this->fread(34 - 24);
$offset = 24;
$thisfile_asf_asfindexobject['objectid'] = $NextObjectGUID;
@@ -1234,7 +1296,7 @@
$thisfile_asf_asfindexobject['index_blocks_count'] = getid3_lib::LittleEndian2Int(substr($ASFIndexObjectData, $offset, 4));
$offset += 4;
- $ASFIndexObjectData .= fread($fd, 4 * $thisfile_asf_asfindexobject['index_specifiers_count']);
+ $ASFIndexObjectData .= $this->fread(4 * $thisfile_asf_asfindexobject['index_specifiers_count']);
for ($IndexSpecifiersCounter = 0; $IndexSpecifiersCounter < $thisfile_asf_asfindexobject['index_specifiers_count']; $IndexSpecifiersCounter++) {
$IndexSpecifierStreamNumber = getid3_lib::LittleEndian2Int(substr($ASFIndexObjectData, $offset, 2));
$offset += 2;
@@ -1244,17 +1306,17 @@
$thisfile_asf_asfindexobject['index_specifiers'][$IndexSpecifiersCounter]['index_type_text'] = $this->ASFIndexObjectIndexTypeLookup($thisfile_asf_asfindexobject['index_specifiers'][$IndexSpecifiersCounter]['index_type']);
}
- $ASFIndexObjectData .= fread($fd, 4);
+ $ASFIndexObjectData .= $this->fread(4);
$thisfile_asf_asfindexobject['index_entry_count'] = getid3_lib::LittleEndian2Int(substr($ASFIndexObjectData, $offset, 4));
$offset += 4;
- $ASFIndexObjectData .= fread($fd, 8 * $thisfile_asf_asfindexobject['index_specifiers_count']);
+ $ASFIndexObjectData .= $this->fread(8 * $thisfile_asf_asfindexobject['index_specifiers_count']);
for ($IndexSpecifiersCounter = 0; $IndexSpecifiersCounter < $thisfile_asf_asfindexobject['index_specifiers_count']; $IndexSpecifiersCounter++) {
$thisfile_asf_asfindexobject['block_positions'][$IndexSpecifiersCounter] = getid3_lib::LittleEndian2Int(substr($ASFIndexObjectData, $offset, 8));
$offset += 8;
}
- $ASFIndexObjectData .= fread($fd, 4 * $thisfile_asf_asfindexobject['index_specifiers_count'] * $thisfile_asf_asfindexobject['index_entry_count']);
+ $ASFIndexObjectData .= $this->fread(4 * $thisfile_asf_asfindexobject['index_specifiers_count'] * $thisfile_asf_asfindexobject['index_entry_count']);
for ($IndexEntryCounter = 0; $IndexEntryCounter < $thisfile_asf_asfindexobject['index_entry_count']; $IndexEntryCounter++) {
for ($IndexSpecifiersCounter = 0; $IndexSpecifiersCounter < $thisfile_asf_asfindexobject['index_specifiers_count']; $IndexSpecifiersCounter++) {
$thisfile_asf_asfindexobject['offsets'][$IndexSpecifiersCounter][$IndexEntryCounter] = getid3_lib::LittleEndian2Int(substr($ASFIndexObjectData, $offset, 4));
@@ -1267,11 +1329,11 @@
default:
// Implementations shall ignore any standard or non-standard object that they do not know how to handle.
if ($this->GUIDname($NextObjectGUIDtext)) {
- $ThisFileInfo['warning'][] = 'unhandled GUID "'.$this->GUIDname($NextObjectGUIDtext).'" {'.$NextObjectGUIDtext.'} in ASF body at offset '.($offset - 16 - 8);
+ $this->warning('unhandled GUID "'.$this->GUIDname($NextObjectGUIDtext).'" {'.$NextObjectGUIDtext.'} in ASF body at offset '.($offset - 16 - 8));
} else {
- $ThisFileInfo['warning'][] = 'unknown GUID {'.$NextObjectGUIDtext.'} in ASF body at offset '.(ftell($fd) - 16 - 8);
+ $this->warning('unknown GUID {'.$NextObjectGUIDtext.'} in ASF body at offset '.($this->ftell() - 16 - 8));
}
- fseek($fd, ($NextObjectSize - 16 - 8), SEEK_CUR);
+ $this->fseek(($NextObjectSize - 16 - 8), SEEK_CUR);
break;
}
}
@@ -1282,8 +1344,14 @@
case 'WMV1':
case 'WMV2':
case 'WMV3':
+ case 'MSS1':
+ case 'MSS2':
+ case 'WMVA':
+ case 'WVC1':
+ case 'WMVP':
+ case 'WVP2':
$thisfile_video['dataformat'] = 'wmv';
- $ThisFileInfo['mime_type'] = 'video/x-ms-wmv';
+ $info['mime_type'] = 'video/x-ms-wmv';
break;
case 'MP42':
@@ -1291,7 +1359,7 @@
case 'MP4S':
case 'mp4s':
$thisfile_video['dataformat'] = 'asf';
- $ThisFileInfo['mime_type'] = 'video/x-ms-asf';
+ $info['mime_type'] = 'video/x-ms-asf';
break;
default:
@@ -1299,8 +1367,8 @@
case 1:
if (strstr($this->TrimConvert($streamdata['name']), 'Windows Media')) {
$thisfile_video['dataformat'] = 'wmv';
- if ($ThisFileInfo['mime_type'] == 'video/x-ms-asf') {
- $ThisFileInfo['mime_type'] = 'video/x-ms-wmv';
+ if ($info['mime_type'] == 'video/x-ms-asf') {
+ $info['mime_type'] = 'video/x-ms-wmv';
}
}
break;
@@ -1308,8 +1376,8 @@
case 2:
if (strstr($this->TrimConvert($streamdata['name']), 'Windows Media')) {
$thisfile_audio['dataformat'] = 'wma';
- if ($ThisFileInfo['mime_type'] == 'video/x-ms-asf') {
- $ThisFileInfo['mime_type'] = 'audio/x-ms-wma';
+ if ($info['mime_type'] == 'video/x-ms-asf') {
+ $info['mime_type'] = 'audio/x-ms-wma';
}
}
break;
@@ -1320,7 +1388,7 @@
}
}
- switch (@$thisfile_audio['codec']) {
+ switch (isset($thisfile_audio['codec']) ? $thisfile_audio['codec'] : '') {
case 'MPEG Layer-3':
$thisfile_audio['dataformat'] = 'mp3';
break;
@@ -1347,7 +1415,7 @@
break;
default:
- $ThisFileInfo['warning'][] = 'Unknown streamtype: [codec_list_object][codec_entries]['.$streamnumber.'][type_raw] == '.$streamdata['type_raw'];
+ $this->warning('Unknown streamtype: [codec_list_object][codec_entries]['.$streamnumber.'][type_raw] == '.$streamdata['type_raw']);
break;
}
@@ -1354,7 +1422,7 @@
}
}
- if (isset($ThisFileInfo['audio'])) {
+ if (isset($info['audio'])) {
$thisfile_audio['lossless'] = (isset($thisfile_audio['lossless']) ? $thisfile_audio['lossless'] : false);
$thisfile_audio['dataformat'] = (!empty($thisfile_audio['dataformat']) ? $thisfile_audio['dataformat'] : 'asf');
}
@@ -1363,143 +1431,176 @@
$thisfile_video['pixel_aspect_ratio'] = (isset($thisfile_audio['pixel_aspect_ratio']) ? $thisfile_audio['pixel_aspect_ratio'] : (float) 1);
$thisfile_video['dataformat'] = (!empty($thisfile_video['dataformat']) ? $thisfile_video['dataformat'] : 'asf');
}
- $ThisFileInfo['bitrate'] = @$thisfile_audio['bitrate'] + @$thisfile_video['bitrate'];
+ if (!empty($thisfile_video['streams'])) {
+ $thisfile_video['resolution_x'] = 0;
+ $thisfile_video['resolution_y'] = 0;
+ foreach ($thisfile_video['streams'] as $key => $valuearray) {
+ if (($valuearray['resolution_x'] > $thisfile_video['resolution_x']) || ($valuearray['resolution_y'] > $thisfile_video['resolution_y'])) {
+ $thisfile_video['resolution_x'] = $valuearray['resolution_x'];
+ $thisfile_video['resolution_y'] = $valuearray['resolution_y'];
+ }
+ }
+ }
+ $info['bitrate'] = (isset($thisfile_audio['bitrate']) ? $thisfile_audio['bitrate'] : 0) + (isset($thisfile_video['bitrate']) ? $thisfile_video['bitrate'] : 0);
+
+ if ((!isset($info['playtime_seconds']) || ($info['playtime_seconds'] <= 0)) && ($info['bitrate'] > 0)) {
+ $info['playtime_seconds'] = ($info['filesize'] - $info['avdataoffset']) / ($info['bitrate'] / 8);
+ }
+
return true;
}
- function ASFCodecListObjectTypeLookup($CodecListType) {
- static $ASFCodecListObjectTypeLookup = array();
- if (empty($ASFCodecListObjectTypeLookup)) {
- $ASFCodecListObjectTypeLookup[0x0001] = 'Video Codec';
- $ASFCodecListObjectTypeLookup[0x0002] = 'Audio Codec';
- $ASFCodecListObjectTypeLookup[0xFFFF] = 'Unknown Codec';
- }
+ /**
+ * @param int $CodecListType
+ *
+ * @return string
+ */
+ public static function codecListObjectTypeLookup($CodecListType) {
+ static $lookup = array(
+ 0x0001 => 'Video Codec',
+ 0x0002 => 'Audio Codec',
+ 0xFFFF => 'Unknown Codec'
+ );
- return (isset($ASFCodecListObjectTypeLookup[$CodecListType]) ? $ASFCodecListObjectTypeLookup[$CodecListType] : 'Invalid Codec Type');
+ return (isset($lookup[$CodecListType]) ? $lookup[$CodecListType] : 'Invalid Codec Type');
}
- function KnownGUIDs() {
- static $GUIDarray = array();
- if (empty($GUIDarray)) {
- $GUIDarray['GETID3_ASF_Extended_Stream_Properties_Object'] = '14E6A5CB-C672-4332-8399-A96952065B5A';
- $GUIDarray['GETID3_ASF_Padding_Object'] = '1806D474-CADF-4509-A4BA-9AABCB96AAE8';
- $GUIDarray['GETID3_ASF_Payload_Ext_Syst_Pixel_Aspect_Ratio'] = '1B1EE554-F9EA-4BC8-821A-376B74E4C4B8';
- $GUIDarray['GETID3_ASF_Script_Command_Object'] = '1EFB1A30-0B62-11D0-A39B-00A0C90348F6';
- $GUIDarray['GETID3_ASF_No_Error_Correction'] = '20FB5700-5B55-11CF-A8FD-00805F5C442B';
- $GUIDarray['GETID3_ASF_Content_Branding_Object'] = '2211B3FA-BD23-11D2-B4B7-00A0C955FC6E';
- $GUIDarray['GETID3_ASF_Content_Encryption_Object'] = '2211B3FB-BD23-11D2-B4B7-00A0C955FC6E';
- $GUIDarray['GETID3_ASF_Digital_Signature_Object'] = '2211B3FC-BD23-11D2-B4B7-00A0C955FC6E';
- $GUIDarray['GETID3_ASF_Extended_Content_Encryption_Object'] = '298AE614-2622-4C17-B935-DAE07EE9289C';
- $GUIDarray['GETID3_ASF_Simple_Index_Object'] = '33000890-E5B1-11CF-89F4-00A0C90349CB';
- $GUIDarray['GETID3_ASF_Degradable_JPEG_Media'] = '35907DE0-E415-11CF-A917-00805F5C442B';
- $GUIDarray['GETID3_ASF_Payload_Extension_System_Timecode'] = '399595EC-8667-4E2D-8FDB-98814CE76C1E';
- $GUIDarray['GETID3_ASF_Binary_Media'] = '3AFB65E2-47EF-40F2-AC2C-70A90D71D343';
- $GUIDarray['GETID3_ASF_Timecode_Index_Object'] = '3CB73FD0-0C4A-4803-953D-EDF7B6228F0C';
- $GUIDarray['GETID3_ASF_Metadata_Library_Object'] = '44231C94-9498-49D1-A141-1D134E457054';
- $GUIDarray['GETID3_ASF_Reserved_3'] = '4B1ACBE3-100B-11D0-A39B-00A0C90348F6';
- $GUIDarray['GETID3_ASF_Reserved_4'] = '4CFEDB20-75F6-11CF-9C0F-00A0C90349CB';
- $GUIDarray['GETID3_ASF_Command_Media'] = '59DACFC0-59E6-11D0-A3AC-00A0C90348F6';
- $GUIDarray['GETID3_ASF_Header_Extension_Object'] = '5FBF03B5-A92E-11CF-8EE3-00C00C205365';
- $GUIDarray['GETID3_ASF_Media_Object_Index_Parameters_Obj'] = '6B203BAD-3F11-4E84-ACA8-D7613DE2CFA7';
- $GUIDarray['GETID3_ASF_Header_Object'] = '75B22630-668E-11CF-A6D9-00AA0062CE6C';
- $GUIDarray['GETID3_ASF_Content_Description_Object'] = '75B22633-668E-11CF-A6D9-00AA0062CE6C';
- $GUIDarray['GETID3_ASF_Error_Correction_Object'] = '75B22635-668E-11CF-A6D9-00AA0062CE6C';
- $GUIDarray['GETID3_ASF_Data_Object'] = '75B22636-668E-11CF-A6D9-00AA0062CE6C';
- $GUIDarray['GETID3_ASF_Web_Stream_Media_Subtype'] = '776257D4-C627-41CB-8F81-7AC7FF1C40CC';
- $GUIDarray['GETID3_ASF_Stream_Bitrate_Properties_Object'] = '7BF875CE-468D-11D1-8D82-006097C9A2B2';
- $GUIDarray['GETID3_ASF_Language_List_Object'] = '7C4346A9-EFE0-4BFC-B229-393EDE415C85';
- $GUIDarray['GETID3_ASF_Codec_List_Object'] = '86D15240-311D-11D0-A3A4-00A0C90348F6';
- $GUIDarray['GETID3_ASF_Reserved_2'] = '86D15241-311D-11D0-A3A4-00A0C90348F6';
- $GUIDarray['GETID3_ASF_File_Properties_Object'] = '8CABDCA1-A947-11CF-8EE4-00C00C205365';
- $GUIDarray['GETID3_ASF_File_Transfer_Media'] = '91BD222C-F21C-497A-8B6D-5AA86BFC0185';
- $GUIDarray['GETID3_ASF_Old_RTP_Extension_Data'] = '96800C63-4C94-11D1-837B-0080C7A37F95';
- $GUIDarray['GETID3_ASF_Advanced_Mutual_Exclusion_Object'] = 'A08649CF-4775-4670-8A16-6E35357566CD';
- $GUIDarray['GETID3_ASF_Bandwidth_Sharing_Object'] = 'A69609E6-517B-11D2-B6AF-00C04FD908E9';
- $GUIDarray['GETID3_ASF_Reserved_1'] = 'ABD3D211-A9BA-11cf-8EE6-00C00C205365';
- $GUIDarray['GETID3_ASF_Bandwidth_Sharing_Exclusive'] = 'AF6060AA-5197-11D2-B6AF-00C04FD908E9';
- $GUIDarray['GETID3_ASF_Bandwidth_Sharing_Partial'] = 'AF6060AB-5197-11D2-B6AF-00C04FD908E9';
- $GUIDarray['GETID3_ASF_JFIF_Media'] = 'B61BE100-5B4E-11CF-A8FD-00805F5C442B';
- $GUIDarray['GETID3_ASF_Stream_Properties_Object'] = 'B7DC0791-A9B7-11CF-8EE6-00C00C205365';
- $GUIDarray['GETID3_ASF_Video_Media'] = 'BC19EFC0-5B4D-11CF-A8FD-00805F5C442B';
- $GUIDarray['GETID3_ASF_Audio_Spread'] = 'BFC3CD50-618F-11CF-8BB2-00AA00B4E220';
- $GUIDarray['GETID3_ASF_Metadata_Object'] = 'C5F8CBEA-5BAF-4877-8467-AA8C44FA4CCA';
- $GUIDarray['GETID3_ASF_Payload_Ext_Syst_Sample_Duration'] = 'C6BD9450-867F-4907-83A3-C77921B733AD';
- $GUIDarray['GETID3_ASF_Group_Mutual_Exclusion_Object'] = 'D1465A40-5A79-4338-B71B-E36B8FD6C249';
- $GUIDarray['GETID3_ASF_Extended_Content_Description_Object'] = 'D2D0A440-E307-11D2-97F0-00A0C95EA850';
- $GUIDarray['GETID3_ASF_Stream_Prioritization_Object'] = 'D4FED15B-88D3-454F-81F0-ED5C45999E24';
- $GUIDarray['GETID3_ASF_Payload_Ext_System_Content_Type'] = 'D590DC20-07BC-436C-9CF7-F3BBFBF1A4DC';
- $GUIDarray['GETID3_ASF_Old_File_Properties_Object'] = 'D6E229D0-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_ASF_Header_Object'] = 'D6E229D1-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_ASF_Data_Object'] = 'D6E229D2-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Index_Object'] = 'D6E229D3-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Stream_Properties_Object'] = 'D6E229D4-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Content_Description_Object'] = 'D6E229D5-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Script_Command_Object'] = 'D6E229D6-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Marker_Object'] = 'D6E229D7-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Component_Download_Object'] = 'D6E229D8-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Stream_Group_Object'] = 'D6E229D9-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Scalable_Object'] = 'D6E229DA-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Prioritization_Object'] = 'D6E229DB-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Bitrate_Mutual_Exclusion_Object'] = 'D6E229DC-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Inter_Media_Dependency_Object'] = 'D6E229DD-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Rating_Object'] = 'D6E229DE-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Index_Parameters_Object'] = 'D6E229DF-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Color_Table_Object'] = 'D6E229E0-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Language_List_Object'] = 'D6E229E1-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Audio_Media'] = 'D6E229E2-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Video_Media'] = 'D6E229E3-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Image_Media'] = 'D6E229E4-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Timecode_Media'] = 'D6E229E5-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Text_Media'] = 'D6E229E6-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_MIDI_Media'] = 'D6E229E7-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Command_Media'] = 'D6E229E8-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_No_Error_Concealment'] = 'D6E229EA-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Scrambled_Audio'] = 'D6E229EB-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_No_Color_Table'] = 'D6E229EC-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_SMPTE_Time'] = 'D6E229ED-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_ASCII_Text'] = 'D6E229EE-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Unicode_Text'] = 'D6E229EF-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_HTML_Text'] = 'D6E229F0-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_URL_Command'] = 'D6E229F1-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Filename_Command'] = 'D6E229F2-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_ACM_Codec'] = 'D6E229F3-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_VCM_Codec'] = 'D6E229F4-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_QuickTime_Codec'] = 'D6E229F5-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_DirectShow_Transform_Filter'] = 'D6E229F6-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_DirectShow_Rendering_Filter'] = 'D6E229F7-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_No_Enhancement'] = 'D6E229F8-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Unknown_Enhancement_Type'] = 'D6E229F9-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Temporal_Enhancement'] = 'D6E229FA-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Spatial_Enhancement'] = 'D6E229FB-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Quality_Enhancement'] = 'D6E229FC-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Number_of_Channels_Enhancement'] = 'D6E229FD-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Frequency_Response_Enhancement'] = 'D6E229FE-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Media_Object'] = 'D6E229FF-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Mutex_Language'] = 'D6E22A00-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Mutex_Bitrate'] = 'D6E22A01-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Mutex_Unknown'] = 'D6E22A02-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_ASF_Placeholder_Object'] = 'D6E22A0E-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Old_Data_Unit_Extension_Object'] = 'D6E22A0F-35DA-11D1-9034-00A0C90349BE';
- $GUIDarray['GETID3_ASF_Web_Stream_Format'] = 'DA1E6B13-8359-4050-B398-388E965BF00C';
- $GUIDarray['GETID3_ASF_Payload_Ext_System_File_Name'] = 'E165EC0E-19ED-45D7-B4A7-25CBD1E28E9B';
- $GUIDarray['GETID3_ASF_Marker_Object'] = 'F487CD01-A951-11CF-8EE6-00C00C205365';
- $GUIDarray['GETID3_ASF_Timecode_Index_Parameters_Object'] = 'F55E496D-9797-4B5D-8C8B-604DFE9BFB24';
- $GUIDarray['GETID3_ASF_Audio_Media'] = 'F8699E40-5B4D-11CF-A8FD-00805F5C442B';
- $GUIDarray['GETID3_ASF_Media_Object_Index_Object'] = 'FEB103F8-12AD-4C64-840F-2A1D2F7AD48C';
- $GUIDarray['GETID3_ASF_Alt_Extended_Content_Encryption_Obj'] = 'FF889EF1-ADEE-40DA-9E71-98704BB928CE';
- }
+ /**
+ * @return array
+ */
+ public static function KnownGUIDs() {
+ static $GUIDarray = array(
+ 'GETID3_ASF_Extended_Stream_Properties_Object' => '14E6A5CB-C672-4332-8399-A96952065B5A',
+ 'GETID3_ASF_Padding_Object' => '1806D474-CADF-4509-A4BA-9AABCB96AAE8',
+ 'GETID3_ASF_Payload_Ext_Syst_Pixel_Aspect_Ratio' => '1B1EE554-F9EA-4BC8-821A-376B74E4C4B8',
+ 'GETID3_ASF_Script_Command_Object' => '1EFB1A30-0B62-11D0-A39B-00A0C90348F6',
+ 'GETID3_ASF_No_Error_Correction' => '20FB5700-5B55-11CF-A8FD-00805F5C442B',
+ 'GETID3_ASF_Content_Branding_Object' => '2211B3FA-BD23-11D2-B4B7-00A0C955FC6E',
+ 'GETID3_ASF_Content_Encryption_Object' => '2211B3FB-BD23-11D2-B4B7-00A0C955FC6E',
+ 'GETID3_ASF_Digital_Signature_Object' => '2211B3FC-BD23-11D2-B4B7-00A0C955FC6E',
+ 'GETID3_ASF_Extended_Content_Encryption_Object' => '298AE614-2622-4C17-B935-DAE07EE9289C',
+ 'GETID3_ASF_Simple_Index_Object' => '33000890-E5B1-11CF-89F4-00A0C90349CB',
+ 'GETID3_ASF_Degradable_JPEG_Media' => '35907DE0-E415-11CF-A917-00805F5C442B',
+ 'GETID3_ASF_Payload_Extension_System_Timecode' => '399595EC-8667-4E2D-8FDB-98814CE76C1E',
+ 'GETID3_ASF_Binary_Media' => '3AFB65E2-47EF-40F2-AC2C-70A90D71D343',
+ 'GETID3_ASF_Timecode_Index_Object' => '3CB73FD0-0C4A-4803-953D-EDF7B6228F0C',
+ 'GETID3_ASF_Metadata_Library_Object' => '44231C94-9498-49D1-A141-1D134E457054',
+ 'GETID3_ASF_Reserved_3' => '4B1ACBE3-100B-11D0-A39B-00A0C90348F6',
+ 'GETID3_ASF_Reserved_4' => '4CFEDB20-75F6-11CF-9C0F-00A0C90349CB',
+ 'GETID3_ASF_Command_Media' => '59DACFC0-59E6-11D0-A3AC-00A0C90348F6',
+ 'GETID3_ASF_Header_Extension_Object' => '5FBF03B5-A92E-11CF-8EE3-00C00C205365',
+ 'GETID3_ASF_Media_Object_Index_Parameters_Obj' => '6B203BAD-3F11-4E84-ACA8-D7613DE2CFA7',
+ 'GETID3_ASF_Header_Object' => '75B22630-668E-11CF-A6D9-00AA0062CE6C',
+ 'GETID3_ASF_Content_Description_Object' => '75B22633-668E-11CF-A6D9-00AA0062CE6C',
+ 'GETID3_ASF_Error_Correction_Object' => '75B22635-668E-11CF-A6D9-00AA0062CE6C',
+ 'GETID3_ASF_Data_Object' => '75B22636-668E-11CF-A6D9-00AA0062CE6C',
+ 'GETID3_ASF_Web_Stream_Media_Subtype' => '776257D4-C627-41CB-8F81-7AC7FF1C40CC',
+ 'GETID3_ASF_Stream_Bitrate_Properties_Object' => '7BF875CE-468D-11D1-8D82-006097C9A2B2',
+ 'GETID3_ASF_Language_List_Object' => '7C4346A9-EFE0-4BFC-B229-393EDE415C85',
+ 'GETID3_ASF_Codec_List_Object' => '86D15240-311D-11D0-A3A4-00A0C90348F6',
+ 'GETID3_ASF_Reserved_2' => '86D15241-311D-11D0-A3A4-00A0C90348F6',
+ 'GETID3_ASF_File_Properties_Object' => '8CABDCA1-A947-11CF-8EE4-00C00C205365',
+ 'GETID3_ASF_File_Transfer_Media' => '91BD222C-F21C-497A-8B6D-5AA86BFC0185',
+ 'GETID3_ASF_Old_RTP_Extension_Data' => '96800C63-4C94-11D1-837B-0080C7A37F95',
+ 'GETID3_ASF_Advanced_Mutual_Exclusion_Object' => 'A08649CF-4775-4670-8A16-6E35357566CD',
+ 'GETID3_ASF_Bandwidth_Sharing_Object' => 'A69609E6-517B-11D2-B6AF-00C04FD908E9',
+ 'GETID3_ASF_Reserved_1' => 'ABD3D211-A9BA-11cf-8EE6-00C00C205365',
+ 'GETID3_ASF_Bandwidth_Sharing_Exclusive' => 'AF6060AA-5197-11D2-B6AF-00C04FD908E9',
+ 'GETID3_ASF_Bandwidth_Sharing_Partial' => 'AF6060AB-5197-11D2-B6AF-00C04FD908E9',
+ 'GETID3_ASF_JFIF_Media' => 'B61BE100-5B4E-11CF-A8FD-00805F5C442B',
+ 'GETID3_ASF_Stream_Properties_Object' => 'B7DC0791-A9B7-11CF-8EE6-00C00C205365',
+ 'GETID3_ASF_Video_Media' => 'BC19EFC0-5B4D-11CF-A8FD-00805F5C442B',
+ 'GETID3_ASF_Audio_Spread' => 'BFC3CD50-618F-11CF-8BB2-00AA00B4E220',
+ 'GETID3_ASF_Metadata_Object' => 'C5F8CBEA-5BAF-4877-8467-AA8C44FA4CCA',
+ 'GETID3_ASF_Payload_Ext_Syst_Sample_Duration' => 'C6BD9450-867F-4907-83A3-C77921B733AD',
+ 'GETID3_ASF_Group_Mutual_Exclusion_Object' => 'D1465A40-5A79-4338-B71B-E36B8FD6C249',
+ 'GETID3_ASF_Extended_Content_Description_Object' => 'D2D0A440-E307-11D2-97F0-00A0C95EA850',
+ 'GETID3_ASF_Stream_Prioritization_Object' => 'D4FED15B-88D3-454F-81F0-ED5C45999E24',
+ 'GETID3_ASF_Payload_Ext_System_Content_Type' => 'D590DC20-07BC-436C-9CF7-F3BBFBF1A4DC',
+ 'GETID3_ASF_Old_File_Properties_Object' => 'D6E229D0-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_ASF_Header_Object' => 'D6E229D1-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_ASF_Data_Object' => 'D6E229D2-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Index_Object' => 'D6E229D3-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Stream_Properties_Object' => 'D6E229D4-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Content_Description_Object' => 'D6E229D5-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Script_Command_Object' => 'D6E229D6-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Marker_Object' => 'D6E229D7-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Component_Download_Object' => 'D6E229D8-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Stream_Group_Object' => 'D6E229D9-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Scalable_Object' => 'D6E229DA-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Prioritization_Object' => 'D6E229DB-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Bitrate_Mutual_Exclusion_Object' => 'D6E229DC-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Inter_Media_Dependency_Object' => 'D6E229DD-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Rating_Object' => 'D6E229DE-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Index_Parameters_Object' => 'D6E229DF-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Color_Table_Object' => 'D6E229E0-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Language_List_Object' => 'D6E229E1-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Audio_Media' => 'D6E229E2-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Video_Media' => 'D6E229E3-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Image_Media' => 'D6E229E4-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Timecode_Media' => 'D6E229E5-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Text_Media' => 'D6E229E6-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_MIDI_Media' => 'D6E229E7-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Command_Media' => 'D6E229E8-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_No_Error_Concealment' => 'D6E229EA-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Scrambled_Audio' => 'D6E229EB-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_No_Color_Table' => 'D6E229EC-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_SMPTE_Time' => 'D6E229ED-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_ASCII_Text' => 'D6E229EE-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Unicode_Text' => 'D6E229EF-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_HTML_Text' => 'D6E229F0-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_URL_Command' => 'D6E229F1-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Filename_Command' => 'D6E229F2-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_ACM_Codec' => 'D6E229F3-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_VCM_Codec' => 'D6E229F4-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_QuickTime_Codec' => 'D6E229F5-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_DirectShow_Transform_Filter' => 'D6E229F6-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_DirectShow_Rendering_Filter' => 'D6E229F7-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_No_Enhancement' => 'D6E229F8-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Unknown_Enhancement_Type' => 'D6E229F9-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Temporal_Enhancement' => 'D6E229FA-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Spatial_Enhancement' => 'D6E229FB-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Quality_Enhancement' => 'D6E229FC-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Number_of_Channels_Enhancement' => 'D6E229FD-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Frequency_Response_Enhancement' => 'D6E229FE-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Media_Object' => 'D6E229FF-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Mutex_Language' => 'D6E22A00-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Mutex_Bitrate' => 'D6E22A01-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Mutex_Unknown' => 'D6E22A02-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_ASF_Placeholder_Object' => 'D6E22A0E-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Old_Data_Unit_Extension_Object' => 'D6E22A0F-35DA-11D1-9034-00A0C90349BE',
+ 'GETID3_ASF_Web_Stream_Format' => 'DA1E6B13-8359-4050-B398-388E965BF00C',
+ 'GETID3_ASF_Payload_Ext_System_File_Name' => 'E165EC0E-19ED-45D7-B4A7-25CBD1E28E9B',
+ 'GETID3_ASF_Marker_Object' => 'F487CD01-A951-11CF-8EE6-00C00C205365',
+ 'GETID3_ASF_Timecode_Index_Parameters_Object' => 'F55E496D-9797-4B5D-8C8B-604DFE9BFB24',
+ 'GETID3_ASF_Audio_Media' => 'F8699E40-5B4D-11CF-A8FD-00805F5C442B',
+ 'GETID3_ASF_Media_Object_Index_Object' => 'FEB103F8-12AD-4C64-840F-2A1D2F7AD48C',
+ 'GETID3_ASF_Alt_Extended_Content_Encryption_Obj' => 'FF889EF1-ADEE-40DA-9E71-98704BB928CE',
+ 'GETID3_ASF_Index_Placeholder_Object' => 'D9AADE20-7C17-4F9C-BC28-8555DD98E2A2', // http://cpan.uwinnipeg.ca/htdocs/Audio-WMA/Audio/WMA.pm.html
+ 'GETID3_ASF_Compatibility_Object' => '26F18B5D-4584-47EC-9F5F-0E651F0452C9', // http://cpan.uwinnipeg.ca/htdocs/Audio-WMA/Audio/WMA.pm.html
+ );
return $GUIDarray;
}
- function GUIDname($GUIDstring) {
+ /**
+ * @param string $GUIDstring
+ *
+ * @return string|false
+ */
+ public static function GUIDname($GUIDstring) {
static $GUIDarray = array();
if (empty($GUIDarray)) {
- $GUIDarray = $this->KnownGUIDs();
+ $GUIDarray = self::KnownGUIDs();
}
return array_search($GUIDstring, $GUIDarray);
}
- function ASFIndexObjectIndexTypeLookup($id) {
+ /**
+ * @param int $id
+ *
+ * @return string
+ */
+ public static function ASFIndexObjectIndexTypeLookup($id) {
static $ASFIndexObjectIndexTypeLookup = array();
if (empty($ASFIndexObjectIndexTypeLookup)) {
$ASFIndexObjectIndexTypeLookup[1] = 'Nearest Past Data Packet';
@@ -1509,7 +1610,12 @@
return (isset($ASFIndexObjectIndexTypeLookup[$id]) ? $ASFIndexObjectIndexTypeLookup[$id] : 'invalid');
}
- function GUIDtoBytestring($GUIDstring) {
+ /**
+ * @param string $GUIDstring
+ *
+ * @return string
+ */
+ public static function GUIDtoBytestring($GUIDstring) {
// Microsoft defines these 16-byte (128-bit) GUIDs in the strangest way:
// first 4 bytes are in little-endian order
// next 2 bytes are appended in little-endian order
@@ -1544,32 +1650,43 @@
return $hexbytecharstring;
}
- function BytestringToGUID($Bytestring) {
- $GUIDstring = str_pad(dechex(ord($Bytestring{3})), 2, '0', STR_PAD_LEFT);
- $GUIDstring .= str_pad(dechex(ord($Bytestring{2})), 2, '0', STR_PAD_LEFT);
- $GUIDstring .= str_pad(dechex(ord($Bytestring{1})), 2, '0', STR_PAD_LEFT);
- $GUIDstring .= str_pad(dechex(ord($Bytestring{0})), 2, '0', STR_PAD_LEFT);
+ /**
+ * @param string $Bytestring
+ *
+ * @return string
+ */
+ public static function BytestringToGUID($Bytestring) {
+ $GUIDstring = str_pad(dechex(ord($Bytestring[3])), 2, '0', STR_PAD_LEFT);
+ $GUIDstring .= str_pad(dechex(ord($Bytestring[2])), 2, '0', STR_PAD_LEFT);
+ $GUIDstring .= str_pad(dechex(ord($Bytestring[1])), 2, '0', STR_PAD_LEFT);
+ $GUIDstring .= str_pad(dechex(ord($Bytestring[0])), 2, '0', STR_PAD_LEFT);
$GUIDstring .= '-';
- $GUIDstring .= str_pad(dechex(ord($Bytestring{5})), 2, '0', STR_PAD_LEFT);
- $GUIDstring .= str_pad(dechex(ord($Bytestring{4})), 2, '0', STR_PAD_LEFT);
+ $GUIDstring .= str_pad(dechex(ord($Bytestring[5])), 2, '0', STR_PAD_LEFT);
+ $GUIDstring .= str_pad(dechex(ord($Bytestring[4])), 2, '0', STR_PAD_LEFT);
$GUIDstring .= '-';
- $GUIDstring .= str_pad(dechex(ord($Bytestring{7})), 2, '0', STR_PAD_LEFT);
- $GUIDstring .= str_pad(dechex(ord($Bytestring{6})), 2, '0', STR_PAD_LEFT);
+ $GUIDstring .= str_pad(dechex(ord($Bytestring[7])), 2, '0', STR_PAD_LEFT);
+ $GUIDstring .= str_pad(dechex(ord($Bytestring[6])), 2, '0', STR_PAD_LEFT);
$GUIDstring .= '-';
- $GUIDstring .= str_pad(dechex(ord($Bytestring{8})), 2, '0', STR_PAD_LEFT);
- $GUIDstring .= str_pad(dechex(ord($Bytestring{9})), 2, '0', STR_PAD_LEFT);
+ $GUIDstring .= str_pad(dechex(ord($Bytestring[8])), 2, '0', STR_PAD_LEFT);
+ $GUIDstring .= str_pad(dechex(ord($Bytestring[9])), 2, '0', STR_PAD_LEFT);
$GUIDstring .= '-';
- $GUIDstring .= str_pad(dechex(ord($Bytestring{10})), 2, '0', STR_PAD_LEFT);
- $GUIDstring .= str_pad(dechex(ord($Bytestring{11})), 2, '0', STR_PAD_LEFT);
- $GUIDstring .= str_pad(dechex(ord($Bytestring{12})), 2, '0', STR_PAD_LEFT);
- $GUIDstring .= str_pad(dechex(ord($Bytestring{13})), 2, '0', STR_PAD_LEFT);
- $GUIDstring .= str_pad(dechex(ord($Bytestring{14})), 2, '0', STR_PAD_LEFT);
- $GUIDstring .= str_pad(dechex(ord($Bytestring{15})), 2, '0', STR_PAD_LEFT);
+ $GUIDstring .= str_pad(dechex(ord($Bytestring[10])), 2, '0', STR_PAD_LEFT);
+ $GUIDstring .= str_pad(dechex(ord($Bytestring[11])), 2, '0', STR_PAD_LEFT);
+ $GUIDstring .= str_pad(dechex(ord($Bytestring[12])), 2, '0', STR_PAD_LEFT);
+ $GUIDstring .= str_pad(dechex(ord($Bytestring[13])), 2, '0', STR_PAD_LEFT);
+ $GUIDstring .= str_pad(dechex(ord($Bytestring[14])), 2, '0', STR_PAD_LEFT);
+ $GUIDstring .= str_pad(dechex(ord($Bytestring[15])), 2, '0', STR_PAD_LEFT);
return strtoupper($GUIDstring);
}
- function FILETIMEtoUNIXtime($FILETIME, $round=true) {
+ /**
+ * @param int $FILETIME
+ * @param bool $round
+ *
+ * @return float|int
+ */
+ public static function FILETIMEtoUNIXtime($FILETIME, $round=true) {
// FILETIME is a 64-bit unsigned integer representing
// the number of 100-nanosecond intervals since January 1, 1601
// UNIX timestamp is number of seconds since January 1, 1970
@@ -1580,56 +1697,391 @@
return ($FILETIME - 116444736000000000) / 10000000;
}
- function WMpictureTypeLookup($WMpictureType) {
- static $WMpictureTypeLookup = array();
- if (empty($WMpictureTypeLookup)) {
- $WMpictureTypeLookup[0x03] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Front Cover');
- $WMpictureTypeLookup[0x04] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Back Cover');
- $WMpictureTypeLookup[0x00] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'User Defined');
- $WMpictureTypeLookup[0x05] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Leaflet Page');
- $WMpictureTypeLookup[0x06] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Media Label');
- $WMpictureTypeLookup[0x07] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Lead Artist');
- $WMpictureTypeLookup[0x08] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Artist');
- $WMpictureTypeLookup[0x09] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Conductor');
- $WMpictureTypeLookup[0x0A] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Band');
- $WMpictureTypeLookup[0x0B] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Composer');
- $WMpictureTypeLookup[0x0C] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Lyricist');
- $WMpictureTypeLookup[0x0D] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Recording Location');
- $WMpictureTypeLookup[0x0E] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'During Recording');
- $WMpictureTypeLookup[0x0F] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'During Performance');
- $WMpictureTypeLookup[0x10] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Video Screen Capture');
- $WMpictureTypeLookup[0x12] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Illustration');
- $WMpictureTypeLookup[0x13] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Band Logotype');
- $WMpictureTypeLookup[0x14] = getid3_lib::iconv_fallback('ISO-8859-1', 'UTF-16LE', 'Publisher Logotype');
+ /**
+ * @param int $WMpictureType
+ *
+ * @return string
+ */
+ public static function WMpictureTypeLookup($WMpictureType) {
+ static $lookup = null;
+ if ($lookup === null) {
+ $lookup = array(
+ 0x03 => 'Front Cover',
+ 0x04 => 'Back Cover',
+ 0x00 => 'User Defined',
+ 0x05 => 'Leaflet Page',
+ 0x06 => 'Media Label',
+ 0x07 => 'Lead Artist',
+ 0x08 => 'Artist',
+ 0x09 => 'Conductor',
+ 0x0A => 'Band',
+ 0x0B => 'Composer',
+ 0x0C => 'Lyricist',
+ 0x0D => 'Recording Location',
+ 0x0E => 'During Recording',
+ 0x0F => 'During Performance',
+ 0x10 => 'Video Screen Capture',
+ 0x12 => 'Illustration',
+ 0x13 => 'Band Logotype',
+ 0x14 => 'Publisher Logotype'
+ );
+ $lookup = array_map(function($str) {
+ return getid3_lib::iconv_fallback('UTF-8', 'UTF-16LE', $str);
+ }, $lookup);
}
- return @$WMpictureTypeLookup[$WMpictureType];
+
+ return (isset($lookup[$WMpictureType]) ? $lookup[$WMpictureType] : '');
}
+ /**
+ * @param string $asf_header_extension_object_data
+ * @param int $unhandled_sections
+ *
+ * @return array
+ */
+ public function HeaderExtensionObjectDataParse(&$asf_header_extension_object_data, &$unhandled_sections) {
+ // http://msdn.microsoft.com/en-us/library/bb643323.aspx
- // Remove terminator 00 00 and convert UNICODE to Latin-1
- function TrimConvert($string) {
+ $offset = 0;
+ $objectOffset = 0;
+ $HeaderExtensionObjectParsed = array();
+ while ($objectOffset < strlen($asf_header_extension_object_data)) {
+ $offset = $objectOffset;
+ $thisObject = array();
- // remove terminator, only if present (it should be, but...)
- if (substr($string, strlen($string) - 2, 2) == "\x00\x00") {
- $string = substr($string, 0, strlen($string) - 2);
+ $thisObject['guid'] = substr($asf_header_extension_object_data, $offset, 16);
+ $offset += 16;
+ $thisObject['guid_text'] = $this->BytestringToGUID($thisObject['guid']);
+ $thisObject['guid_name'] = $this->GUIDname($thisObject['guid_text']);
+
+ $thisObject['size'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 8));
+ $offset += 8;
+ if ($thisObject['size'] <= 0) {
+ break;
+ }
+
+ switch ($thisObject['guid']) {
+ case GETID3_ASF_Extended_Stream_Properties_Object:
+ $thisObject['start_time'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 8));
+ $offset += 8;
+ $thisObject['start_time_unix'] = $this->FILETIMEtoUNIXtime($thisObject['start_time']);
+
+ $thisObject['end_time'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 8));
+ $offset += 8;
+ $thisObject['end_time_unix'] = $this->FILETIMEtoUNIXtime($thisObject['end_time']);
+
+ $thisObject['data_bitrate'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
+ $offset += 4;
+
+ $thisObject['buffer_size'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
+ $offset += 4;
+
+ $thisObject['initial_buffer_fullness'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
+ $offset += 4;
+
+ $thisObject['alternate_data_bitrate'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
+ $offset += 4;
+
+ $thisObject['alternate_buffer_size'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
+ $offset += 4;
+
+ $thisObject['alternate_initial_buffer_fullness'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
+ $offset += 4;
+
+ $thisObject['maximum_object_size'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
+ $offset += 4;
+
+ $thisObject['flags_raw'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
+ $offset += 4;
+ $thisObject['flags']['reliable'] = (bool) $thisObject['flags_raw'] & 0x00000001;
+ $thisObject['flags']['seekable'] = (bool) $thisObject['flags_raw'] & 0x00000002;
+ $thisObject['flags']['no_cleanpoints'] = (bool) $thisObject['flags_raw'] & 0x00000004;
+ $thisObject['flags']['resend_live_cleanpoints'] = (bool) $thisObject['flags_raw'] & 0x00000008;
+
+ $thisObject['stream_number'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
+ $offset += 2;
+
+ $thisObject['stream_language_id_index'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
+ $offset += 2;
+
+ $thisObject['average_time_per_frame'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
+ $offset += 4;
+
+ $thisObject['stream_name_count'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
+ $offset += 2;
+
+ $thisObject['payload_extension_system_count'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
+ $offset += 2;
+
+ for ($i = 0; $i < $thisObject['stream_name_count']; $i++) {
+ $streamName = array();
+
+ $streamName['language_id_index'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
+ $offset += 2;
+
+ $streamName['stream_name_length'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
+ $offset += 2;
+
+ $streamName['stream_name'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, $streamName['stream_name_length']));
+ $offset += $streamName['stream_name_length'];
+
+ $thisObject['stream_names'][$i] = $streamName;
+ }
+
+ for ($i = 0; $i < $thisObject['payload_extension_system_count']; $i++) {
+ $payloadExtensionSystem = array();
+
+ $payloadExtensionSystem['extension_system_id'] = substr($asf_header_extension_object_data, $offset, 16);
+ $offset += 16;
+ $payloadExtensionSystem['extension_system_id_text'] = $this->BytestringToGUID($payloadExtensionSystem['extension_system_id']);
+
+ $payloadExtensionSystem['extension_system_size'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
+ $offset += 2;
+ if ($payloadExtensionSystem['extension_system_size'] <= 0) {
+ break 2;
+ }
+
+ $payloadExtensionSystem['extension_system_info_length'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
+ $offset += 4;
+
+ $payloadExtensionSystem['extension_system_info_length'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, $payloadExtensionSystem['extension_system_info_length']));
+ $offset += $payloadExtensionSystem['extension_system_info_length'];
+
+ $thisObject['payload_extension_systems'][$i] = $payloadExtensionSystem;
+ }
+
+ break;
+
+ case GETID3_ASF_Padding_Object:
+ // padding, skip it
+ break;
+
+ case GETID3_ASF_Metadata_Object:
+ $thisObject['description_record_counts'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
+ $offset += 2;
+
+ for ($i = 0; $i < $thisObject['description_record_counts']; $i++) {
+ $descriptionRecord = array();
+
+ $descriptionRecord['reserved_1'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2)); // must be zero
+ $offset += 2;
+
+ $descriptionRecord['stream_number'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
+ $offset += 2;
+
+ $descriptionRecord['name_length'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
+ $offset += 2;
+
+ $descriptionRecord['data_type'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
+ $offset += 2;
+ $descriptionRecord['data_type_text'] = self::metadataLibraryObjectDataTypeLookup($descriptionRecord['data_type']);
+
+ $descriptionRecord['data_length'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
+ $offset += 4;
+
+ $descriptionRecord['name'] = substr($asf_header_extension_object_data, $offset, $descriptionRecord['name_length']);
+ $offset += $descriptionRecord['name_length'];
+
+ $descriptionRecord['data'] = substr($asf_header_extension_object_data, $offset, $descriptionRecord['data_length']);
+ $offset += $descriptionRecord['data_length'];
+ switch ($descriptionRecord['data_type']) {
+ case 0x0000: // Unicode string
+ break;
+
+ case 0x0001: // BYTE array
+ // do nothing
+ break;
+
+ case 0x0002: // BOOL
+ $descriptionRecord['data'] = (bool) getid3_lib::LittleEndian2Int($descriptionRecord['data']);
+ break;
+
+ case 0x0003: // DWORD
+ case 0x0004: // QWORD
+ case 0x0005: // WORD
+ $descriptionRecord['data'] = getid3_lib::LittleEndian2Int($descriptionRecord['data']);
+ break;
+
+ case 0x0006: // GUID
+ $descriptionRecord['data_text'] = $this->BytestringToGUID($descriptionRecord['data']);
+ break;
+ }
+
+ $thisObject['description_record'][$i] = $descriptionRecord;
+ }
+ break;
+
+ case GETID3_ASF_Language_List_Object:
+ $thisObject['language_id_record_counts'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
+ $offset += 2;
+
+ for ($i = 0; $i < $thisObject['language_id_record_counts']; $i++) {
+ $languageIDrecord = array();
+
+ $languageIDrecord['language_id_length'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 1));
+ $offset += 1;
+
+ $languageIDrecord['language_id'] = substr($asf_header_extension_object_data, $offset, $languageIDrecord['language_id_length']);
+ $offset += $languageIDrecord['language_id_length'];
+
+ $thisObject['language_id_record'][$i] = $languageIDrecord;
+ }
+ break;
+
+ case GETID3_ASF_Metadata_Library_Object:
+ $thisObject['description_records_count'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
+ $offset += 2;
+
+ for ($i = 0; $i < $thisObject['description_records_count']; $i++) {
+ $descriptionRecord = array();
+
+ $descriptionRecord['language_list_index'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
+ $offset += 2;
+
+ $descriptionRecord['stream_number'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
+ $offset += 2;
+
+ $descriptionRecord['name_length'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
+ $offset += 2;
+
+ $descriptionRecord['data_type'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
+ $offset += 2;
+ $descriptionRecord['data_type_text'] = self::metadataLibraryObjectDataTypeLookup($descriptionRecord['data_type']);
+
+ $descriptionRecord['data_length'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
+ $offset += 4;
+
+ $descriptionRecord['name'] = substr($asf_header_extension_object_data, $offset, $descriptionRecord['name_length']);
+ $offset += $descriptionRecord['name_length'];
+
+ $descriptionRecord['data'] = substr($asf_header_extension_object_data, $offset, $descriptionRecord['data_length']);
+ $offset += $descriptionRecord['data_length'];
+
+ if (preg_match('#^WM/Picture$#', str_replace("\x00", '', trim($descriptionRecord['name'])))) {
+ $WMpicture = $this->ASF_WMpicture($descriptionRecord['data']);
+ foreach ($WMpicture as $key => $value) {
+ $descriptionRecord['data'] = $WMpicture;
+ }
+ unset($WMpicture);
+ }
+
+ $thisObject['description_record'][$i] = $descriptionRecord;
+ }
+ break;
+
+ default:
+ $unhandled_sections++;
+ if ($this->GUIDname($thisObject['guid_text'])) {
+ $this->warning('unhandled Header Extension Object GUID "'.$this->GUIDname($thisObject['guid_text']).'" {'.$thisObject['guid_text'].'} at offset '.($offset - 16 - 8));
+ } else {
+ $this->warning('unknown Header Extension Object GUID {'.$thisObject['guid_text'].'} in at offset '.($offset - 16 - 8));
+ }
+ break;
+ }
+ $HeaderExtensionObjectParsed[] = $thisObject;
+
+ $objectOffset += $thisObject['size'];
}
+ return $HeaderExtensionObjectParsed;
+ }
- // convert
- return trim(getid3_lib::iconv_fallback('UTF-16LE', 'ISO-8859-1', $string), ' ');
+ /**
+ * @param int $id
+ *
+ * @return string
+ */
+ public static function metadataLibraryObjectDataTypeLookup($id) {
+ static $lookup = array(
+ 0x0000 => 'Unicode string', // The data consists of a sequence of Unicode characters
+ 0x0001 => 'BYTE array', // The type of the data is implementation-specific
+ 0x0002 => 'BOOL', // The data is 2 bytes long and should be interpreted as a 16-bit unsigned integer. Only 0x0000 or 0x0001 are permitted values
+ 0x0003 => 'DWORD', // The data is 4 bytes long and should be interpreted as a 32-bit unsigned integer
+ 0x0004 => 'QWORD', // The data is 8 bytes long and should be interpreted as a 64-bit unsigned integer
+ 0x0005 => 'WORD', // The data is 2 bytes long and should be interpreted as a 16-bit unsigned integer
+ 0x0006 => 'GUID', // The data is 16 bytes long and should be interpreted as a 128-bit GUID
+ );
+ return (isset($lookup[$id]) ? $lookup[$id] : 'invalid');
}
+ /**
+ * @param string $data
+ *
+ * @return array
+ */
+ public function ASF_WMpicture(&$data) {
+ //typedef struct _WMPicture{
+ // LPWSTR pwszMIMEType;
+ // BYTE bPictureType;
+ // LPWSTR pwszDescription;
+ // DWORD dwDataLen;
+ // BYTE* pbData;
+ //} WM_PICTURE;
- function TrimTerm($string) {
+ $WMpicture = array();
+ $offset = 0;
+ $WMpicture['image_type_id'] = getid3_lib::LittleEndian2Int(substr($data, $offset, 1));
+ $offset += 1;
+ $WMpicture['image_type'] = self::WMpictureTypeLookup($WMpicture['image_type_id']);
+ $WMpicture['image_size'] = getid3_lib::LittleEndian2Int(substr($data, $offset, 4));
+ $offset += 4;
+
+ $WMpicture['image_mime'] = '';
+ do {
+ $next_byte_pair = substr($data, $offset, 2);
+ $offset += 2;
+ $WMpicture['image_mime'] .= $next_byte_pair;
+ } while ($next_byte_pair !== "\x00\x00");
+
+ $WMpicture['image_description'] = '';
+ do {
+ $next_byte_pair = substr($data, $offset, 2);
+ $offset += 2;
+ $WMpicture['image_description'] .= $next_byte_pair;
+ } while ($next_byte_pair !== "\x00\x00");
+
+ $WMpicture['dataoffset'] = $offset;
+ $WMpicture['data'] = substr($data, $offset);
+
+ $imageinfo = array();
+ $WMpicture['image_mime'] = '';
+ $imagechunkcheck = getid3_lib::GetDataImageSize($WMpicture['data'], $imageinfo);
+ unset($imageinfo);
+ if (!empty($imagechunkcheck)) {
+ $WMpicture['image_mime'] = image_type_to_mime_type($imagechunkcheck[2]);
+ }
+ if (!isset($this->getid3->info['asf']['comments']['picture'])) {
+ $this->getid3->info['asf']['comments']['picture'] = array();
+ }
+ $this->getid3->info['asf']['comments']['picture'][] = array('data'=>$WMpicture['data'], 'image_mime'=>$WMpicture['image_mime']);
+
+ return $WMpicture;
+ }
+
+ /**
+ * Remove terminator 00 00 and convert UTF-16LE to Latin-1.
+ *
+ * @param string $string
+ *
+ * @return string
+ */
+ public static function TrimConvert($string) {
+ return trim(getid3_lib::iconv_fallback('UTF-16LE', 'ISO-8859-1', self::TrimTerm($string)), ' ');
+ }
+
+ /**
+ * Remove terminator 00 00.
+ *
+ * @param string $string
+ *
+ * @return string
+ */
+ public static function TrimTerm($string) {
// remove terminator, only if present (it should be, but...)
- if (substr($string, -2) == "\x00\x00") {
+ if (substr($string, -2) === "\x00\x00") {
$string = substr($string, 0, -2);
}
return $string;
}
-
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.bink.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.bink.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.bink.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,11 @@
<?php
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio.bink.php //
// module for analyzing Bink or Smacker audio-video files //
@@ -13,58 +13,64 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_bink
+class getid3_bink extends getid3_handler
{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- function getid3_bink(&$fd, &$ThisFileInfo) {
+ $this->error('Bink / Smacker files not properly processed by this version of getID3() ['.$this->getid3->version().']');
-$ThisFileInfo['error'][] = 'Bink / Smacker files not properly processed by this version of getID3()';
-
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
- $fileTypeID = fread($fd, 3);
+ $this->fseek($info['avdataoffset']);
+ $fileTypeID = $this->fread(3);
switch ($fileTypeID) {
case 'BIK':
- return $this->ParseBink($fd, $ThisFileInfo);
- break;
+ return $this->ParseBink();
case 'SMK':
- return $this->ParseSmacker($fd, $ThisFileInfo);
- break;
+ return $this->ParseSmacker();
default:
- $ThisFileInfo['error'][] = 'Expecting "BIK" or "SMK" at offset '.$ThisFileInfo['avdataoffset'].', found "'.$fileTypeID.'"';
+ $this->error('Expecting "BIK" or "SMK" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($fileTypeID).'"');
return false;
- break;
}
-
- return true;
-
}
- function ParseBink(&$fd, &$ThisFileInfo) {
- $ThisFileInfo['fileformat'] = 'bink';
- $ThisFileInfo['video']['dataformat'] = 'bink';
+ /**
+ * @return bool
+ */
+ public function ParseBink() {
+ $info = &$this->getid3->info;
+ $info['fileformat'] = 'bink';
+ $info['video']['dataformat'] = 'bink';
- $fileData = 'BIK'.fread($fd, 13);
+ $fileData = 'BIK'.$this->fread(13);
- $ThisFileInfo['bink']['data_size'] = getid3_lib::LittleEndian2Int(substr($fileData, 4, 4));
- $ThisFileInfo['bink']['frame_count'] = getid3_lib::LittleEndian2Int(substr($fileData, 8, 2));
+ $info['bink']['data_size'] = getid3_lib::LittleEndian2Int(substr($fileData, 4, 4));
+ $info['bink']['frame_count'] = getid3_lib::LittleEndian2Int(substr($fileData, 8, 2));
- if (($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) != ($ThisFileInfo['bink']['data_size'] + 8)) {
- $ThisFileInfo['error'][] = 'Probably truncated file: expecting '.$ThisFileInfo['bink']['data_size'].' bytes, found '.($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']);
+ if (($info['avdataend'] - $info['avdataoffset']) != ($info['bink']['data_size'] + 8)) {
+ $this->error('Probably truncated file: expecting '.$info['bink']['data_size'].' bytes, found '.($info['avdataend'] - $info['avdataoffset']));
}
return true;
}
- function ParseSmacker(&$fd, &$ThisFileInfo) {
- $ThisFileInfo['fileformat'] = 'smacker';
- $ThisFileInfo['video']['dataformat'] = 'smacker';
+ /**
+ * @return bool
+ */
+ public function ParseSmacker() {
+ $info = &$this->getid3->info;
+ $info['fileformat'] = 'smacker';
+ $info['video']['dataformat'] = 'smacker';
- return false;
+ return true;
}
}
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.flv.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.flv.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.flv.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,175 +1,308 @@
<?php
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
+/////////////////////////////////////////////////////////////////
// //
-// FLV module by Seth Kaufman <seth at whirl-i-gig.com> //
+// module.audio-video.flv.php //
+// module for analyzing Shockwave Flash Video files //
+// dependencies: NONE //
// //
+/////////////////////////////////////////////////////////////////
+// //
+// FLV module by Seth Kaufman <sethØwhirl-i-gig*com> //
+// //
// * version 0.1 (26 June 2005) //
// //
+// * version 0.1.1 (15 July 2005) //
// minor modifications by James Heinrich <info at getid3.org> //
-// * version 0.1.1 (15 July 2005) //
// //
-// Support for On2 VP6 codec and meta information by //
-// Steve Webster <steve.webster at featurecreep.com> //
// * version 0.2 (22 February 2006) //
+// Support for On2 VP6 codec and meta information //
+// by Steve Webster <steve.websterØfeaturecreep*com> //
// //
+// * version 0.3 (15 June 2006) //
// Modified to not read entire file into memory //
-// by James Heinrich <info at getid3.org> //
-// * version 0.3 (15 June 2006) //
+// by James Heinrich <info at getid3.org> //
// //
-/////////////////////////////////////////////////////////////////
+// * version 0.4 (07 December 2007) //
+// Bugfixes for incorrectly parsed FLV dimensions //
+// and incorrect parsing of onMetaTag //
+// by Evgeny Moysevich <moysevichØgmail*com> //
// //
-// module.audio-video.flv.php //
-// module for analyzing Shockwave Flash Video files //
-// dependencies: NONE //
+// * version 0.5 (21 May 2009) //
+// Fixed parsing of audio tags and added additional codec //
+// details. The duration is now read from onMetaTag (if //
+// exists), rather than parsing whole file //
+// by Nigel Barnes <ngbarnesØhotmail*com> //
+// //
+// * version 0.6 (24 May 2009) //
+// Better parsing of files with h264 video //
+// by Evgeny Moysevich <moysevichØgmail*com> //
+// //
+// * version 0.6.1 (30 May 2011) //
+// prevent infinite loops in expGolombUe() //
+// //
+// * version 0.7.0 (16 Jul 2013) //
+// handle GETID3_FLV_VIDEO_VP6FLV_ALPHA //
+// improved AVCSequenceParameterSetReader::readData() //
+// by Xander Schouwerwou <schouwerwouØgmail*com> //
// ///
/////////////////////////////////////////////////////////////////
-define('GETID3_FLV_TAG_AUDIO', 8);
-define('GETID3_FLV_TAG_VIDEO', 9);
-define('GETID3_FLV_TAG_META', 18);
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-define('GETID3_FLV_VIDEO_H263', 2);
-define('GETID3_FLV_VIDEO_SCREEN', 3);
-define('GETID3_FLV_VIDEO_VP6', 4);
+define('GETID3_FLV_TAG_AUDIO', 8);
+define('GETID3_FLV_TAG_VIDEO', 9);
+define('GETID3_FLV_TAG_META', 18);
-class getid3_flv
+define('GETID3_FLV_VIDEO_H263', 2);
+define('GETID3_FLV_VIDEO_SCREEN', 3);
+define('GETID3_FLV_VIDEO_VP6FLV', 4);
+define('GETID3_FLV_VIDEO_VP6FLV_ALPHA', 5);
+define('GETID3_FLV_VIDEO_SCREENV2', 6);
+define('GETID3_FLV_VIDEO_H264', 7);
+
+define('H264_AVC_SEQUENCE_HEADER', 0);
+define('H264_PROFILE_BASELINE', 66);
+define('H264_PROFILE_MAIN', 77);
+define('H264_PROFILE_EXTENDED', 88);
+define('H264_PROFILE_HIGH', 100);
+define('H264_PROFILE_HIGH10', 110);
+define('H264_PROFILE_HIGH422', 122);
+define('H264_PROFILE_HIGH444', 144);
+define('H264_PROFILE_HIGH444_PREDICTIVE', 244);
+
+class getid3_flv extends getid3_handler
{
+ const magic = 'FLV';
- function getid3_flv(&$fd, &$ThisFileInfo, $ReturnAllTagData=false) {
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
+ /**
+ * Break out of the loop if too many frames have been scanned; only scan this
+ * many if meta frame does not contain useful duration.
+ *
+ * @var int
+ */
+ public $max_frames = 100000;
- $FLVdataLength = $ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset'];
- $FLVheader = fread($fd, 5);
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- $ThisFileInfo['fileformat'] = 'flv';
- $ThisFileInfo['flv']['header']['signature'] = substr($FLVheader, 0, 3);
- $ThisFileInfo['flv']['header']['version'] = getid3_lib::BigEndian2Int(substr($FLVheader, 3, 1));
- $TypeFlags = getid3_lib::BigEndian2Int(substr($FLVheader, 4, 1));
+ $this->fseek($info['avdataoffset']);
- if ($ThisFileInfo['flv']['header']['signature'] != 'FLV') {
- $ThisFileInfo['error'][] = 'Expecting "FLV" at offset '.$ThisFileInfo['avdataoffset'].', found "'.$ThisFileInfo['flv']['header']['signature'].'"';
- unset($ThisFileInfo['flv']);
- unset($ThisFileInfo['fileformat']);
+ $FLVdataLength = $info['avdataend'] - $info['avdataoffset'];
+ $FLVheader = $this->fread(5);
+
+ $info['fileformat'] = 'flv';
+ $info['flv']['header']['signature'] = substr($FLVheader, 0, 3);
+ $info['flv']['header']['version'] = getid3_lib::BigEndian2Int(substr($FLVheader, 3, 1));
+ $TypeFlags = getid3_lib::BigEndian2Int(substr($FLVheader, 4, 1));
+
+ if ($info['flv']['header']['signature'] != self::magic) {
+ $this->error('Expecting "'.getid3_lib::PrintHexBytes(self::magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($info['flv']['header']['signature']).'"');
+ unset($info['flv'], $info['fileformat']);
return false;
}
- $ThisFileInfo['flv']['header']['hasAudio'] = (bool) ($TypeFlags & 0x04);
- $ThisFileInfo['flv']['header']['hasVideo'] = (bool) ($TypeFlags & 0x01);
+ $info['flv']['header']['hasAudio'] = (bool) ($TypeFlags & 0x04);
+ $info['flv']['header']['hasVideo'] = (bool) ($TypeFlags & 0x01);
- $FrameSizeDataLength = getid3_lib::BigEndian2Int(fread($fd, 4));
+ $FrameSizeDataLength = getid3_lib::BigEndian2Int($this->fread(4));
$FLVheaderFrameLength = 9;
if ($FrameSizeDataLength > $FLVheaderFrameLength) {
- fseek($fd, $FrameSizeDataLength - $FLVheaderFrameLength, SEEK_CUR);
+ $this->fseek($FrameSizeDataLength - $FLVheaderFrameLength, SEEK_CUR);
}
-
$Duration = 0;
- while ((ftell($fd) + 1) < $ThisFileInfo['avdataend']) {
- //if (!$ThisFileInfo['flv']['header']['hasAudio'] || isset($ThisFileInfo['flv']['audio']['audioFormat'])) {
- // if (!$ThisFileInfo['flv']['header']['hasVideo'] || isset($ThisFileInfo['flv']['video']['videoCodec'])) {
- // break;
- // }
- //}
+ $found_video = false;
+ $found_audio = false;
+ $found_meta = false;
+ $found_valid_meta_playtime = false;
+ $tagParseCount = 0;
+ $info['flv']['framecount'] = array('total'=>0, 'audio'=>0, 'video'=>0);
+ $flv_framecount = &$info['flv']['framecount'];
+ while ((($this->ftell() + 16) < $info['avdataend']) && (($tagParseCount++ <= $this->max_frames) || !$found_valid_meta_playtime)) {
+ $ThisTagHeader = $this->fread(16);
- $ThisTagHeader = fread($fd, 16);
-
$PreviousTagLength = getid3_lib::BigEndian2Int(substr($ThisTagHeader, 0, 4));
$TagType = getid3_lib::BigEndian2Int(substr($ThisTagHeader, 4, 1));
$DataLength = getid3_lib::BigEndian2Int(substr($ThisTagHeader, 5, 3));
$Timestamp = getid3_lib::BigEndian2Int(substr($ThisTagHeader, 8, 3));
$LastHeaderByte = getid3_lib::BigEndian2Int(substr($ThisTagHeader, 15, 1));
- $NextOffset = ftell($fd) - 1 + $DataLength;
+ $NextOffset = $this->ftell() - 1 + $DataLength;
+ if ($Timestamp > $Duration) {
+ $Duration = $Timestamp;
+ }
+ $flv_framecount['total']++;
switch ($TagType) {
case GETID3_FLV_TAG_AUDIO:
- if (!isset($ThisFileInfo['flv']['audio']['audioFormat'])) {
- $ThisFileInfo['flv']['audio']['audioFormat'] = $LastHeaderByte & 0x07;
- $ThisFileInfo['flv']['audio']['audioRate'] = ($LastHeaderByte & 0x30) / 0x10;
- $ThisFileInfo['flv']['audio']['audioSampleSize'] = ($LastHeaderByte & 0x40) / 0x40;
- $ThisFileInfo['flv']['audio']['audioType'] = ($LastHeaderByte & 0x80) / 0x80;
+ $flv_framecount['audio']++;
+ if (!$found_audio) {
+ $found_audio = true;
+ $info['flv']['audio']['audioFormat'] = ($LastHeaderByte >> 4) & 0x0F;
+ $info['flv']['audio']['audioRate'] = ($LastHeaderByte >> 2) & 0x03;
+ $info['flv']['audio']['audioSampleSize'] = ($LastHeaderByte >> 1) & 0x01;
+ $info['flv']['audio']['audioType'] = $LastHeaderByte & 0x01;
}
break;
case GETID3_FLV_TAG_VIDEO:
- if (!isset($ThisFileInfo['flv']['video']['videoCodec'])) {
- $ThisFileInfo['flv']['video']['videoCodec'] = $LastHeaderByte & 0x07;
+ $flv_framecount['video']++;
+ if (!$found_video) {
+ $found_video = true;
+ $info['flv']['video']['videoCodec'] = $LastHeaderByte & 0x07;
- $FLVvideoHeader = fread($fd, 11);
+ $FLVvideoHeader = $this->fread(11);
- if ($ThisFileInfo['flv']['video']['videoCodec'] != GETID3_FLV_VIDEO_VP6) {
+ if ($info['flv']['video']['videoCodec'] == GETID3_FLV_VIDEO_H264) {
+ // this code block contributed by: moysevichØgmail*com
+ $AVCPacketType = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 0, 1));
+ if ($AVCPacketType == H264_AVC_SEQUENCE_HEADER) {
+ // read AVCDecoderConfigurationRecord
+ $configurationVersion = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 4, 1));
+ $AVCProfileIndication = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 5, 1));
+ $profile_compatibility = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 6, 1));
+ $lengthSizeMinusOne = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 7, 1));
+ $numOfSequenceParameterSets = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 8, 1));
+
+ if (($numOfSequenceParameterSets & 0x1F) != 0) {
+ // there is at least one SequenceParameterSet
+ // read size of the first SequenceParameterSet
+ //$spsSize = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 9, 2));
+ $spsSize = getid3_lib::LittleEndian2Int(substr($FLVvideoHeader, 9, 2));
+ // read the first SequenceParameterSet
+ $sps = $this->fread($spsSize);
+ if (strlen($sps) == $spsSize) { // make sure that whole SequenceParameterSet was red
+ $spsReader = new AVCSequenceParameterSetReader($sps);
+ $spsReader->readData();
+ $info['video']['resolution_x'] = $spsReader->getWidth();
+ $info['video']['resolution_y'] = $spsReader->getHeight();
+ }
+ }
+ }
+ // end: moysevichØgmail*com
+
+ } elseif ($info['flv']['video']['videoCodec'] == GETID3_FLV_VIDEO_H263) {
+
$PictureSizeType = (getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 3, 2))) >> 7;
$PictureSizeType = $PictureSizeType & 0x0007;
- $ThisFileInfo['flv']['header']['videoSizeType'] = $PictureSizeType;
+ $info['flv']['header']['videoSizeType'] = $PictureSizeType;
switch ($PictureSizeType) {
case 0:
- $PictureSizeEnc = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 5, 2));
- $PictureSizeEnc <<= 1;
- $ThisFileInfo['video']['resolution_x'] = ($PictureSizeEnc & 0xFF00) >> 8;
- $PictureSizeEnc = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 6, 2));
- $PictureSizeEnc <<= 1;
- $ThisFileInfo['video']['resolution_y'] = ($PictureSizeEnc & 0xFF00) >> 8;
+ //$PictureSizeEnc = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 5, 2));
+ //$PictureSizeEnc <<= 1;
+ //$info['video']['resolution_x'] = ($PictureSizeEnc & 0xFF00) >> 8;
+ //$PictureSizeEnc = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 6, 2));
+ //$PictureSizeEnc <<= 1;
+ //$info['video']['resolution_y'] = ($PictureSizeEnc & 0xFF00) >> 8;
+
+ $PictureSizeEnc['x'] = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 4, 2)) >> 7;
+ $PictureSizeEnc['y'] = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 5, 2)) >> 7;
+ $info['video']['resolution_x'] = $PictureSizeEnc['x'] & 0xFF;
+ $info['video']['resolution_y'] = $PictureSizeEnc['y'] & 0xFF;
break;
case 1:
- $PictureSizeEnc = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 5, 4));
- $PictureSizeEnc <<= 1;
- $ThisFileInfo['video']['resolution_x'] = ($PictureSizeEnc & 0xFFFF0000) >> 16;
-
- $PictureSizeEnc = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 7, 4));
- $PictureSizeEnc <<= 1;
- $ThisFileInfo['video']['resolution_y'] = ($PictureSizeEnc & 0xFFFF0000) >> 16;
+ $PictureSizeEnc['x'] = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 4, 3)) >> 7;
+ $PictureSizeEnc['y'] = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 6, 3)) >> 7;
+ $info['video']['resolution_x'] = $PictureSizeEnc['x'] & 0xFFFF;
+ $info['video']['resolution_y'] = $PictureSizeEnc['y'] & 0xFFFF;
break;
case 2:
- $ThisFileInfo['video']['resolution_x'] = 352;
- $ThisFileInfo['video']['resolution_y'] = 288;
+ $info['video']['resolution_x'] = 352;
+ $info['video']['resolution_y'] = 288;
break;
case 3:
- $ThisFileInfo['video']['resolution_x'] = 176;
- $ThisFileInfo['video']['resolution_y'] = 144;
+ $info['video']['resolution_x'] = 176;
+ $info['video']['resolution_y'] = 144;
break;
case 4:
- $ThisFileInfo['video']['resolution_x'] = 128;
- $ThisFileInfo['video']['resolution_y'] = 96;
+ $info['video']['resolution_x'] = 128;
+ $info['video']['resolution_y'] = 96;
break;
case 5:
- $ThisFileInfo['video']['resolution_x'] = 320;
- $ThisFileInfo['video']['resolution_y'] = 240;
+ $info['video']['resolution_x'] = 320;
+ $info['video']['resolution_y'] = 240;
break;
case 6:
- $ThisFileInfo['video']['resolution_x'] = 160;
- $ThisFileInfo['video']['resolution_y'] = 120;
+ $info['video']['resolution_x'] = 160;
+ $info['video']['resolution_y'] = 120;
break;
default:
- $ThisFileInfo['video']['resolution_x'] = 0;
- $ThisFileInfo['video']['resolution_y'] = 0;
+ $info['video']['resolution_x'] = 0;
+ $info['video']['resolution_y'] = 0;
break;
}
+
+ } elseif ($info['flv']['video']['videoCodec'] == GETID3_FLV_VIDEO_VP6FLV_ALPHA) {
+
+ /* contributed by schouwerwouØgmail*com */
+ if (!isset($info['video']['resolution_x'])) { // only when meta data isn't set
+ $PictureSizeEnc['x'] = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 6, 2));
+ $PictureSizeEnc['y'] = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 7, 2));
+ $info['video']['resolution_x'] = ($PictureSizeEnc['x'] & 0xFF) << 3;
+ $info['video']['resolution_y'] = ($PictureSizeEnc['y'] & 0xFF) << 3;
+ }
+ /* end schouwerwouØgmail*com */
+
}
+ if (!empty($info['video']['resolution_x']) && !empty($info['video']['resolution_y'])) {
+ $info['video']['pixel_aspect_ratio'] = $info['video']['resolution_x'] / $info['video']['resolution_y'];
+ }
}
break;
// Meta tag
case GETID3_FLV_TAG_META:
+ if (!$found_meta) {
+ $found_meta = true;
+ $this->fseek(-1, SEEK_CUR);
+ $datachunk = $this->fread($DataLength);
+ $AMFstream = new AMFStream($datachunk);
+ $reader = new AMFReader($AMFstream);
+ $eventName = $reader->readData();
+ $info['flv']['meta'][$eventName] = $reader->readData();
+ unset($reader);
- fseek($fd, -1, SEEK_CUR);
- $reader = new AMFReader(new AMFStream(fread($fd, $DataLength)));
- $eventName = $reader->readData();
- $ThisFileInfo['meta'][$eventName] = $reader->readData();
- unset($reader);
-
- $ThisFileInfo['video']['frame_rate'] = $ThisFileInfo['meta']['onMetaData']['framerate'];
- $ThisFileInfo['video']['resolution_x'] = $ThisFileInfo['meta']['onMetaData']['width'];
- $ThisFileInfo['video']['resolution_y'] = $ThisFileInfo['meta']['onMetaData']['height'];
+ $copykeys = array('framerate'=>'frame_rate', 'width'=>'resolution_x', 'height'=>'resolution_y', 'audiodatarate'=>'bitrate', 'videodatarate'=>'bitrate');
+ foreach ($copykeys as $sourcekey => $destkey) {
+ if (isset($info['flv']['meta']['onMetaData'][$sourcekey])) {
+ switch ($sourcekey) {
+ case 'width':
+ case 'height':
+ $info['video'][$destkey] = intval(round($info['flv']['meta']['onMetaData'][$sourcekey]));
+ break;
+ case 'audiodatarate':
+ $info['audio'][$destkey] = getid3_lib::CastAsInt(round($info['flv']['meta']['onMetaData'][$sourcekey] * 1000));
+ break;
+ case 'videodatarate':
+ case 'frame_rate':
+ default:
+ $info['video'][$destkey] = $info['flv']['meta']['onMetaData'][$sourcekey];
+ break;
+ }
+ }
+ }
+ if (!empty($info['flv']['meta']['onMetaData']['duration'])) {
+ $found_valid_meta_playtime = true;
+ }
+ }
break;
default:
@@ -176,117 +309,195 @@
// noop
break;
}
+ $this->fseek($NextOffset);
+ }
- if ($Timestamp > $Duration) {
- $Duration = $Timestamp;
- }
-
- fseek($fd, $NextOffset, SEEK_SET);
+ $info['playtime_seconds'] = $Duration / 1000;
+ if ($info['playtime_seconds'] > 0) {
+ $info['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
}
- $ThisFileInfo['playtime_seconds'] = $Duration / 1000;
- $ThisFileInfo['bitrate'] = ($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) / $ThisFileInfo['playtime_seconds'];
+ if ($info['flv']['header']['hasAudio']) {
+ $info['audio']['codec'] = self::audioFormatLookup($info['flv']['audio']['audioFormat']);
+ $info['audio']['sample_rate'] = self::audioRateLookup($info['flv']['audio']['audioRate']);
+ $info['audio']['bits_per_sample'] = self::audioBitDepthLookup($info['flv']['audio']['audioSampleSize']);
- if ($ThisFileInfo['flv']['header']['hasAudio']) {
- $ThisFileInfo['audio']['codec'] = $this->FLVaudioFormat($ThisFileInfo['flv']['audio']['audioFormat']);
- $ThisFileInfo['audio']['sample_rate'] = $this->FLVaudioRate($ThisFileInfo['flv']['audio']['audioRate']);
- $ThisFileInfo['audio']['bits_per_sample'] = $this->FLVaudioBitDepth($ThisFileInfo['flv']['audio']['audioSampleSize']);
+ $info['audio']['channels'] = $info['flv']['audio']['audioType'] + 1; // 0=mono,1=stereo
+ $info['audio']['lossless'] = ($info['flv']['audio']['audioFormat'] ? false : true); // 0=uncompressed
+ $info['audio']['dataformat'] = 'flv';
+ }
+ if (!empty($info['flv']['header']['hasVideo'])) {
+ $info['video']['codec'] = self::videoCodecLookup($info['flv']['video']['videoCodec']);
+ $info['video']['dataformat'] = 'flv';
+ $info['video']['lossless'] = false;
+ }
- $ThisFileInfo['audio']['channels'] = $ThisFileInfo['flv']['audio']['audioType'] + 1; // 0=mono,1=stereo
- $ThisFileInfo['audio']['lossless'] = ($ThisFileInfo['flv']['audio']['audioFormat'] ? false : true); // 0=uncompressed
- $ThisFileInfo['audio']['dataformat'] = 'flv';
+ // Set information from meta
+ if (!empty($info['flv']['meta']['onMetaData']['duration'])) {
+ $info['playtime_seconds'] = $info['flv']['meta']['onMetaData']['duration'];
+ $info['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
}
- if (@$ThisFileInfo['flv']['header']['hasVideo']) {
- $ThisFileInfo['video']['codec'] = $this->FLVvideoCodec($ThisFileInfo['flv']['video']['videoCodec']);
- $ThisFileInfo['video']['dataformat'] = 'flv';
- $ThisFileInfo['video']['lossless'] = false;
+ if (isset($info['flv']['meta']['onMetaData']['audiocodecid'])) {
+ $info['audio']['codec'] = self::audioFormatLookup($info['flv']['meta']['onMetaData']['audiocodecid']);
}
-
+ if (isset($info['flv']['meta']['onMetaData']['videocodecid'])) {
+ $info['video']['codec'] = self::videoCodecLookup($info['flv']['meta']['onMetaData']['videocodecid']);
+ }
return true;
}
-
- function FLVaudioFormat($id) {
- $FLVaudioFormat = array(
- 0 => 'uncompressed',
- 1 => 'ADPCM',
- 2 => 'mp3',
- 5 => 'Nellymoser 8kHz mono',
- 6 => 'Nellymoser',
+ /**
+ * @param int $id
+ *
+ * @return string|false
+ */
+ public static function audioFormatLookup($id) {
+ static $lookup = array(
+ 0 => 'Linear PCM, platform endian',
+ 1 => 'ADPCM',
+ 2 => 'mp3',
+ 3 => 'Linear PCM, little endian',
+ 4 => 'Nellymoser 16kHz mono',
+ 5 => 'Nellymoser 8kHz mono',
+ 6 => 'Nellymoser',
+ 7 => 'G.711A-law logarithmic PCM',
+ 8 => 'G.711 mu-law logarithmic PCM',
+ 9 => 'reserved',
+ 10 => 'AAC',
+ 11 => 'Speex',
+ 12 => false, // unknown?
+ 13 => false, // unknown?
+ 14 => 'mp3 8kHz',
+ 15 => 'Device-specific sound',
);
- return (@$FLVaudioFormat[$id] ? @$FLVaudioFormat[$id] : false);
+ return (isset($lookup[$id]) ? $lookup[$id] : false);
}
- function FLVaudioRate($id) {
- $FLVaudioRate = array(
+ /**
+ * @param int $id
+ *
+ * @return int|false
+ */
+ public static function audioRateLookup($id) {
+ static $lookup = array(
0 => 5500,
1 => 11025,
2 => 22050,
3 => 44100,
);
- return (@$FLVaudioRate[$id] ? @$FLVaudioRate[$id] : false);
+ return (isset($lookup[$id]) ? $lookup[$id] : false);
}
- function FLVaudioBitDepth($id) {
- $FLVaudioBitDepth = array(
+ /**
+ * @param int $id
+ *
+ * @return int|false
+ */
+ public static function audioBitDepthLookup($id) {
+ static $lookup = array(
0 => 8,
1 => 16,
);
- return (@$FLVaudioBitDepth[$id] ? @$FLVaudioBitDepth[$id] : false);
+ return (isset($lookup[$id]) ? $lookup[$id] : false);
}
- function FLVvideoCodec($id) {
- $FLVvideoCodec = array(
- GETID3_FLV_VIDEO_H263 => 'Sorenson H.263',
- GETID3_FLV_VIDEO_SCREEN => 'Screen video',
- GETID3_FLV_VIDEO_VP6 => 'On2 VP6',
+ /**
+ * @param int $id
+ *
+ * @return string|false
+ */
+ public static function videoCodecLookup($id) {
+ static $lookup = array(
+ GETID3_FLV_VIDEO_H263 => 'Sorenson H.263',
+ GETID3_FLV_VIDEO_SCREEN => 'Screen video',
+ GETID3_FLV_VIDEO_VP6FLV => 'On2 VP6',
+ GETID3_FLV_VIDEO_VP6FLV_ALPHA => 'On2 VP6 with alpha channel',
+ GETID3_FLV_VIDEO_SCREENV2 => 'Screen video v2',
+ GETID3_FLV_VIDEO_H264 => 'Sorenson H.264',
);
- return (@$FLVvideoCodec[$id] ? @$FLVvideoCodec[$id] : false);
+ return (isset($lookup[$id]) ? $lookup[$id] : false);
}
}
-class AMFStream {
- var $bytes;
- var $pos;
+class AMFStream
+{
+ /**
+ * @var string
+ */
+ public $bytes;
- function AMFStream(&$bytes) {
+ /**
+ * @var int
+ */
+ public $pos;
+
+ /**
+ * @param string $bytes
+ */
+ public function __construct(&$bytes) {
$this->bytes =& $bytes;
$this->pos = 0;
}
- function readByte() {
- return getid3_lib::BigEndian2Int(substr($this->bytes, $this->pos++, 1));
+ /**
+ * @return int
+ */
+ public function readByte() { // 8-bit
+ return ord(substr($this->bytes, $this->pos++, 1));
}
- function readInt() {
+ /**
+ * @return int
+ */
+ public function readInt() { // 16-bit
return ($this->readByte() << 8) + $this->readByte();
}
- function readLong() {
+ /**
+ * @return int
+ */
+ public function readLong() { // 32-bit
return ($this->readByte() << 24) + ($this->readByte() << 16) + ($this->readByte() << 8) + $this->readByte();
}
- function readDouble() {
+ /**
+ * @return float|false
+ */
+ public function readDouble() {
return getid3_lib::BigEndian2Float($this->read(8));
}
- function readUTF() {
+ /**
+ * @return string
+ */
+ public function readUTF() {
$length = $this->readInt();
return $this->read($length);
}
- function readLongUTF() {
+ /**
+ * @return string
+ */
+ public function readLongUTF() {
$length = $this->readLong();
return $this->read($length);
}
- function read($length) {
+ /**
+ * @param int $length
+ *
+ * @return string
+ */
+ public function read($length) {
$val = substr($this->bytes, $this->pos, $length);
$this->pos += $length;
return $val;
}
- function peekByte() {
+ /**
+ * @return int
+ */
+ public function peekByte() {
$pos = $this->pos;
$val = $this->readByte();
$this->pos = $pos;
@@ -293,7 +504,10 @@
return $val;
}
- function peekInt() {
+ /**
+ * @return int
+ */
+ public function peekInt() {
$pos = $this->pos;
$val = $this->readInt();
$this->pos = $pos;
@@ -300,7 +514,10 @@
return $val;
}
- function peekLong() {
+ /**
+ * @return int
+ */
+ public function peekLong() {
$pos = $this->pos;
$val = $this->readLong();
$this->pos = $pos;
@@ -307,7 +524,10 @@
return $val;
}
- function peekDouble() {
+ /**
+ * @return float|false
+ */
+ public function peekDouble() {
$pos = $this->pos;
$val = $this->readDouble();
$this->pos = $pos;
@@ -314,7 +534,10 @@
return $val;
}
- function peekUTF() {
+ /**
+ * @return string
+ */
+ public function peekUTF() {
$pos = $this->pos;
$val = $this->readUTF();
$this->pos = $pos;
@@ -321,7 +544,10 @@
return $val;
}
- function peekLongUTF() {
+ /**
+ * @return string
+ */
+ public function peekLongUTF() {
$pos = $this->pos;
$val = $this->readLongUTF();
$this->pos = $pos;
@@ -329,19 +555,29 @@
}
}
-class AMFReader {
- var $stream;
+class AMFReader
+{
+ /**
+ * @var AMFStream
+ */
+ public $stream;
- function AMFReader(&$stream) {
- $this->stream =& $stream;
+ /**
+ * @param AMFStream $stream
+ */
+ public function __construct(AMFStream $stream) {
+ $this->stream = $stream;
}
- function readData() {
+ /**
+ * @return mixed
+ */
+ public function readData() {
$value = null;
$type = $this->stream->readByte();
+ switch ($type) {
- switch($type) {
// Double
case 0:
$value = $this->readDouble();
@@ -365,7 +601,6 @@
// null
case 6:
return null;
- break;
// Mixed array
case 8:
@@ -400,98 +635,275 @@
// Long string
default:
$value = '(unknown or unsupported data type)';
- break;
+ break;
}
return $value;
}
- function readDouble() {
+ /**
+ * @return float|false
+ */
+ public function readDouble() {
return $this->stream->readDouble();
}
- function readBoolean() {
+ /**
+ * @return bool
+ */
+ public function readBoolean() {
return $this->stream->readByte() == 1;
}
- function readString() {
+ /**
+ * @return string
+ */
+ public function readString() {
return $this->stream->readUTF();
}
- function readObject() {
+ /**
+ * @return array
+ */
+ public function readObject() {
// Get highest numerical index - ignored
- $highestIndex = $this->stream->readLong();
+// $highestIndex = $this->stream->readLong();
$data = array();
+ $key = null;
while ($key = $this->stream->readUTF()) {
- // Mixed array record ends with empty string (0x00 0x00) and 0x09
- if (($key == '') && ($this->stream->peekByte() == 0x09)) {
- // Consume byte
- $this->stream->readByte();
- break;
- }
-
$data[$key] = $this->readData();
}
-
+ // Mixed array record ends with empty string (0x00 0x00) and 0x09
+ if (($key == '') && ($this->stream->peekByte() == 0x09)) {
+ // Consume byte
+ $this->stream->readByte();
+ }
return $data;
}
- function readMixedArray() {
+ /**
+ * @return array
+ */
+ public function readMixedArray() {
// Get highest numerical index - ignored
$highestIndex = $this->stream->readLong();
$data = array();
+ $key = null;
while ($key = $this->stream->readUTF()) {
- // Mixed array record ends with empty string (0x00 0x00) and 0x09
- if (($key == '') && ($this->stream->peekByte() == 0x09)) {
- // Consume byte
- $this->stream->readByte();
- break;
- }
-
if (is_numeric($key)) {
- $key = (float) $key;
+ $key = (int) $key;
}
-
$data[$key] = $this->readData();
}
+ // Mixed array record ends with empty string (0x00 0x00) and 0x09
+ if (($key == '') && ($this->stream->peekByte() == 0x09)) {
+ // Consume byte
+ $this->stream->readByte();
+ }
return $data;
}
- function readArray() {
+ /**
+ * @return array
+ */
+ public function readArray() {
$length = $this->stream->readLong();
-
$data = array();
- for ($i = 0; $i < count($length); $i++) {
+ for ($i = 0; $i < $length; $i++) {
$data[] = $this->readData();
}
-
return $data;
}
- function readDate() {
+ /**
+ * @return float|false
+ */
+ public function readDate() {
$timestamp = $this->stream->readDouble();
$timezone = $this->stream->readInt();
return $timestamp;
}
- function readLongString() {
+ /**
+ * @return string
+ */
+ public function readLongString() {
return $this->stream->readLongUTF();
}
- function readXML() {
+ /**
+ * @return string
+ */
+ public function readXML() {
return $this->stream->readLongUTF();
}
- function readTypedObject() {
+ /**
+ * @return array
+ */
+ public function readTypedObject() {
$className = $this->stream->readUTF();
return $this->readObject();
}
}
-?>
\ No newline at end of file
+class AVCSequenceParameterSetReader
+{
+ /**
+ * @var string
+ */
+ public $sps;
+ public $start = 0;
+ public $currentBytes = 0;
+ public $currentBits = 0;
+
+ /**
+ * @var int
+ */
+ public $width;
+
+ /**
+ * @var int
+ */
+ public $height;
+
+ /**
+ * @param string $sps
+ */
+ public function __construct($sps) {
+ $this->sps = $sps;
+ }
+
+ public function readData() {
+ $this->skipBits(8);
+ $this->skipBits(8);
+ $profile = $this->getBits(8); // read profile
+ if ($profile > 0) {
+ $this->skipBits(8);
+ $level_idc = $this->getBits(8); // level_idc
+ $this->expGolombUe(); // seq_parameter_set_id // sps
+ $this->expGolombUe(); // log2_max_frame_num_minus4
+ $picOrderType = $this->expGolombUe(); // pic_order_cnt_type
+ if ($picOrderType == 0) {
+ $this->expGolombUe(); // log2_max_pic_order_cnt_lsb_minus4
+ } elseif ($picOrderType == 1) {
+ $this->skipBits(1); // delta_pic_order_always_zero_flag
+ $this->expGolombSe(); // offset_for_non_ref_pic
+ $this->expGolombSe(); // offset_for_top_to_bottom_field
+ $num_ref_frames_in_pic_order_cnt_cycle = $this->expGolombUe(); // num_ref_frames_in_pic_order_cnt_cycle
+ for ($i = 0; $i < $num_ref_frames_in_pic_order_cnt_cycle; $i++) {
+ $this->expGolombSe(); // offset_for_ref_frame[ i ]
+ }
+ }
+ $this->expGolombUe(); // num_ref_frames
+ $this->skipBits(1); // gaps_in_frame_num_value_allowed_flag
+ $pic_width_in_mbs_minus1 = $this->expGolombUe(); // pic_width_in_mbs_minus1
+ $pic_height_in_map_units_minus1 = $this->expGolombUe(); // pic_height_in_map_units_minus1
+
+ $frame_mbs_only_flag = $this->getBits(1); // frame_mbs_only_flag
+ if ($frame_mbs_only_flag == 0) {
+ $this->skipBits(1); // mb_adaptive_frame_field_flag
+ }
+ $this->skipBits(1); // direct_8x8_inference_flag
+ $frame_cropping_flag = $this->getBits(1); // frame_cropping_flag
+
+ $frame_crop_left_offset = 0;
+ $frame_crop_right_offset = 0;
+ $frame_crop_top_offset = 0;
+ $frame_crop_bottom_offset = 0;
+
+ if ($frame_cropping_flag) {
+ $frame_crop_left_offset = $this->expGolombUe(); // frame_crop_left_offset
+ $frame_crop_right_offset = $this->expGolombUe(); // frame_crop_right_offset
+ $frame_crop_top_offset = $this->expGolombUe(); // frame_crop_top_offset
+ $frame_crop_bottom_offset = $this->expGolombUe(); // frame_crop_bottom_offset
+ }
+ $this->skipBits(1); // vui_parameters_present_flag
+ // etc
+
+ $this->width = (($pic_width_in_mbs_minus1 + 1) * 16) - ($frame_crop_left_offset * 2) - ($frame_crop_right_offset * 2);
+ $this->height = ((2 - $frame_mbs_only_flag) * ($pic_height_in_map_units_minus1 + 1) * 16) - ($frame_crop_top_offset * 2) - ($frame_crop_bottom_offset * 2);
+ }
+ }
+
+ /**
+ * @param int $bits
+ */
+ public function skipBits($bits) {
+ $newBits = $this->currentBits + $bits;
+ $this->currentBytes += (int)floor($newBits / 8);
+ $this->currentBits = $newBits % 8;
+ }
+
+ /**
+ * @return int
+ */
+ public function getBit() {
+ $result = (getid3_lib::BigEndian2Int(substr($this->sps, $this->currentBytes, 1)) >> (7 - $this->currentBits)) & 0x01;
+ $this->skipBits(1);
+ return $result;
+ }
+
+ /**
+ * @param int $bits
+ *
+ * @return int
+ */
+ public function getBits($bits) {
+ $result = 0;
+ for ($i = 0; $i < $bits; $i++) {
+ $result = ($result << 1) + $this->getBit();
+ }
+ return $result;
+ }
+
+ /**
+ * @return int
+ */
+ public function expGolombUe() {
+ $significantBits = 0;
+ $bit = $this->getBit();
+ while ($bit == 0) {
+ $significantBits++;
+ $bit = $this->getBit();
+
+ if ($significantBits > 31) {
+ // something is broken, this is an emergency escape to prevent infinite loops
+ return 0;
+ }
+ }
+ return (1 << $significantBits) + $this->getBits($significantBits) - 1;
+ }
+
+ /**
+ * @return int
+ */
+ public function expGolombSe() {
+ $result = $this->expGolombUe();
+ if (($result & 0x01) == 0) {
+ return -($result >> 1);
+ } else {
+ return ($result + 1) >> 1;
+ }
+ }
+
+ /**
+ * @return int
+ */
+ public function getWidth() {
+ return $this->width;
+ }
+
+ /**
+ * @return int
+ */
+ public function getHeight() {
+ return $this->height;
+ }
+}
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.matroska.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.matroska.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.matroska.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio-video.matriska.php //
// module for analyzing Matroska containers //
@@ -13,25 +14,1535 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_matroska
+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.
+define('EBML_ID_SEEKHEAD', 0x014D9B74); // [11][4D][9B][74] -- Contains the position of other level 1 elements.
+define('EBML_ID_TAGS', 0x0254C367); // [12][54][C3][67] -- Element containing elements specific to Tracks/Chapters. A list of valid tags can be found <http://www.matroska.org/technical/specs/tagging/index.html>.
+define('EBML_ID_INFO', 0x0549A966); // [15][49][A9][66] -- Contains miscellaneous general information and statistics on the file.
+define('EBML_ID_TRACKS', 0x0654AE6B); // [16][54][AE][6B] -- A top-level block of information with many tracks described.
+define('EBML_ID_SEGMENT', 0x08538067); // [18][53][80][67] -- This element contains all other top-level (level 1) elements. Typically a Matroska file is composed of 1 segment.
+define('EBML_ID_ATTACHMENTS', 0x0941A469); // [19][41][A4][69] -- Contain attached files.
+define('EBML_ID_EBML', 0x0A45DFA3); // [1A][45][DF][A3] -- Set the EBML characteristics of the data to follow. Each EBML document has to start with this.
+define('EBML_ID_CUES', 0x0C53BB6B); // [1C][53][BB][6B] -- A top-level element to speed seeking access. All entries are local to the segment.
+define('EBML_ID_CLUSTER', 0x0F43B675); // [1F][43][B6][75] -- The lower level element containing the (monolithic) Block structure.
+define('EBML_ID_LANGUAGE', 0x02B59C); // [22][B5][9C] -- Specifies the language of the track in the Matroska languages form.
+define('EBML_ID_TRACKTIMECODESCALE', 0x03314F); // [23][31][4F] -- The scale to apply on this track to work at normal speed in relation with other tracks (mostly used to adjust video speed when the audio length differs).
+define('EBML_ID_DEFAULTDURATION', 0x03E383); // [23][E3][83] -- Number of nanoseconds (i.e. not scaled) per frame.
+define('EBML_ID_CODECNAME', 0x058688); // [25][86][88] -- A human-readable string specifying the codec.
+define('EBML_ID_CODECDOWNLOADURL', 0x06B240); // [26][B2][40] -- A URL to download about the codec used.
+define('EBML_ID_TIMECODESCALE', 0x0AD7B1); // [2A][D7][B1] -- Timecode scale in nanoseconds (1.000.000 means all timecodes in the segment are expressed in milliseconds).
+define('EBML_ID_COLOURSPACE', 0x0EB524); // [2E][B5][24] -- Same value as in AVI (32 bits).
+define('EBML_ID_GAMMAVALUE', 0x0FB523); // [2F][B5][23] -- Gamma Value.
+define('EBML_ID_CODECSETTINGS', 0x1A9697); // [3A][96][97] -- A string describing the encoding setting used.
+define('EBML_ID_CODECINFOURL', 0x1B4040); // [3B][40][40] -- A URL to find information about the codec used.
+define('EBML_ID_PREVFILENAME', 0x1C83AB); // [3C][83][AB] -- An escaped filename corresponding to the previous segment.
+define('EBML_ID_PREVUID', 0x1CB923); // [3C][B9][23] -- A unique ID to identify the previous chained segment (128 bits).
+define('EBML_ID_NEXTFILENAME', 0x1E83BB); // [3E][83][BB] -- An escaped filename corresponding to the next segment.
+define('EBML_ID_NEXTUID', 0x1EB923); // [3E][B9][23] -- A unique ID to identify the next chained segment (128 bits).
+define('EBML_ID_CONTENTCOMPALGO', 0x0254); // [42][54] -- The compression algorithm used. Algorithms that have been specified so far are:
+define('EBML_ID_CONTENTCOMPSETTINGS', 0x0255); // [42][55] -- Settings that might be needed by the decompressor. For Header Stripping (ContentCompAlgo=3), the bytes that were removed from the beggining of each frames of the track.
+define('EBML_ID_DOCTYPE', 0x0282); // [42][82] -- A string that describes the type of document that follows this EBML header ('matroska' in our case).
+define('EBML_ID_DOCTYPEREADVERSION', 0x0285); // [42][85] -- The minimum DocType version an interpreter has to support to read this file.
+define('EBML_ID_EBMLVERSION', 0x0286); // [42][86] -- The version of EBML parser used to create the file.
+define('EBML_ID_DOCTYPEVERSION', 0x0287); // [42][87] -- The version of DocType interpreter used to create the file.
+define('EBML_ID_EBMLMAXIDLENGTH', 0x02F2); // [42][F2] -- The maximum length of the IDs you'll find in this file (4 or less in Matroska).
+define('EBML_ID_EBMLMAXSIZELENGTH', 0x02F3); // [42][F3] -- The maximum length of the sizes you'll find in this file (8 or less in Matroska). This does not override the element size indicated at the beginning of an element. Elements that have an indicated size which is larger than what is allowed by EBMLMaxSizeLength shall be considered invalid.
+define('EBML_ID_EBMLREADVERSION', 0x02F7); // [42][F7] -- The minimum EBML version a parser has to support to read this file.
+define('EBML_ID_CHAPLANGUAGE', 0x037C); // [43][7C] -- The languages corresponding to the string, in the bibliographic ISO-639-2 form.
+define('EBML_ID_CHAPCOUNTRY', 0x037E); // [43][7E] -- The countries corresponding to the string, same 2 octets as in Internet domains.
+define('EBML_ID_SEGMENTFAMILY', 0x0444); // [44][44] -- A randomly generated unique ID that all segments related to each other must use (128 bits).
+define('EBML_ID_DATEUTC', 0x0461); // [44][61] -- Date of the origin of timecode (value 0), i.e. production date.
+define('EBML_ID_TAGLANGUAGE', 0x047A); // [44][7A] -- Specifies the language of the tag specified, in the Matroska languages form.
+define('EBML_ID_TAGDEFAULT', 0x0484); // [44][84] -- Indication to know if this is the default/original language to use for the given tag.
+define('EBML_ID_TAGBINARY', 0x0485); // [44][85] -- The values of the Tag if it is binary. Note that this cannot be used in the same SimpleTag as TagString.
+define('EBML_ID_TAGSTRING', 0x0487); // [44][87] -- The value of the Tag.
+define('EBML_ID_DURATION', 0x0489); // [44][89] -- Duration of the segment (based on TimecodeScale).
+define('EBML_ID_CHAPPROCESSPRIVATE', 0x050D); // [45][0D] -- Some optional data attached to the ChapProcessCodecID information. For ChapProcessCodecID = 1, it is the "DVD level" equivalent.
+define('EBML_ID_CHAPTERFLAGENABLED', 0x0598); // [45][98] -- Specify wether the chapter is enabled. It can be enabled/disabled by a Control Track. When disabled, the movie should skip all the content between the TimeStart and TimeEnd of this chapter.
+define('EBML_ID_TAGNAME', 0x05A3); // [45][A3] -- The name of the Tag that is going to be stored.
+define('EBML_ID_EDITIONENTRY', 0x05B9); // [45][B9] -- Contains all information about a segment edition.
+define('EBML_ID_EDITIONUID', 0x05BC); // [45][BC] -- A unique ID to identify the edition. It's useful for tagging an edition.
+define('EBML_ID_EDITIONFLAGHIDDEN', 0x05BD); // [45][BD] -- If an edition is hidden (1), it should not be available to the user interface (but still to Control Tracks).
+define('EBML_ID_EDITIONFLAGDEFAULT', 0x05DB); // [45][DB] -- If a flag is set (1) the edition should be used as the default one.
+define('EBML_ID_EDITIONFLAGORDERED', 0x05DD); // [45][DD] -- Specify if the chapters can be defined multiple times and the order to play them is enforced.
+define('EBML_ID_FILEDATA', 0x065C); // [46][5C] -- The data of the file.
+define('EBML_ID_FILEMIMETYPE', 0x0660); // [46][60] -- MIME type of the file.
+define('EBML_ID_FILENAME', 0x066E); // [46][6E] -- Filename of the attached file.
+define('EBML_ID_FILEREFERRAL', 0x0675); // [46][75] -- A binary value that a track/codec can refer to when the attachment is needed.
+define('EBML_ID_FILEDESCRIPTION', 0x067E); // [46][7E] -- A human-friendly name for the attached file.
+define('EBML_ID_FILEUID', 0x06AE); // [46][AE] -- Unique ID representing the file, as random as possible.
+define('EBML_ID_CONTENTENCALGO', 0x07E1); // [47][E1] -- The encryption algorithm used. The value '0' means that the contents have not been encrypted but only signed. Predefined values:
+define('EBML_ID_CONTENTENCKEYID', 0x07E2); // [47][E2] -- For public key algorithms this is the ID of the public key the data was encrypted with.
+define('EBML_ID_CONTENTSIGNATURE', 0x07E3); // [47][E3] -- A cryptographic signature of the contents.
+define('EBML_ID_CONTENTSIGKEYID', 0x07E4); // [47][E4] -- This is the ID of the private key the data was signed with.
+define('EBML_ID_CONTENTSIGALGO', 0x07E5); // [47][E5] -- The algorithm used for the signature. A value of '0' means that the contents have not been signed but only encrypted. Predefined values:
+define('EBML_ID_CONTENTSIGHASHALGO', 0x07E6); // [47][E6] -- The hash algorithm used for the signature. A value of '0' means that the contents have not been signed but only encrypted. Predefined values:
+define('EBML_ID_MUXINGAPP', 0x0D80); // [4D][80] -- Muxing application or library ("libmatroska-0.4.3").
+define('EBML_ID_SEEK', 0x0DBB); // [4D][BB] -- Contains a single seek entry to an EBML element.
+define('EBML_ID_CONTENTENCODINGORDER', 0x1031); // [50][31] -- Tells when this modification was used during encoding/muxing starting with 0 and counting upwards. The decoder/demuxer has to start with the highest order number it finds and work its way down. This value has to be unique over all ContentEncodingOrder elements in the segment.
+define('EBML_ID_CONTENTENCODINGSCOPE', 0x1032); // [50][32] -- A bit field that describes which elements have been modified in this way. Values (big endian) can be OR'ed. Possible values:
+define('EBML_ID_CONTENTENCODINGTYPE', 0x1033); // [50][33] -- A value describing what kind of transformation has been done. Possible values:
+define('EBML_ID_CONTENTCOMPRESSION', 0x1034); // [50][34] -- Settings describing the compression used. Must be present if the value of ContentEncodingType is 0 and absent otherwise. Each block must be decompressable even if no previous block is available in order not to prevent seeking.
+define('EBML_ID_CONTENTENCRYPTION', 0x1035); // [50][35] -- Settings describing the encryption used. Must be present if the value of ContentEncodingType is 1 and absent otherwise.
+define('EBML_ID_CUEREFNUMBER', 0x135F); // [53][5F] -- Number of the referenced Block of Track X in the specified Cluster.
+define('EBML_ID_NAME', 0x136E); // [53][6E] -- A human-readable track name.
+define('EBML_ID_CUEBLOCKNUMBER', 0x1378); // [53][78] -- Number of the Block in the specified Cluster.
+define('EBML_ID_TRACKOFFSET', 0x137F); // [53][7F] -- A value to add to the Block's Timecode. This can be used to adjust the playback offset of a track.
+define('EBML_ID_SEEKID', 0x13AB); // [53][AB] -- The binary ID corresponding to the element name.
+define('EBML_ID_SEEKPOSITION', 0x13AC); // [53][AC] -- The position of the element in the segment in octets (0 = first level 1 element).
+define('EBML_ID_STEREOMODE', 0x13B8); // [53][B8] -- Stereo-3D video mode.
+define('EBML_ID_OLDSTEREOMODE', 0x13B9); // [53][B9] -- Bogus StereoMode value used in old versions of libmatroska. DO NOT USE. (0: mono, 1: right eye, 2: left eye, 3: both eyes).
+define('EBML_ID_PIXELCROPBOTTOM', 0x14AA); // [54][AA] -- The number of video pixels to remove at the bottom of the image (for HDTV content).
+define('EBML_ID_DISPLAYWIDTH', 0x14B0); // [54][B0] -- Width of the video frames to display.
+define('EBML_ID_DISPLAYUNIT', 0x14B2); // [54][B2] -- Type of the unit for DisplayWidth/Height (0: pixels, 1: centimeters, 2: inches).
+define('EBML_ID_ASPECTRATIOTYPE', 0x14B3); // [54][B3] -- Specify the possible modifications to the aspect ratio (0: free resizing, 1: keep aspect ratio, 2: fixed).
+define('EBML_ID_DISPLAYHEIGHT', 0x14BA); // [54][BA] -- Height of the video frames to display.
+define('EBML_ID_PIXELCROPTOP', 0x14BB); // [54][BB] -- The number of video pixels to remove at the top of the image.
+define('EBML_ID_PIXELCROPLEFT', 0x14CC); // [54][CC] -- The number of video pixels to remove on the left of the image.
+define('EBML_ID_PIXELCROPRIGHT', 0x14DD); // [54][DD] -- The number of video pixels to remove on the right of the image.
+define('EBML_ID_FLAGFORCED', 0x15AA); // [55][AA] -- Set if that track MUST be used during playback. There can be many forced track for a kind (audio, video or subs), the player should select the one which language matches the user preference or the default + forced track. Overlay MAY happen between a forced and non-forced track of the same kind.
+define('EBML_ID_MAXBLOCKADDITIONID', 0x15EE); // [55][EE] -- The maximum value of BlockAddID. A value 0 means there is no BlockAdditions for this track.
+define('EBML_ID_WRITINGAPP', 0x1741); // [57][41] -- Writing application ("mkvmerge-0.3.3").
+define('EBML_ID_CLUSTERSILENTTRACKS', 0x1854); // [58][54] -- The list of tracks that are not used in that part of the stream. It is useful when using overlay tracks on seeking. Then you should decide what track to use.
+define('EBML_ID_CLUSTERSILENTTRACKNUMBER', 0x18D7); // [58][D7] -- One of the track number that are not used from now on in the stream. It could change later if not specified as silent in a further Cluster.
+define('EBML_ID_ATTACHEDFILE', 0x21A7); // [61][A7] -- An attached file.
+define('EBML_ID_CONTENTENCODING', 0x2240); // [62][40] -- Settings for one content encoding like compression or encryption.
+define('EBML_ID_BITDEPTH', 0x2264); // [62][64] -- Bits per sample, mostly used for PCM.
+define('EBML_ID_CODECPRIVATE', 0x23A2); // [63][A2] -- Private data only known to the codec.
+define('EBML_ID_TARGETS', 0x23C0); // [63][C0] -- Contain all UIDs where the specified meta data apply. It is void to describe everything in the segment.
+define('EBML_ID_CHAPTERPHYSICALEQUIV', 0x23C3); // [63][C3] -- Specify the physical equivalent of this ChapterAtom like "DVD" (60) or "SIDE" (50), see complete list of values.
+define('EBML_ID_TAGCHAPTERUID', 0x23C4); // [63][C4] -- A unique ID to identify the Chapter(s) the tags belong to. If the value is 0 at this level, the tags apply to all chapters in the Segment.
+define('EBML_ID_TAGTRACKUID', 0x23C5); // [63][C5] -- A unique ID to identify the Track(s) the tags belong to. If the value is 0 at this level, the tags apply to all tracks in the Segment.
+define('EBML_ID_TAGATTACHMENTUID', 0x23C6); // [63][C6] -- A unique ID to identify the Attachment(s) the tags belong to. If the value is 0 at this level, the tags apply to all the attachments in the Segment.
+define('EBML_ID_TAGEDITIONUID', 0x23C9); // [63][C9] -- A unique ID to identify the EditionEntry(s) the tags belong to. If the value is 0 at this level, the tags apply to all editions in the Segment.
+define('EBML_ID_TARGETTYPE', 0x23CA); // [63][CA] -- An informational string that can be used to display the logical level of the target like "ALBUM", "TRACK", "MOVIE", "CHAPTER", etc (see TargetType).
+define('EBML_ID_TRACKTRANSLATE', 0x2624); // [66][24] -- The track identification for the given Chapter Codec.
+define('EBML_ID_TRACKTRANSLATETRACKID', 0x26A5); // [66][A5] -- The binary value used to represent this track in the chapter codec data. The format depends on the ChapProcessCodecID used.
+define('EBML_ID_TRACKTRANSLATECODEC', 0x26BF); // [66][BF] -- The chapter codec using this ID (0: Matroska Script, 1: DVD-menu).
+define('EBML_ID_TRACKTRANSLATEEDITIONUID', 0x26FC); // [66][FC] -- Specify an edition UID on which this translation applies. When not specified, it means for all editions found in the segment.
+define('EBML_ID_SIMPLETAG', 0x27C8); // [67][C8] -- Contains general information about the target.
+define('EBML_ID_TARGETTYPEVALUE', 0x28CA); // [68][CA] -- A number to indicate the logical level of the target (see TargetType).
+define('EBML_ID_CHAPPROCESSCOMMAND', 0x2911); // [69][11] -- Contains all the commands associated to the Atom.
+define('EBML_ID_CHAPPROCESSTIME', 0x2922); // [69][22] -- Defines when the process command should be handled (0: during the whole chapter, 1: before starting playback, 2: after playback of the chapter).
+define('EBML_ID_CHAPTERTRANSLATE', 0x2924); // [69][24] -- A tuple of corresponding ID used by chapter codecs to represent this segment.
+define('EBML_ID_CHAPPROCESSDATA', 0x2933); // [69][33] -- Contains the command information. The data should be interpreted depending on the ChapProcessCodecID value. For ChapProcessCodecID = 1, the data correspond to the binary DVD cell pre/post commands.
+define('EBML_ID_CHAPPROCESS', 0x2944); // [69][44] -- Contains all the commands associated to the Atom.
+define('EBML_ID_CHAPPROCESSCODECID', 0x2955); // [69][55] -- Contains the type of the codec used for the processing. A value of 0 means native Matroska processing (to be defined), a value of 1 means the DVD command set is used. More codec IDs can be added later.
+define('EBML_ID_CHAPTERTRANSLATEID', 0x29A5); // [69][A5] -- The binary value used to represent this segment in the chapter codec data. The format depends on the ChapProcessCodecID used.
+define('EBML_ID_CHAPTERTRANSLATECODEC', 0x29BF); // [69][BF] -- The chapter codec using this ID (0: Matroska Script, 1: DVD-menu).
+define('EBML_ID_CHAPTERTRANSLATEEDITIONUID', 0x29FC); // [69][FC] -- Specify an edition UID on which this correspondance applies. When not specified, it means for all editions found in the segment.
+define('EBML_ID_CONTENTENCODINGS', 0x2D80); // [6D][80] -- Settings for several content encoding mechanisms like compression or encryption.
+define('EBML_ID_MINCACHE', 0x2DE7); // [6D][E7] -- The minimum number of frames a player should be able to cache during playback. If set to 0, the reference pseudo-cache system is not used.
+define('EBML_ID_MAXCACHE', 0x2DF8); // [6D][F8] -- The maximum cache size required to store referenced frames in and the current frame. 0 means no cache is needed.
+define('EBML_ID_CHAPTERSEGMENTUID', 0x2E67); // [6E][67] -- A segment to play in place of this chapter. Edition ChapterSegmentEditionUID should be used for this segment, otherwise no edition is used.
+define('EBML_ID_CHAPTERSEGMENTEDITIONUID', 0x2EBC); // [6E][BC] -- The edition to play from the segment linked in ChapterSegmentUID.
+define('EBML_ID_TRACKOVERLAY', 0x2FAB); // [6F][AB] -- Specify that this track is an overlay track for the Track specified (in the u-integer). That means when this track has a gap (see SilentTracks) the overlay track should be used instead. The order of multiple TrackOverlay matters, the first one is the one that should be used. If not found it should be the second, etc.
+define('EBML_ID_TAG', 0x3373); // [73][73] -- Element containing elements specific to Tracks/Chapters.
+define('EBML_ID_SEGMENTFILENAME', 0x3384); // [73][84] -- A filename corresponding to this segment.
+define('EBML_ID_SEGMENTUID', 0x33A4); // [73][A4] -- A randomly generated unique ID to identify the current segment between many others (128 bits).
+define('EBML_ID_CHAPTERUID', 0x33C4); // [73][C4] -- A unique ID to identify the Chapter.
+define('EBML_ID_TRACKUID', 0x33C5); // [73][C5] -- A unique ID to identify the Track. This should be kept the same when making a direct stream copy of the Track to another file.
+define('EBML_ID_ATTACHMENTLINK', 0x3446); // [74][46] -- The UID of an attachment that is used by this codec.
+define('EBML_ID_CLUSTERBLOCKADDITIONS', 0x35A1); // [75][A1] -- Contain additional blocks to complete the main one. An EBML parser that has no knowledge of the Block structure could still see and use/skip these data.
+define('EBML_ID_CHANNELPOSITIONS', 0x347B); // [7D][7B] -- Table of horizontal angles for each successive channel, see appendix.
+define('EBML_ID_OUTPUTSAMPLINGFREQUENCY', 0x38B5); // [78][B5] -- Real output sampling frequency in Hz (used for SBR techniques).
+define('EBML_ID_TITLE', 0x3BA9); // [7B][A9] -- General name of the segment.
+define('EBML_ID_CHAPTERDISPLAY', 0x00); // [80] -- Contains all possible strings to use for the chapter display.
+define('EBML_ID_TRACKTYPE', 0x03); // [83] -- A set of track types coded on 8 bits (1: video, 2: audio, 3: complex, 0x10: logo, 0x11: subtitle, 0x12: buttons, 0x20: control).
+define('EBML_ID_CHAPSTRING', 0x05); // [85] -- Contains the string to use as the chapter atom.
+define('EBML_ID_CODECID', 0x06); // [86] -- An ID corresponding to the codec, see the codec page for more info.
+define('EBML_ID_FLAGDEFAULT', 0x08); // [88] -- Set if that track (audio, video or subs) SHOULD be used if no language found matches the user preference.
+define('EBML_ID_CHAPTERTRACKNUMBER', 0x09); // [89] -- UID of the Track to apply this chapter too. In the absense of a control track, choosing this chapter will select the listed Tracks and deselect unlisted tracks. Absense of this element indicates that the Chapter should be applied to any currently used Tracks.
+define('EBML_ID_CLUSTERSLICES', 0x0E); // [8E] -- Contains slices description.
+define('EBML_ID_CHAPTERTRACK', 0x0F); // [8F] -- List of tracks on which the chapter applies. If this element is not present, all tracks apply
+define('EBML_ID_CHAPTERTIMESTART', 0x11); // [91] -- Timecode of the start of Chapter (not scaled).
+define('EBML_ID_CHAPTERTIMEEND', 0x12); // [92] -- Timecode of the end of Chapter (timecode excluded, not scaled).
+define('EBML_ID_CUEREFTIME', 0x16); // [96] -- Timecode of the referenced Block.
+define('EBML_ID_CUEREFCLUSTER', 0x17); // [97] -- Position of the Cluster containing the referenced Block.
+define('EBML_ID_CHAPTERFLAGHIDDEN', 0x18); // [98] -- If a chapter is hidden (1), it should not be available to the user interface (but still to Control Tracks).
+define('EBML_ID_FLAGINTERLACED', 0x1A); // [9A] -- Set if the video is interlaced.
+define('EBML_ID_CLUSTERBLOCKDURATION', 0x1B); // [9B] -- The duration of the Block (based on TimecodeScale). This element is mandatory when DefaultDuration is set for the track. When not written and with no DefaultDuration, the value is assumed to be the difference between the timecode of this Block and the timecode of the next Block in "display" order (not coding order). This element can be useful at the end of a Track (as there is not other Block available), or when there is a break in a track like for subtitle tracks.
+define('EBML_ID_FLAGLACING', 0x1C); // [9C] -- Set if the track may contain blocks using lacing.
+define('EBML_ID_CHANNELS', 0x1F); // [9F] -- Numbers of channels in the track.
+define('EBML_ID_CLUSTERBLOCKGROUP', 0x20); // [A0] -- Basic container of information containing a single Block or BlockVirtual, and information specific to that Block/VirtualBlock.
+define('EBML_ID_CLUSTERBLOCK', 0x21); // [A1] -- Block containing the actual data to be rendered and a timecode relative to the Cluster Timecode.
+define('EBML_ID_CLUSTERBLOCKVIRTUAL', 0x22); // [A2] -- A Block with no data. It must be stored in the stream at the place the real Block should be in display order.
+define('EBML_ID_CLUSTERSIMPLEBLOCK', 0x23); // [A3] -- Similar to Block but without all the extra information, mostly used to reduced overhead when no extra feature is needed.
+define('EBML_ID_CLUSTERCODECSTATE', 0x24); // [A4] -- The new codec state to use. Data interpretation is private to the codec. This information should always be referenced by a seek entry.
+define('EBML_ID_CLUSTERBLOCKADDITIONAL', 0x25); // [A5] -- Interpreted by the codec as it wishes (using the BlockAddID).
+define('EBML_ID_CLUSTERBLOCKMORE', 0x26); // [A6] -- Contain the BlockAdditional and some parameters.
+define('EBML_ID_CLUSTERPOSITION', 0x27); // [A7] -- Position of the Cluster in the segment (0 in live broadcast streams). It might help to resynchronise offset on damaged streams.
+define('EBML_ID_CODECDECODEALL', 0x2A); // [AA] -- The codec can decode potentially damaged data.
+define('EBML_ID_CLUSTERPREVSIZE', 0x2B); // [AB] -- Size of the previous Cluster, in octets. Can be useful for backward playing.
+define('EBML_ID_TRACKENTRY', 0x2E); // [AE] -- Describes a track with all elements.
+define('EBML_ID_CLUSTERENCRYPTEDBLOCK', 0x2F); // [AF] -- Similar to SimpleBlock but the data inside the Block are Transformed (encrypt and/or signed).
+define('EBML_ID_PIXELWIDTH', 0x30); // [B0] -- Width of the encoded video frames in pixels.
+define('EBML_ID_CUETIME', 0x33); // [B3] -- Absolute timecode according to the segment time base.
+define('EBML_ID_SAMPLINGFREQUENCY', 0x35); // [B5] -- Sampling frequency in Hz.
+define('EBML_ID_CHAPTERATOM', 0x36); // [B6] -- Contains the atom information to use as the chapter atom (apply to all tracks).
+define('EBML_ID_CUETRACKPOSITIONS', 0x37); // [B7] -- Contain positions for different tracks corresponding to the timecode.
+define('EBML_ID_FLAGENABLED', 0x39); // [B9] -- Set if the track is used.
+define('EBML_ID_PIXELHEIGHT', 0x3A); // [BA] -- Height of the encoded video frames in pixels.
+define('EBML_ID_CUEPOINT', 0x3B); // [BB] -- Contains all information relative to a seek point in the segment.
+define('EBML_ID_CRC32', 0x3F); // [BF] -- The CRC is computed on all the data of the Master element it's in, regardless of its position. It's recommended to put the CRC value at the beggining of the Master element for easier reading. All level 1 elements should include a CRC-32.
+define('EBML_ID_CLUSTERBLOCKADDITIONID', 0x4B); // [CB] -- The ID of the BlockAdditional element (0 is the main Block).
+define('EBML_ID_CLUSTERLACENUMBER', 0x4C); // [CC] -- The reverse number of the frame in the lace (0 is the last frame, 1 is the next to last, etc). While there are a few files in the wild with this element, it is no longer in use and has been deprecated. Being able to interpret this element is not required for playback.
+define('EBML_ID_CLUSTERFRAMENUMBER', 0x4D); // [CD] -- The number of the frame to generate from this lace with this delay (allow you to generate many frames from the same Block/Frame).
+define('EBML_ID_CLUSTERDELAY', 0x4E); // [CE] -- The (scaled) delay to apply to the element.
+define('EBML_ID_CLUSTERDURATION', 0x4F); // [CF] -- The (scaled) duration to apply to the element.
+define('EBML_ID_TRACKNUMBER', 0x57); // [D7] -- The track number as used in the Block Header (using more than 127 tracks is not encouraged, though the design allows an unlimited number).
+define('EBML_ID_CUEREFERENCE', 0x5B); // [DB] -- The Clusters containing the required referenced Blocks.
+define('EBML_ID_VIDEO', 0x60); // [E0] -- Video settings.
+define('EBML_ID_AUDIO', 0x61); // [E1] -- Audio settings.
+define('EBML_ID_CLUSTERTIMESLICE', 0x68); // [E8] -- Contains extra time information about the data contained in the Block. While there are a few files in the wild with this element, it is no longer in use and has been deprecated. Being able to interpret this element is not required for playback.
+define('EBML_ID_CUECODECSTATE', 0x6A); // [EA] -- The position of the Codec State corresponding to this Cue element. 0 means that the data is taken from the initial Track Entry.
+define('EBML_ID_CUEREFCODECSTATE', 0x6B); // [EB] -- The position of the Codec State corresponding to this referenced element. 0 means that the data is taken from the initial Track Entry.
+define('EBML_ID_VOID', 0x6C); // [EC] -- Used to void damaged data, to avoid unexpected behaviors when using damaged data. The content is discarded. Also used to reserve space in a sub-element for later use.
+define('EBML_ID_CLUSTERTIMECODE', 0x67); // [E7] -- Absolute timecode of the cluster (based on TimecodeScale).
+define('EBML_ID_CLUSTERBLOCKADDID', 0x6E); // [EE] -- An ID to identify the BlockAdditional level.
+define('EBML_ID_CUECLUSTERPOSITION', 0x71); // [F1] -- The position of the Cluster containing the required Block.
+define('EBML_ID_CUETRACK', 0x77); // [F7] -- The track for which a position is given.
+define('EBML_ID_CLUSTERREFERENCEPRIORITY', 0x7A); // [FA] -- This frame is referenced and has the specified cache priority. In cache only a frame of the same or higher priority can replace this frame. A value of 0 means the frame is not referenced.
+define('EBML_ID_CLUSTERREFERENCEBLOCK', 0x7B); // [FB] -- Timecode of another frame used as a reference (ie: B or P frame). The timecode is relative to the block it's attached to.
+define('EBML_ID_CLUSTERREFERENCEVIRTUAL', 0x7D); // [FD] -- Relative position of the data that should be in position of the virtual block.
+
+
+/**
+* @tutorial http://www.matroska.org/technical/specs/index.html
+*
+* @todo Rewrite EBML parser to reduce it's size and honor default element values
+* @todo After rewrite implement stream size calculation, that will provide additional useful info and enable AAC/FLAC audio bitrate detection
+*/
+class getid3_matroska extends getid3_handler
{
+ /**
+ * If true, do not return information about CLUSTER chunks, since there's a lot of them
+ * and they're not usually useful [default: TRUE].
+ *
+ * @var bool
+ */
+ public static $hide_clusters = true;
- function getid3_matroska(&$fd, &$ThisFileInfo) {
+ /**
+ * True to parse the whole file, not only header [default: FALSE].
+ *
+ * @var bool
+ */
+ public static $parse_whole_file = false;
- $ThisFileInfo['fileformat'] = 'matroska';
+ /*
+ * Private parser settings/placeholders.
+ */
+ private $EBMLbuffer = '';
+ private $EBMLbuffer_offset = 0;
+ private $EBMLbuffer_length = 0;
+ private $current_offset = 0;
+ private $unuseful_elements = array(EBML_ID_CRC32, EBML_ID_VOID);
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
+ /**
+ * @return bool
+ */
+ public function Analyze()
+ {
+ $info = &$this->getid3->info;
- //$ThisFileInfo['matroska']['raw']['a'] = $this->EBML2Int(fread($fd, 4));
+ // parse container
+ try {
+ $this->parseEBML($info);
+ } catch (Exception $e) {
+ $this->error('EBML parser: '.$e->getMessage());
+ }
- $ThisFileInfo['error'][] = 'Mastroka parsing not enabled in this version of getID3()';
- return false;
+ // calculate playtime
+ if (isset($info['matroska']['info']) && is_array($info['matroska']['info'])) {
+ foreach ($info['matroska']['info'] as $key => $infoarray) {
+ if (isset($infoarray['Duration'])) {
+ // TimecodeScale is how many nanoseconds each Duration unit is
+ $info['playtime_seconds'] = $infoarray['Duration'] * ((isset($infoarray['TimecodeScale']) ? $infoarray['TimecodeScale'] : 1000000) / 1000000000);
+ break;
+ }
+ }
+ }
+ // extract tags
+ if (isset($info['matroska']['tags']) && is_array($info['matroska']['tags'])) {
+ foreach ($info['matroska']['tags'] as $key => $infoarray) {
+ $this->ExtractCommentsSimpleTag($infoarray);
+ }
+ }
+
+ // process tracks
+ if (isset($info['matroska']['tracks']['tracks']) && is_array($info['matroska']['tracks']['tracks'])) {
+ foreach ($info['matroska']['tracks']['tracks'] as $key => $trackarray) {
+
+ $track_info = array();
+ $track_info['dataformat'] = self::CodecIDtoCommonName($trackarray['CodecID']);
+ $track_info['default'] = (isset($trackarray['FlagDefault']) ? $trackarray['FlagDefault'] : true);
+ if (isset($trackarray['Name'])) { $track_info['name'] = $trackarray['Name']; }
+
+ switch ($trackarray['TrackType']) {
+
+ case 1: // Video
+ $track_info['resolution_x'] = $trackarray['PixelWidth'];
+ $track_info['resolution_y'] = $trackarray['PixelHeight'];
+ $track_info['display_unit'] = self::displayUnit(isset($trackarray['DisplayUnit']) ? $trackarray['DisplayUnit'] : 0);
+ $track_info['display_x'] = (isset($trackarray['DisplayWidth']) ? $trackarray['DisplayWidth'] : $trackarray['PixelWidth']);
+ $track_info['display_y'] = (isset($trackarray['DisplayHeight']) ? $trackarray['DisplayHeight'] : $trackarray['PixelHeight']);
+
+ if (isset($trackarray['PixelCropBottom'])) { $track_info['crop_bottom'] = $trackarray['PixelCropBottom']; }
+ if (isset($trackarray['PixelCropTop'])) { $track_info['crop_top'] = $trackarray['PixelCropTop']; }
+ if (isset($trackarray['PixelCropLeft'])) { $track_info['crop_left'] = $trackarray['PixelCropLeft']; }
+ if (isset($trackarray['PixelCropRight'])) { $track_info['crop_right'] = $trackarray['PixelCropRight']; }
+ if (isset($trackarray['DefaultDuration'])) { $track_info['frame_rate'] = round(1000000000 / $trackarray['DefaultDuration'], 3); }
+ if (isset($trackarray['CodecName'])) { $track_info['codec'] = $trackarray['CodecName']; }
+
+ switch ($trackarray['CodecID']) {
+ case 'V_MS/VFW/FOURCC':
+ 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']);
+ $info['matroska']['track_codec_parsed'][$trackarray['TrackNumber']] = $parsed;
+ break;
+
+ /*case 'V_MPEG4/ISO/AVC':
+ $h264['profile'] = getid3_lib::BigEndian2Int(substr($trackarray['CodecPrivate'], 1, 1));
+ $h264['level'] = getid3_lib::BigEndian2Int(substr($trackarray['CodecPrivate'], 3, 1));
+ $rn = getid3_lib::BigEndian2Int(substr($trackarray['CodecPrivate'], 4, 1));
+ $h264['NALUlength'] = ($rn & 3) + 1;
+ $rn = getid3_lib::BigEndian2Int(substr($trackarray['CodecPrivate'], 5, 1));
+ $nsps = ($rn & 31);
+ $offset = 6;
+ for ($i = 0; $i < $nsps; $i ++) {
+ $length = getid3_lib::BigEndian2Int(substr($trackarray['CodecPrivate'], $offset, 2));
+ $h264['SPS'][] = substr($trackarray['CodecPrivate'], $offset + 2, $length);
+ $offset += 2 + $length;
+ }
+ $npps = getid3_lib::BigEndian2Int(substr($trackarray['CodecPrivate'], $offset, 1));
+ $offset += 1;
+ for ($i = 0; $i < $npps; $i ++) {
+ $length = getid3_lib::BigEndian2Int(substr($trackarray['CodecPrivate'], $offset, 2));
+ $h264['PPS'][] = substr($trackarray['CodecPrivate'], $offset + 2, $length);
+ $offset += 2 + $length;
+ }
+ $info['matroska']['track_codec_parsed'][$trackarray['TrackNumber']] = $h264;
+ break;*/
+ }
+
+ $info['video']['streams'][$trackarray['TrackUID']] = $track_info;
+ break;
+
+ case 2: // Audio
+ $track_info['sample_rate'] = (isset($trackarray['SamplingFrequency']) ? $trackarray['SamplingFrequency'] : 8000.0);
+ $track_info['channels'] = (isset($trackarray['Channels']) ? $trackarray['Channels'] : 1);
+ $track_info['language'] = (isset($trackarray['Language']) ? $trackarray['Language'] : 'eng');
+ if (isset($trackarray['BitDepth'])) { $track_info['bits_per_sample'] = $trackarray['BitDepth']; }
+ if (isset($trackarray['CodecName'])) { $track_info['codec'] = $trackarray['CodecName']; }
+
+ switch ($trackarray['CodecID']) {
+ case 'A_PCM/INT/LIT':
+ case 'A_PCM/INT/BIG':
+ $track_info['bitrate'] = $track_info['sample_rate'] * $track_info['channels'] * $trackarray['BitDepth'];
+ break;
+
+ case 'A_AC3':
+ case 'A_EAC3':
+ case 'A_DTS':
+ case 'A_MPEG/L3':
+ case 'A_MPEG/L2':
+ case 'A_FLAC':
+ $module_dataformat = ($track_info['dataformat'] == 'mp2' ? 'mp3' : ($track_info['dataformat'] == 'eac3' ? 'ac3' : $track_info['dataformat']));
+ getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.'.$module_dataformat.'.php', __FILE__, true);
+
+ if (!isset($info['matroska']['track_data_offsets'][$trackarray['TrackNumber']])) {
+ $this->warning('Unable to parse audio data ['.basename(__FILE__).':'.__LINE__.'] because $info[matroska][track_data_offsets]['.$trackarray['TrackNumber'].'] not set');
+ break;
+ }
+
+ // create temp instance
+ $getid3_temp = new getID3();
+ if ($track_info['dataformat'] != 'flac') {
+ $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'];
+ if ($track_info['dataformat'][0] == 'm' || $track_info['dataformat'] == 'flac') {
+ $getid3_temp->info['avdataend'] = $info['matroska']['track_data_offsets'][$trackarray['TrackNumber']]['offset'] + $info['matroska']['track_data_offsets'][$trackarray['TrackNumber']]['length'];
+ }
+
+ // analyze
+ $class = 'getid3_'.$module_dataformat;
+ $header_data_key = $track_info['dataformat'][0] == 'm' ? 'mpeg' : $track_info['dataformat'];
+ $getid3_audio = new $class($getid3_temp, __CLASS__);
+ if ($track_info['dataformat'] == 'flac') {
+ $getid3_audio->AnalyzeString($trackarray['CodecPrivate']);
+ }
+ else {
+ $getid3_audio->Analyze();
+ }
+ if (!empty($getid3_temp->info[$header_data_key])) {
+ $info['matroska']['track_codec_parsed'][$trackarray['TrackNumber']] = $getid3_temp->info[$header_data_key];
+ if (isset($getid3_temp->info['audio']) && is_array($getid3_temp->info['audio'])) {
+ foreach ($getid3_temp->info['audio'] as $sub_key => $value) {
+ $track_info[$sub_key] = $value;
+ }
+ }
+ }
+ else {
+ $this->warning('Unable to parse audio data ['.basename(__FILE__).':'.__LINE__.'] because '.$class.'::Analyze() failed at offset '.$getid3_temp->info['avdataoffset']);
+ }
+
+ // copy errors and warnings
+ if (!empty($getid3_temp->info['error'])) {
+ foreach ($getid3_temp->info['error'] as $newerror) {
+ $this->warning($class.'() says: ['.$newerror.']');
+ }
+ }
+ if (!empty($getid3_temp->info['warning'])) {
+ foreach ($getid3_temp->info['warning'] as $newerror) {
+ $this->warning($class.'() says: ['.$newerror.']');
+ }
+ }
+ unset($getid3_temp, $getid3_audio);
+ break;
+
+ case 'A_AAC':
+ case 'A_AAC/MPEG2/LC':
+ case 'A_AAC/MPEG2/LC/SBR':
+ 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');
+ break;
+
+ case 'A_VORBIS':
+ if (!isset($trackarray['CodecPrivate'])) {
+ $this->warning('Unable to parse audio data ['.basename(__FILE__).':'.__LINE__.'] because CodecPrivate data not set');
+ break;
+ }
+ $vorbis_offset = strpos($trackarray['CodecPrivate'], 'vorbis', 1);
+ if ($vorbis_offset === false) {
+ $this->warning('Unable to parse audio data ['.basename(__FILE__).':'.__LINE__.'] because CodecPrivate data does not contain "vorbis" keyword');
+ break;
+ }
+ $vorbis_offset -= 1;
+
+ getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.ogg.php', __FILE__, true);
+
+ // create temp instance
+ $getid3_temp = new getID3();
+
+ // analyze
+ $getid3_ogg = new getid3_ogg($getid3_temp);
+ $oggpageinfo['page_seqno'] = 0;
+ $getid3_ogg->ParseVorbisPageHeader($trackarray['CodecPrivate'], $vorbis_offset, $oggpageinfo);
+ if (!empty($getid3_temp->info['ogg'])) {
+ $info['matroska']['track_codec_parsed'][$trackarray['TrackNumber']] = $getid3_temp->info['ogg'];
+ if (isset($getid3_temp->info['audio']) && is_array($getid3_temp->info['audio'])) {
+ foreach ($getid3_temp->info['audio'] as $sub_key => $value) {
+ $track_info[$sub_key] = $value;
+ }
+ }
+ }
+
+ // copy errors and warnings
+ if (!empty($getid3_temp->info['error'])) {
+ foreach ($getid3_temp->info['error'] as $newerror) {
+ $this->warning('getid3_ogg() says: ['.$newerror.']');
+ }
+ }
+ if (!empty($getid3_temp->info['warning'])) {
+ foreach ($getid3_temp->info['warning'] as $newerror) {
+ $this->warning('getid3_ogg() says: ['.$newerror.']');
+ }
+ }
+
+ if (!empty($getid3_temp->info['ogg']['bitrate_nominal'])) {
+ $track_info['bitrate'] = $getid3_temp->info['ogg']['bitrate_nominal'];
+ }
+ unset($getid3_temp, $getid3_ogg, $oggpageinfo, $vorbis_offset);
+ break;
+
+ case 'A_MS/ACM':
+ getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, true);
+
+ $parsed = getid3_riff::parseWAVEFORMATex($trackarray['CodecPrivate']);
+ foreach ($parsed as $sub_key => $value) {
+ if ($sub_key != 'raw') {
+ $track_info[$sub_key] = $value;
+ }
+ }
+ $info['matroska']['track_codec_parsed'][$trackarray['TrackNumber']] = $parsed;
+ break;
+
+ default:
+ $this->warning('Unhandled audio type "'.(isset($trackarray['CodecID']) ? $trackarray['CodecID'] : '').'"');
+ break;
+ }
+
+ $info['audio']['streams'][$trackarray['TrackUID']] = $track_info;
+ break;
+ }
+ }
+
+ if (!empty($info['video']['streams'])) {
+ $info['video'] = self::getDefaultStreamInfo($info['video']['streams']);
+ }
+ if (!empty($info['audio']['streams'])) {
+ $info['audio'] = self::getDefaultStreamInfo($info['audio']['streams']);
+ }
+ }
+
+ // process attachments
+ if (isset($info['matroska']['attachments']) && $this->getid3->option_save_attachments !== getID3::ATTACHMENTS_NONE) {
+ foreach ($info['matroska']['attachments'] as $i => $entry) {
+ if (strpos($entry['FileMimeType'], 'image/') === 0 && !empty($entry['FileData'])) {
+ $info['matroska']['comments']['picture'][] = array('data' => $entry['FileData'], 'image_mime' => $entry['FileMimeType'], 'filename' => $entry['FileName']);
+ }
+ }
+ }
+
+ // determine mime type
+ if (!empty($info['video']['streams'])) {
+ $info['mime_type'] = ($info['matroska']['doctype'] == 'webm' ? 'video/webm' : 'video/x-matroska');
+ } elseif (!empty($info['audio']['streams'])) {
+ $info['mime_type'] = ($info['matroska']['doctype'] == 'webm' ? 'audio/webm' : 'audio/x-matroska');
+ } 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'];
+ }
+ }
+ }
+ }
+ }
+
+ return true;
}
+ /**
+ * @param array $info
+ */
+ private function parseEBML(&$info) {
+ // http://www.matroska.org/technical/specs/index.html#EBMLBasics
+ $this->current_offset = $info['avdataoffset'];
- function EBML2Int($EBMLstring) {
+ while ($this->getEBMLelement($top_element, $info['avdataend'])) {
+ switch ($top_element['id']) {
+
+ case EBML_ID_EBML:
+ $info['matroska']['header']['offset'] = $top_element['offset'];
+ $info['matroska']['header']['length'] = $top_element['length'];
+
+ while ($this->getEBMLelement($element_data, $top_element['end'], true)) {
+ switch ($element_data['id']) {
+
+ case EBML_ID_EBMLVERSION:
+ case EBML_ID_EBMLREADVERSION:
+ case EBML_ID_EBMLMAXIDLENGTH:
+ case EBML_ID_EBMLMAXSIZELENGTH:
+ case EBML_ID_DOCTYPEVERSION:
+ case EBML_ID_DOCTYPEREADVERSION:
+ $element_data['data'] = getid3_lib::BigEndian2Int($element_data['data']);
+ break;
+
+ case EBML_ID_DOCTYPE:
+ $element_data['data'] = getid3_lib::trimNullByte($element_data['data']);
+ $info['matroska']['doctype'] = $element_data['data'];
+ $info['fileformat'] = $element_data['data'];
+ break;
+
+ default:
+ $this->unhandledElement('header', __LINE__, $element_data);
+ break;
+ }
+
+ unset($element_data['offset'], $element_data['end']);
+ $info['matroska']['header']['elements'][] = $element_data;
+ }
+ break;
+
+ case EBML_ID_SEGMENT:
+ $info['matroska']['segment'][0]['offset'] = $top_element['offset'];
+ $info['matroska']['segment'][0]['length'] = $top_element['length'];
+
+ while ($this->getEBMLelement($element_data, $top_element['end'])) {
+ if ($element_data['id'] != EBML_ID_CLUSTER || !self::$hide_clusters) { // collect clusters only if required
+ $info['matroska']['segments'][] = $element_data;
+ }
+ switch ($element_data['id']) {
+
+ case EBML_ID_SEEKHEAD: // Contains the position of other level 1 elements.
+
+ while ($this->getEBMLelement($seek_entry, $element_data['end'])) {
+ switch ($seek_entry['id']) {
+
+ case EBML_ID_SEEK: // Contains a single seek entry to an EBML element
+ while ($this->getEBMLelement($sub_seek_entry, $seek_entry['end'], true)) {
+
+ switch ($sub_seek_entry['id']) {
+
+ case EBML_ID_SEEKID:
+ $seek_entry['target_id'] = self::EBML2Int($sub_seek_entry['data']);
+ $seek_entry['target_name'] = self::EBMLidName($seek_entry['target_id']);
+ break;
+
+ case EBML_ID_SEEKPOSITION:
+ $seek_entry['target_offset'] = $element_data['offset'] + getid3_lib::BigEndian2Int($sub_seek_entry['data']);
+ break;
+
+ default:
+ $this->unhandledElement('seekhead.seek', __LINE__, $sub_seek_entry); }
+ break;
+ }
+ if (!isset($seek_entry['target_id'])) {
+ $this->warning('seek_entry[target_id] unexpectedly not set at '.$seek_entry['offset']);
+ break;
+ }
+ if (($seek_entry['target_id'] != EBML_ID_CLUSTER) || !self::$hide_clusters) { // collect clusters only if required
+ $info['matroska']['seek'][] = $seek_entry;
+ }
+ break;
+
+ default:
+ $this->unhandledElement('seekhead', __LINE__, $seek_entry);
+ break;
+ }
+ }
+ break;
+
+ case EBML_ID_TRACKS: // A top-level block of information with many tracks described.
+ $info['matroska']['tracks'] = $element_data;
+
+ while ($this->getEBMLelement($track_entry, $element_data['end'])) {
+ switch ($track_entry['id']) {
+
+ case EBML_ID_TRACKENTRY: //subelements: Describes a track with all elements.
+
+ while ($this->getEBMLelement($subelement, $track_entry['end'], array(EBML_ID_VIDEO, EBML_ID_AUDIO, EBML_ID_CONTENTENCODINGS, EBML_ID_CODECPRIVATE))) {
+ 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_TRACKTYPE:
+ case EBML_ID_MINCACHE:
+ case EBML_ID_MAXCACHE:
+ case EBML_ID_MAXBLOCKADDITIONID:
+ case EBML_ID_DEFAULTDURATION: // nanoseconds per frame
+ $track_entry[$subelement['id_name']] = getid3_lib::BigEndian2Int($subelement['data']);
+ break;
+
+ case EBML_ID_TRACKTIMECODESCALE:
+ $track_entry[$subelement['id_name']] = getid3_lib::BigEndian2Float($subelement['data']);
+ break;
+
+ case EBML_ID_CODECID:
+ case EBML_ID_LANGUAGE:
+ case EBML_ID_NAME:
+ case EBML_ID_CODECNAME:
+ $track_entry[$subelement['id_name']] = getid3_lib::trimNullByte($subelement['data']);
+ break;
+
+ case EBML_ID_CODECPRIVATE:
+ $track_entry[$subelement['id_name']] = $this->readEBMLelementData($subelement['length'], true);
+ break;
+
+ case EBML_ID_FLAGENABLED:
+ case EBML_ID_FLAGDEFAULT:
+ case EBML_ID_FLAGFORCED:
+ case EBML_ID_FLAGLACING:
+ case EBML_ID_CODECDECODEALL:
+ $track_entry[$subelement['id_name']] = (bool) getid3_lib::BigEndian2Int($subelement['data']);
+ break;
+
+ case EBML_ID_VIDEO:
+
+ while ($this->getEBMLelement($sub_subelement, $subelement['end'], true)) {
+ switch ($sub_subelement['id']) {
+
+ case EBML_ID_PIXELWIDTH:
+ case EBML_ID_PIXELHEIGHT:
+ case EBML_ID_PIXELCROPBOTTOM:
+ case EBML_ID_PIXELCROPTOP:
+ case EBML_ID_PIXELCROPLEFT:
+ case EBML_ID_PIXELCROPRIGHT:
+ case EBML_ID_DISPLAYWIDTH:
+ case EBML_ID_DISPLAYHEIGHT:
+ case EBML_ID_DISPLAYUNIT:
+ case EBML_ID_ASPECTRATIOTYPE:
+ case EBML_ID_STEREOMODE:
+ case EBML_ID_OLDSTEREOMODE:
+ $track_entry[$sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_subelement['data']);
+ break;
+
+ case EBML_ID_FLAGINTERLACED:
+ $track_entry[$sub_subelement['id_name']] = (bool)getid3_lib::BigEndian2Int($sub_subelement['data']);
+ break;
+
+ case EBML_ID_GAMMAVALUE:
+ $track_entry[$sub_subelement['id_name']] = getid3_lib::BigEndian2Float($sub_subelement['data']);
+ break;
+
+ case EBML_ID_COLOURSPACE:
+ $track_entry[$sub_subelement['id_name']] = getid3_lib::trimNullByte($sub_subelement['data']);
+ break;
+
+ default:
+ $this->unhandledElement('track.video', __LINE__, $sub_subelement);
+ break;
+ }
+ }
+ break;
+
+ case EBML_ID_AUDIO:
+
+ while ($this->getEBMLelement($sub_subelement, $subelement['end'], true)) {
+ switch ($sub_subelement['id']) {
+
+ case EBML_ID_CHANNELS:
+ case EBML_ID_BITDEPTH:
+ $track_entry[$sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_subelement['data']);
+ break;
+
+ case EBML_ID_SAMPLINGFREQUENCY:
+ case EBML_ID_OUTPUTSAMPLINGFREQUENCY:
+ $track_entry[$sub_subelement['id_name']] = getid3_lib::BigEndian2Float($sub_subelement['data']);
+ break;
+
+ case EBML_ID_CHANNELPOSITIONS:
+ $track_entry[$sub_subelement['id_name']] = getid3_lib::trimNullByte($sub_subelement['data']);
+ break;
+
+ default:
+ $this->unhandledElement('track.audio', __LINE__, $sub_subelement);
+ break;
+ }
+ }
+ break;
+
+ case EBML_ID_CONTENTENCODINGS:
+
+ while ($this->getEBMLelement($sub_subelement, $subelement['end'])) {
+ switch ($sub_subelement['id']) {
+
+ case EBML_ID_CONTENTENCODING:
+
+ while ($this->getEBMLelement($sub_sub_subelement, $sub_subelement['end'], array(EBML_ID_CONTENTCOMPRESSION, EBML_ID_CONTENTENCRYPTION))) {
+ switch ($sub_sub_subelement['id']) {
+
+ case EBML_ID_CONTENTENCODINGORDER:
+ case EBML_ID_CONTENTENCODINGSCOPE:
+ case EBML_ID_CONTENTENCODINGTYPE:
+ $track_entry[$sub_subelement['id_name']][$sub_sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_sub_subelement['data']);
+ break;
+
+ case EBML_ID_CONTENTCOMPRESSION:
+
+ while ($this->getEBMLelement($sub_sub_sub_subelement, $sub_sub_subelement['end'], true)) {
+ switch ($sub_sub_sub_subelement['id']) {
+
+ case EBML_ID_CONTENTCOMPALGO:
+ $track_entry[$sub_subelement['id_name']][$sub_sub_subelement['id_name']][$sub_sub_sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_sub_sub_subelement['data']);
+ break;
+
+ case EBML_ID_CONTENTCOMPSETTINGS:
+ $track_entry[$sub_subelement['id_name']][$sub_sub_subelement['id_name']][$sub_sub_sub_subelement['id_name']] = $sub_sub_sub_subelement['data'];
+ break;
+
+ default:
+ $this->unhandledElement('track.contentencodings.contentencoding.contentcompression', __LINE__, $sub_sub_sub_subelement);
+ break;
+ }
+ }
+ break;
+
+ case EBML_ID_CONTENTENCRYPTION:
+
+ while ($this->getEBMLelement($sub_sub_sub_subelement, $sub_sub_subelement['end'], true)) {
+ switch ($sub_sub_sub_subelement['id']) {
+
+ case EBML_ID_CONTENTENCALGO:
+ case EBML_ID_CONTENTSIGALGO:
+ case EBML_ID_CONTENTSIGHASHALGO:
+ $track_entry[$sub_subelement['id_name']][$sub_sub_subelement['id_name']][$sub_sub_sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_sub_sub_subelement['data']);
+ break;
+
+ case EBML_ID_CONTENTENCKEYID:
+ case EBML_ID_CONTENTSIGNATURE:
+ case EBML_ID_CONTENTSIGKEYID:
+ $track_entry[$sub_subelement['id_name']][$sub_sub_subelement['id_name']][$sub_sub_sub_subelement['id_name']] = $sub_sub_sub_subelement['data'];
+ break;
+
+ default:
+ $this->unhandledElement('track.contentencodings.contentencoding.contentcompression', __LINE__, $sub_sub_sub_subelement);
+ break;
+ }
+ }
+ break;
+
+ default:
+ $this->unhandledElement('track.contentencodings.contentencoding', __LINE__, $sub_sub_subelement);
+ break;
+ }
+ }
+ break;
+
+ default:
+ $this->unhandledElement('track.contentencodings', __LINE__, $sub_subelement);
+ break;
+ }
+ }
+ break;
+
+ default:
+ $this->unhandledElement('track', __LINE__, $subelement);
+ break;
+ }
+ }
+
+ $info['matroska']['tracks']['tracks'][] = $track_entry;
+ break;
+
+ default:
+ $this->unhandledElement('tracks', __LINE__, $track_entry);
+ break;
+ }
+ }
+ break;
+
+ case EBML_ID_INFO: // Contains miscellaneous general information and statistics on the file.
+ $info_entry = array();
+
+ while ($this->getEBMLelement($subelement, $element_data['end'], true)) {
+ switch ($subelement['id']) {
+
+ case EBML_ID_TIMECODESCALE:
+ $info_entry[$subelement['id_name']] = getid3_lib::BigEndian2Int($subelement['data']);
+ break;
+
+ case EBML_ID_DURATION:
+ $info_entry[$subelement['id_name']] = getid3_lib::BigEndian2Float($subelement['data']);
+ break;
+
+ case EBML_ID_DATEUTC:
+ $info_entry[$subelement['id_name']] = getid3_lib::BigEndian2Int($subelement['data']);
+ $info_entry[$subelement['id_name'].'_unix'] = self::EBMLdate2unix($info_entry[$subelement['id_name']]);
+ break;
+
+ case EBML_ID_SEGMENTUID:
+ case EBML_ID_PREVUID:
+ case EBML_ID_NEXTUID:
+ $info_entry[$subelement['id_name']] = getid3_lib::trimNullByte($subelement['data']);
+ break;
+
+ case EBML_ID_SEGMENTFAMILY:
+ $info_entry[$subelement['id_name']][] = getid3_lib::trimNullByte($subelement['data']);
+ break;
+
+ case EBML_ID_SEGMENTFILENAME:
+ case EBML_ID_PREVFILENAME:
+ case EBML_ID_NEXTFILENAME:
+ case EBML_ID_TITLE:
+ case EBML_ID_MUXINGAPP:
+ case EBML_ID_WRITINGAPP:
+ $info_entry[$subelement['id_name']] = getid3_lib::trimNullByte($subelement['data']);
+ $info['matroska']['comments'][strtolower($subelement['id_name'])][] = $info_entry[$subelement['id_name']];
+ break;
+
+ case EBML_ID_CHAPTERTRANSLATE:
+ $chaptertranslate_entry = array();
+
+ while ($this->getEBMLelement($sub_subelement, $subelement['end'], true)) {
+ switch ($sub_subelement['id']) {
+
+ case EBML_ID_CHAPTERTRANSLATEEDITIONUID:
+ $chaptertranslate_entry[$sub_subelement['id_name']][] = getid3_lib::BigEndian2Int($sub_subelement['data']);
+ break;
+
+ case EBML_ID_CHAPTERTRANSLATECODEC:
+ $chaptertranslate_entry[$sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_subelement['data']);
+ break;
+
+ case EBML_ID_CHAPTERTRANSLATEID:
+ $chaptertranslate_entry[$sub_subelement['id_name']] = getid3_lib::trimNullByte($sub_subelement['data']);
+ break;
+
+ default:
+ $this->unhandledElement('info.chaptertranslate', __LINE__, $sub_subelement);
+ break;
+ }
+ }
+ $info_entry[$subelement['id_name']] = $chaptertranslate_entry;
+ break;
+
+ default:
+ $this->unhandledElement('info', __LINE__, $subelement);
+ break;
+ }
+ }
+ $info['matroska']['info'][] = $info_entry;
+ break;
+
+ case EBML_ID_CUES: // A top-level element to speed seeking access. All entries are local to the segment. Should be mandatory for non "live" streams.
+ if (self::$hide_clusters) { // do not parse cues if hide clusters is "ON" till they point to clusters anyway
+ $this->current_offset = $element_data['end'];
+ break;
+ }
+ $cues_entry = array();
+
+ while ($this->getEBMLelement($subelement, $element_data['end'])) {
+ switch ($subelement['id']) {
+
+ case EBML_ID_CUEPOINT:
+ $cuepoint_entry = array();
+
+ while ($this->getEBMLelement($sub_subelement, $subelement['end'], array(EBML_ID_CUETRACKPOSITIONS))) {
+ switch ($sub_subelement['id']) {
+
+ case EBML_ID_CUETRACKPOSITIONS:
+ $cuetrackpositions_entry = array();
+
+ while ($this->getEBMLelement($sub_sub_subelement, $sub_subelement['end'], true)) {
+ switch ($sub_sub_subelement['id']) {
+
+ case EBML_ID_CUETRACK:
+ case EBML_ID_CUECLUSTERPOSITION:
+ case EBML_ID_CUEBLOCKNUMBER:
+ case EBML_ID_CUECODECSTATE:
+ $cuetrackpositions_entry[$sub_sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_sub_subelement['data']);
+ break;
+
+ default:
+ $this->unhandledElement('cues.cuepoint.cuetrackpositions', __LINE__, $sub_sub_subelement);
+ break;
+ }
+ }
+ $cuepoint_entry[$sub_subelement['id_name']][] = $cuetrackpositions_entry;
+ break;
+
+ case EBML_ID_CUETIME:
+ $cuepoint_entry[$sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_subelement['data']);
+ break;
+
+ default:
+ $this->unhandledElement('cues.cuepoint', __LINE__, $sub_subelement);
+ break;
+ }
+ }
+ $cues_entry[] = $cuepoint_entry;
+ break;
+
+ default:
+ $this->unhandledElement('cues', __LINE__, $subelement);
+ break;
+ }
+ }
+ $info['matroska']['cues'] = $cues_entry;
+ break;
+
+ case EBML_ID_TAGS: // Element containing elements specific to Tracks/Chapters.
+ $tags_entry = array();
+
+ while ($this->getEBMLelement($subelement, $element_data['end'], false)) {
+ switch ($subelement['id']) {
+
+ case EBML_ID_TAG:
+ $tag_entry = array();
+
+ while ($this->getEBMLelement($sub_subelement, $subelement['end'], false)) {
+ switch ($sub_subelement['id']) {
+
+ case EBML_ID_TARGETS:
+ $targets_entry = array();
+
+ while ($this->getEBMLelement($sub_sub_subelement, $sub_subelement['end'], true)) {
+ switch ($sub_sub_subelement['id']) {
+
+ case EBML_ID_TARGETTYPEVALUE:
+ $targets_entry[$sub_sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_sub_subelement['data']);
+ $targets_entry[strtolower($sub_sub_subelement['id_name']).'_long'] = self::TargetTypeValue($targets_entry[$sub_sub_subelement['id_name']]);
+ break;
+
+ case EBML_ID_TARGETTYPE:
+ $targets_entry[$sub_sub_subelement['id_name']] = $sub_sub_subelement['data'];
+ break;
+
+ case EBML_ID_TAGTRACKUID:
+ case EBML_ID_TAGEDITIONUID:
+ case EBML_ID_TAGCHAPTERUID:
+ case EBML_ID_TAGATTACHMENTUID:
+ $targets_entry[$sub_sub_subelement['id_name']][] = getid3_lib::PrintHexBytes($sub_sub_subelement['data'], true, false);
+ break;
+
+ default:
+ $this->unhandledElement('tags.tag.targets', __LINE__, $sub_sub_subelement);
+ break;
+ }
+ }
+ $tag_entry[$sub_subelement['id_name']] = $targets_entry;
+ break;
+
+ case EBML_ID_SIMPLETAG:
+ $tag_entry[$sub_subelement['id_name']][] = $this->HandleEMBLSimpleTag($sub_subelement['end']);
+ break;
+
+ default:
+ $this->unhandledElement('tags.tag', __LINE__, $sub_subelement);
+ break;
+ }
+ }
+ $tags_entry[] = $tag_entry;
+ break;
+
+ default:
+ $this->unhandledElement('tags', __LINE__, $subelement);
+ break;
+ }
+ }
+ $info['matroska']['tags'] = $tags_entry;
+ break;
+
+ case EBML_ID_ATTACHMENTS: // Contain attached files.
+
+ while ($this->getEBMLelement($subelement, $element_data['end'])) {
+ switch ($subelement['id']) {
+
+ case EBML_ID_ATTACHEDFILE:
+ $attachedfile_entry = array();
+
+ while ($this->getEBMLelement($sub_subelement, $subelement['end'], array(EBML_ID_FILEDATA))) {
+ switch ($sub_subelement['id']) {
+
+ case EBML_ID_FILEDESCRIPTION:
+ case EBML_ID_FILENAME:
+ case EBML_ID_FILEMIMETYPE:
+ $attachedfile_entry[$sub_subelement['id_name']] = $sub_subelement['data'];
+ break;
+
+ case EBML_ID_FILEDATA:
+ $attachedfile_entry['data_offset'] = $this->current_offset;
+ $attachedfile_entry['data_length'] = $sub_subelement['length'];
+
+ $attachedfile_entry[$sub_subelement['id_name']] = $this->saveAttachment(
+ $attachedfile_entry['FileName'],
+ $attachedfile_entry['data_offset'],
+ $attachedfile_entry['data_length']);
+
+ $this->current_offset = $sub_subelement['end'];
+ break;
+
+ case EBML_ID_FILEUID:
+ $attachedfile_entry[$sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_subelement['data']);
+ break;
+
+ default:
+ $this->unhandledElement('attachments.attachedfile', __LINE__, $sub_subelement);
+ break;
+ }
+ }
+ $info['matroska']['attachments'][] = $attachedfile_entry;
+ break;
+
+ default:
+ $this->unhandledElement('attachments', __LINE__, $subelement);
+ break;
+ }
+ }
+ break;
+
+ case EBML_ID_CHAPTERS:
+
+ while ($this->getEBMLelement($subelement, $element_data['end'])) {
+ switch ($subelement['id']) {
+
+ case EBML_ID_EDITIONENTRY:
+ $editionentry_entry = array();
+
+ while ($this->getEBMLelement($sub_subelement, $subelement['end'], array(EBML_ID_CHAPTERATOM))) {
+ switch ($sub_subelement['id']) {
+
+ case EBML_ID_EDITIONUID:
+ $editionentry_entry[$sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_subelement['data']);
+ break;
+
+ case EBML_ID_EDITIONFLAGHIDDEN:
+ case EBML_ID_EDITIONFLAGDEFAULT:
+ case EBML_ID_EDITIONFLAGORDERED:
+ $editionentry_entry[$sub_subelement['id_name']] = (bool)getid3_lib::BigEndian2Int($sub_subelement['data']);
+ break;
+
+ case EBML_ID_CHAPTERATOM:
+ $chapteratom_entry = array();
+
+ while ($this->getEBMLelement($sub_sub_subelement, $sub_subelement['end'], array(EBML_ID_CHAPTERTRACK, EBML_ID_CHAPTERDISPLAY))) {
+ switch ($sub_sub_subelement['id']) {
+
+ case EBML_ID_CHAPTERSEGMENTUID:
+ case EBML_ID_CHAPTERSEGMENTEDITIONUID:
+ $chapteratom_entry[$sub_sub_subelement['id_name']] = $sub_sub_subelement['data'];
+ break;
+
+ case EBML_ID_CHAPTERFLAGENABLED:
+ case EBML_ID_CHAPTERFLAGHIDDEN:
+ $chapteratom_entry[$sub_sub_subelement['id_name']] = (bool)getid3_lib::BigEndian2Int($sub_sub_subelement['data']);
+ break;
+
+ case EBML_ID_CHAPTERUID:
+ case EBML_ID_CHAPTERTIMESTART:
+ case EBML_ID_CHAPTERTIMEEND:
+ $chapteratom_entry[$sub_sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_sub_subelement['data']);
+ break;
+
+ case EBML_ID_CHAPTERTRACK:
+ $chaptertrack_entry = array();
+
+ while ($this->getEBMLelement($sub_sub_sub_subelement, $sub_sub_subelement['end'], true)) {
+ switch ($sub_sub_sub_subelement['id']) {
+
+ case EBML_ID_CHAPTERTRACKNUMBER:
+ $chaptertrack_entry[$sub_sub_sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_sub_sub_subelement['data']);
+ break;
+
+ default:
+ $this->unhandledElement('chapters.editionentry.chapteratom.chaptertrack', __LINE__, $sub_sub_sub_subelement);
+ break;
+ }
+ }
+ $chapteratom_entry[$sub_sub_subelement['id_name']][] = $chaptertrack_entry;
+ break;
+
+ case EBML_ID_CHAPTERDISPLAY:
+ $chapterdisplay_entry = array();
+
+ while ($this->getEBMLelement($sub_sub_sub_subelement, $sub_sub_subelement['end'], true)) {
+ switch ($sub_sub_sub_subelement['id']) {
+
+ case EBML_ID_CHAPSTRING:
+ case EBML_ID_CHAPLANGUAGE:
+ case EBML_ID_CHAPCOUNTRY:
+ $chapterdisplay_entry[$sub_sub_sub_subelement['id_name']] = $sub_sub_sub_subelement['data'];
+ break;
+
+ default:
+ $this->unhandledElement('chapters.editionentry.chapteratom.chapterdisplay', __LINE__, $sub_sub_sub_subelement);
+ break;
+ }
+ }
+ $chapteratom_entry[$sub_sub_subelement['id_name']][] = $chapterdisplay_entry;
+ break;
+
+ default:
+ $this->unhandledElement('chapters.editionentry.chapteratom', __LINE__, $sub_sub_subelement);
+ break;
+ }
+ }
+ $editionentry_entry[$sub_subelement['id_name']][] = $chapteratom_entry;
+ break;
+
+ default:
+ $this->unhandledElement('chapters.editionentry', __LINE__, $sub_subelement);
+ break;
+ }
+ }
+ $info['matroska']['chapters'][] = $editionentry_entry;
+ break;
+
+ default:
+ $this->unhandledElement('chapters', __LINE__, $subelement);
+ break;
+ }
+ }
+ break;
+
+ case EBML_ID_CLUSTER: // The lower level element containing the (monolithic) Block structure.
+ $cluster_entry = array();
+
+ while ($this->getEBMLelement($subelement, $element_data['end'], array(EBML_ID_CLUSTERSILENTTRACKS, EBML_ID_CLUSTERBLOCKGROUP, EBML_ID_CLUSTERSIMPLEBLOCK))) {
+ switch ($subelement['id']) {
+
+ case EBML_ID_CLUSTERTIMECODE:
+ case EBML_ID_CLUSTERPOSITION:
+ case EBML_ID_CLUSTERPREVSIZE:
+ $cluster_entry[$subelement['id_name']] = getid3_lib::BigEndian2Int($subelement['data']);
+ break;
+
+ case EBML_ID_CLUSTERSILENTTRACKS:
+ $cluster_silent_tracks = array();
+
+ while ($this->getEBMLelement($sub_subelement, $subelement['end'], true)) {
+ switch ($sub_subelement['id']) {
+
+ case EBML_ID_CLUSTERSILENTTRACKNUMBER:
+ $cluster_silent_tracks[] = getid3_lib::BigEndian2Int($sub_subelement['data']);
+ break;
+
+ default:
+ $this->unhandledElement('cluster.silenttracks', __LINE__, $sub_subelement);
+ break;
+ }
+ }
+ $cluster_entry[$subelement['id_name']][] = $cluster_silent_tracks;
+ break;
+
+ case EBML_ID_CLUSTERBLOCKGROUP:
+ $cluster_block_group = array('offset' => $this->current_offset);
+
+ while ($this->getEBMLelement($sub_subelement, $subelement['end'], array(EBML_ID_CLUSTERBLOCK))) {
+ switch ($sub_subelement['id']) {
+
+ case EBML_ID_CLUSTERBLOCK:
+ $cluster_block_group[$sub_subelement['id_name']] = $this->HandleEMBLClusterBlock($sub_subelement, EBML_ID_CLUSTERBLOCK, $info);
+ break;
+
+ case EBML_ID_CLUSTERREFERENCEPRIORITY: // unsigned-int
+ case EBML_ID_CLUSTERBLOCKDURATION: // unsigned-int
+ $cluster_block_group[$sub_subelement['id_name']] = getid3_lib::BigEndian2Int($sub_subelement['data']);
+ break;
+
+ case EBML_ID_CLUSTERREFERENCEBLOCK: // signed-int
+ $cluster_block_group[$sub_subelement['id_name']][] = getid3_lib::BigEndian2Int($sub_subelement['data'], false, true);
+ break;
+
+ case EBML_ID_CLUSTERCODECSTATE:
+ $cluster_block_group[$sub_subelement['id_name']] = getid3_lib::trimNullByte($sub_subelement['data']);
+ break;
+
+ default:
+ $this->unhandledElement('clusters.blockgroup', __LINE__, $sub_subelement);
+ break;
+ }
+ }
+ $cluster_entry[$subelement['id_name']][] = $cluster_block_group;
+ break;
+
+ case EBML_ID_CLUSTERSIMPLEBLOCK:
+ $cluster_entry[$subelement['id_name']][] = $this->HandleEMBLClusterBlock($subelement, EBML_ID_CLUSTERSIMPLEBLOCK, $info);
+ break;
+
+ default:
+ $this->unhandledElement('cluster', __LINE__, $subelement);
+ break;
+ }
+ $this->current_offset = $subelement['end'];
+ }
+ if (!self::$hide_clusters) {
+ $info['matroska']['cluster'][] = $cluster_entry;
+ }
+
+ // check to see if all the data we need exists already, if so, break out of the loop
+ if (!self::$parse_whole_file) {
+ if (isset($info['matroska']['info']) && is_array($info['matroska']['info'])) {
+ if (isset($info['matroska']['tracks']['tracks']) && is_array($info['matroska']['tracks']['tracks'])) {
+ if (count($info['matroska']['track_data_offsets']) == count($info['matroska']['tracks']['tracks'])) {
+ return;
+ }
+ }
+ }
+ }
+ break;
+
+ default:
+ $this->unhandledElement('segment', __LINE__, $element_data);
+ break;
+ }
+ }
+ break;
+
+ default:
+ $this->unhandledElement('root', __LINE__, $top_element);
+ break;
+ }
+ }
+ }
+
+ /**
+ * @param int $min_data
+ *
+ * @return bool
+ */
+ private function EnsureBufferHasEnoughData($min_data=1024) {
+ if (($this->current_offset - $this->EBMLbuffer_offset) >= ($this->EBMLbuffer_length - $min_data)) {
+ $read_bytes = max($min_data, $this->getid3->fread_buffer_size());
+
+ try {
+ $this->fseek($this->current_offset);
+ $this->EBMLbuffer_offset = $this->current_offset;
+ $this->EBMLbuffer = $this->fread($read_bytes);
+ $this->EBMLbuffer_length = strlen($this->EBMLbuffer);
+ } catch (getid3_exception $e) {
+ $this->warning('EBML parser: '.$e->getMessage());
+ return false;
+ }
+
+ if ($this->EBMLbuffer_length == 0 && $this->feof()) {
+ return $this->error('EBML parser: ran out of file at offset '.$this->current_offset);
+ }
+ }
+ return true;
+ }
+
+ /**
+ * @return int|float|false
+ */
+ private function readEBMLint() {
+ $actual_offset = $this->current_offset - $this->EBMLbuffer_offset;
+
+ // get length of integer
+ $first_byte_int = ord($this->EBMLbuffer[$actual_offset]);
+ if (0x80 & $first_byte_int) {
+ $length = 1;
+ } elseif (0x40 & $first_byte_int) {
+ $length = 2;
+ } elseif (0x20 & $first_byte_int) {
+ $length = 3;
+ } elseif (0x10 & $first_byte_int) {
+ $length = 4;
+ } elseif (0x08 & $first_byte_int) {
+ $length = 5;
+ } elseif (0x04 & $first_byte_int) {
+ $length = 6;
+ } elseif (0x02 & $first_byte_int) {
+ $length = 7;
+ } elseif (0x01 & $first_byte_int) {
+ $length = 8;
+ } else {
+ throw new Exception('invalid EBML integer (leading 0x00) at '.$this->current_offset);
+ }
+
+ // read
+ $int_value = self::EBML2Int(substr($this->EBMLbuffer, $actual_offset, $length));
+ $this->current_offset += $length;
+
+ return $int_value;
+ }
+
+ /**
+ * @param int $length
+ * @param bool $check_buffer
+ *
+ * @return string|false
+ */
+ private function readEBMLelementData($length, $check_buffer=false) {
+ if ($check_buffer && !$this->EnsureBufferHasEnoughData($length)) {
+ return false;
+ }
+ $data = substr($this->EBMLbuffer, $this->current_offset - $this->EBMLbuffer_offset, $length);
+ $this->current_offset += $length;
+ return $data;
+ }
+
+ /**
+ * @param array $element
+ * @param int $parent_end
+ * @param array|bool $get_data
+ *
+ * @return bool
+ */
+ private function getEBMLelement(&$element, $parent_end, $get_data=false) {
+ if ($this->current_offset >= $parent_end) {
+ return false;
+ }
+
+ if (!$this->EnsureBufferHasEnoughData()) {
+ $this->current_offset = PHP_INT_MAX; // do not exit parser right now, allow to finish current loop to gather maximum information
+ return false;
+ }
+
+ $element = array();
+
+ // set offset
+ $element['offset'] = $this->current_offset;
+
+ // get ID
+ $element['id'] = $this->readEBMLint();
+
+ // get name
+ $element['id_name'] = self::EBMLidName($element['id']);
+
+ // get length
+ $element['length'] = $this->readEBMLint();
+
+ // get end offset
+ $element['end'] = $this->current_offset + $element['length'];
+
+ // get raw data
+ $dont_parse = (in_array($element['id'], $this->unuseful_elements) || $element['id_name'] == dechex($element['id']));
+ if (($get_data === true || (is_array($get_data) && !in_array($element['id'], $get_data))) && !$dont_parse) {
+ $element['data'] = $this->readEBMLelementData($element['length'], $element);
+ }
+
+ return true;
+ }
+
+ /**
+ * @param string $type
+ * @param int $line
+ * @param array $element
+ */
+ private function unhandledElement($type, $line, $element) {
+ // warn only about unknown and missed elements, not about unuseful
+ if (!in_array($element['id'], $this->unuseful_elements)) {
+ $this->warning('Unhandled '.$type.' element ['.basename(__FILE__).':'.$line.'] ('.$element['id'].'::'.$element['id_name'].' ['.$element['length'].' bytes]) at '.$element['offset']);
+ }
+
+ // increase offset for unparsed elements
+ if (!isset($element['data'])) {
+ $this->current_offset = $element['end'];
+ }
+ }
+
+ /**
+ * @param array $SimpleTagArray
+ *
+ * @return bool
+ */
+ private function ExtractCommentsSimpleTag($SimpleTagArray) {
+ if (!empty($SimpleTagArray['SimpleTag'])) {
+ foreach ($SimpleTagArray['SimpleTag'] as $SimpleTagKey => $SimpleTagData) {
+ if (!empty($SimpleTagData['TagName']) && !empty($SimpleTagData['TagString'])) {
+ $this->getid3->info['matroska']['comments'][strtolower($SimpleTagData['TagName'])][] = $SimpleTagData['TagString'];
+ }
+ if (!empty($SimpleTagData['SimpleTag'])) {
+ $this->ExtractCommentsSimpleTag($SimpleTagData);
+ }
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * @param int $parent_end
+ *
+ * @return array
+ */
+ private function HandleEMBLSimpleTag($parent_end) {
+ $simpletag_entry = array();
+
+ while ($this->getEBMLelement($element, $parent_end, array(EBML_ID_SIMPLETAG))) {
+ switch ($element['id']) {
+
+ case EBML_ID_TAGNAME:
+ case EBML_ID_TAGLANGUAGE:
+ case EBML_ID_TAGSTRING:
+ case EBML_ID_TAGBINARY:
+ $simpletag_entry[$element['id_name']] = $element['data'];
+ break;
+
+ case EBML_ID_SIMPLETAG:
+ $simpletag_entry[$element['id_name']][] = $this->HandleEMBLSimpleTag($element['end']);
+ break;
+
+ case EBML_ID_TAGDEFAULT:
+ $simpletag_entry[$element['id_name']] = (bool)getid3_lib::BigEndian2Int($element['data']);
+ break;
+
+ default:
+ $this->unhandledElement('tag.simpletag', __LINE__, $element);
+ break;
+ }
+ }
+
+ return $simpletag_entry;
+ }
+
+ /**
+ * @param array $element
+ * @param int $block_type
+ * @param array $info
+ *
+ * @return array
+ */
+ private function HandleEMBLClusterBlock($element, $block_type, &$info) {
+ // http://www.matroska.org/technical/specs/index.html#block_structure
+ // http://www.matroska.org/technical/specs/index.html#simpleblock_structure
+
+ $block_data = array();
+ $block_data['tracknumber'] = $this->readEBMLint();
+ $block_data['timecode'] = getid3_lib::BigEndian2Int($this->readEBMLelementData(2), false, true);
+ $block_data['flags_raw'] = getid3_lib::BigEndian2Int($this->readEBMLelementData(1));
+
+ if ($block_type == EBML_ID_CLUSTERSIMPLEBLOCK) {
+ $block_data['flags']['keyframe'] = (($block_data['flags_raw'] & 0x80) >> 7);
+ //$block_data['flags']['reserved1'] = (($block_data['flags_raw'] & 0x70) >> 4);
+ }
+ else {
+ //$block_data['flags']['reserved1'] = (($block_data['flags_raw'] & 0xF0) >> 4);
+ }
+ $block_data['flags']['invisible'] = (bool)(($block_data['flags_raw'] & 0x08) >> 3);
+ $block_data['flags']['lacing'] = (($block_data['flags_raw'] & 0x06) >> 1); // 00=no lacing; 01=Xiph lacing; 11=EBML lacing; 10=fixed-size lacing
+ if ($block_type == EBML_ID_CLUSTERSIMPLEBLOCK) {
+ $block_data['flags']['discardable'] = (($block_data['flags_raw'] & 0x01));
+ }
+ else {
+ //$block_data['flags']['reserved2'] = (($block_data['flags_raw'] & 0x01) >> 0);
+ }
+ $block_data['flags']['lacing_type'] = self::BlockLacingType($block_data['flags']['lacing']);
+
+ // Lace (when lacing bit is set)
+ if ($block_data['flags']['lacing'] > 0) {
+ $block_data['lace_frames'] = getid3_lib::BigEndian2Int($this->readEBMLelementData(1)) + 1; // Number of frames in the lace-1 (uint8)
+ if ($block_data['flags']['lacing'] != 0x02) {
+ for ($i = 1; $i < $block_data['lace_frames']; $i ++) { // Lace-coded size of each frame of the lace, except for the last one (multiple uint8). *This is not used with Fixed-size lacing as it is calculated automatically from (total size of lace) / (number of frames in lace).
+ if ($block_data['flags']['lacing'] == 0x03) { // EBML lacing
+ $block_data['lace_frames_size'][$i] = $this->readEBMLint(); // TODO: read size correctly, calc size for the last frame. For now offsets are deteminded OK with readEBMLint() and that's the most important thing.
+ }
+ else { // Xiph lacing
+ $block_data['lace_frames_size'][$i] = 0;
+ do {
+ $size = getid3_lib::BigEndian2Int($this->readEBMLelementData(1));
+ $block_data['lace_frames_size'][$i] += $size;
+ }
+ while ($size == 255);
+ }
+ }
+ if ($block_data['flags']['lacing'] == 0x01) { // calc size of the last frame only for Xiph lacing, till EBML sizes are now anyway determined incorrectly
+ $block_data['lace_frames_size'][] = $element['end'] - $this->current_offset - array_sum($block_data['lace_frames_size']);
+ }
+ }
+ }
+
+ if (!isset($info['matroska']['track_data_offsets'][$block_data['tracknumber']])) {
+ $info['matroska']['track_data_offsets'][$block_data['tracknumber']]['offset'] = $this->current_offset;
+ $info['matroska']['track_data_offsets'][$block_data['tracknumber']]['length'] = $element['end'] - $this->current_offset;
+ //$info['matroska']['track_data_offsets'][$block_data['tracknumber']]['total_length'] = 0;
+ }
+ //$info['matroska']['track_data_offsets'][$block_data['tracknumber']]['total_length'] += $info['matroska']['track_data_offsets'][$block_data['tracknumber']]['length'];
+ //$info['matroska']['track_data_offsets'][$block_data['tracknumber']]['duration'] = $block_data['timecode'] * ((isset($info['matroska']['info'][0]['TimecodeScale']) ? $info['matroska']['info'][0]['TimecodeScale'] : 1000000) / 1000000000);
+
+ // set offset manually
+ $this->current_offset = $element['end'];
+
+ return $block_data;
+ }
+
+ /**
+ * @param string $EBMLstring
+ *
+ * @return int|float|false
+ */
+ private static function EBML2Int($EBMLstring) {
// http://matroska.org/specs/
// Element ID coded with an UTF-8 like system:
@@ -51,28 +1562,361 @@
// 0000 001x xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx - value 0 to 2^49-2
// 0000 0001 xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx - value 0 to 2^56-2
- if (0x80 & ord($EBMLstring{0})) {
- $EBMLstring{0} = chr(ord($EBMLstring{0}) & 0x7F);
- } elseif (0x40 & ord($EBMLstring{0})) {
- $EBMLstring{0} = chr(ord($EBMLstring{0}) & 0x3F);
- } elseif (0x20 & ord($EBMLstring{0})) {
- $EBMLstring{0} = chr(ord($EBMLstring{0}) & 0x1F);
- } elseif (0x10 & ord($EBMLstring{0})) {
- $EBMLstring{0} = chr(ord($EBMLstring{0}) & 0x0F);
- } elseif (0x08 & ord($EBMLstring{0})) {
- $EBMLstring{0} = chr(ord($EBMLstring{0}) & 0x07);
- } elseif (0x04 & ord($EBMLstring{0})) {
- $EBMLstring{0} = chr(ord($EBMLstring{0}) & 0x03);
- } elseif (0x02 & ord($EBMLstring{0})) {
- $EBMLstring{0} = chr(ord($EBMLstring{0}) & 0x01);
- } elseif (0x01 & ord($EBMLstring{0})) {
- $EBMLstring{0} = chr(ord($EBMLstring{0}) & 0x00);
- } else {
- return false;
+ $first_byte_int = ord($EBMLstring[0]);
+ if (0x80 & $first_byte_int) {
+ $EBMLstring[0] = chr($first_byte_int & 0x7F);
+ } elseif (0x40 & $first_byte_int) {
+ $EBMLstring[0] = chr($first_byte_int & 0x3F);
+ } elseif (0x20 & $first_byte_int) {
+ $EBMLstring[0] = chr($first_byte_int & 0x1F);
+ } elseif (0x10 & $first_byte_int) {
+ $EBMLstring[0] = chr($first_byte_int & 0x0F);
+ } elseif (0x08 & $first_byte_int) {
+ $EBMLstring[0] = chr($first_byte_int & 0x07);
+ } elseif (0x04 & $first_byte_int) {
+ $EBMLstring[0] = chr($first_byte_int & 0x03);
+ } elseif (0x02 & $first_byte_int) {
+ $EBMLstring[0] = chr($first_byte_int & 0x01);
+ } elseif (0x01 & $first_byte_int) {
+ $EBMLstring[0] = chr($first_byte_int & 0x00);
}
+
return getid3_lib::BigEndian2Int($EBMLstring);
}
+ /**
+ * @param int $EBMLdatestamp
+ *
+ * @return float
+ */
+ private static function EBMLdate2unix($EBMLdatestamp) {
+ // Date - signed 8 octets integer in nanoseconds with 0 indicating the precise beginning of the millennium (at 2001-01-01T00:00:00,000000000 UTC)
+ // 978307200 == mktime(0, 0, 0, 1, 1, 2001) == January 1, 2001 12:00:00am UTC
+ return round(($EBMLdatestamp / 1000000000) + 978307200);
+ }
+
+ /**
+ * @param int $target_type
+ *
+ * @return string|int
+ */
+ public static function TargetTypeValue($target_type) {
+ // http://www.matroska.org/technical/specs/tagging/index.html
+ static $TargetTypeValue = array();
+ if (empty($TargetTypeValue)) {
+ $TargetTypeValue[10] = 'A: ~ V:shot'; // the lowest hierarchy found in music or movies
+ $TargetTypeValue[20] = 'A:subtrack/part/movement ~ V:scene'; // corresponds to parts of a track for audio (like a movement)
+ $TargetTypeValue[30] = 'A:track/song ~ V:chapter'; // the common parts of an album or a movie
+ $TargetTypeValue[40] = 'A:part/session ~ V:part/session'; // when an album or episode has different logical parts
+ $TargetTypeValue[50] = 'A:album/opera/concert ~ V:movie/episode/concert'; // the most common grouping level of music and video (equals to an episode for TV series)
+ $TargetTypeValue[60] = 'A:edition/issue/volume/opus ~ V:season/sequel/volume'; // a list of lower levels grouped together
+ $TargetTypeValue[70] = 'A:collection ~ V:collection'; // the high hierarchy consisting of many different lower items
+ }
+ return (isset($TargetTypeValue[$target_type]) ? $TargetTypeValue[$target_type] : $target_type);
+ }
+
+ /**
+ * @param int $lacingtype
+ *
+ * @return string|int
+ */
+ public static function BlockLacingType($lacingtype) {
+ // http://matroska.org/technical/specs/index.html#block_structure
+ static $BlockLacingType = array();
+ if (empty($BlockLacingType)) {
+ $BlockLacingType[0x00] = 'no lacing';
+ $BlockLacingType[0x01] = 'Xiph lacing';
+ $BlockLacingType[0x02] = 'fixed-size lacing';
+ $BlockLacingType[0x03] = 'EBML lacing';
+ }
+ return (isset($BlockLacingType[$lacingtype]) ? $BlockLacingType[$lacingtype] : $lacingtype);
+ }
+
+ /**
+ * @param string $codecid
+ *
+ * @return string
+ */
+ public static function CodecIDtoCommonName($codecid) {
+ // http://www.matroska.org/technical/specs/codecid/index.html
+ static $CodecIDlist = array();
+ if (empty($CodecIDlist)) {
+ $CodecIDlist['A_AAC'] = 'aac';
+ $CodecIDlist['A_AAC/MPEG2/LC'] = 'aac';
+ $CodecIDlist['A_AC3'] = 'ac3';
+ $CodecIDlist['A_EAC3'] = 'eac3';
+ $CodecIDlist['A_DTS'] = 'dts';
+ $CodecIDlist['A_FLAC'] = 'flac';
+ $CodecIDlist['A_MPEG/L1'] = 'mp1';
+ $CodecIDlist['A_MPEG/L2'] = 'mp2';
+ $CodecIDlist['A_MPEG/L3'] = 'mp3';
+ $CodecIDlist['A_PCM/INT/LIT'] = 'pcm'; // PCM Integer Little Endian
+ $CodecIDlist['A_PCM/INT/BIG'] = 'pcm'; // PCM Integer Big Endian
+ $CodecIDlist['A_QUICKTIME/QDMC'] = 'quicktime'; // Quicktime: QDesign Music
+ $CodecIDlist['A_QUICKTIME/QDM2'] = 'quicktime'; // Quicktime: QDesign Music v2
+ $CodecIDlist['A_VORBIS'] = 'vorbis';
+ $CodecIDlist['V_MPEG1'] = 'mpeg';
+ $CodecIDlist['V_THEORA'] = 'theora';
+ $CodecIDlist['V_REAL/RV40'] = 'real';
+ $CodecIDlist['V_REAL/RV10'] = 'real';
+ $CodecIDlist['V_REAL/RV20'] = 'real';
+ $CodecIDlist['V_REAL/RV30'] = 'real';
+ $CodecIDlist['V_QUICKTIME'] = 'quicktime'; // Quicktime
+ $CodecIDlist['V_MPEG4/ISO/AP'] = 'mpeg4';
+ $CodecIDlist['V_MPEG4/ISO/ASP'] = 'mpeg4';
+ $CodecIDlist['V_MPEG4/ISO/AVC'] = 'h264';
+ $CodecIDlist['V_MPEG4/ISO/SP'] = 'mpeg4';
+ $CodecIDlist['V_VP8'] = 'vp8';
+ $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);
+ }
+
+ /**
+ * @param int $value
+ *
+ * @return string
+ */
+ private static function EBMLidName($value) {
+ static $EBMLidList = array();
+ if (empty($EBMLidList)) {
+ $EBMLidList[EBML_ID_ASPECTRATIOTYPE] = 'AspectRatioType';
+ $EBMLidList[EBML_ID_ATTACHEDFILE] = 'AttachedFile';
+ $EBMLidList[EBML_ID_ATTACHMENTLINK] = 'AttachmentLink';
+ $EBMLidList[EBML_ID_ATTACHMENTS] = 'Attachments';
+ $EBMLidList[EBML_ID_AUDIO] = 'Audio';
+ $EBMLidList[EBML_ID_BITDEPTH] = 'BitDepth';
+ $EBMLidList[EBML_ID_CHANNELPOSITIONS] = 'ChannelPositions';
+ $EBMLidList[EBML_ID_CHANNELS] = 'Channels';
+ $EBMLidList[EBML_ID_CHAPCOUNTRY] = 'ChapCountry';
+ $EBMLidList[EBML_ID_CHAPLANGUAGE] = 'ChapLanguage';
+ $EBMLidList[EBML_ID_CHAPPROCESS] = 'ChapProcess';
+ $EBMLidList[EBML_ID_CHAPPROCESSCODECID] = 'ChapProcessCodecID';
+ $EBMLidList[EBML_ID_CHAPPROCESSCOMMAND] = 'ChapProcessCommand';
+ $EBMLidList[EBML_ID_CHAPPROCESSDATA] = 'ChapProcessData';
+ $EBMLidList[EBML_ID_CHAPPROCESSPRIVATE] = 'ChapProcessPrivate';
+ $EBMLidList[EBML_ID_CHAPPROCESSTIME] = 'ChapProcessTime';
+ $EBMLidList[EBML_ID_CHAPSTRING] = 'ChapString';
+ $EBMLidList[EBML_ID_CHAPTERATOM] = 'ChapterAtom';
+ $EBMLidList[EBML_ID_CHAPTERDISPLAY] = 'ChapterDisplay';
+ $EBMLidList[EBML_ID_CHAPTERFLAGENABLED] = 'ChapterFlagEnabled';
+ $EBMLidList[EBML_ID_CHAPTERFLAGHIDDEN] = 'ChapterFlagHidden';
+ $EBMLidList[EBML_ID_CHAPTERPHYSICALEQUIV] = 'ChapterPhysicalEquiv';
+ $EBMLidList[EBML_ID_CHAPTERS] = 'Chapters';
+ $EBMLidList[EBML_ID_CHAPTERSEGMENTEDITIONUID] = 'ChapterSegmentEditionUID';
+ $EBMLidList[EBML_ID_CHAPTERSEGMENTUID] = 'ChapterSegmentUID';
+ $EBMLidList[EBML_ID_CHAPTERTIMEEND] = 'ChapterTimeEnd';
+ $EBMLidList[EBML_ID_CHAPTERTIMESTART] = 'ChapterTimeStart';
+ $EBMLidList[EBML_ID_CHAPTERTRACK] = 'ChapterTrack';
+ $EBMLidList[EBML_ID_CHAPTERTRACKNUMBER] = 'ChapterTrackNumber';
+ $EBMLidList[EBML_ID_CHAPTERTRANSLATE] = 'ChapterTranslate';
+ $EBMLidList[EBML_ID_CHAPTERTRANSLATECODEC] = 'ChapterTranslateCodec';
+ $EBMLidList[EBML_ID_CHAPTERTRANSLATEEDITIONUID] = 'ChapterTranslateEditionUID';
+ $EBMLidList[EBML_ID_CHAPTERTRANSLATEID] = 'ChapterTranslateID';
+ $EBMLidList[EBML_ID_CHAPTERUID] = 'ChapterUID';
+ $EBMLidList[EBML_ID_CLUSTER] = 'Cluster';
+ $EBMLidList[EBML_ID_CLUSTERBLOCK] = 'ClusterBlock';
+ $EBMLidList[EBML_ID_CLUSTERBLOCKADDID] = 'ClusterBlockAddID';
+ $EBMLidList[EBML_ID_CLUSTERBLOCKADDITIONAL] = 'ClusterBlockAdditional';
+ $EBMLidList[EBML_ID_CLUSTERBLOCKADDITIONID] = 'ClusterBlockAdditionID';
+ $EBMLidList[EBML_ID_CLUSTERBLOCKADDITIONS] = 'ClusterBlockAdditions';
+ $EBMLidList[EBML_ID_CLUSTERBLOCKDURATION] = 'ClusterBlockDuration';
+ $EBMLidList[EBML_ID_CLUSTERBLOCKGROUP] = 'ClusterBlockGroup';
+ $EBMLidList[EBML_ID_CLUSTERBLOCKMORE] = 'ClusterBlockMore';
+ $EBMLidList[EBML_ID_CLUSTERBLOCKVIRTUAL] = 'ClusterBlockVirtual';
+ $EBMLidList[EBML_ID_CLUSTERCODECSTATE] = 'ClusterCodecState';
+ $EBMLidList[EBML_ID_CLUSTERDELAY] = 'ClusterDelay';
+ $EBMLidList[EBML_ID_CLUSTERDURATION] = 'ClusterDuration';
+ $EBMLidList[EBML_ID_CLUSTERENCRYPTEDBLOCK] = 'ClusterEncryptedBlock';
+ $EBMLidList[EBML_ID_CLUSTERFRAMENUMBER] = 'ClusterFrameNumber';
+ $EBMLidList[EBML_ID_CLUSTERLACENUMBER] = 'ClusterLaceNumber';
+ $EBMLidList[EBML_ID_CLUSTERPOSITION] = 'ClusterPosition';
+ $EBMLidList[EBML_ID_CLUSTERPREVSIZE] = 'ClusterPrevSize';
+ $EBMLidList[EBML_ID_CLUSTERREFERENCEBLOCK] = 'ClusterReferenceBlock';
+ $EBMLidList[EBML_ID_CLUSTERREFERENCEPRIORITY] = 'ClusterReferencePriority';
+ $EBMLidList[EBML_ID_CLUSTERREFERENCEVIRTUAL] = 'ClusterReferenceVirtual';
+ $EBMLidList[EBML_ID_CLUSTERSILENTTRACKNUMBER] = 'ClusterSilentTrackNumber';
+ $EBMLidList[EBML_ID_CLUSTERSILENTTRACKS] = 'ClusterSilentTracks';
+ $EBMLidList[EBML_ID_CLUSTERSIMPLEBLOCK] = 'ClusterSimpleBlock';
+ $EBMLidList[EBML_ID_CLUSTERTIMECODE] = 'ClusterTimecode';
+ $EBMLidList[EBML_ID_CLUSTERTIMESLICE] = 'ClusterTimeSlice';
+ $EBMLidList[EBML_ID_CODECDECODEALL] = 'CodecDecodeAll';
+ $EBMLidList[EBML_ID_CODECDOWNLOADURL] = 'CodecDownloadURL';
+ $EBMLidList[EBML_ID_CODECID] = 'CodecID';
+ $EBMLidList[EBML_ID_CODECINFOURL] = 'CodecInfoURL';
+ $EBMLidList[EBML_ID_CODECNAME] = 'CodecName';
+ $EBMLidList[EBML_ID_CODECPRIVATE] = 'CodecPrivate';
+ $EBMLidList[EBML_ID_CODECSETTINGS] = 'CodecSettings';
+ $EBMLidList[EBML_ID_COLOURSPACE] = 'ColourSpace';
+ $EBMLidList[EBML_ID_CONTENTCOMPALGO] = 'ContentCompAlgo';
+ $EBMLidList[EBML_ID_CONTENTCOMPRESSION] = 'ContentCompression';
+ $EBMLidList[EBML_ID_CONTENTCOMPSETTINGS] = 'ContentCompSettings';
+ $EBMLidList[EBML_ID_CONTENTENCALGO] = 'ContentEncAlgo';
+ $EBMLidList[EBML_ID_CONTENTENCKEYID] = 'ContentEncKeyID';
+ $EBMLidList[EBML_ID_CONTENTENCODING] = 'ContentEncoding';
+ $EBMLidList[EBML_ID_CONTENTENCODINGORDER] = 'ContentEncodingOrder';
+ $EBMLidList[EBML_ID_CONTENTENCODINGS] = 'ContentEncodings';
+ $EBMLidList[EBML_ID_CONTENTENCODINGSCOPE] = 'ContentEncodingScope';
+ $EBMLidList[EBML_ID_CONTENTENCODINGTYPE] = 'ContentEncodingType';
+ $EBMLidList[EBML_ID_CONTENTENCRYPTION] = 'ContentEncryption';
+ $EBMLidList[EBML_ID_CONTENTSIGALGO] = 'ContentSigAlgo';
+ $EBMLidList[EBML_ID_CONTENTSIGHASHALGO] = 'ContentSigHashAlgo';
+ $EBMLidList[EBML_ID_CONTENTSIGKEYID] = 'ContentSigKeyID';
+ $EBMLidList[EBML_ID_CONTENTSIGNATURE] = 'ContentSignature';
+ $EBMLidList[EBML_ID_CRC32] = 'CRC32';
+ $EBMLidList[EBML_ID_CUEBLOCKNUMBER] = 'CueBlockNumber';
+ $EBMLidList[EBML_ID_CUECLUSTERPOSITION] = 'CueClusterPosition';
+ $EBMLidList[EBML_ID_CUECODECSTATE] = 'CueCodecState';
+ $EBMLidList[EBML_ID_CUEPOINT] = 'CuePoint';
+ $EBMLidList[EBML_ID_CUEREFCLUSTER] = 'CueRefCluster';
+ $EBMLidList[EBML_ID_CUEREFCODECSTATE] = 'CueRefCodecState';
+ $EBMLidList[EBML_ID_CUEREFERENCE] = 'CueReference';
+ $EBMLidList[EBML_ID_CUEREFNUMBER] = 'CueRefNumber';
+ $EBMLidList[EBML_ID_CUEREFTIME] = 'CueRefTime';
+ $EBMLidList[EBML_ID_CUES] = 'Cues';
+ $EBMLidList[EBML_ID_CUETIME] = 'CueTime';
+ $EBMLidList[EBML_ID_CUETRACK] = 'CueTrack';
+ $EBMLidList[EBML_ID_CUETRACKPOSITIONS] = 'CueTrackPositions';
+ $EBMLidList[EBML_ID_DATEUTC] = 'DateUTC';
+ $EBMLidList[EBML_ID_DEFAULTDURATION] = 'DefaultDuration';
+ $EBMLidList[EBML_ID_DISPLAYHEIGHT] = 'DisplayHeight';
+ $EBMLidList[EBML_ID_DISPLAYUNIT] = 'DisplayUnit';
+ $EBMLidList[EBML_ID_DISPLAYWIDTH] = 'DisplayWidth';
+ $EBMLidList[EBML_ID_DOCTYPE] = 'DocType';
+ $EBMLidList[EBML_ID_DOCTYPEREADVERSION] = 'DocTypeReadVersion';
+ $EBMLidList[EBML_ID_DOCTYPEVERSION] = 'DocTypeVersion';
+ $EBMLidList[EBML_ID_DURATION] = 'Duration';
+ $EBMLidList[EBML_ID_EBML] = 'EBML';
+ $EBMLidList[EBML_ID_EBMLMAXIDLENGTH] = 'EBMLMaxIDLength';
+ $EBMLidList[EBML_ID_EBMLMAXSIZELENGTH] = 'EBMLMaxSizeLength';
+ $EBMLidList[EBML_ID_EBMLREADVERSION] = 'EBMLReadVersion';
+ $EBMLidList[EBML_ID_EBMLVERSION] = 'EBMLVersion';
+ $EBMLidList[EBML_ID_EDITIONENTRY] = 'EditionEntry';
+ $EBMLidList[EBML_ID_EDITIONFLAGDEFAULT] = 'EditionFlagDefault';
+ $EBMLidList[EBML_ID_EDITIONFLAGHIDDEN] = 'EditionFlagHidden';
+ $EBMLidList[EBML_ID_EDITIONFLAGORDERED] = 'EditionFlagOrdered';
+ $EBMLidList[EBML_ID_EDITIONUID] = 'EditionUID';
+ $EBMLidList[EBML_ID_FILEDATA] = 'FileData';
+ $EBMLidList[EBML_ID_FILEDESCRIPTION] = 'FileDescription';
+ $EBMLidList[EBML_ID_FILEMIMETYPE] = 'FileMimeType';
+ $EBMLidList[EBML_ID_FILENAME] = 'FileName';
+ $EBMLidList[EBML_ID_FILEREFERRAL] = 'FileReferral';
+ $EBMLidList[EBML_ID_FILEUID] = 'FileUID';
+ $EBMLidList[EBML_ID_FLAGDEFAULT] = 'FlagDefault';
+ $EBMLidList[EBML_ID_FLAGENABLED] = 'FlagEnabled';
+ $EBMLidList[EBML_ID_FLAGFORCED] = 'FlagForced';
+ $EBMLidList[EBML_ID_FLAGINTERLACED] = 'FlagInterlaced';
+ $EBMLidList[EBML_ID_FLAGLACING] = 'FlagLacing';
+ $EBMLidList[EBML_ID_GAMMAVALUE] = 'GammaValue';
+ $EBMLidList[EBML_ID_INFO] = 'Info';
+ $EBMLidList[EBML_ID_LANGUAGE] = 'Language';
+ $EBMLidList[EBML_ID_MAXBLOCKADDITIONID] = 'MaxBlockAdditionID';
+ $EBMLidList[EBML_ID_MAXCACHE] = 'MaxCache';
+ $EBMLidList[EBML_ID_MINCACHE] = 'MinCache';
+ $EBMLidList[EBML_ID_MUXINGAPP] = 'MuxingApp';
+ $EBMLidList[EBML_ID_NAME] = 'Name';
+ $EBMLidList[EBML_ID_NEXTFILENAME] = 'NextFilename';
+ $EBMLidList[EBML_ID_NEXTUID] = 'NextUID';
+ $EBMLidList[EBML_ID_OUTPUTSAMPLINGFREQUENCY] = 'OutputSamplingFrequency';
+ $EBMLidList[EBML_ID_PIXELCROPBOTTOM] = 'PixelCropBottom';
+ $EBMLidList[EBML_ID_PIXELCROPLEFT] = 'PixelCropLeft';
+ $EBMLidList[EBML_ID_PIXELCROPRIGHT] = 'PixelCropRight';
+ $EBMLidList[EBML_ID_PIXELCROPTOP] = 'PixelCropTop';
+ $EBMLidList[EBML_ID_PIXELHEIGHT] = 'PixelHeight';
+ $EBMLidList[EBML_ID_PIXELWIDTH] = 'PixelWidth';
+ $EBMLidList[EBML_ID_PREVFILENAME] = 'PrevFilename';
+ $EBMLidList[EBML_ID_PREVUID] = 'PrevUID';
+ $EBMLidList[EBML_ID_SAMPLINGFREQUENCY] = 'SamplingFrequency';
+ $EBMLidList[EBML_ID_SEEK] = 'Seek';
+ $EBMLidList[EBML_ID_SEEKHEAD] = 'SeekHead';
+ $EBMLidList[EBML_ID_SEEKID] = 'SeekID';
+ $EBMLidList[EBML_ID_SEEKPOSITION] = 'SeekPosition';
+ $EBMLidList[EBML_ID_SEGMENT] = 'Segment';
+ $EBMLidList[EBML_ID_SEGMENTFAMILY] = 'SegmentFamily';
+ $EBMLidList[EBML_ID_SEGMENTFILENAME] = 'SegmentFilename';
+ $EBMLidList[EBML_ID_SEGMENTUID] = 'SegmentUID';
+ $EBMLidList[EBML_ID_SIMPLETAG] = 'SimpleTag';
+ $EBMLidList[EBML_ID_CLUSTERSLICES] = 'ClusterSlices';
+ $EBMLidList[EBML_ID_STEREOMODE] = 'StereoMode';
+ $EBMLidList[EBML_ID_OLDSTEREOMODE] = 'OldStereoMode';
+ $EBMLidList[EBML_ID_TAG] = 'Tag';
+ $EBMLidList[EBML_ID_TAGATTACHMENTUID] = 'TagAttachmentUID';
+ $EBMLidList[EBML_ID_TAGBINARY] = 'TagBinary';
+ $EBMLidList[EBML_ID_TAGCHAPTERUID] = 'TagChapterUID';
+ $EBMLidList[EBML_ID_TAGDEFAULT] = 'TagDefault';
+ $EBMLidList[EBML_ID_TAGEDITIONUID] = 'TagEditionUID';
+ $EBMLidList[EBML_ID_TAGLANGUAGE] = 'TagLanguage';
+ $EBMLidList[EBML_ID_TAGNAME] = 'TagName';
+ $EBMLidList[EBML_ID_TAGTRACKUID] = 'TagTrackUID';
+ $EBMLidList[EBML_ID_TAGS] = 'Tags';
+ $EBMLidList[EBML_ID_TAGSTRING] = 'TagString';
+ $EBMLidList[EBML_ID_TARGETS] = 'Targets';
+ $EBMLidList[EBML_ID_TARGETTYPE] = 'TargetType';
+ $EBMLidList[EBML_ID_TARGETTYPEVALUE] = 'TargetTypeValue';
+ $EBMLidList[EBML_ID_TIMECODESCALE] = 'TimecodeScale';
+ $EBMLidList[EBML_ID_TITLE] = 'Title';
+ $EBMLidList[EBML_ID_TRACKENTRY] = 'TrackEntry';
+ $EBMLidList[EBML_ID_TRACKNUMBER] = 'TrackNumber';
+ $EBMLidList[EBML_ID_TRACKOFFSET] = 'TrackOffset';
+ $EBMLidList[EBML_ID_TRACKOVERLAY] = 'TrackOverlay';
+ $EBMLidList[EBML_ID_TRACKS] = 'Tracks';
+ $EBMLidList[EBML_ID_TRACKTIMECODESCALE] = 'TrackTimecodeScale';
+ $EBMLidList[EBML_ID_TRACKTRANSLATE] = 'TrackTranslate';
+ $EBMLidList[EBML_ID_TRACKTRANSLATECODEC] = 'TrackTranslateCodec';
+ $EBMLidList[EBML_ID_TRACKTRANSLATEEDITIONUID] = 'TrackTranslateEditionUID';
+ $EBMLidList[EBML_ID_TRACKTRANSLATETRACKID] = 'TrackTranslateTrackID';
+ $EBMLidList[EBML_ID_TRACKTYPE] = 'TrackType';
+ $EBMLidList[EBML_ID_TRACKUID] = 'TrackUID';
+ $EBMLidList[EBML_ID_VIDEO] = 'Video';
+ $EBMLidList[EBML_ID_VOID] = 'Void';
+ $EBMLidList[EBML_ID_WRITINGAPP] = 'WritingApp';
+ }
+
+ return (isset($EBMLidList[$value]) ? $EBMLidList[$value] : dechex($value));
+ }
+
+ /**
+ * @param int $value
+ *
+ * @return string
+ */
+ public static function displayUnit($value) {
+ // http://www.matroska.org/technical/specs/index.html#DisplayUnit
+ static $units = array(
+ 0 => 'pixels',
+ 1 => 'centimeters',
+ 2 => 'inches',
+ 3 => 'Display Aspect Ratio');
+
+ return (isset($units[$value]) ? $units[$value] : 'unknown');
+ }
+
+ /**
+ * @param array $streams
+ *
+ * @return array
+ */
+ private static function getDefaultStreamInfo($streams)
+ {
+ $stream = array();
+ foreach (array_reverse($streams) as $stream) {
+ if ($stream['default']) {
+ break;
+ }
+ }
+
+ $unset = array('default', 'name');
+ foreach ($unset as $u) {
+ if (isset($stream[$u])) {
+ unset($stream[$u]);
+ }
+ }
+
+ $info = $stream;
+ $info['streams'] = $streams;
+
+ return $info;
+ }
+
}
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.mpeg.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.mpeg.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.mpeg.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio-video.mpeg.php //
// module for analyzing MPEG files //
@@ -13,213 +14,532 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.mp3.php', __FILE__, true);
-define('GETID3_MPEG_VIDEO_PICTURE_START', "\x00\x00\x01\x00");
-define('GETID3_MPEG_VIDEO_USER_DATA_START', "\x00\x00\x01\xB2");
-define('GETID3_MPEG_VIDEO_SEQUENCE_HEADER', "\x00\x00\x01\xB3");
-define('GETID3_MPEG_VIDEO_SEQUENCE_ERROR', "\x00\x00\x01\xB4");
-define('GETID3_MPEG_VIDEO_EXTENSION_START', "\x00\x00\x01\xB5");
-define('GETID3_MPEG_VIDEO_SEQUENCE_END', "\x00\x00\x01\xB7");
-define('GETID3_MPEG_VIDEO_GROUP_START', "\x00\x00\x01\xB8");
-define('GETID3_MPEG_AUDIO_START', "\x00\x00\x01\xC0");
+class getid3_mpeg extends getid3_handler
+{
+ const START_CODE_BASE = "\x00\x00\x01";
+ const VIDEO_PICTURE_START = "\x00\x00\x01\x00";
+ const VIDEO_USER_DATA_START = "\x00\x00\x01\xB2";
+ const VIDEO_SEQUENCE_HEADER = "\x00\x00\x01\xB3";
+ const VIDEO_SEQUENCE_ERROR = "\x00\x00\x01\xB4";
+ const VIDEO_EXTENSION_START = "\x00\x00\x01\xB5";
+ const VIDEO_SEQUENCE_END = "\x00\x00\x01\xB7";
+ const VIDEO_GROUP_START = "\x00\x00\x01\xB8";
+ const AUDIO_START = "\x00\x00\x01\xC0";
-class getid3_mpeg
-{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- function getid3_mpeg(&$fd, &$ThisFileInfo) {
- if ($ThisFileInfo['avdataend'] <= $ThisFileInfo['avdataoffset']) {
- $ThisFileInfo['error'][] = '"avdataend" ('.$ThisFileInfo['avdataend'].') is unexpectedly less-than-or-equal-to "avdataoffset" ('.$ThisFileInfo['avdataoffset'].')';
- return false;
- }
- $ThisFileInfo['fileformat'] = 'mpeg';
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
- $MPEGstreamData = fread($fd, min(100000, $ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']));
- $MPEGstreamDataLength = strlen($MPEGstreamData);
+ $info['fileformat'] = 'mpeg';
+ $this->fseek($info['avdataoffset']);
- $foundVideo = true;
- $VideoChunkOffset = 0;
- while (substr($MPEGstreamData, $VideoChunkOffset++, 4) !== GETID3_MPEG_VIDEO_SEQUENCE_HEADER) {
- if ($VideoChunkOffset >= $MPEGstreamDataLength) {
- $foundVideo = false;
+ $MPEGstreamData = $this->fread($this->getid3->option_fread_buffer_size);
+ $MPEGstreamBaseOffset = 0; // how far are we from the beginning of the file data ($info['avdataoffset'])
+ $MPEGstreamDataOffset = 0; // how far are we from the beginning of the buffer data (~32kB)
+
+ $StartCodeValue = false;
+ $prevStartCodeValue = false;
+
+ $GOPcounter = -1;
+ $FramesByGOP = array();
+ $ParsedAVchannels = array();
+
+ do {
+//echo $MPEGstreamDataOffset.' vs '.(strlen($MPEGstreamData) - 1024).'<Br>';
+ if ($MPEGstreamDataOffset > (strlen($MPEGstreamData) - 16384)) {
+ // buffer running low, get more data
+//echo 'reading more data<br>';
+ $MPEGstreamData .= $this->fread($this->getid3->option_fread_buffer_size);
+ if (strlen($MPEGstreamData) > $this->getid3->option_fread_buffer_size) {
+ $MPEGstreamData = substr($MPEGstreamData, $MPEGstreamDataOffset);
+ $MPEGstreamBaseOffset += $MPEGstreamDataOffset;
+ $MPEGstreamDataOffset = 0;
+ }
+ }
+ if (($StartCodeOffset = strpos($MPEGstreamData, self::START_CODE_BASE, $MPEGstreamDataOffset)) === false) {
+//echo 'no more start codes found.<br>';
break;
+ } else {
+ $MPEGstreamDataOffset = $StartCodeOffset;
+ $prevStartCodeValue = $StartCodeValue;
+ $StartCodeValue = ord(substr($MPEGstreamData, $StartCodeOffset + 3, 1));
+//echo 'Found "'.strtoupper(dechex($StartCodeValue)).'" at offset '.($MPEGstreamBaseOffset + $StartCodeOffset).' ($MPEGstreamDataOffset = '.$MPEGstreamDataOffset.')<br>';
}
- }
- if ($foundVideo) {
+ $MPEGstreamDataOffset += 4;
+ switch ($StartCodeValue) {
- // Start code 32 bits
- // horizontal frame size 12 bits
- // vertical frame size 12 bits
- // pixel aspect ratio 4 bits
- // frame rate 4 bits
- // bitrate 18 bits
- // marker bit 1 bit
- // VBV buffer size 10 bits
- // constrained parameter flag 1 bit
- // intra quant. matrix flag 1 bit
- // intra quant. matrix values 512 bits (present if matrix flag == 1)
- // non-intra quant. matrix flag 1 bit
- // non-intra quant. matrix values 512 bits (present if matrix flag == 1)
+ case 0x00: // picture_start_code
+ if (!empty($info['mpeg']['video']['bitrate_mode']) && ($info['mpeg']['video']['bitrate_mode'] == 'vbr')) {
+ $bitstream = getid3_lib::BigEndian2Bin(substr($MPEGstreamData, $StartCodeOffset + 4, 4));
+ $bitstreamoffset = 0;
- $ThisFileInfo['video']['dataformat'] = 'mpeg';
+ $PictureHeader = array();
- $VideoChunkOffset += (strlen(GETID3_MPEG_VIDEO_SEQUENCE_HEADER) - 1);
+ $PictureHeader['temporal_reference'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 10); // 10-bit unsigned integer associated with each input picture. It is incremented by one, modulo 1024, for each input frame. When a frame is coded as two fields the temporal reference in the picture header of both fields is the same. Following a group start header the temporal reference of the earliest picture (in display order) shall be reset to zero.
+ $PictureHeader['picture_coding_type'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 3); // 3 bits for picture_coding_type
+ $PictureHeader['vbv_delay'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 16); // 16 bits for vbv_delay
+ //... etc
- $FrameSizeDWORD = getid3_lib::BigEndian2Int(substr($MPEGstreamData, $VideoChunkOffset, 3));
- $VideoChunkOffset += 3;
+ $FramesByGOP[$GOPcounter][] = $PictureHeader;
+ }
+ break;
- $AspectRatioFrameRateDWORD = getid3_lib::BigEndian2Int(substr($MPEGstreamData, $VideoChunkOffset, 1));
- $VideoChunkOffset += 1;
+ case 0xB3: // sequence_header_code
+ // Note: purposely doing the less-pretty (and probably a bit slower) method of using string of bits rather than bitwise operations.
+ // Mostly because PHP 32-bit doesn't handle unsigned integers well for bitwise operation.
+ // Also the MPEG stream is designed as a bitstream and often doesn't align nicely with byte boundaries.
+ $info['video']['codec'] = 'MPEG-1'; // will be updated if extension_start_code found
- $assortedinformation = getid3_lib::BigEndian2Bin(substr($MPEGstreamData, $VideoChunkOffset, 4));
- $VideoChunkOffset += 4;
+ $bitstream = getid3_lib::BigEndian2Bin(substr($MPEGstreamData, $StartCodeOffset + 4, 8));
+ $bitstreamoffset = 0;
- $ThisFileInfo['mpeg']['video']['raw']['framesize_horizontal'] = ($FrameSizeDWORD & 0xFFF000) >> 12; // 12 bits for horizontal frame size
- $ThisFileInfo['mpeg']['video']['raw']['framesize_vertical'] = ($FrameSizeDWORD & 0x000FFF); // 12 bits for vertical frame size
- $ThisFileInfo['mpeg']['video']['raw']['pixel_aspect_ratio'] = ($AspectRatioFrameRateDWORD & 0xF0) >> 4;
- $ThisFileInfo['mpeg']['video']['raw']['frame_rate'] = ($AspectRatioFrameRateDWORD & 0x0F);
+ $info['mpeg']['video']['raw']['horizontal_size_value'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 12); // 12 bits for horizontal frame size. Note: horizontal_size_extension, if present, will add 2 most-significant bits to this value
+ $info['mpeg']['video']['raw']['vertical_size_value'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 12); // 12 bits for vertical frame size. Note: vertical_size_extension, if present, will add 2 most-significant bits to this value
+ $info['mpeg']['video']['raw']['aspect_ratio_information'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 4); // 4 bits for aspect_ratio_information
+ $info['mpeg']['video']['raw']['frame_rate_code'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 4); // 4 bits for Frame Rate id code
+ $info['mpeg']['video']['raw']['bitrate'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 18); // 18 bits for bit_rate_value (18 set bits = VBR, otherwise bitrate = this value * 400)
+ $marker_bit = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // The term "marker_bit" indicates a one bit field in which the value zero is forbidden. These marker bits are introduced at several points in the syntax to avoid start code emulation.
+ $info['mpeg']['video']['raw']['vbv_buffer_size'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 10); // 10 bits vbv_buffer_size_value
+ $info['mpeg']['video']['raw']['constrained_param_flag'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: constrained_param_flag
+ $info['mpeg']['video']['raw']['load_intra_quantiser_matrix'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: load_intra_quantiser_matrix
- $ThisFileInfo['mpeg']['video']['framesize_horizontal'] = $ThisFileInfo['mpeg']['video']['raw']['framesize_horizontal'];
- $ThisFileInfo['mpeg']['video']['framesize_vertical'] = $ThisFileInfo['mpeg']['video']['raw']['framesize_vertical'];
+ if ($info['mpeg']['video']['raw']['load_intra_quantiser_matrix']) {
+ $bitstream .= getid3_lib::BigEndian2Bin(substr($MPEGstreamData, $StartCodeOffset + 12, 64));
+ for ($i = 0; $i < 64; $i++) {
+ $info['mpeg']['video']['raw']['intra_quantiser_matrix'][$i] = self::readBitsFromStream($bitstream, $bitstreamoffset, 8);
+ }
+ }
+ $info['mpeg']['video']['raw']['load_non_intra_quantiser_matrix'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1);
- $ThisFileInfo['mpeg']['video']['pixel_aspect_ratio'] = $this->MPEGvideoAspectRatioLookup($ThisFileInfo['mpeg']['video']['raw']['pixel_aspect_ratio']);
- $ThisFileInfo['mpeg']['video']['pixel_aspect_ratio_text'] = $this->MPEGvideoAspectRatioTextLookup($ThisFileInfo['mpeg']['video']['raw']['pixel_aspect_ratio']);
- $ThisFileInfo['mpeg']['video']['frame_rate'] = $this->MPEGvideoFramerateLookup($ThisFileInfo['mpeg']['video']['raw']['frame_rate']);
+ if ($info['mpeg']['video']['raw']['load_non_intra_quantiser_matrix']) {
+ $bitstream .= getid3_lib::BigEndian2Bin(substr($MPEGstreamData, $StartCodeOffset + 12 + ($info['mpeg']['video']['raw']['load_intra_quantiser_matrix'] ? 64 : 0), 64));
+ for ($i = 0; $i < 64; $i++) {
+ $info['mpeg']['video']['raw']['non_intra_quantiser_matrix'][$i] = self::readBitsFromStream($bitstream, $bitstreamoffset, 8);
+ }
+ }
- $ThisFileInfo['mpeg']['video']['raw']['bitrate'] = getid3_lib::Bin2Dec(substr($assortedinformation, 0, 18));
- $ThisFileInfo['mpeg']['video']['raw']['marker_bit'] = (bool) getid3_lib::Bin2Dec(substr($assortedinformation, 18, 1));
- $ThisFileInfo['mpeg']['video']['raw']['vbv_buffer_size'] = getid3_lib::Bin2Dec(substr($assortedinformation, 19, 10));
- $ThisFileInfo['mpeg']['video']['raw']['constrained_param_flag'] = (bool) getid3_lib::Bin2Dec(substr($assortedinformation, 29, 1));
- $ThisFileInfo['mpeg']['video']['raw']['intra_quant_flag'] = (bool) getid3_lib::Bin2Dec(substr($assortedinformation, 30, 1));
- if ($ThisFileInfo['mpeg']['video']['raw']['intra_quant_flag']) {
+ $info['mpeg']['video']['pixel_aspect_ratio'] = self::videoAspectRatioLookup($info['mpeg']['video']['raw']['aspect_ratio_information']); // may be overridden later if file turns out to be MPEG-2
+ $info['mpeg']['video']['pixel_aspect_ratio_text'] = self::videoAspectRatioTextLookup($info['mpeg']['video']['raw']['aspect_ratio_information']); // may be overridden later if file turns out to be MPEG-2
+ $info['mpeg']['video']['frame_rate'] = self::videoFramerateLookup($info['mpeg']['video']['raw']['frame_rate_code']);
+ if ($info['mpeg']['video']['raw']['bitrate'] == 0x3FFFF) { // 18 set bits = VBR
+ //$this->warning('This version of getID3() ['.$this->getid3->version().'] cannot determine average bitrate of VBR MPEG video files');
+ $info['mpeg']['video']['bitrate_mode'] = 'vbr';
+ } else {
+ $info['mpeg']['video']['bitrate'] = $info['mpeg']['video']['raw']['bitrate'] * 400;
+ $info['mpeg']['video']['bitrate_mode'] = 'cbr';
+ $info['video']['bitrate'] = $info['mpeg']['video']['bitrate'];
+ }
+ $info['video']['resolution_x'] = $info['mpeg']['video']['raw']['horizontal_size_value'];
+ $info['video']['resolution_y'] = $info['mpeg']['video']['raw']['vertical_size_value'];
+ $info['video']['frame_rate'] = $info['mpeg']['video']['frame_rate'];
+ $info['video']['bitrate_mode'] = $info['mpeg']['video']['bitrate_mode'];
+ $info['video']['pixel_aspect_ratio'] = $info['mpeg']['video']['pixel_aspect_ratio'];
+ $info['video']['lossless'] = false;
+ $info['video']['bits_per_sample'] = 24;
+ break;
- // read 512 bits
- $ThisFileInfo['mpeg']['video']['raw']['intra_quant'] = getid3_lib::BigEndian2Bin(substr($MPEGstreamData, $VideoChunkOffset, 64));
- $VideoChunkOffset += 64;
+ case 0xB5: // extension_start_code
+ $info['video']['codec'] = 'MPEG-2';
- $ThisFileInfo['mpeg']['video']['raw']['non_intra_quant_flag'] = (bool) getid3_lib::Bin2Dec(substr($ThisFileInfo['mpeg']['video']['raw']['intra_quant'], 511, 1));
- $ThisFileInfo['mpeg']['video']['raw']['intra_quant'] = getid3_lib::Bin2Dec(substr($assortedinformation, 31, 1)).substr(getid3_lib::BigEndian2Bin(substr($MPEGstreamData, $VideoChunkOffset, 64)), 0, 511);
+ $bitstream = getid3_lib::BigEndian2Bin(substr($MPEGstreamData, $StartCodeOffset + 4, 8)); // 48 bits for Sequence Extension ID; 61 bits for Sequence Display Extension ID; 59 bits for Sequence Scalable Extension ID
+ $bitstreamoffset = 0;
- if ($ThisFileInfo['mpeg']['video']['raw']['non_intra_quant_flag']) {
- $ThisFileInfo['mpeg']['video']['raw']['non_intra_quant'] = substr($MPEGstreamData, $VideoChunkOffset, 64);
- $VideoChunkOffset += 64;
- }
+ $info['mpeg']['video']['raw']['extension_start_code_identifier'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 4); // 4 bits for extension_start_code_identifier
+//echo $info['mpeg']['video']['raw']['extension_start_code_identifier'].'<br>';
+ switch ($info['mpeg']['video']['raw']['extension_start_code_identifier']) {
+ case 1: // 0001 Sequence Extension ID
+ $info['mpeg']['video']['raw']['profile_and_level_indication'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 8); // 8 bits for profile_and_level_indication
+ $info['mpeg']['video']['raw']['progressive_sequence'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: progressive_sequence
+ $info['mpeg']['video']['raw']['chroma_format'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 2); // 2 bits for chroma_format
+ $info['mpeg']['video']['raw']['horizontal_size_extension'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 2); // 2 bits for horizontal_size_extension
+ $info['mpeg']['video']['raw']['vertical_size_extension'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 2); // 2 bits for vertical_size_extension
+ $info['mpeg']['video']['raw']['bit_rate_extension'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 12); // 12 bits for bit_rate_extension
+ $marker_bit = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // The term "marker_bit" indicates a one bit field in which the value zero is forbidden. These marker bits are introduced at several points in the syntax to avoid start code emulation.
+ $info['mpeg']['video']['raw']['vbv_buffer_size_extension'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 8); // 8 bits for vbv_buffer_size_extension
+ $info['mpeg']['video']['raw']['low_delay'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: low_delay
+ $info['mpeg']['video']['raw']['frame_rate_extension_n'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 2); // 2 bits for frame_rate_extension_n
+ $info['mpeg']['video']['raw']['frame_rate_extension_d'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 5); // 5 bits for frame_rate_extension_d
- } else {
+ $info['video']['resolution_x'] = ($info['mpeg']['video']['raw']['horizontal_size_extension'] << 12) | $info['mpeg']['video']['raw']['horizontal_size_value'];
+ $info['video']['resolution_y'] = ($info['mpeg']['video']['raw']['vertical_size_extension'] << 12) | $info['mpeg']['video']['raw']['vertical_size_value'];
+ $info['video']['interlaced'] = !$info['mpeg']['video']['raw']['progressive_sequence'];
+ $info['mpeg']['video']['interlaced'] = !$info['mpeg']['video']['raw']['progressive_sequence'];
+ $info['mpeg']['video']['chroma_format'] = self::chromaFormatTextLookup($info['mpeg']['video']['raw']['chroma_format']);
- $ThisFileInfo['mpeg']['video']['raw']['non_intra_quant_flag'] = (bool) getid3_lib::Bin2Dec(substr($assortedinformation, 31, 1));
- if ($ThisFileInfo['mpeg']['video']['raw']['non_intra_quant_flag']) {
- $ThisFileInfo['mpeg']['video']['raw']['non_intra_quant'] = substr($MPEGstreamData, $VideoChunkOffset, 64);
- $VideoChunkOffset += 64;
- }
+ if (isset($info['mpeg']['video']['raw']['aspect_ratio_information'])) {
+ // MPEG-2 defines the aspect ratio flag differently from MPEG-1, but the MPEG-2 extension start code may occur after we've already looked up the aspect ratio assuming it was MPEG-1, so re-lookup assuming MPEG-2
+ // This must be done after the extended size is known, so the display aspect ratios can be converted to pixel aspect ratios.
+ $info['mpeg']['video']['pixel_aspect_ratio'] = self::videoAspectRatioLookup($info['mpeg']['video']['raw']['aspect_ratio_information'], 2, $info['video']['resolution_x'], $info['video']['resolution_y']);
+ $info['mpeg']['video']['pixel_aspect_ratio_text'] = self::videoAspectRatioTextLookup($info['mpeg']['video']['raw']['aspect_ratio_information'], 2);
+ $info['video']['pixel_aspect_ratio'] = $info['mpeg']['video']['pixel_aspect_ratio'];
+ $info['video']['pixel_aspect_ratio_text'] = $info['mpeg']['video']['pixel_aspect_ratio_text'];
+ }
- }
+ break;
- if ($ThisFileInfo['mpeg']['video']['raw']['bitrate'] == 0x3FFFF) { // 18 set bits
+ case 2: // 0010 Sequence Display Extension ID
+ $info['mpeg']['video']['raw']['video_format'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 3); // 3 bits for video_format
+ $info['mpeg']['video']['raw']['colour_description'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: colour_description
+ if ($info['mpeg']['video']['raw']['colour_description']) {
+ $info['mpeg']['video']['raw']['colour_primaries'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 8); // 8 bits for colour_primaries
+ $info['mpeg']['video']['raw']['transfer_characteristics'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 8); // 8 bits for transfer_characteristics
+ $info['mpeg']['video']['raw']['matrix_coefficients'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 8); // 8 bits for matrix_coefficients
+ }
+ $info['mpeg']['video']['raw']['display_horizontal_size'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 14); // 14 bits for display_horizontal_size
+ $marker_bit = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // The term "marker_bit" indicates a one bit field in which the value zero is forbidden. These marker bits are introduced at several points in the syntax to avoid start code emulation.
+ $info['mpeg']['video']['raw']['display_vertical_size'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 14); // 14 bits for display_vertical_size
- $ThisFileInfo['warning'][] = 'This version of getID3() ['.GETID3_VERSION.'] cannot determine average bitrate of VBR MPEG video files';
- $ThisFileInfo['mpeg']['video']['bitrate_mode'] = 'vbr';
+ $info['mpeg']['video']['video_format'] = self::videoFormatTextLookup($info['mpeg']['video']['raw']['video_format']);
+ break;
- } else {
+ case 3: // 0011 Quant Matrix Extension ID
+ break;
- $ThisFileInfo['mpeg']['video']['bitrate'] = $ThisFileInfo['mpeg']['video']['raw']['bitrate'] * 400;
- $ThisFileInfo['mpeg']['video']['bitrate_mode'] = 'cbr';
- $ThisFileInfo['video']['bitrate'] = $ThisFileInfo['mpeg']['video']['bitrate'];
+ case 5: // 0101 Sequence Scalable Extension ID
+ $info['mpeg']['video']['raw']['scalable_mode'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 2); // 2 bits for scalable_mode
+ $info['mpeg']['video']['raw']['layer_id'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 4); // 4 bits for layer_id
+ if ($info['mpeg']['video']['raw']['scalable_mode'] == 1) { // "spatial scalability"
+ $info['mpeg']['video']['raw']['lower_layer_prediction_horizontal_size'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 14); // 14 bits for lower_layer_prediction_horizontal_size
+ $marker_bit = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // The term "marker_bit" indicates a one bit field in which the value zero is forbidden. These marker bits are introduced at several points in the syntax to avoid start code emulation.
+ $info['mpeg']['video']['raw']['lower_layer_prediction_vertical_size'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 14); // 14 bits for lower_layer_prediction_vertical_size
+ $info['mpeg']['video']['raw']['horizontal_subsampling_factor_m'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 5); // 5 bits for horizontal_subsampling_factor_m
+ $info['mpeg']['video']['raw']['horizontal_subsampling_factor_n'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 5); // 5 bits for horizontal_subsampling_factor_n
+ $info['mpeg']['video']['raw']['vertical_subsampling_factor_m'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 5); // 5 bits for vertical_subsampling_factor_m
+ $info['mpeg']['video']['raw']['vertical_subsampling_factor_n'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 5); // 5 bits for vertical_subsampling_factor_n
+ } elseif ($info['mpeg']['video']['raw']['scalable_mode'] == 3) { // "temporal scalability"
+ $info['mpeg']['video']['raw']['picture_mux_enable'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: picture_mux_enable
+ if ($info['mpeg']['video']['raw']['picture_mux_enable']) {
+ $info['mpeg']['video']['raw']['mux_to_progressive_sequence'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: mux_to_progressive_sequence
+ }
+ $info['mpeg']['video']['raw']['picture_mux_order'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 3); // 3 bits for picture_mux_order
+ $info['mpeg']['video']['raw']['picture_mux_factor'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 3); // 3 bits for picture_mux_factor
+ }
- }
+ $info['mpeg']['video']['scalable_mode'] = self::scalableModeTextLookup($info['mpeg']['video']['raw']['scalable_mode']);
+ break;
- $ThisFileInfo['video']['resolution_x'] = $ThisFileInfo['mpeg']['video']['framesize_horizontal'];
- $ThisFileInfo['video']['resolution_y'] = $ThisFileInfo['mpeg']['video']['framesize_vertical'];
- $ThisFileInfo['video']['frame_rate'] = $ThisFileInfo['mpeg']['video']['frame_rate'];
- $ThisFileInfo['video']['bitrate_mode'] = $ThisFileInfo['mpeg']['video']['bitrate_mode'];
- $ThisFileInfo['video']['pixel_aspect_ratio'] = $ThisFileInfo['mpeg']['video']['pixel_aspect_ratio'];
- $ThisFileInfo['video']['lossless'] = false;
- $ThisFileInfo['video']['bits_per_sample'] = 24;
+ case 7: // 0111 Picture Display Extension ID
+ break;
- } else {
+ case 8: // 1000 Picture Coding Extension ID
+ $info['mpeg']['video']['raw']['f_code_00'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 4); // 4 bits for f_code[0][0] (forward horizontal)
+ $info['mpeg']['video']['raw']['f_code_01'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 4); // 4 bits for f_code[0][1] (forward vertical)
+ $info['mpeg']['video']['raw']['f_code_10'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 4); // 4 bits for f_code[1][0] (backward horizontal)
+ $info['mpeg']['video']['raw']['f_code_11'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 4); // 4 bits for f_code[1][1] (backward vertical)
+ $info['mpeg']['video']['raw']['intra_dc_precision'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 2); // 2 bits for intra_dc_precision
+ $info['mpeg']['video']['raw']['picture_structure'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 2); // 2 bits for picture_structure
+ $info['mpeg']['video']['raw']['top_field_first'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: top_field_first
+ $info['mpeg']['video']['raw']['frame_pred_frame_dct'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: frame_pred_frame_dct
+ $info['mpeg']['video']['raw']['concealment_motion_vectors'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: concealment_motion_vectors
+ $info['mpeg']['video']['raw']['q_scale_type'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: q_scale_type
+ $info['mpeg']['video']['raw']['intra_vlc_format'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: intra_vlc_format
+ $info['mpeg']['video']['raw']['alternate_scan'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: alternate_scan
+ $info['mpeg']['video']['raw']['repeat_first_field'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: repeat_first_field
+ $info['mpeg']['video']['raw']['chroma_420_type'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: chroma_420_type
+ $info['mpeg']['video']['raw']['progressive_frame'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: progressive_frame
+ $info['mpeg']['video']['raw']['composite_display_flag'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: composite_display_flag
+ if ($info['mpeg']['video']['raw']['composite_display_flag']) {
+ $info['mpeg']['video']['raw']['v_axis'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: v_axis
+ $info['mpeg']['video']['raw']['field_sequence'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 3); // 3 bits for field_sequence
+ $info['mpeg']['video']['raw']['sub_carrier'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: sub_carrier
+ $info['mpeg']['video']['raw']['burst_amplitude'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 7); // 7 bits for burst_amplitude
+ $info['mpeg']['video']['raw']['sub_carrier_phase'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 8); // 8 bits for sub_carrier_phase
+ }
- $ThisFileInfo['error'][] = 'Could not find start of video block in the first 100,000 bytes (or before end of file) - this might not be an MPEG-video file?';
+ $info['mpeg']['video']['intra_dc_precision_bits'] = $info['mpeg']['video']['raw']['intra_dc_precision'] + 8;
+ $info['mpeg']['video']['picture_structure'] = self::pictureStructureTextLookup($info['mpeg']['video']['raw']['picture_structure']);
+ break;
- }
+ case 9: // 1001 Picture Spatial Scalable Extension ID
+ break;
+ case 10: // 1010 Picture Temporal Scalable Extension ID
+ break;
- //0x000001B3 begins the sequence_header of every MPEG video stream.
- //But in MPEG-2, this header must immediately be followed by an
- //extension_start_code (0x000001B5) with a sequence_extension ID (1).
- //(This extension contains all the additional MPEG-2 stuff.)
- //MPEG-1 doesn't have this extension, so that's a sure way to tell the
- //difference between MPEG-1 and MPEG-2 video streams.
+ default:
+ $this->warning('Unexpected $info[mpeg][video][raw][extension_start_code_identifier] value of '.$info['mpeg']['video']['raw']['extension_start_code_identifier']);
+ break;
+ }
+ break;
- if (substr($MPEGstreamData, $VideoChunkOffset, 4) == GETID3_MPEG_VIDEO_EXTENSION_START) {
- $ThisFileInfo['video']['codec'] = 'MPEG-2';
- } else {
- $ThisFileInfo['video']['codec'] = 'MPEG-1';
- }
+ case 0xB8: // group_of_pictures_header
+ $GOPcounter++;
+ if (!empty($info['mpeg']['video']['bitrate_mode']) && ($info['mpeg']['video']['bitrate_mode'] == 'vbr')) {
+ $bitstream = getid3_lib::BigEndian2Bin(substr($MPEGstreamData, $StartCodeOffset + 4, 4)); // 27 bits needed for group_of_pictures_header
+ $bitstreamoffset = 0;
- $AudioChunkOffset = 0;
- while (true) {
- while (substr($MPEGstreamData, $AudioChunkOffset++, 4) !== GETID3_MPEG_AUDIO_START) {
- if ($AudioChunkOffset >= $MPEGstreamDataLength) {
- break 2;
- }
- }
+ $GOPheader = array();
- for ($i = 0; $i <= 7; $i++) {
- // some files have the MPEG-audio header 8 bytes after the end of the $00 $00 $01 $C0 signature, some have it up to 13 bytes (or more?) after
- // I have no idea why or what the difference is, so this is a stupid hack.
- // If anybody has any better idea of what's going on, please let me know - info at getid3.org
+ $GOPheader['byte_offset'] = $MPEGstreamBaseOffset + $StartCodeOffset;
+ $GOPheader['drop_frame_flag'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: drop_frame_flag
+ $GOPheader['time_code_hours'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 5); // 5 bits for time_code_hours
+ $GOPheader['time_code_minutes'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 6); // 6 bits for time_code_minutes
+ $marker_bit = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // The term "marker_bit" indicates a one bit field in which the value zero is forbidden. These marker bits are introduced at several points in the syntax to avoid start code emulation.
+ $GOPheader['time_code_seconds'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 6); // 6 bits for time_code_seconds
+ $GOPheader['time_code_pictures'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 6); // 6 bits for time_code_pictures
+ $GOPheader['closed_gop'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: closed_gop
+ $GOPheader['broken_link'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: broken_link
- $dummy = $ThisFileInfo;
- if (getid3_mp3::decodeMPEGaudioHeader($fd, ($AudioChunkOffset + 3) + 8 + $i, $dummy, false)) {
- $ThisFileInfo = $dummy;
- $ThisFileInfo['audio']['bitrate_mode'] = 'cbr';
- $ThisFileInfo['audio']['lossless'] = false;
- break 2;
+ $time_code_separator = ($GOPheader['drop_frame_flag'] ? ';' : ':'); // While non-drop time code is displayed with colons separating the digit pairs "HH:MM:SS:FF" drop frame is usually represented with a semi-colon (;) or period (.) as the divider between all the digit pairs "HH;MM;SS;FF", "HH.MM.SS.FF"
+ $GOPheader['time_code'] = sprintf('%02d'.$time_code_separator.'%02d'.$time_code_separator.'%02d'.$time_code_separator.'%02d', $GOPheader['time_code_hours'], $GOPheader['time_code_minutes'], $GOPheader['time_code_seconds'], $GOPheader['time_code_pictures']);
- }
+ $info['mpeg']['group_of_pictures'][] = $GOPheader;
+ }
+ break;
+
+ case 0xC0: // audio stream
+ case 0xC1: // audio stream
+ case 0xC2: // audio stream
+ case 0xC3: // audio stream
+ case 0xC4: // audio stream
+ case 0xC5: // audio stream
+ case 0xC6: // audio stream
+ case 0xC7: // audio stream
+ case 0xC8: // audio stream
+ case 0xC9: // audio stream
+ case 0xCA: // audio stream
+ case 0xCB: // audio stream
+ case 0xCC: // audio stream
+ case 0xCD: // audio stream
+ case 0xCE: // audio stream
+ case 0xCF: // audio stream
+ case 0xD0: // audio stream
+ case 0xD1: // audio stream
+ case 0xD2: // audio stream
+ case 0xD3: // audio stream
+ case 0xD4: // audio stream
+ case 0xD5: // audio stream
+ case 0xD6: // audio stream
+ case 0xD7: // audio stream
+ case 0xD8: // audio stream
+ case 0xD9: // audio stream
+ case 0xDA: // audio stream
+ case 0xDB: // audio stream
+ case 0xDC: // audio stream
+ case 0xDD: // audio stream
+ case 0xDE: // audio stream
+ case 0xDF: // audio stream
+ //case 0xE0: // video stream
+ //case 0xE1: // video stream
+ //case 0xE2: // video stream
+ //case 0xE3: // video stream
+ //case 0xE4: // video stream
+ //case 0xE5: // video stream
+ //case 0xE6: // video stream
+ //case 0xE7: // video stream
+ //case 0xE8: // video stream
+ //case 0xE9: // video stream
+ //case 0xEA: // video stream
+ //case 0xEB: // video stream
+ //case 0xEC: // video stream
+ //case 0xED: // video stream
+ //case 0xEE: // video stream
+ //case 0xEF: // video stream
+ if (isset($ParsedAVchannels[$StartCodeValue])) {
+ break;
+ }
+ $ParsedAVchannels[$StartCodeValue] = $StartCodeValue;
+ // http://en.wikipedia.org/wiki/Packetized_elementary_stream
+ // http://dvd.sourceforge.net/dvdinfo/pes-hdr.html
+/*
+ $PackedElementaryStream = array();
+ if ($StartCodeValue >= 0xE0) {
+ $PackedElementaryStream['stream_type'] = 'video';
+ $PackedElementaryStream['stream_id'] = $StartCodeValue - 0xE0;
+ } else {
+ $PackedElementaryStream['stream_type'] = 'audio';
+ $PackedElementaryStream['stream_id'] = $StartCodeValue - 0xC0;
+ }
+ $PackedElementaryStream['packet_length'] = getid3_lib::BigEndian2Int(substr($MPEGstreamData, $StartCodeOffset + 4, 2));
+
+ $bitstream = getid3_lib::BigEndian2Bin(substr($MPEGstreamData, $StartCodeOffset + 6, 3)); // more may be needed below
+ $bitstreamoffset = 0;
+
+ $PackedElementaryStream['marker_bits'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 2); // 2 bits for marker_bits -- should be "10" = 2
+echo 'marker_bits = '.$PackedElementaryStream['marker_bits'].'<br>';
+ $PackedElementaryStream['scrambling_control'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 2); // 2 bits for scrambling_control -- 00 implies not scrambled
+ $PackedElementaryStream['priority'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: priority
+ $PackedElementaryStream['data_alignment_indicator'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: data_alignment_indicator -- 1 indicates that the PES packet header is immediately followed by the video start code or audio syncword
+ $PackedElementaryStream['copyright'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: copyright -- 1 implies copyrighted
+ $PackedElementaryStream['original_or_copy'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: original_or_copy -- 1 implies original
+ $PackedElementaryStream['pts_flag'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: pts_flag -- Presentation Time Stamp
+ $PackedElementaryStream['dts_flag'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: dts_flag -- Decode Time Stamp
+ $PackedElementaryStream['escr_flag'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: escr_flag -- Elementary Stream Clock Reference
+ $PackedElementaryStream['es_rate_flag'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: es_rate_flag -- Elementary Stream [data] Rate
+ $PackedElementaryStream['dsm_trick_mode_flag'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: dsm_trick_mode_flag -- DSM trick mode - not used by DVD
+ $PackedElementaryStream['additional_copy_info_flag'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: additional_copy_info_flag
+ $PackedElementaryStream['crc_flag'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: crc_flag
+ $PackedElementaryStream['extension_flag'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 1); // 1 bit flag: extension_flag
+ $PackedElementaryStream['pes_remain_header_length'] = self::readBitsFromStream($bitstream, $bitstreamoffset, 8); // 1 bit flag: priority
+
+ $additional_header_bytes = 0;
+ $additional_header_bytes += ($PackedElementaryStream['pts_flag'] ? 5 : 0);
+ $additional_header_bytes += ($PackedElementaryStream['dts_flag'] ? 5 : 0);
+ $additional_header_bytes += ($PackedElementaryStream['escr_flag'] ? 6 : 0);
+ $additional_header_bytes += ($PackedElementaryStream['es_rate_flag'] ? 3 : 0);
+ $additional_header_bytes += ($PackedElementaryStream['additional_copy_info_flag'] ? 1 : 0);
+ $additional_header_bytes += ($PackedElementaryStream['crc_flag'] ? 2 : 0);
+ $additional_header_bytes += ($PackedElementaryStream['extension_flag'] ? 1 : 0);
+$PackedElementaryStream['additional_header_bytes'] = $additional_header_bytes;
+ $bitstream .= getid3_lib::BigEndian2Bin(substr($MPEGstreamData, $StartCodeOffset + 9, $additional_header_bytes));
+
+ $info['mpeg']['packed_elementary_streams'][$PackedElementaryStream['stream_type']][$PackedElementaryStream['stream_id']][] = $PackedElementaryStream;
+*/
+ $getid3_temp = new getID3();
+ $getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
+ $getid3_temp->info = $info;
+ $getid3_mp3 = new getid3_mp3($getid3_temp);
+ for ($i = 0; $i <= 7; $i++) {
+ // some files have the MPEG-audio header 8 bytes after the end of the $00 $00 $01 $C0 signature, some have it up to 13 bytes (or more?) after
+ // I have no idea why or what the difference is, so this is a stupid hack.
+ // If anybody has any better idea of what's going on, please let me know - info at getid3.org
+ $getid3_temp->info = $info; // only overwrite real data if valid header found
+//echo 'audio at? '.($MPEGstreamBaseOffset + $StartCodeOffset + 4 + 8 + $i).'<br>';
+ if ($getid3_mp3->decodeMPEGaudioHeader($MPEGstreamBaseOffset + $StartCodeOffset + 4 + 8 + $i, $getid3_temp->info, false)) {
+//echo 'yes!<br>';
+ $info = $getid3_temp->info;
+ $info['audio']['bitrate_mode'] = 'cbr';
+ $info['audio']['lossless'] = false;
+ break;
+ }
+ }
+ unset($getid3_temp, $getid3_mp3);
+ break;
+
+ case 0xBC: // Program Stream Map
+ case 0xBD: // Private stream 1 (non MPEG audio, subpictures)
+ case 0xBE: // Padding stream
+ case 0xBF: // Private stream 2 (navigation data)
+ case 0xF0: // ECM stream
+ case 0xF1: // EMM stream
+ case 0xF2: // DSM-CC stream
+ case 0xF3: // ISO/IEC_13522_stream
+ case 0xF4: // ITU-I Rec. H.222.1 type A
+ case 0xF5: // ITU-I Rec. H.222.1 type B
+ case 0xF6: // ITU-I Rec. H.222.1 type C
+ case 0xF7: // ITU-I Rec. H.222.1 type D
+ case 0xF8: // ITU-I Rec. H.222.1 type E
+ case 0xF9: // ancilliary stream
+ case 0xFA: // ISO/IEC 14496-1 SL-packtized stream
+ case 0xFB: // ISO/IEC 14496-1 FlexMux stream
+ case 0xFC: // metadata stream
+ case 0xFD: // extended stream ID
+ case 0xFE: // reserved data stream
+ case 0xFF: // program stream directory
+ // ignore
+ break;
+
+ default:
+ // ignore
+ break;
}
- }
+ } while (true);
- // Temporary hack to account for interleaving overhead:
- if (!empty($ThisFileInfo['video']['bitrate']) && !empty($ThisFileInfo['audio']['bitrate'])) {
- $ThisFileInfo['playtime_seconds'] = (($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) * 8) / ($ThisFileInfo['video']['bitrate'] + $ThisFileInfo['audio']['bitrate']);
- // Interleaved MPEG audio/video files have a certain amount of overhead that varies
- // by both video and audio bitrates, and not in any sensible, linear/logarithmic patter
- // Use interpolated lookup tables to approximately guess how much is overhead, because
- // playtime is calculated as filesize / total-bitrate
- $ThisFileInfo['playtime_seconds'] *= $this->MPEGsystemNonOverheadPercentage($ThisFileInfo['video']['bitrate'], $ThisFileInfo['audio']['bitrate']);
- //switch ($ThisFileInfo['video']['bitrate']) {
- // case('5000000'):
- // $multiplier = 0.93292642112380355828048824319889;
- // break;
- // case('5500000'):
- // $multiplier = 0.93582895375200989965359777343219;
- // break;
- // case('6000000'):
- // $multiplier = 0.93796247714820932532911373859139;
- // break;
- // case('7000000'):
- // $multiplier = 0.9413264083635103463010117778776;
- // break;
- // default:
- // $multiplier = 1;
- // break;
- //}
- //$ThisFileInfo['playtime_seconds'] *= $multiplier;
- //$ThisFileInfo['warning'][] = 'Interleaved MPEG audio/video playtime may be inaccurate. With current hack should be within a few seconds of accurate. Report to info at getid3.org if off by more than 10 seconds.';
- if ($ThisFileInfo['video']['bitrate'] < 50000) {
- $ThisFileInfo['warning'][] = 'Interleaved MPEG audio/video playtime may be slightly inaccurate for video bitrates below 100kbps. Except in extreme low-bitrate situations, error should be less than 1%. Report to info at getid3.org if greater than this.';
+// // Temporary hack to account for interleaving overhead:
+// if (!empty($info['video']['bitrate']) && !empty($info['audio']['bitrate'])) {
+// $info['playtime_seconds'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / ($info['video']['bitrate'] + $info['audio']['bitrate']);
+//
+// // Interleaved MPEG audio/video files have a certain amount of overhead that varies
+// // by both video and audio bitrates, and not in any sensible, linear/logarithmic pattern
+// // Use interpolated lookup tables to approximately guess how much is overhead, because
+// // playtime is calculated as filesize / total-bitrate
+// $info['playtime_seconds'] *= self::systemNonOverheadPercentage($info['video']['bitrate'], $info['audio']['bitrate']);
+//
+// //switch ($info['video']['bitrate']) {
+// // case('5000000'):
+// // $multiplier = 0.93292642112380355828048824319889;
+// // break;
+// // case('5500000'):
+// // $multiplier = 0.93582895375200989965359777343219;
+// // break;
+// // case('6000000'):
+// // $multiplier = 0.93796247714820932532911373859139;
+// // break;
+// // case('7000000'):
+// // $multiplier = 0.9413264083635103463010117778776;
+// // break;
+// // default:
+// // $multiplier = 1;
+// // break;
+// //}
+// //$info['playtime_seconds'] *= $multiplier;
+// //$this->warning('Interleaved MPEG audio/video playtime may be inaccurate. With current hack should be within a few seconds of accurate. Report to info at getid3.org if off by more than 10 seconds.');
+// if ($info['video']['bitrate'] < 50000) {
+// $this->warning('Interleaved MPEG audio/video playtime may be slightly inaccurate for video bitrates below 100kbps. Except in extreme low-bitrate situations, error should be less than 1%. Report to info at getid3.org if greater than this.');
+// }
+// }
+//
+/*
+$time_prev = 0;
+$byte_prev = 0;
+$vbr_bitrates = array();
+foreach ($info['mpeg']['group_of_pictures'] as $gopkey => $gopdata) {
+ $time_this = ($gopdata['time_code_hours'] * 3600) + ($gopdata['time_code_minutes'] * 60) + $gopdata['time_code_seconds'] + ($gopdata['time_code_seconds'] / 30);
+ $byte_this = $gopdata['byte_offset'];
+ if ($gopkey > 0) {
+ if ($time_this > $time_prev) {
+ $bytedelta = $byte_this - $byte_prev;
+ $timedelta = $time_this - $time_prev;
+ $this_bitrate = ($bytedelta * 8) / $timedelta;
+echo $gopkey.': ('.number_format($time_prev, 2).'-'.number_format($time_this, 2).') '.number_format($bytedelta).' bytes over '.number_format($timedelta, 3).' seconds = '.number_format($this_bitrate / 1000, 2).'kbps<br>';
+ $time_prev = $time_this;
+ $byte_prev = $byte_this;
+ $vbr_bitrates[] = $this_bitrate;
+ }
+ }
+}
+echo 'average_File_bitrate = '.number_format(array_sum($vbr_bitrates) / count($vbr_bitrates), 1).'<br>';
+*/
+//echo '<pre>'.print_r($FramesByGOP, true).'</pre>';
+ if (!empty($info['mpeg']['video']['bitrate_mode']) && ($info['mpeg']['video']['bitrate_mode'] == 'vbr')) {
+ $last_GOP_id = max(array_keys($FramesByGOP));
+ $frames_in_last_GOP = count($FramesByGOP[$last_GOP_id]);
+ $gopdata = &$info['mpeg']['group_of_pictures'][$last_GOP_id];
+ $info['playtime_seconds'] = ($gopdata['time_code_hours'] * 3600) + ($gopdata['time_code_minutes'] * 60) + $gopdata['time_code_seconds'] + (($gopdata['time_code_pictures'] + $frames_in_last_GOP + 1) / $info['mpeg']['video']['frame_rate']);
+ if (!isset($info['video']['bitrate'])) {
+ $overall_bitrate = ($info['avdataend'] - $info['avdataoffset']) * 8 / $info['playtime_seconds'];
+ $info['video']['bitrate'] = $overall_bitrate - (isset($info['audio']['bitrate']) ? $info['audio']['bitrate'] : 0);
}
+ unset($info['mpeg']['group_of_pictures']);
}
return true;
}
+ /**
+ * @param string $bitstream
+ * @param int $bitstreamoffset
+ * @param int $bits_to_read
+ * @param bool $return_singlebit_as_boolean
+ *
+ * @return bool|int
+ */
+ private function readBitsFromStream(&$bitstream, &$bitstreamoffset, $bits_to_read, $return_singlebit_as_boolean=true) {
+ $return = bindec(substr($bitstream, $bitstreamoffset, $bits_to_read));
+ $bitstreamoffset += $bits_to_read;
+ if (($bits_to_read == 1) && $return_singlebit_as_boolean) {
+ $return = (bool) $return;
+ }
+ return $return;
+ }
- function MPEGsystemNonOverheadPercentage($VideoBitrate, $AudioBitrate) {
+ /**
+ * @param int $VideoBitrate
+ * @param int $AudioBitrate
+ *
+ * @return float|int
+ */
+ public static function systemNonOverheadPercentage($VideoBitrate, $AudioBitrate) {
$OverheadPercentage = 0;
$AudioBitrate = max(min($AudioBitrate / 1000, 384), 32); // limit to range of 32kbps - 384kbps (should be only legal bitrates, but maybe VBR?)
@@ -270,23 +590,93 @@
return $OverheadPercentage;
}
+ /**
+ * @param int $rawframerate
+ *
+ * @return float
+ */
+ public static function videoFramerateLookup($rawframerate) {
+ $lookup = array(0, 23.976, 24, 25, 29.97, 30, 50, 59.94, 60);
+ return (float) (isset($lookup[$rawframerate]) ? $lookup[$rawframerate] : 0);
+ }
- function MPEGvideoFramerateLookup($rawframerate) {
- $MPEGvideoFramerateLookup = array(0, 23.976, 24, 25, 29.97, 30, 50, 59.94, 60);
- return (isset($MPEGvideoFramerateLookup[$rawframerate]) ? (float) $MPEGvideoFramerateLookup[$rawframerate] : (float) 0);
+ /**
+ * @param int $rawaspectratio
+ * @param int $mpeg_version
+ * @param int $width
+ * @param int $height
+ *
+ * @return float
+ */
+ public static function videoAspectRatioLookup($rawaspectratio, $mpeg_version=1, $width=0, $height=0) {
+ $lookup = array(
+ 1 => array(0, 1, 0.6735, 0.7031, 0.7615, 0.8055, 0.8437, 0.8935, 0.9157, 0.9815, 1.0255, 1.0695, 1.0950, 1.1575, 1.2015, 0),
+ 2 => array(0, 1, 1.3333, 1.7778, 2.2100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+ );
+ $ratio = (float) (isset($lookup[$mpeg_version][$rawaspectratio]) ? $lookup[$mpeg_version][$rawaspectratio] : 0);
+ if ($mpeg_version == 2 && $ratio != 1) {
+ // Calculate pixel aspect ratio from MPEG-2 display aspect ratio
+ $ratio = $ratio * $height / $width;
+ }
+ return $ratio;
}
- function MPEGvideoAspectRatioLookup($rawaspectratio) {
- $MPEGvideoAspectRatioLookup = array(0, 1, 0.6735, 0.7031, 0.7615, 0.8055, 0.8437, 0.8935, 0.9157, 0.9815, 1.0255, 1.0695, 1.0950, 1.1575, 1.2015, 0);
- return (isset($MPEGvideoAspectRatioLookup[$rawaspectratio]) ? (float) $MPEGvideoAspectRatioLookup[$rawaspectratio] : (float) 0);
+ /**
+ * @param int $rawaspectratio
+ * @param int $mpeg_version
+ *
+ * @return string
+ */
+ public static function videoAspectRatioTextLookup($rawaspectratio, $mpeg_version=1) {
+ $lookup = array(
+ 1 => array('forbidden', 'square pixels', '0.6735', '16:9, 625 line, PAL', '0.7615', '0.8055', '16:9, 525 line, NTSC', '0.8935', '4:3, 625 line, PAL, CCIR601', '0.9815', '1.0255', '1.0695', '4:3, 525 line, NTSC, CCIR601', '1.1575', '1.2015', 'reserved'),
+ 2 => array('forbidden', 'square pixels', '4:3', '16:9', '2.21:1', 'reserved', 'reserved', 'reserved', 'reserved', 'reserved', 'reserved', 'reserved', 'reserved', 'reserved', 'reserved', 'reserved'), // http://dvd.sourceforge.net/dvdinfo/mpeghdrs.html
+ );
+ return (isset($lookup[$mpeg_version][$rawaspectratio]) ? $lookup[$mpeg_version][$rawaspectratio] : '');
}
- function MPEGvideoAspectRatioTextLookup($rawaspectratio) {
- $MPEGvideoAspectRatioTextLookup = array('forbidden', 'square pixels', '0.6735', '16:9, 625 line, PAL', '0.7615', '0.8055', '16:9, 525 line, NTSC', '0.8935', '4:3, 625 line, PAL, CCIR601', '0.9815', '1.0255', '1.0695', '4:3, 525 line, NTSC, CCIR601', '1.1575', '1.2015', 'reserved');
- return (isset($MPEGvideoAspectRatioTextLookup[$rawaspectratio]) ? $MPEGvideoAspectRatioTextLookup[$rawaspectratio] : '');
+ /**
+ * @param int $video_format
+ *
+ * @return string
+ */
+ public static function videoFormatTextLookup($video_format) {
+ // ISO/IEC 13818-2, section 6.3.6, Table 6-6. Meaning of video_format
+ $lookup = array('component', 'PAL', 'NTSC', 'SECAM', 'MAC', 'Unspecified video format', 'reserved(6)', 'reserved(7)');
+ return (isset($lookup[$video_format]) ? $lookup[$video_format] : '');
}
-}
+ /**
+ * @param int $scalable_mode
+ *
+ * @return string
+ */
+ public static function scalableModeTextLookup($scalable_mode) {
+ // ISO/IEC 13818-2, section 6.3.8, Table 6-10. Definition of scalable_mode
+ $lookup = array('data partitioning', 'spatial scalability', 'SNR scalability', 'temporal scalability');
+ return (isset($lookup[$scalable_mode]) ? $lookup[$scalable_mode] : '');
+ }
+ /**
+ * @param int $picture_structure
+ *
+ * @return string
+ */
+ public static function pictureStructureTextLookup($picture_structure) {
+ // ISO/IEC 13818-2, section 6.3.11, Table 6-14 Meaning of picture_structure
+ $lookup = array('reserved', 'Top Field', 'Bottom Field', 'Frame picture');
+ return (isset($lookup[$picture_structure]) ? $lookup[$picture_structure] : '');
+ }
-?>
\ No newline at end of file
+ /**
+ * @param int $chroma_format
+ *
+ * @return string
+ */
+ public static function chromaFormatTextLookup($chroma_format) {
+ // ISO/IEC 13818-2, section 6.3.11, Table 6-14 Meaning of picture_structure
+ $lookup = array('reserved', '4:2:0', '4:2:2', '4:4:4');
+ return (isset($lookup[$chroma_format]) ? $lookup[$chroma_format] : '');
+ }
+
+}
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.nsv.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.nsv.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.nsv.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio.nsv.php //
// module for analyzing Nullsoft NSV files //
@@ -13,171 +14,189 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_nsv
+class getid3_nsv extends getid3_handler
{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- function getid3_nsv(&$fd, &$ThisFileInfo) {
+ $this->fseek($info['avdataoffset']);
+ $NSVheader = $this->fread(4);
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
- $NSVheader = fread($fd, 4);
-
switch ($NSVheader) {
case 'NSVs':
- if ($this->getNSVsHeaderFilepointer($fd, $ThisFileInfo, 0)) {
- $ThisFileInfo['fileformat'] = 'nsv';
- $ThisFileInfo['audio']['dataformat'] = 'nsv';
- $ThisFileInfo['video']['dataformat'] = 'nsv';
- $ThisFileInfo['audio']['lossless'] = false;
- $ThisFileInfo['video']['lossless'] = false;
+ if ($this->getNSVsHeaderFilepointer(0)) {
+ $info['fileformat'] = 'nsv';
+ $info['audio']['dataformat'] = 'nsv';
+ $info['video']['dataformat'] = 'nsv';
+ $info['audio']['lossless'] = false;
+ $info['video']['lossless'] = false;
}
break;
case 'NSVf':
- if ($this->getNSVfHeaderFilepointer($fd, $ThisFileInfo, 0)) {
- $ThisFileInfo['fileformat'] = 'nsv';
- $ThisFileInfo['audio']['dataformat'] = 'nsv';
- $ThisFileInfo['video']['dataformat'] = 'nsv';
- $ThisFileInfo['audio']['lossless'] = false;
- $ThisFileInfo['video']['lossless'] = false;
- $this->getNSVsHeaderFilepointer($fd, $ThisFileInfo, $ThisFileInfo['nsv']['NSVf']['header_length']);
+ if ($this->getNSVfHeaderFilepointer(0)) {
+ $info['fileformat'] = 'nsv';
+ $info['audio']['dataformat'] = 'nsv';
+ $info['video']['dataformat'] = 'nsv';
+ $info['audio']['lossless'] = false;
+ $info['video']['lossless'] = false;
+ $this->getNSVsHeaderFilepointer($info['nsv']['NSVf']['header_length']);
}
break;
default:
- $ThisFileInfo['error'][] = 'Expecting "NSVs" or "NSVf" at offset '.$ThisFileInfo['avdataoffset'].', found "'.$NSVheader.'"';
+ $this->error('Expecting "NSVs" or "NSVf" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($NSVheader).'"');
return false;
- break;
}
- if (!isset($ThisFileInfo['nsv']['NSVf'])) {
- $ThisFileInfo['warning'][] = 'NSVf header not present - cannot calculate playtime or bitrate';
+ if (!isset($info['nsv']['NSVf'])) {
+ $this->warning('NSVf header not present - cannot calculate playtime or bitrate');
}
return true;
}
- function getNSVsHeaderFilepointer(&$fd, &$ThisFileInfo, $fileoffset) {
- fseek($fd, $fileoffset, SEEK_SET);
- $NSVsheader = fread($fd, 28);
+ /**
+ * @param int $fileoffset
+ *
+ * @return bool
+ */
+ public function getNSVsHeaderFilepointer($fileoffset) {
+ $info = &$this->getid3->info;
+ $this->fseek($fileoffset);
+ $NSVsheader = $this->fread(28);
$offset = 0;
- $ThisFileInfo['nsv']['NSVs']['identifier'] = substr($NSVsheader, $offset, 4);
+ $info['nsv']['NSVs']['identifier'] = substr($NSVsheader, $offset, 4);
$offset += 4;
- if ($ThisFileInfo['nsv']['NSVs']['identifier'] != 'NSVs') {
- $ThisFileInfo['error'][] = 'expected "NSVs" at offset ('.$fileoffset.'), found "'.$ThisFileInfo['nsv']['NSVs']['identifier'].'" instead';
- unset($ThisFileInfo['nsv']['NSVs']);
+ if ($info['nsv']['NSVs']['identifier'] != 'NSVs') {
+ $this->error('expected "NSVs" at offset ('.$fileoffset.'), found "'.$info['nsv']['NSVs']['identifier'].'" instead');
+ unset($info['nsv']['NSVs']);
return false;
}
- $ThisFileInfo['nsv']['NSVs']['offset'] = $fileoffset;
+ $info['nsv']['NSVs']['offset'] = $fileoffset;
- $ThisFileInfo['nsv']['NSVs']['video_codec'] = substr($NSVsheader, $offset, 4);
+ $info['nsv']['NSVs']['video_codec'] = substr($NSVsheader, $offset, 4);
$offset += 4;
- $ThisFileInfo['nsv']['NSVs']['audio_codec'] = substr($NSVsheader, $offset, 4);
+ $info['nsv']['NSVs']['audio_codec'] = substr($NSVsheader, $offset, 4);
$offset += 4;
- $ThisFileInfo['nsv']['NSVs']['resolution_x'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 2));
+ $info['nsv']['NSVs']['resolution_x'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 2));
$offset += 2;
- $ThisFileInfo['nsv']['NSVs']['resolution_y'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 2));
+ $info['nsv']['NSVs']['resolution_y'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 2));
$offset += 2;
- $ThisFileInfo['nsv']['NSVs']['framerate_index'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
+ $info['nsv']['NSVs']['framerate_index'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
$offset += 1;
- //$ThisFileInfo['nsv']['NSVs']['unknown1b'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
+ //$info['nsv']['NSVs']['unknown1b'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
$offset += 1;
- //$ThisFileInfo['nsv']['NSVs']['unknown1c'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
+ //$info['nsv']['NSVs']['unknown1c'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
$offset += 1;
- //$ThisFileInfo['nsv']['NSVs']['unknown1d'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
+ //$info['nsv']['NSVs']['unknown1d'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
$offset += 1;
- //$ThisFileInfo['nsv']['NSVs']['unknown2a'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
+ //$info['nsv']['NSVs']['unknown2a'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
$offset += 1;
- //$ThisFileInfo['nsv']['NSVs']['unknown2b'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
+ //$info['nsv']['NSVs']['unknown2b'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
$offset += 1;
- //$ThisFileInfo['nsv']['NSVs']['unknown2c'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
+ //$info['nsv']['NSVs']['unknown2c'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
$offset += 1;
- //$ThisFileInfo['nsv']['NSVs']['unknown2d'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
+ //$info['nsv']['NSVs']['unknown2d'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
$offset += 1;
- switch ($ThisFileInfo['nsv']['NSVs']['audio_codec']) {
+ switch ($info['nsv']['NSVs']['audio_codec']) {
case 'PCM ':
- $ThisFileInfo['nsv']['NSVs']['bits_channel'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
+ $info['nsv']['NSVs']['bits_channel'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
$offset += 1;
- $ThisFileInfo['nsv']['NSVs']['channels'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
+ $info['nsv']['NSVs']['channels'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 1));
$offset += 1;
- $ThisFileInfo['nsv']['NSVs']['sample_rate'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 2));
+ $info['nsv']['NSVs']['sample_rate'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 2));
$offset += 2;
- $ThisFileInfo['audio']['sample_rate'] = $ThisFileInfo['nsv']['NSVs']['sample_rate'];
+ $info['audio']['sample_rate'] = $info['nsv']['NSVs']['sample_rate'];
break;
case 'MP3 ':
case 'NONE':
default:
- //$ThisFileInfo['nsv']['NSVs']['unknown3'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 4));
+ //$info['nsv']['NSVs']['unknown3'] = getid3_lib::LittleEndian2Int(substr($NSVsheader, $offset, 4));
$offset += 4;
break;
}
- $ThisFileInfo['video']['resolution_x'] = $ThisFileInfo['nsv']['NSVs']['resolution_x'];
- $ThisFileInfo['video']['resolution_y'] = $ThisFileInfo['nsv']['NSVs']['resolution_y'];
- $ThisFileInfo['nsv']['NSVs']['frame_rate'] = $this->NSVframerateLookup($ThisFileInfo['nsv']['NSVs']['framerate_index']);
- $ThisFileInfo['video']['frame_rate'] = $ThisFileInfo['nsv']['NSVs']['frame_rate'];
- $ThisFileInfo['video']['bits_per_sample'] = 24;
- $ThisFileInfo['video']['pixel_aspect_ratio'] = (float) 1;
+ $info['video']['resolution_x'] = $info['nsv']['NSVs']['resolution_x'];
+ $info['video']['resolution_y'] = $info['nsv']['NSVs']['resolution_y'];
+ $info['nsv']['NSVs']['frame_rate'] = $this->NSVframerateLookup($info['nsv']['NSVs']['framerate_index']);
+ $info['video']['frame_rate'] = $info['nsv']['NSVs']['frame_rate'];
+ $info['video']['bits_per_sample'] = 24;
+ $info['video']['pixel_aspect_ratio'] = (float) 1;
return true;
}
- function getNSVfHeaderFilepointer(&$fd, &$ThisFileInfo, $fileoffset, $getTOCoffsets=false) {
- fseek($fd, $fileoffset, SEEK_SET);
- $NSVfheader = fread($fd, 28);
+ /**
+ * @param int $fileoffset
+ * @param bool $getTOCoffsets
+ *
+ * @return bool
+ */
+ public function getNSVfHeaderFilepointer($fileoffset, $getTOCoffsets=false) {
+ $info = &$this->getid3->info;
+ $this->fseek($fileoffset);
+ $NSVfheader = $this->fread(28);
$offset = 0;
- $ThisFileInfo['nsv']['NSVf']['identifier'] = substr($NSVfheader, $offset, 4);
+ $info['nsv']['NSVf']['identifier'] = substr($NSVfheader, $offset, 4);
$offset += 4;
- if ($ThisFileInfo['nsv']['NSVf']['identifier'] != 'NSVf') {
- $ThisFileInfo['error'][] = 'expected "NSVf" at offset ('.$fileoffset.'), found "'.$ThisFileInfo['nsv']['NSVf']['identifier'].'" instead';
- unset($ThisFileInfo['nsv']['NSVf']);
+ if ($info['nsv']['NSVf']['identifier'] != 'NSVf') {
+ $this->error('expected "NSVf" at offset ('.$fileoffset.'), found "'.$info['nsv']['NSVf']['identifier'].'" instead');
+ unset($info['nsv']['NSVf']);
return false;
}
- $ThisFileInfo['nsv']['NSVs']['offset'] = $fileoffset;
+ $info['nsv']['NSVs']['offset'] = $fileoffset;
- $ThisFileInfo['nsv']['NSVf']['header_length'] = getid3_lib::LittleEndian2Int(substr($NSVfheader, $offset, 4));
+ $info['nsv']['NSVf']['header_length'] = getid3_lib::LittleEndian2Int(substr($NSVfheader, $offset, 4));
$offset += 4;
- $ThisFileInfo['nsv']['NSVf']['file_size'] = getid3_lib::LittleEndian2Int(substr($NSVfheader, $offset, 4));
+ $info['nsv']['NSVf']['file_size'] = getid3_lib::LittleEndian2Int(substr($NSVfheader, $offset, 4));
$offset += 4;
- if ($ThisFileInfo['nsv']['NSVf']['file_size'] > $ThisFileInfo['avdataend']) {
- $ThisFileInfo['warning'][] = 'truncated file - NSVf header indicates '.$ThisFileInfo['nsv']['NSVf']['file_size'].' bytes, file actually '.$ThisFileInfo['avdataend'].' bytes';
+ if ($info['nsv']['NSVf']['file_size'] > $info['avdataend']) {
+ $this->warning('truncated file - NSVf header indicates '.$info['nsv']['NSVf']['file_size'].' bytes, file actually '.$info['avdataend'].' bytes');
}
- $ThisFileInfo['nsv']['NSVf']['playtime_ms'] = getid3_lib::LittleEndian2Int(substr($NSVfheader, $offset, 4));
+ $info['nsv']['NSVf']['playtime_ms'] = getid3_lib::LittleEndian2Int(substr($NSVfheader, $offset, 4));
$offset += 4;
- $ThisFileInfo['nsv']['NSVf']['meta_size'] = getid3_lib::LittleEndian2Int(substr($NSVfheader, $offset, 4));
+ $info['nsv']['NSVf']['meta_size'] = getid3_lib::LittleEndian2Int(substr($NSVfheader, $offset, 4));
$offset += 4;
- $ThisFileInfo['nsv']['NSVf']['TOC_entries_1'] = getid3_lib::LittleEndian2Int(substr($NSVfheader, $offset, 4));
+ $info['nsv']['NSVf']['TOC_entries_1'] = getid3_lib::LittleEndian2Int(substr($NSVfheader, $offset, 4));
$offset += 4;
- $ThisFileInfo['nsv']['NSVf']['TOC_entries_2'] = getid3_lib::LittleEndian2Int(substr($NSVfheader, $offset, 4));
+ $info['nsv']['NSVf']['TOC_entries_2'] = getid3_lib::LittleEndian2Int(substr($NSVfheader, $offset, 4));
$offset += 4;
- if ($ThisFileInfo['nsv']['NSVf']['playtime_ms'] == 0) {
- $ThisFileInfo['error'][] = 'Corrupt NSV file: NSVf.playtime_ms == zero';
+ if ($info['nsv']['NSVf']['playtime_ms'] == 0) {
+ $this->error('Corrupt NSV file: NSVf.playtime_ms == zero');
return false;
}
- $NSVfheader .= fread($fd, $ThisFileInfo['nsv']['NSVf']['meta_size'] + (4 * $ThisFileInfo['nsv']['NSVf']['TOC_entries_1']) + (4 * $ThisFileInfo['nsv']['NSVf']['TOC_entries_2']));
+ $NSVfheader .= $this->fread($info['nsv']['NSVf']['meta_size'] + (4 * $info['nsv']['NSVf']['TOC_entries_1']) + (4 * $info['nsv']['NSVf']['TOC_entries_2']));
$NSVfheaderlength = strlen($NSVfheader);
- $ThisFileInfo['nsv']['NSVf']['metadata'] = substr($NSVfheader, $offset, $ThisFileInfo['nsv']['NSVf']['meta_size']);
- $offset += $ThisFileInfo['nsv']['NSVf']['meta_size'];
+ $info['nsv']['NSVf']['metadata'] = substr($NSVfheader, $offset, $info['nsv']['NSVf']['meta_size']);
+ $offset += $info['nsv']['NSVf']['meta_size'];
if ($getTOCoffsets) {
$TOCcounter = 0;
- while ($TOCcounter < $ThisFileInfo['nsv']['NSVf']['TOC_entries_1']) {
- if ($TOCcounter < $ThisFileInfo['nsv']['NSVf']['TOC_entries_1']) {
- $ThisFileInfo['nsv']['NSVf']['TOC_1'][$TOCcounter] = getid3_lib::LittleEndian2Int(substr($NSVfheader, $offset, 4));
+ while ($TOCcounter < $info['nsv']['NSVf']['TOC_entries_1']) {
+ if ($TOCcounter < $info['nsv']['NSVf']['TOC_entries_1']) {
+ $info['nsv']['NSVf']['TOC_1'][$TOCcounter] = getid3_lib::LittleEndian2Int(substr($NSVfheader, $offset, 4));
$offset += 4;
$TOCcounter++;
}
@@ -184,41 +203,41 @@
}
}
- if (trim($ThisFileInfo['nsv']['NSVf']['metadata']) != '') {
- $ThisFileInfo['nsv']['NSVf']['metadata'] = str_replace('`', "\x01", $ThisFileInfo['nsv']['NSVf']['metadata']);
- $CommentPairArray = explode("\x01".' ', $ThisFileInfo['nsv']['NSVf']['metadata']);
+ if (trim($info['nsv']['NSVf']['metadata']) != '') {
+ $info['nsv']['NSVf']['metadata'] = str_replace('`', "\x01", $info['nsv']['NSVf']['metadata']);
+ $CommentPairArray = explode("\x01".' ', $info['nsv']['NSVf']['metadata']);
foreach ($CommentPairArray as $CommentPair) {
if (strstr($CommentPair, '='."\x01")) {
list($key, $value) = explode('='."\x01", $CommentPair, 2);
- $ThisFileInfo['nsv']['comments'][strtolower($key)][] = trim(str_replace("\x01", '', $value));
+ $info['nsv']['comments'][strtolower($key)][] = trim(str_replace("\x01", '', $value));
}
}
}
- $ThisFileInfo['playtime_seconds'] = $ThisFileInfo['nsv']['NSVf']['playtime_ms'] / 1000;
- $ThisFileInfo['bitrate'] = ($ThisFileInfo['nsv']['NSVf']['file_size'] * 8) / $ThisFileInfo['playtime_seconds'];
+ $info['playtime_seconds'] = $info['nsv']['NSVf']['playtime_ms'] / 1000;
+ $info['bitrate'] = ($info['nsv']['NSVf']['file_size'] * 8) / $info['playtime_seconds'];
return true;
}
-
- function NSVframerateLookup($framerateindex) {
+ /**
+ * @param int $framerateindex
+ *
+ * @return float|false
+ */
+ public static function NSVframerateLookup($framerateindex) {
if ($framerateindex <= 127) {
return (float) $framerateindex;
}
-
static $NSVframerateLookup = array();
if (empty($NSVframerateLookup)) {
- $NSVframerateLookup[129] = (float) 29.970;
- $NSVframerateLookup[131] = (float) 23.976;
- $NSVframerateLookup[133] = (float) 14.985;
- $NSVframerateLookup[197] = (float) 59.940;
- $NSVframerateLookup[199] = (float) 47.952;
+ $NSVframerateLookup[129] = 29.970;
+ $NSVframerateLookup[131] = 23.976;
+ $NSVframerateLookup[133] = 14.985;
+ $NSVframerateLookup[197] = 59.940;
+ $NSVframerateLookup[199] = 47.952;
}
return (isset($NSVframerateLookup[$framerateindex]) ? $NSVframerateLookup[$framerateindex] : false);
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.quicktime.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.quicktime.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.quicktime.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,91 +1,89 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio-video.quicktime.php //
// module for analyzing Quicktime and MP3-in-MP4 files //
// dependencies: module.audio.mp3.php //
+// dependencies: module.tag.id3v2.php //
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.mp3.php', __FILE__, true);
+getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v2.php', __FILE__, true); // needed for ISO 639-2 language code lookup
-class getid3_quicktime
+class getid3_quicktime extends getid3_handler
{
- function getid3_quicktime(&$fd, &$ThisFileInfo, $ReturnAtomData=true, $ParseAllPossibleAtoms=false) {
+ public $ReturnAtomData = true;
+ public $ParseAllPossibleAtoms = false;
- $ThisFileInfo['fileformat'] = 'quicktime';
- $ThisFileInfo['quicktime']['hinting'] = false;
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
+ $info['fileformat'] = 'quicktime';
+ $info['quicktime']['hinting'] = false;
+ $info['quicktime']['controller'] = 'standard'; // may be overridden if 'ctyp' atom is present
+ $this->fseek($info['avdataoffset']);
+
$offset = 0;
$atomcounter = 0;
+ $atom_data_read_buffer_size = $info['php_memory_limit'] ? round($info['php_memory_limit'] / 4) : $this->getid3->option_fread_buffer_size * 1024; // set read buffer to 25% of PHP memory limit (if one is specified), otherwise use option_fread_buffer_size [default: 32MB]
+ while ($offset < $info['avdataend']) {
+ if (!getid3_lib::intValueSupported($offset)) {
+ $this->error('Unable to parse atom at offset '.$offset.' because beyond '.round(PHP_INT_MAX / 1073741824).'GB limit of PHP filesystem functions');
+ break;
+ }
+ $this->fseek($offset);
+ $AtomHeader = $this->fread(8);
- while ($offset < $ThisFileInfo['avdataend']) {
- fseek($fd, $offset, SEEK_SET);
- $AtomHeader = fread($fd, 8);
-
$atomsize = getid3_lib::BigEndian2Int(substr($AtomHeader, 0, 4));
- $atomname = substr($AtomHeader, 4, 4);
- $ThisFileInfo['quicktime'][$atomname]['name'] = $atomname;
- $ThisFileInfo['quicktime'][$atomname]['size'] = $atomsize;
- $ThisFileInfo['quicktime'][$atomname]['offset'] = $offset;
+ $atomname = substr($AtomHeader, 4, 4);
- if (($offset + $atomsize) > $ThisFileInfo['avdataend']) {
- $ThisFileInfo['error'][] = 'Atom at offset '.$offset.' claims to go beyond end-of-file (length: '.$atomsize.' bytes)';
+ // 64-bit MOV patch by jlegateØktnc*com
+ if ($atomsize == 1) {
+ $atomsize = getid3_lib::BigEndian2Int($this->fread(8));
+ }
+
+ if (($offset + $atomsize) > $info['avdataend']) {
+ $info['quicktime'][$atomname]['name'] = $atomname;
+ $info['quicktime'][$atomname]['size'] = $atomsize;
+ $info['quicktime'][$atomname]['offset'] = $offset;
+ $this->error('Atom at offset '.$offset.' claims to go beyond end-of-file (length: '.$atomsize.' bytes)');
return false;
}
-
if ($atomsize == 0) {
// Furthermore, for historical reasons the list of atoms is optionally
// terminated by a 32-bit integer set to 0. If you are writing a program
// to read user data atoms, you should allow for the terminating 0.
+ $info['quicktime'][$atomname]['name'] = $atomname;
+ $info['quicktime'][$atomname]['size'] = $atomsize;
+ $info['quicktime'][$atomname]['offset'] = $offset;
break;
}
- switch ($atomname) {
- case 'mdat': // Media DATa atom
- // 'mdat' contains the actual data for the audio/video
- if (($atomsize > 8) && (!isset($ThisFileInfo['avdataend_tmp']) || ($ThisFileInfo['quicktime'][$atomname]['size'] > ($ThisFileInfo['avdataend_tmp'] - $ThisFileInfo['avdataoffset'])))) {
- $ThisFileInfo['avdataoffset'] = $ThisFileInfo['quicktime'][$atomname]['offset'] + 8;
- $OldAVDataEnd = $ThisFileInfo['avdataend'];
- $ThisFileInfo['avdataend'] = $ThisFileInfo['quicktime'][$atomname]['offset'] + $ThisFileInfo['quicktime'][$atomname]['size'];
-
- if (getid3_mp3::MPEGaudioHeaderValid(getid3_mp3::MPEGaudioHeaderDecode(fread($fd, 4)))) {
- getid3_mp3::getOnlyMPEGaudioInfo($fd, $ThisFileInfo, $ThisFileInfo['avdataoffset'], false);
- if (isset($ThisFileInfo['mpeg']['audio'])) {
- $ThisFileInfo['audio']['dataformat'] = 'mp3';
- $ThisFileInfo['audio']['codec'] = (!empty($ThisFileInfo['mpeg']['audio']['encoder']) ? $ThisFileInfo['mpeg']['audio']['encoder'] : (!empty($ThisFileInfo['mpeg']['audio']['codec']) ? $ThisFileInfo['mpeg']['audio']['codec'] : (!empty($ThisFileInfo['mpeg']['audio']['LAME']) ? 'LAME' :'mp3')));
- $ThisFileInfo['audio']['sample_rate'] = $ThisFileInfo['mpeg']['audio']['sample_rate'];
- $ThisFileInfo['audio']['channels'] = $ThisFileInfo['mpeg']['audio']['channels'];
- $ThisFileInfo['audio']['bitrate'] = $ThisFileInfo['mpeg']['audio']['bitrate'];
- $ThisFileInfo['audio']['bitrate_mode'] = strtolower($ThisFileInfo['mpeg']['audio']['bitrate_mode']);
- $ThisFileInfo['bitrate'] = $ThisFileInfo['audio']['bitrate'];
- }
- }
- $ThisFileInfo['avdataend'] = $OldAVDataEnd;
- unset($OldAVDataEnd);
-
- }
- break;
-
- case 'free': // FREE space atom
- case 'skip': // SKIP atom
- case 'wide': // 64-bit expansion placeholder atom
- // 'free', 'skip' and 'wide' are just padding, contains no useful data at all
- break;
-
- default:
- $atomHierarchy = array();
- $ThisFileInfo['quicktime'][$atomname] = $this->QuicktimeParseAtom($atomname, $atomsize, fread($fd, $atomsize), $ThisFileInfo, $offset, $atomHierarchy, $ParseAllPossibleAtoms);
- break;
+ $atomHierarchy = array();
+ $parsedAtomData = $this->QuicktimeParseAtom($atomname, $atomsize, $this->fread(min($atomsize, $atom_data_read_buffer_size)), $offset, $atomHierarchy, $this->ParseAllPossibleAtoms);
+ $parsedAtomData['name'] = $atomname;
+ $parsedAtomData['size'] = $atomsize;
+ $parsedAtomData['offset'] = $offset;
+ if (in_array($atomname, array('uuid'))) {
+ @$info['quicktime'][$atomname][] = $parsedAtomData;
+ } else {
+ $info['quicktime'][$atomname] = $parsedAtomData;
}
$offset += $atomsize;
@@ -92,443 +90,913 @@
$atomcounter++;
}
- if (!empty($ThisFileInfo['avdataend_tmp'])) {
+ if (!empty($info['avdataend_tmp'])) {
// this value is assigned to a temp value and then erased because
// otherwise any atoms beyond the 'mdat' atom would not get parsed
- $ThisFileInfo['avdataend'] = $ThisFileInfo['avdataend_tmp'];
- unset($ThisFileInfo['avdataend_tmp']);
+ $info['avdataend'] = $info['avdataend_tmp'];
+ unset($info['avdataend_tmp']);
}
- if (!isset($ThisFileInfo['bitrate']) && isset($ThisFileInfo['playtime_seconds'])) {
- $ThisFileInfo['bitrate'] = (($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) * 8) / $ThisFileInfo['playtime_seconds'];
+ if (!empty($info['quicktime']['comments']['chapters']) && is_array($info['quicktime']['comments']['chapters']) && (count($info['quicktime']['comments']['chapters']) > 0)) {
+ $durations = $this->quicktime_time_to_sample_table($info);
+ for ($i = 0; $i < count($info['quicktime']['comments']['chapters']); $i++) {
+ $bookmark = array();
+ $bookmark['title'] = $info['quicktime']['comments']['chapters'][$i];
+ if (isset($durations[$i])) {
+ $bookmark['duration_sample'] = $durations[$i]['sample_duration'];
+ if ($i > 0) {
+ $bookmark['start_sample'] = $info['quicktime']['bookmarks'][($i - 1)]['start_sample'] + $info['quicktime']['bookmarks'][($i - 1)]['duration_sample'];
+ } else {
+ $bookmark['start_sample'] = 0;
+ }
+ if ($time_scale = $this->quicktime_bookmark_time_scale($info)) {
+ $bookmark['duration_seconds'] = $bookmark['duration_sample'] / $time_scale;
+ $bookmark['start_seconds'] = $bookmark['start_sample'] / $time_scale;
+ }
+ }
+ $info['quicktime']['bookmarks'][] = $bookmark;
+ }
}
- if (isset($ThisFileInfo['bitrate']) && !isset($ThisFileInfo['audio']['bitrate']) && !isset($ThisFileInfo['quicktime']['video'])) {
- $ThisFileInfo['audio']['bitrate'] = $ThisFileInfo['bitrate'];
+
+ if (isset($info['quicktime']['temp_meta_key_names'])) {
+ unset($info['quicktime']['temp_meta_key_names']);
}
- if (($ThisFileInfo['audio']['dataformat'] == 'mp4') && empty($ThisFileInfo['video']['resolution_x'])) {
- $ThisFileInfo['fileformat'] = 'mp4';
- $ThisFileInfo['mime_type'] = 'audio/mp4';
- unset($ThisFileInfo['video']['dataformat']);
+ if (!empty($info['quicktime']['comments']['location.ISO6709'])) {
+ // https://en.wikipedia.org/wiki/ISO_6709
+ foreach ($info['quicktime']['comments']['location.ISO6709'] as $ISO6709string) {
+ $ISO6709parsed = array('latitude'=>false, 'longitude'=>false, 'altitude'=>false);
+ if (preg_match('#^([\\+\\-])([0-9]{2}|[0-9]{4}|[0-9]{6})(\\.[0-9]+)?([\\+\\-])([0-9]{3}|[0-9]{5}|[0-9]{7})(\\.[0-9]+)?(([\\+\\-])([0-9]{3}|[0-9]{5}|[0-9]{7})(\\.[0-9]+)?)?/$#', $ISO6709string, $matches)) {
+ @list($dummy, $lat_sign, $lat_deg, $lat_deg_dec, $lon_sign, $lon_deg, $lon_deg_dec, $dummy, $alt_sign, $alt_deg, $alt_deg_dec) = $matches;
+
+ if (strlen($lat_deg) == 2) { // [+-]DD.D
+ $ISO6709parsed['latitude'] = (($lat_sign == '-') ? -1 : 1) * floatval(ltrim($lat_deg, '0').$lat_deg_dec);
+ } elseif (strlen($lat_deg) == 4) { // [+-]DDMM.M
+ $ISO6709parsed['latitude'] = (($lat_sign == '-') ? -1 : 1) * floatval(ltrim(substr($lat_deg, 0, 2), '0')) + floatval(ltrim(substr($lat_deg, 2, 2), '0').$lat_deg_dec / 60);
+ } elseif (strlen($lat_deg) == 6) { // [+-]DDMMSS.S
+ $ISO6709parsed['latitude'] = (($lat_sign == '-') ? -1 : 1) * floatval(ltrim(substr($lat_deg, 0, 2), '0')) + floatval(ltrim(substr($lat_deg, 2, 2), '0') / 60) + floatval(ltrim(substr($lat_deg, 4, 2), '0').$lat_deg_dec / 3600);
+ }
+
+ if (strlen($lon_deg) == 3) { // [+-]DDD.D
+ $ISO6709parsed['longitude'] = (($lon_sign == '-') ? -1 : 1) * floatval(ltrim($lon_deg, '0').$lon_deg_dec);
+ } elseif (strlen($lon_deg) == 5) { // [+-]DDDMM.M
+ $ISO6709parsed['longitude'] = (($lon_sign == '-') ? -1 : 1) * floatval(ltrim(substr($lon_deg, 0, 2), '0')) + floatval(ltrim(substr($lon_deg, 2, 2), '0').$lon_deg_dec / 60);
+ } elseif (strlen($lon_deg) == 7) { // [+-]DDDMMSS.S
+ $ISO6709parsed['longitude'] = (($lon_sign == '-') ? -1 : 1) * floatval(ltrim(substr($lon_deg, 0, 2), '0')) + floatval(ltrim(substr($lon_deg, 2, 2), '0') / 60) + floatval(ltrim(substr($lon_deg, 4, 2), '0').$lon_deg_dec / 3600);
+ }
+
+ if (strlen($alt_deg) == 3) { // [+-]DDD.D
+ $ISO6709parsed['altitude'] = (($alt_sign == '-') ? -1 : 1) * floatval(ltrim($alt_deg, '0').$alt_deg_dec);
+ } elseif (strlen($alt_deg) == 5) { // [+-]DDDMM.M
+ $ISO6709parsed['altitude'] = (($alt_sign == '-') ? -1 : 1) * floatval(ltrim(substr($alt_deg, 0, 2), '0')) + floatval(ltrim(substr($alt_deg, 2, 2), '0').$alt_deg_dec / 60);
+ } elseif (strlen($alt_deg) == 7) { // [+-]DDDMMSS.S
+ $ISO6709parsed['altitude'] = (($alt_sign == '-') ? -1 : 1) * floatval(ltrim(substr($alt_deg, 0, 2), '0')) + floatval(ltrim(substr($alt_deg, 2, 2), '0') / 60) + floatval(ltrim(substr($alt_deg, 4, 2), '0').$alt_deg_dec / 3600);
+ }
+
+ foreach (array('latitude', 'longitude', 'altitude') as $key) {
+ if ($ISO6709parsed[$key] !== false) {
+ $value = (($lat_sign == '-') ? -1 : 1) * floatval($ISO6709parsed[$key]);
+ if (!isset($info['quicktime']['comments']['gps_'.$key]) || !in_array($value, $info['quicktime']['comments']['gps_'.$key])) {
+ @$info['quicktime']['comments']['gps_'.$key][] = (($lat_sign == '-') ? -1 : 1) * floatval($ISO6709parsed[$key]);
+ }
+ }
+ }
+ }
+ if ($ISO6709parsed['latitude'] === false) {
+ $this->warning('location.ISO6709 string not parsed correctly: "'.$ISO6709string.'", please submit as a bug');
+ }
+ break;
+ }
}
- if (!$ReturnAtomData) {
- unset($ThisFileInfo['quicktime']['moov']);
+ if (!isset($info['bitrate']) && isset($info['playtime_seconds'])) {
+ $info['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
}
+ if (isset($info['bitrate']) && !isset($info['audio']['bitrate']) && !isset($info['quicktime']['video'])) {
+ $info['audio']['bitrate'] = $info['bitrate'];
+ }
+ if (!empty($info['bitrate']) && !empty($info['audio']['bitrate']) && empty($info['video']['bitrate']) && !empty($info['video']['frame_rate']) && !empty($info['video']['resolution_x']) && ($info['bitrate'] > $info['audio']['bitrate'])) {
+ $info['video']['bitrate'] = $info['bitrate'] - $info['audio']['bitrate'];
+ }
+ if (!empty($info['playtime_seconds']) && !isset($info['video']['frame_rate']) && !empty($info['quicktime']['stts_framecount'])) {
+ foreach ($info['quicktime']['stts_framecount'] as $key => $samples_count) {
+ $samples_per_second = $samples_count / $info['playtime_seconds'];
+ if ($samples_per_second > 240) {
+ // has to be audio samples
+ } else {
+ $info['video']['frame_rate'] = $samples_per_second;
+ break;
+ }
+ }
+ }
+ if ($info['audio']['dataformat'] == 'mp4') {
+ $info['fileformat'] = 'mp4';
+ if (empty($info['video']['resolution_x'])) {
+ $info['mime_type'] = 'audio/mp4';
+ unset($info['video']['dataformat']);
+ } else {
+ $info['mime_type'] = 'video/mp4';
+ }
+ }
- if (empty($ThisFileInfo['audio']['dataformat']) && !empty($ThisFileInfo['quicktime']['audio'])) {
- $ThisFileInfo['audio']['dataformat'] = 'quicktime';
+ if (!$this->ReturnAtomData) {
+ unset($info['quicktime']['moov']);
}
- if (empty($ThisFileInfo['video']['dataformat']) && !empty($ThisFileInfo['quicktime']['video'])) {
- $ThisFileInfo['video']['dataformat'] = 'quicktime';
+
+ if (empty($info['audio']['dataformat']) && !empty($info['quicktime']['audio'])) {
+ $info['audio']['dataformat'] = 'quicktime';
}
+ if (empty($info['video']['dataformat']) && !empty($info['quicktime']['video'])) {
+ $info['video']['dataformat'] = 'quicktime';
+ }
+ if (isset($info['video']) && ($info['mime_type'] == 'audio/mp4') && empty($info['video']['resolution_x']) && empty($info['video']['resolution_y'])) {
+ unset($info['video']);
+ }
return true;
}
- function QuicktimeParseAtom($atomname, $atomsize, $atomdata, &$ThisFileInfo, $baseoffset, &$atomHierarchy, $ParseAllPossibleAtoms) {
+ /**
+ * @param string $atomname
+ * @param int $atomsize
+ * @param string $atom_data
+ * @param int $baseoffset
+ * @param array $atomHierarchy
+ * @param bool $ParseAllPossibleAtoms
+ *
+ * @return array|false
+ */
+ public function QuicktimeParseAtom($atomname, $atomsize, $atom_data, $baseoffset, &$atomHierarchy, $ParseAllPossibleAtoms) {
// http://developer.apple.com/techpubs/quicktime/qtdevdocs/APIREF/INDEX/atomalphaindex.htm
+ // https://code.google.com/p/mp4v2/wiki/iTunesMetadata
+ $info = &$this->getid3->info;
+
+ $atom_parent = end($atomHierarchy); // not array_pop($atomHierarchy); see https://www.getid3.org/phpBB3/viewtopic.php?t=1717
array_push($atomHierarchy, $atomname);
- $atomstructure['hierarchy'] = implode(' ', $atomHierarchy);
- $atomstructure['name'] = $atomname;
- $atomstructure['size'] = $atomsize;
- $atomstructure['offset'] = $baseoffset;
+ $atom_structure = array();
+ $atom_structure['hierarchy'] = implode(' ', $atomHierarchy);
+ $atom_structure['name'] = $atomname;
+ $atom_structure['size'] = $atomsize;
+ $atom_structure['offset'] = $baseoffset;
+ if (substr($atomname, 0, 3) == "\x00\x00\x00") {
+ // https://github.com/JamesHeinrich/getID3/issues/139
+ $atomname = getid3_lib::BigEndian2Int($atomname);
+ $atom_structure['name'] = $atomname;
+ $atom_structure['subatoms'] = $this->QuicktimeParseContainerAtom($atom_data, $baseoffset + 8, $atomHierarchy, $ParseAllPossibleAtoms);
+ } else {
+ switch ($atomname) {
+ case 'moov': // MOVie container atom
+ case 'trak': // TRAcK container atom
+ case 'clip': // CLIPping container atom
+ case 'matt': // track MATTe container atom
+ case 'edts': // EDiTS container atom
+ case 'tref': // Track REFerence container atom
+ case 'mdia': // MeDIA container atom
+ case 'minf': // Media INFormation container atom
+ case 'dinf': // Data INFormation container atom
+ case 'nmhd': // Null Media HeaDer container atom
+ case 'udta': // User DaTA container atom
+ case 'cmov': // Compressed MOVie container atom
+ case 'rmra': // Reference Movie Record Atom
+ case 'rmda': // Reference Movie Descriptor Atom
+ case 'gmhd': // Generic Media info HeaDer atom (seen on QTVR)
+ $atom_structure['subatoms'] = $this->QuicktimeParseContainerAtom($atom_data, $baseoffset + 8, $atomHierarchy, $ParseAllPossibleAtoms);
+ break;
- switch ($atomname) {
- case 'moov': // MOVie container atom
- case 'trak': // TRAcK container atom
- case 'clip': // CLIPping container atom
- case 'matt': // track MATTe container atom
- case 'edts': // EDiTS container atom
- case 'tref': // Track REFerence container atom
- case 'mdia': // MeDIA container atom
- case 'minf': // Media INFormation container atom
- case 'dinf': // Data INFormation container atom
- case 'udta': // User DaTA container atom
- case 'stbl': // Sample TaBLe container atom
- case 'cmov': // Compressed MOVie container atom
- case 'rmra': // Reference Movie Record Atom
- case 'rmda': // Reference Movie Descriptor Atom
- case 'gmhd': // Generic Media info HeaDer atom (seen on QTVR)
- $atomstructure['subatoms'] = $this->QuicktimeParseContainerAtom($atomdata, $ThisFileInfo, $baseoffset + 8, $atomHierarchy, $ParseAllPossibleAtoms);
- break;
+ case 'ilst': // Item LiST container atom
+ if ($atom_structure['subatoms'] = $this->QuicktimeParseContainerAtom($atom_data, $baseoffset + 8, $atomHierarchy, $ParseAllPossibleAtoms)) {
+ // some "ilst" atoms contain data atoms that have a numeric name, and the data is far more accessible if the returned array is compacted
+ $allnumericnames = true;
+ foreach ($atom_structure['subatoms'] as $subatomarray) {
+ if (!is_integer($subatomarray['name']) || (count($subatomarray['subatoms']) != 1)) {
+ $allnumericnames = false;
+ break;
+ }
+ }
+ if ($allnumericnames) {
+ $newData = array();
+ foreach ($atom_structure['subatoms'] as $subatomarray) {
+ foreach ($subatomarray['subatoms'] as $newData_subatomarray) {
+ unset($newData_subatomarray['hierarchy'], $newData_subatomarray['name']);
+ $newData[$subatomarray['name']] = $newData_subatomarray;
+ break;
+ }
+ }
+ $atom_structure['data'] = $newData;
+ unset($atom_structure['subatoms']);
+ }
+ }
+ break;
+ case 'stbl': // Sample TaBLe container atom
+ $atom_structure['subatoms'] = $this->QuicktimeParseContainerAtom($atom_data, $baseoffset + 8, $atomHierarchy, $ParseAllPossibleAtoms);
+ $isVideo = false;
+ $framerate = 0;
+ $framecount = 0;
+ foreach ($atom_structure['subatoms'] as $key => $value_array) {
+ if (isset($value_array['sample_description_table'])) {
+ foreach ($value_array['sample_description_table'] as $key2 => $value_array2) {
+ if (isset($value_array2['data_format'])) {
+ switch ($value_array2['data_format']) {
+ case 'avc1':
+ case 'mp4v':
+ // video data
+ $isVideo = true;
+ break;
+ case 'mp4a':
+ // audio data
+ break;
+ }
+ }
+ }
+ } elseif (isset($value_array['time_to_sample_table'])) {
+ foreach ($value_array['time_to_sample_table'] as $key2 => $value_array2) {
+ if (isset($value_array2['sample_count']) && isset($value_array2['sample_duration']) && ($value_array2['sample_duration'] > 0)) {
+ $framerate = round($info['quicktime']['time_scale'] / $value_array2['sample_duration'], 3);
+ $framecount = $value_array2['sample_count'];
+ }
+ }
+ }
+ }
+ if ($isVideo && $framerate) {
+ $info['quicktime']['video']['frame_rate'] = $framerate;
+ $info['video']['frame_rate'] = $info['quicktime']['video']['frame_rate'];
+ }
+ if ($isVideo && $framecount) {
+ $info['quicktime']['video']['frame_count'] = $framecount;
+ }
+ break;
- case '©cpy':
- case '©day':
- case '©dir':
- case '©ed1':
- case '©ed2':
- case '©ed3':
- case '©ed4':
- case '©ed5':
- case '©ed6':
- case '©ed7':
- case '©ed8':
- case '©ed9':
- case '©fmt':
- case '©inf':
- case '©prd':
- case '©prf':
- case '©req':
- case '©src':
- case '©wrt':
- case '©nam':
- case '©cmt':
- case '©wrn':
- case '©hst':
- case '©mak':
- case '©mod':
- case '©PRD':
- case '©swr':
- case '©aut':
- case '©ART':
- case '©trk':
- case '©alb':
- case '©com':
- case '©gen':
- case '©ope':
- case '©url':
- case '©enc':
- $atomstructure['data_length'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 2));
- $atomstructure['language_id'] = getid3_lib::BigEndian2Int(substr($atomdata, 2, 2));
- $atomstructure['data'] = substr($atomdata, 4);
- $atomstructure['language'] = $this->QuicktimeLanguageLookup($atomstructure['language_id']);
- if (empty($ThisFileInfo['comments']['language']) || (!in_array($atomstructure['language'], $ThisFileInfo['comments']['language']))) {
- $ThisFileInfo['comments']['language'][] = $atomstructure['language'];
- }
- $this->CopyToAppropriateCommentsSection($atomname, $atomstructure['data'], $ThisFileInfo);
- break;
+ case "\xA9".'alb': // ALBum
+ case "\xA9".'ART': //
+ case "\xA9".'art': // ARTist
+ case "\xA9".'aut': //
+ case "\xA9".'cmt': // CoMmenT
+ case "\xA9".'com': // COMposer
+ case "\xA9".'cpy': //
+ case "\xA9".'day': // content created year
+ case "\xA9".'dir': //
+ case "\xA9".'ed1': //
+ case "\xA9".'ed2': //
+ case "\xA9".'ed3': //
+ case "\xA9".'ed4': //
+ case "\xA9".'ed5': //
+ case "\xA9".'ed6': //
+ case "\xA9".'ed7': //
+ case "\xA9".'ed8': //
+ case "\xA9".'ed9': //
+ case "\xA9".'enc': //
+ case "\xA9".'fmt': //
+ case "\xA9".'gen': // GENre
+ case "\xA9".'grp': // GRouPing
+ case "\xA9".'hst': //
+ case "\xA9".'inf': //
+ case "\xA9".'lyr': // LYRics
+ case "\xA9".'mak': //
+ case "\xA9".'mod': //
+ case "\xA9".'nam': // full NAMe
+ case "\xA9".'ope': //
+ case "\xA9".'PRD': //
+ case "\xA9".'prf': //
+ case "\xA9".'req': //
+ case "\xA9".'src': //
+ case "\xA9".'swr': //
+ case "\xA9".'too': // encoder
+ case "\xA9".'trk': // TRacK
+ case "\xA9".'url': //
+ case "\xA9".'wrn': //
+ case "\xA9".'wrt': // WRiTer
+ case '----': // itunes specific
+ case 'aART': // Album ARTist
+ case 'akID': // iTunes store account type
+ case 'apID': // Purchase Account
+ case 'atID': //
+ case 'catg': // CaTeGory
+ case 'cmID': //
+ case 'cnID': //
+ case 'covr': // COVeR artwork
+ case 'cpil': // ComPILation
+ case 'cprt': // CoPyRighT
+ case 'desc': // DESCription
+ case 'disk': // DISK number
+ case 'egid': // Episode Global ID
+ case 'geID': //
+ case 'gnre': // GeNRE
+ case 'hdvd': // HD ViDeo
+ case 'keyw': // KEYWord
+ case 'ldes': // Long DEScription
+ case 'pcst': // PodCaST
+ case 'pgap': // GAPless Playback
+ case 'plID': //
+ case 'purd': // PURchase Date
+ case 'purl': // Podcast URL
+ case 'rati': //
+ case 'rndu': //
+ case 'rpdu': //
+ case 'rtng': // RaTiNG
+ case 'sfID': // iTunes store country
+ case 'soaa': // SOrt Album Artist
+ case 'soal': // SOrt ALbum
+ case 'soar': // SOrt ARtist
+ case 'soco': // SOrt COmposer
+ case 'sonm': // SOrt NaMe
+ case 'sosn': // SOrt Show Name
+ case 'stik': //
+ case 'tmpo': // TeMPO (BPM)
+ case 'trkn': // TRacK Number
+ case 'tven': // tvEpisodeID
+ case 'tves': // TV EpiSode
+ case 'tvnn': // TV Network Name
+ case 'tvsh': // TV SHow Name
+ case 'tvsn': // TV SeasoN
+ if ($atom_parent == 'udta') {
+ // User data atom handler
+ $atom_structure['data_length'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 2));
+ $atom_structure['language_id'] = getid3_lib::BigEndian2Int(substr($atom_data, 2, 2));
+ $atom_structure['data'] = substr($atom_data, 4);
+ $atom_structure['language'] = $this->QuicktimeLanguageLookup($atom_structure['language_id']);
+ if (empty($info['comments']['language']) || (!in_array($atom_structure['language'], $info['comments']['language']))) {
+ $info['comments']['language'][] = $atom_structure['language'];
+ }
+ } else {
+ // Apple item list box atom handler
+ $atomoffset = 0;
+ if (substr($atom_data, 2, 2) == "\x10\xB5") {
+ // not sure what it means, but observed on iPhone4 data.
+ // Each $atom_data has 2 bytes of datasize, plus 0x10B5, then data
+ while ($atomoffset < strlen($atom_data)) {
+ $boxsmallsize = getid3_lib::BigEndian2Int(substr($atom_data, $atomoffset, 2));
+ $boxsmalltype = substr($atom_data, $atomoffset + 2, 2);
+ $boxsmalldata = substr($atom_data, $atomoffset + 4, $boxsmallsize);
+ if ($boxsmallsize <= 1) {
+ $this->warning('Invalid QuickTime atom smallbox size "'.$boxsmallsize.'" in atom "'.preg_replace('#[^a-zA-Z0-9 _\\-]#', '?', $atomname).'" at offset: '.($atom_structure['offset'] + $atomoffset));
+ $atom_structure['data'] = null;
+ $atomoffset = strlen($atom_data);
+ break;
+ }
+ switch ($boxsmalltype) {
+ case "\x10\xB5":
+ $atom_structure['data'] = $boxsmalldata;
+ break;
+ default:
+ $this->warning('Unknown QuickTime smallbox type: "'.preg_replace('#[^a-zA-Z0-9 _\\-]#', '?', $boxsmalltype).'" ('.trim(getid3_lib::PrintHexBytes($boxsmalltype)).') at offset '.$baseoffset);
+ $atom_structure['data'] = $atom_data;
+ break;
+ }
+ $atomoffset += (4 + $boxsmallsize);
+ }
+ } else {
+ while ($atomoffset < strlen($atom_data)) {
+ $boxsize = getid3_lib::BigEndian2Int(substr($atom_data, $atomoffset, 4));
+ $boxtype = substr($atom_data, $atomoffset + 4, 4);
+ $boxdata = substr($atom_data, $atomoffset + 8, $boxsize - 8);
+ if ($boxsize <= 1) {
+ $this->warning('Invalid QuickTime atom box size "'.$boxsize.'" in atom "'.preg_replace('#[^a-zA-Z0-9 _\\-]#', '?', $atomname).'" at offset: '.($atom_structure['offset'] + $atomoffset));
+ $atom_structure['data'] = null;
+ $atomoffset = strlen($atom_data);
+ break;
+ }
+ $atomoffset += $boxsize;
- case 'play': // auto-PLAY atom
- $atomstructure['autoplay'] = (bool) getid3_lib::BigEndian2Int(substr($atomdata, 0, 1));
+ switch ($boxtype) {
+ case 'mean':
+ case 'name':
+ $atom_structure[$boxtype] = substr($boxdata, 4);
+ break;
- $ThisFileInfo['quicktime']['autoplay'] = $atomstructure['autoplay'];
- break;
+ case 'data':
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($boxdata, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($boxdata, 1, 3));
+ switch ($atom_structure['flags_raw']) {
+ case 0: // data flag
+ case 21: // tmpo/cpil flag
+ switch ($atomname) {
+ case 'cpil':
+ case 'hdvd':
+ case 'pcst':
+ case 'pgap':
+ // 8-bit integer (boolean)
+ $atom_structure['data'] = getid3_lib::BigEndian2Int(substr($boxdata, 8, 1));
+ break;
+ case 'tmpo':
+ // 16-bit integer
+ $atom_structure['data'] = getid3_lib::BigEndian2Int(substr($boxdata, 8, 2));
+ break;
- case 'WLOC': // Window LOCation atom
- $atomstructure['location_x'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 2));
- $atomstructure['location_y'] = getid3_lib::BigEndian2Int(substr($atomdata, 2, 2));
- break;
+ case 'disk':
+ case 'trkn':
+ // binary
+ $num = getid3_lib::BigEndian2Int(substr($boxdata, 10, 2));
+ $num_total = getid3_lib::BigEndian2Int(substr($boxdata, 12, 2));
+ $atom_structure['data'] = empty($num) ? '' : $num;
+ $atom_structure['data'] .= empty($num_total) ? '' : '/'.$num_total;
+ break;
+ case 'gnre':
+ // enum
+ $GenreID = getid3_lib::BigEndian2Int(substr($boxdata, 8, 4));
+ $atom_structure['data'] = getid3_id3v1::LookupGenreName($GenreID - 1);
+ break;
- case 'LOOP': // LOOPing atom
- case 'SelO': // play SELection Only atom
- case 'AllF': // play ALL Frames atom
- $atomstructure['data'] = getid3_lib::BigEndian2Int($atomdata);
- break;
+ case 'rtng':
+ // 8-bit integer
+ $atom_structure[$atomname] = getid3_lib::BigEndian2Int(substr($boxdata, 8, 1));
+ $atom_structure['data'] = $this->QuicktimeContentRatingLookup($atom_structure[$atomname]);
+ break;
+ case 'stik':
+ // 8-bit integer (enum)
+ $atom_structure[$atomname] = getid3_lib::BigEndian2Int(substr($boxdata, 8, 1));
+ $atom_structure['data'] = $this->QuicktimeSTIKLookup($atom_structure[$atomname]);
+ break;
- case 'name': //
- case 'MCPS': // Media Cleaner PRo
- case '@PRM': // adobe PReMiere version
- case '@PRQ': // adobe PRemiere Quicktime version
- $atomstructure['data'] = $atomdata;
- break;
+ case 'sfID':
+ // 32-bit integer
+ $atom_structure[$atomname] = getid3_lib::BigEndian2Int(substr($boxdata, 8, 4));
+ $atom_structure['data'] = $this->QuicktimeStoreFrontCodeLookup($atom_structure[$atomname]);
+ break;
+ case 'egid':
+ case 'purl':
+ $atom_structure['data'] = substr($boxdata, 8);
+ break;
- case 'cmvd': // Compressed MooV Data atom
- // Code by ubergeekØubergeek*tv based on information from
- // http://developer.apple.com/quicktime/icefloe/dispatch012.html
- $atomstructure['unCompressedSize'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 4));
+ case 'plID':
+ // 64-bit integer
+ $atom_structure['data'] = getid3_lib::BigEndian2Int(substr($boxdata, 8, 8));
+ break;
- $CompressedFileData = substr($atomdata, 4);
- if ($UncompressedHeader = @gzuncompress($CompressedFileData)) {
- $atomstructure['subatoms'] = $this->QuicktimeParseContainerAtom($UncompressedHeader, $ThisFileInfo, 0, $atomHierarchy, $ParseAllPossibleAtoms);
- } else {
- $ThisFileInfo['warning'][] = 'Error decompressing compressed MOV atom at offset '.$atomstructure['offset'];
- }
- break;
+ case 'covr':
+ $atom_structure['data'] = substr($boxdata, 8);
+ // not a foolproof check, but better than nothing
+ if (preg_match('#^\\xFF\\xD8\\xFF#', $atom_structure['data'])) {
+ $atom_structure['image_mime'] = 'image/jpeg';
+ } elseif (preg_match('#^\\x89\\x50\\x4E\\x47\\x0D\\x0A\\x1A\\x0A#', $atom_structure['data'])) {
+ $atom_structure['image_mime'] = 'image/png';
+ } elseif (preg_match('#^GIF#', $atom_structure['data'])) {
+ $atom_structure['image_mime'] = 'image/gif';
+ }
+ $info['quicktime']['comments']['picture'][] = array('image_mime'=>$atom_structure['image_mime'], 'data'=>$atom_structure['data'], 'description'=>'cover');
+ break;
+ case 'atID':
+ case 'cnID':
+ case 'geID':
+ case 'tves':
+ case 'tvsn':
+ default:
+ // 32-bit integer
+ $atom_structure['data'] = getid3_lib::BigEndian2Int(substr($boxdata, 8, 4));
+ }
+ break;
- case 'dcom': // Data COMpression atom
- $atomstructure['compression_id'] = $atomdata;
- $atomstructure['compression_text'] = $this->QuicktimeDCOMLookup($atomdata);
- break;
+ case 1: // text flag
+ case 13: // image flag
+ default:
+ $atom_structure['data'] = substr($boxdata, 8);
+ if ($atomname == 'covr') {
+ // not a foolproof check, but better than nothing
+ if (preg_match('#^\\xFF\\xD8\\xFF#', $atom_structure['data'])) {
+ $atom_structure['image_mime'] = 'image/jpeg';
+ } elseif (preg_match('#^\\x89\\x50\\x4E\\x47\\x0D\\x0A\\x1A\\x0A#', $atom_structure['data'])) {
+ $atom_structure['image_mime'] = 'image/png';
+ } elseif (preg_match('#^GIF#', $atom_structure['data'])) {
+ $atom_structure['image_mime'] = 'image/gif';
+ }
+ $info['quicktime']['comments']['picture'][] = array('image_mime'=>$atom_structure['image_mime'], 'data'=>$atom_structure['data'], 'description'=>'cover');
+ }
+ break;
+ }
+ break;
- case 'rdrf': // Reference movie Data ReFerence atom
- $atomstructure['version'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 1));
- $atomstructure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 1, 3));
- $atomstructure['flags']['internal_data'] = (bool) ($atomstructure['flags_raw'] & 0x000001);
+ default:
+ $this->warning('Unknown QuickTime box type: "'.preg_replace('#[^a-zA-Z0-9 _\\-]#', '?', $boxtype).'" ('.trim(getid3_lib::PrintHexBytes($boxtype)).') at offset '.$baseoffset);
+ $atom_structure['data'] = $atom_data;
- $atomstructure['reference_type_name'] = substr($atomdata, 4, 4);
- $atomstructure['reference_length'] = getid3_lib::BigEndian2Int(substr($atomdata, 8, 4));
- switch ($atomstructure['reference_type_name']) {
- case 'url ':
- $atomstructure['url'] = $this->NoNullString(substr($atomdata, 12));
- break;
+ }
+ }
+ }
+ }
+ $this->CopyToAppropriateCommentsSection($atomname, $atom_structure['data'], $atom_structure['name']);
+ break;
- case 'alis':
- $atomstructure['file_alias'] = substr($atomdata, 12);
- break;
- case 'rsrc':
- $atomstructure['resource_alias'] = substr($atomdata, 12);
- break;
+ case 'play': // auto-PLAY atom
+ $atom_structure['autoplay'] = (bool) getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
- default:
- $atomstructure['data'] = substr($atomdata, 12);
- break;
- }
- break;
+ $info['quicktime']['autoplay'] = $atom_structure['autoplay'];
+ break;
- case 'rmqu': // Reference Movie QUality atom
- $atomstructure['movie_quality'] = getid3_lib::BigEndian2Int($atomdata);
- break;
+ case 'WLOC': // Window LOCation atom
+ $atom_structure['location_x'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 2));
+ $atom_structure['location_y'] = getid3_lib::BigEndian2Int(substr($atom_data, 2, 2));
+ break;
- case 'rmcs': // Reference Movie Cpu Speed atom
- $atomstructure['version'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 1));
- $atomstructure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 1, 3)); // hardcoded: 0x0000
- $atomstructure['cpu_speed_rating'] = getid3_lib::BigEndian2Int(substr($atomdata, 4, 2));
- break;
+ case 'LOOP': // LOOPing atom
+ case 'SelO': // play SELection Only atom
+ case 'AllF': // play ALL Frames atom
+ $atom_structure['data'] = getid3_lib::BigEndian2Int($atom_data);
+ break;
- case 'rmvc': // Reference Movie Version Check atom
- $atomstructure['version'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 1));
- $atomstructure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 1, 3)); // hardcoded: 0x0000
- $atomstructure['gestalt_selector'] = substr($atomdata, 4, 4);
- $atomstructure['gestalt_value_mask'] = getid3_lib::BigEndian2Int(substr($atomdata, 8, 4));
- $atomstructure['gestalt_value'] = getid3_lib::BigEndian2Int(substr($atomdata, 12, 4));
- $atomstructure['gestalt_check_type'] = getid3_lib::BigEndian2Int(substr($atomdata, 14, 2));
- break;
+ case 'name': //
+ case 'MCPS': // Media Cleaner PRo
+ case '@PRM': // adobe PReMiere version
+ case '@PRQ': // adobe PRemiere Quicktime version
+ $atom_structure['data'] = $atom_data;
+ break;
- case 'rmcd': // Reference Movie Component check atom
- $atomstructure['version'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 1));
- $atomstructure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 1, 3)); // hardcoded: 0x0000
- $atomstructure['component_type'] = substr($atomdata, 4, 4);
- $atomstructure['component_subtype'] = substr($atomdata, 8, 4);
- $atomstructure['component_manufacturer'] = substr($atomdata, 12, 4);
- $atomstructure['component_flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 16, 4));
- $atomstructure['component_flags_mask'] = getid3_lib::BigEndian2Int(substr($atomdata, 20, 4));
- $atomstructure['component_min_version'] = getid3_lib::BigEndian2Int(substr($atomdata, 24, 4));
- break;
+ case 'cmvd': // Compressed MooV Data atom
+ // Code by ubergeekØubergeek*tv based on information from
+ // http://developer.apple.com/quicktime/icefloe/dispatch012.html
+ $atom_structure['unCompressedSize'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 4));
+ $CompressedFileData = substr($atom_data, 4);
+ if ($UncompressedHeader = @gzuncompress($CompressedFileData)) {
+ $atom_structure['subatoms'] = $this->QuicktimeParseContainerAtom($UncompressedHeader, 0, $atomHierarchy, $ParseAllPossibleAtoms);
+ } else {
+ $this->warning('Error decompressing compressed MOV atom at offset '.$atom_structure['offset']);
+ }
+ break;
- case 'rmdr': // Reference Movie Data Rate atom
- $atomstructure['version'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 1));
- $atomstructure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 1, 3)); // hardcoded: 0x0000
- $atomstructure['data_rate'] = getid3_lib::BigEndian2Int(substr($atomdata, 4, 4));
- $atomstructure['data_rate_bps'] = $atomstructure['data_rate'] * 10;
- break;
+ case 'dcom': // Data COMpression atom
+ $atom_structure['compression_id'] = $atom_data;
+ $atom_structure['compression_text'] = $this->QuicktimeDCOMLookup($atom_data);
+ break;
- case 'rmla': // Reference Movie Language Atom
- $atomstructure['version'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 1));
- $atomstructure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 1, 3)); // hardcoded: 0x0000
- $atomstructure['language_id'] = getid3_lib::BigEndian2Int(substr($atomdata, 4, 2));
+ case 'rdrf': // Reference movie Data ReFerence atom
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3));
+ $atom_structure['flags']['internal_data'] = (bool) ($atom_structure['flags_raw'] & 0x000001);
- $atomstructure['language'] = $this->QuicktimeLanguageLookup($atomstructure['language_id']);
- if (empty($ThisFileInfo['comments']['language']) || (!in_array($atomstructure['language'], $ThisFileInfo['comments']['language']))) {
- $ThisFileInfo['comments']['language'][] = $atomstructure['language'];
- }
- break;
+ $atom_structure['reference_type_name'] = substr($atom_data, 4, 4);
+ $atom_structure['reference_length'] = getid3_lib::BigEndian2Int(substr($atom_data, 8, 4));
+ switch ($atom_structure['reference_type_name']) {
+ case 'url ':
+ $atom_structure['url'] = $this->NoNullString(substr($atom_data, 12));
+ break;
+ case 'alis':
+ $atom_structure['file_alias'] = substr($atom_data, 12);
+ break;
- case 'rmla': // Reference Movie Language Atom
- $atomstructure['version'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 1));
- $atomstructure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 1, 3)); // hardcoded: 0x0000
- $atomstructure['track_id'] = getid3_lib::BigEndian2Int(substr($atomdata, 4, 2));
- break;
+ case 'rsrc':
+ $atom_structure['resource_alias'] = substr($atom_data, 12);
+ break;
+ default:
+ $atom_structure['data'] = substr($atom_data, 12);
+ break;
+ }
+ break;
- case 'ptv ': // Print To Video - defines a movie's full screen mode
- // http://developer.apple.com/documentation/QuickTime/APIREF/SOURCESIV/at_ptv-_pg.htm
- $atomstructure['display_size_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 2));
- $atomstructure['reserved_1'] = getid3_lib::BigEndian2Int(substr($atomdata, 2, 2)); // hardcoded: 0x0000
- $atomstructure['reserved_2'] = getid3_lib::BigEndian2Int(substr($atomdata, 4, 2)); // hardcoded: 0x0000
- $atomstructure['slide_show_flag'] = getid3_lib::BigEndian2Int(substr($atomdata, 6, 1));
- $atomstructure['play_on_open_flag'] = getid3_lib::BigEndian2Int(substr($atomdata, 7, 1));
- $atomstructure['flags']['play_on_open'] = (bool) $atomstructure['play_on_open_flag'];
- $atomstructure['flags']['slide_show'] = (bool) $atomstructure['slide_show_flag'];
+ case 'rmqu': // Reference Movie QUality atom
+ $atom_structure['movie_quality'] = getid3_lib::BigEndian2Int($atom_data);
+ break;
- $ptv_lookup[0] = 'normal';
- $ptv_lookup[1] = 'double';
- $ptv_lookup[2] = 'half';
- $ptv_lookup[3] = 'full';
- $ptv_lookup[4] = 'current';
- if (isset($ptv_lookup[$atomstructure['display_size_raw']])) {
- $atomstructure['display_size'] = $ptv_lookup[$atomstructure['display_size_raw']];
- } else {
- $ThisFileInfo['warning'][] = 'unknown "ptv " display constant ('.$atomstructure['display_size_raw'].')';
- }
- break;
+ case 'rmcs': // Reference Movie Cpu Speed atom
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+ $atom_structure['cpu_speed_rating'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 2));
+ break;
- case 'stsd': // Sample Table Sample Description atom
- $atomstructure['version'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 1));
- $atomstructure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 1, 3)); // hardcoded: 0x0000
- $atomstructure['number_entries'] = getid3_lib::BigEndian2Int(substr($atomdata, 4, 4));
- $stsdEntriesDataOffset = 8;
- for ($i = 0; $i < $atomstructure['number_entries']; $i++) {
- $atomstructure['sample_description_table'][$i]['size'] = getid3_lib::BigEndian2Int(substr($atomdata, $stsdEntriesDataOffset, 4));
- $stsdEntriesDataOffset += 4;
- $atomstructure['sample_description_table'][$i]['data_format'] = substr($atomdata, $stsdEntriesDataOffset, 4);
- $stsdEntriesDataOffset += 4;
- $atomstructure['sample_description_table'][$i]['reserved'] = getid3_lib::BigEndian2Int(substr($atomdata, $stsdEntriesDataOffset, 6));
- $stsdEntriesDataOffset += 6;
- $atomstructure['sample_description_table'][$i]['reference_index'] = getid3_lib::BigEndian2Int(substr($atomdata, $stsdEntriesDataOffset, 2));
- $stsdEntriesDataOffset += 2;
- $atomstructure['sample_description_table'][$i]['data'] = substr($atomdata, $stsdEntriesDataOffset, ($atomstructure['sample_description_table'][$i]['size'] - 4 - 4 - 6 - 2));
- $stsdEntriesDataOffset += ($atomstructure['sample_description_table'][$i]['size'] - 4 - 4 - 6 - 2);
- $atomstructure['sample_description_table'][$i]['encoder_version'] = getid3_lib::BigEndian2Int(substr($atomstructure['sample_description_table'][$i]['data'], 0, 2));
- $atomstructure['sample_description_table'][$i]['encoder_revision'] = getid3_lib::BigEndian2Int(substr($atomstructure['sample_description_table'][$i]['data'], 2, 2));
- $atomstructure['sample_description_table'][$i]['encoder_vendor'] = substr($atomstructure['sample_description_table'][$i]['data'], 4, 4);
+ case 'rmvc': // Reference Movie Version Check atom
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+ $atom_structure['gestalt_selector'] = substr($atom_data, 4, 4);
+ $atom_structure['gestalt_value_mask'] = getid3_lib::BigEndian2Int(substr($atom_data, 8, 4));
+ $atom_structure['gestalt_value'] = getid3_lib::BigEndian2Int(substr($atom_data, 12, 4));
+ $atom_structure['gestalt_check_type'] = getid3_lib::BigEndian2Int(substr($atom_data, 14, 2));
+ break;
- switch ($atomstructure['sample_description_table'][$i]['encoder_vendor']) {
- case "\x00\x00\x00\x00":
- // audio atom
- $atomstructure['sample_description_table'][$i]['audio_channels'] = getid3_lib::BigEndian2Int(substr($atomstructure['sample_description_table'][$i]['data'], 8, 2));
- $atomstructure['sample_description_table'][$i]['audio_bit_depth'] = getid3_lib::BigEndian2Int(substr($atomstructure['sample_description_table'][$i]['data'], 10, 2));
- $atomstructure['sample_description_table'][$i]['audio_compression_id'] = getid3_lib::BigEndian2Int(substr($atomstructure['sample_description_table'][$i]['data'], 12, 2));
- $atomstructure['sample_description_table'][$i]['audio_packet_size'] = getid3_lib::BigEndian2Int(substr($atomstructure['sample_description_table'][$i]['data'], 14, 2));
- $atomstructure['sample_description_table'][$i]['audio_sample_rate'] = getid3_lib::FixedPoint16_16(substr($atomstructure['sample_description_table'][$i]['data'], 16, 4));
+ case 'rmcd': // Reference Movie Component check atom
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+ $atom_structure['component_type'] = substr($atom_data, 4, 4);
+ $atom_structure['component_subtype'] = substr($atom_data, 8, 4);
+ $atom_structure['component_manufacturer'] = substr($atom_data, 12, 4);
+ $atom_structure['component_flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 16, 4));
+ $atom_structure['component_flags_mask'] = getid3_lib::BigEndian2Int(substr($atom_data, 20, 4));
+ $atom_structure['component_min_version'] = getid3_lib::BigEndian2Int(substr($atom_data, 24, 4));
+ break;
- switch ($atomstructure['sample_description_table'][$i]['data_format']) {
- case 'mp4v':
- $ThisFileInfo['fileformat'] = 'mp4';
- $ThisFileInfo['error'][] = 'This version ('.GETID3_VERSION.') of getID3() does not fully support MPEG-4 audio/video streams';
- break;
- case 'qtvr':
- $ThisFileInfo['video']['dataformat'] = 'quicktimevr';
- break;
+ case 'rmdr': // Reference Movie Data Rate atom
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+ $atom_structure['data_rate'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
- case 'mp4a':
- default:
- $ThisFileInfo['quicktime']['audio']['codec'] = $this->QuicktimeAudioCodecLookup($atomstructure['sample_description_table'][$i]['data_format']);
- $ThisFileInfo['quicktime']['audio']['sample_rate'] = $atomstructure['sample_description_table'][$i]['audio_sample_rate'];
- $ThisFileInfo['quicktime']['audio']['channels'] = $atomstructure['sample_description_table'][$i]['audio_channels'];
- $ThisFileInfo['quicktime']['audio']['bit_depth'] = $atomstructure['sample_description_table'][$i]['audio_bit_depth'];
- $ThisFileInfo['audio']['codec'] = $ThisFileInfo['quicktime']['audio']['codec'];
- $ThisFileInfo['audio']['sample_rate'] = $ThisFileInfo['quicktime']['audio']['sample_rate'];
- $ThisFileInfo['audio']['channels'] = $ThisFileInfo['quicktime']['audio']['channels'];
- $ThisFileInfo['audio']['bits_per_sample'] = $ThisFileInfo['quicktime']['audio']['bit_depth'];
- switch ($atomstructure['sample_description_table'][$i]['data_format']) {
- case 'raw ': // PCM
- case 'alac': // Apple Lossless Audio Codec
- $ThisFileInfo['audio']['lossless'] = true;
- break;
- default:
- $ThisFileInfo['audio']['lossless'] = false;
- break;
- }
- break;
- }
- break;
+ $atom_structure['data_rate_bps'] = $atom_structure['data_rate'] * 10;
+ break;
- default:
- switch ($atomstructure['sample_description_table'][$i]['data_format']) {
- case 'mp4s':
- $ThisFileInfo['fileformat'] = 'mp4';
- break;
- default:
- // video atom
- $atomstructure['sample_description_table'][$i]['video_temporal_quality'] = getid3_lib::BigEndian2Int(substr($atomstructure['sample_description_table'][$i]['data'], 8, 4));
- $atomstructure['sample_description_table'][$i]['video_spatial_quality'] = getid3_lib::BigEndian2Int(substr($atomstructure['sample_description_table'][$i]['data'], 12, 4));
- $atomstructure['sample_description_table'][$i]['video_frame_width'] = getid3_lib::BigEndian2Int(substr($atomstructure['sample_description_table'][$i]['data'], 16, 2));
- $atomstructure['sample_description_table'][$i]['video_frame_height'] = getid3_lib::BigEndian2Int(substr($atomstructure['sample_description_table'][$i]['data'], 18, 2));
- $atomstructure['sample_description_table'][$i]['video_resolution_x'] = getid3_lib::FixedPoint16_16(substr($atomstructure['sample_description_table'][$i]['data'], 20, 4));
- $atomstructure['sample_description_table'][$i]['video_resolution_y'] = getid3_lib::FixedPoint16_16(substr($atomstructure['sample_description_table'][$i]['data'], 24, 4));
- $atomstructure['sample_description_table'][$i]['video_data_size'] = getid3_lib::BigEndian2Int(substr($atomstructure['sample_description_table'][$i]['data'], 28, 4));
- $atomstructure['sample_description_table'][$i]['video_frame_count'] = getid3_lib::BigEndian2Int(substr($atomstructure['sample_description_table'][$i]['data'], 32, 2));
- $atomstructure['sample_description_table'][$i]['video_encoder_name_len'] = getid3_lib::BigEndian2Int(substr($atomstructure['sample_description_table'][$i]['data'], 34, 1));
- $atomstructure['sample_description_table'][$i]['video_encoder_name'] = substr($atomstructure['sample_description_table'][$i]['data'], 35, $atomstructure['sample_description_table'][$i]['video_encoder_name_len']);
- $atomstructure['sample_description_table'][$i]['video_pixel_color_depth'] = getid3_lib::BigEndian2Int(substr($atomstructure['sample_description_table'][$i]['data'], 66, 2));
- $atomstructure['sample_description_table'][$i]['video_color_table_id'] = getid3_lib::BigEndian2Int(substr($atomstructure['sample_description_table'][$i]['data'], 68, 2));
+ case 'rmla': // Reference Movie Language Atom
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+ $atom_structure['language_id'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 2));
- $atomstructure['sample_description_table'][$i]['video_pixel_color_type'] = (($atomstructure['sample_description_table'][$i]['video_pixel_color_depth'] > 32) ? 'grayscale' : 'color');
- $atomstructure['sample_description_table'][$i]['video_pixel_color_name'] = $this->QuicktimeColorNameLookup($atomstructure['sample_description_table'][$i]['video_pixel_color_depth']);
+ $atom_structure['language'] = $this->QuicktimeLanguageLookup($atom_structure['language_id']);
+ if (empty($info['comments']['language']) || (!in_array($atom_structure['language'], $info['comments']['language']))) {
+ $info['comments']['language'][] = $atom_structure['language'];
+ }
+ break;
- if ($atomstructure['sample_description_table'][$i]['video_pixel_color_name'] != 'invalid') {
- $ThisFileInfo['quicktime']['video']['codec_fourcc'] = $atomstructure['sample_description_table'][$i]['data_format'];
- $ThisFileInfo['quicktime']['video']['codec_fourcc_lookup'] = $this->QuicktimeVideoCodecLookup($atomstructure['sample_description_table'][$i]['data_format']);
- $ThisFileInfo['quicktime']['video']['codec'] = $atomstructure['sample_description_table'][$i]['video_encoder_name'];
- $ThisFileInfo['quicktime']['video']['color_depth'] = $atomstructure['sample_description_table'][$i]['video_pixel_color_depth'];
- $ThisFileInfo['quicktime']['video']['color_depth_name'] = $atomstructure['sample_description_table'][$i]['video_pixel_color_name'];
- $ThisFileInfo['video']['codec'] = $ThisFileInfo['quicktime']['video']['codec'];
- $ThisFileInfo['video']['bits_per_sample'] = $ThisFileInfo['quicktime']['video']['color_depth'];
- }
- $ThisFileInfo['video']['lossless'] = false;
- $ThisFileInfo['video']['pixel_aspect_ratio'] = (float) 1;
- break;
- }
- break;
+ case 'ptv ': // Print To Video - defines a movie's full screen mode
+ // http://developer.apple.com/documentation/QuickTime/APIREF/SOURCESIV/at_ptv-_pg.htm
+ $atom_structure['display_size_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 2));
+ $atom_structure['reserved_1'] = getid3_lib::BigEndian2Int(substr($atom_data, 2, 2)); // hardcoded: 0x0000
+ $atom_structure['reserved_2'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 2)); // hardcoded: 0x0000
+ $atom_structure['slide_show_flag'] = getid3_lib::BigEndian2Int(substr($atom_data, 6, 1));
+ $atom_structure['play_on_open_flag'] = getid3_lib::BigEndian2Int(substr($atom_data, 7, 1));
+
+ $atom_structure['flags']['play_on_open'] = (bool) $atom_structure['play_on_open_flag'];
+ $atom_structure['flags']['slide_show'] = (bool) $atom_structure['slide_show_flag'];
+
+ $ptv_lookup[0] = 'normal';
+ $ptv_lookup[1] = 'double';
+ $ptv_lookup[2] = 'half';
+ $ptv_lookup[3] = 'full';
+ $ptv_lookup[4] = 'current';
+ if (isset($ptv_lookup[$atom_structure['display_size_raw']])) {
+ $atom_structure['display_size'] = $ptv_lookup[$atom_structure['display_size_raw']];
+ } else {
+ $this->warning('unknown "ptv " display constant ('.$atom_structure['display_size_raw'].')');
}
- switch (strtolower($atomstructure['sample_description_table'][$i]['data_format'])) {
- case 'mp4a':
- $ThisFileInfo['audio']['dataformat'] = 'mp4';
- $ThisFileInfo['quicktime']['audio']['codec'] = 'mp4';
- break;
+ break;
- case '3ivx':
- case '3iv1':
- case '3iv2':
- $ThisFileInfo['video']['dataformat'] = '3ivx';
- break;
- case 'xvid':
- $ThisFileInfo['video']['dataformat'] = 'xvid';
- break;
+ case 'stsd': // Sample Table Sample Description atom
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+ $atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
- case 'mp4v':
- $ThisFileInfo['video']['dataformat'] = 'mpeg4';
- break;
+ // see: https://github.com/JamesHeinrich/getID3/issues/111
+ // Some corrupt files have been known to have high bits set in the number_entries field
+ // This field shouldn't really need to be 32-bits, values stores are likely in the range 1-100000
+ // Workaround: mask off the upper byte and throw a warning if it's nonzero
+ if ($atom_structure['number_entries'] > 0x000FFFFF) {
+ if ($atom_structure['number_entries'] > 0x00FFFFFF) {
+ $this->warning('"stsd" atom contains improbably large number_entries (0x'.getid3_lib::PrintHexBytes(substr($atom_data, 4, 4), true, false).' = '.$atom_structure['number_entries'].'), probably in error. Ignoring upper byte and interpreting this as 0x'.getid3_lib::PrintHexBytes(substr($atom_data, 5, 3), true, false).' = '.($atom_structure['number_entries'] & 0x00FFFFFF));
+ $atom_structure['number_entries'] = ($atom_structure['number_entries'] & 0x00FFFFFF);
+ } else {
+ $this->warning('"stsd" atom contains improbably large number_entries (0x'.getid3_lib::PrintHexBytes(substr($atom_data, 4, 4), true, false).' = '.$atom_structure['number_entries'].'), probably in error. Please report this to info at getid3.org referencing bug report #111');
+ }
+ }
- case 'divx':
- case 'div1':
- case 'div2':
- case 'div3':
- case 'div4':
- case 'div5':
- case 'div6':
- $TDIVXileInfo['video']['dataformat'] = 'divx';
- break;
+ $stsdEntriesDataOffset = 8;
+ for ($i = 0; $i < $atom_structure['number_entries']; $i++) {
+ $atom_structure['sample_description_table'][$i]['size'] = getid3_lib::BigEndian2Int(substr($atom_data, $stsdEntriesDataOffset, 4));
+ $stsdEntriesDataOffset += 4;
+ $atom_structure['sample_description_table'][$i]['data_format'] = substr($atom_data, $stsdEntriesDataOffset, 4);
+ $stsdEntriesDataOffset += 4;
+ $atom_structure['sample_description_table'][$i]['reserved'] = getid3_lib::BigEndian2Int(substr($atom_data, $stsdEntriesDataOffset, 6));
+ $stsdEntriesDataOffset += 6;
+ $atom_structure['sample_description_table'][$i]['reference_index'] = getid3_lib::BigEndian2Int(substr($atom_data, $stsdEntriesDataOffset, 2));
+ $stsdEntriesDataOffset += 2;
+ $atom_structure['sample_description_table'][$i]['data'] = substr($atom_data, $stsdEntriesDataOffset, ($atom_structure['sample_description_table'][$i]['size'] - 4 - 4 - 6 - 2));
+ $stsdEntriesDataOffset += ($atom_structure['sample_description_table'][$i]['size'] - 4 - 4 - 6 - 2);
- default:
- // do nothing
- break;
+ if (substr($atom_structure['sample_description_table'][$i]['data'], 1, 54) == 'application/octet-stream;type=com.parrot.videometadata') {
+ // special handling for apparently-malformed (TextMetaDataSampleEntry?) data for some version of Parrot drones
+ $atom_structure['sample_description_table'][$i]['parrot_frame_metadata']['mime_type'] = substr($atom_structure['sample_description_table'][$i]['data'], 1, 55);
+ $atom_structure['sample_description_table'][$i]['parrot_frame_metadata']['metadata_version'] = (int) substr($atom_structure['sample_description_table'][$i]['data'], 55, 1);
+ unset($atom_structure['sample_description_table'][$i]['data']);
+$this->warning('incomplete/incorrect handling of "stsd" with Parrot metadata in this version of getID3() ['.$this->getid3->version().']');
+ continue;
+ }
+
+ $atom_structure['sample_description_table'][$i]['encoder_version'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 0, 2));
+ $atom_structure['sample_description_table'][$i]['encoder_revision'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 2, 2));
+ $atom_structure['sample_description_table'][$i]['encoder_vendor'] = substr($atom_structure['sample_description_table'][$i]['data'], 4, 4);
+
+ switch ($atom_structure['sample_description_table'][$i]['encoder_vendor']) {
+
+ case "\x00\x00\x00\x00":
+ // audio tracks
+ $atom_structure['sample_description_table'][$i]['audio_channels'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 8, 2));
+ $atom_structure['sample_description_table'][$i]['audio_bit_depth'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 10, 2));
+ $atom_structure['sample_description_table'][$i]['audio_compression_id'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 12, 2));
+ $atom_structure['sample_description_table'][$i]['audio_packet_size'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 14, 2));
+ $atom_structure['sample_description_table'][$i]['audio_sample_rate'] = getid3_lib::FixedPoint16_16(substr($atom_structure['sample_description_table'][$i]['data'], 16, 4));
+
+ // video tracks
+ // http://developer.apple.com/library/mac/#documentation/QuickTime/QTFF/QTFFChap3/qtff3.html
+ $atom_structure['sample_description_table'][$i]['temporal_quality'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 8, 4));
+ $atom_structure['sample_description_table'][$i]['spatial_quality'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 12, 4));
+ $atom_structure['sample_description_table'][$i]['width'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 16, 2));
+ $atom_structure['sample_description_table'][$i]['height'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 18, 2));
+ $atom_structure['sample_description_table'][$i]['resolution_x'] = getid3_lib::FixedPoint16_16(substr($atom_structure['sample_description_table'][$i]['data'], 24, 4));
+ $atom_structure['sample_description_table'][$i]['resolution_y'] = getid3_lib::FixedPoint16_16(substr($atom_structure['sample_description_table'][$i]['data'], 28, 4));
+ $atom_structure['sample_description_table'][$i]['data_size'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 32, 4));
+ $atom_structure['sample_description_table'][$i]['frame_count'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 36, 2));
+ $atom_structure['sample_description_table'][$i]['compressor_name'] = substr($atom_structure['sample_description_table'][$i]['data'], 38, 4);
+ $atom_structure['sample_description_table'][$i]['pixel_depth'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 42, 2));
+ $atom_structure['sample_description_table'][$i]['color_table_id'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 44, 2));
+
+ switch ($atom_structure['sample_description_table'][$i]['data_format']) {
+ case '2vuY':
+ case 'avc1':
+ case 'cvid':
+ case 'dvc ':
+ case 'dvcp':
+ case 'gif ':
+ case 'h263':
+ case 'jpeg':
+ case 'kpcd':
+ case 'mjpa':
+ case 'mjpb':
+ case 'mp4v':
+ case 'png ':
+ case 'raw ':
+ case 'rle ':
+ case 'rpza':
+ case 'smc ':
+ case 'SVQ1':
+ case 'SVQ3':
+ case 'tiff':
+ case 'v210':
+ case 'v216':
+ case 'v308':
+ case 'v408':
+ case 'v410':
+ case 'yuv2':
+ $info['fileformat'] = 'mp4';
+ $info['video']['fourcc'] = $atom_structure['sample_description_table'][$i]['data_format'];
+ if ($this->QuicktimeVideoCodecLookup($info['video']['fourcc'])) {
+ $info['video']['fourcc_lookup'] = $this->QuicktimeVideoCodecLookup($info['video']['fourcc']);
+ }
+
+ // https://www.getid3.org/phpBB3/viewtopic.php?t=1550
+ //if ((!empty($atom_structure['sample_description_table'][$i]['width']) && !empty($atom_structure['sample_description_table'][$i]['width'])) && (empty($info['video']['resolution_x']) || empty($info['video']['resolution_y']) || (number_format($info['video']['resolution_x'], 6) != number_format(round($info['video']['resolution_x']), 6)) || (number_format($info['video']['resolution_y'], 6) != number_format(round($info['video']['resolution_y']), 6)))) { // ugly check for floating point numbers
+ if (!empty($atom_structure['sample_description_table'][$i]['width']) && !empty($atom_structure['sample_description_table'][$i]['height'])) {
+ // assume that values stored here are more important than values stored in [tkhd] atom
+ $info['video']['resolution_x'] = $atom_structure['sample_description_table'][$i]['width'];
+ $info['video']['resolution_y'] = $atom_structure['sample_description_table'][$i]['height'];
+ $info['quicktime']['video']['resolution_x'] = $info['video']['resolution_x'];
+ $info['quicktime']['video']['resolution_y'] = $info['video']['resolution_y'];
+ }
+ break;
+
+ case 'qtvr':
+ $info['video']['dataformat'] = 'quicktimevr';
+ break;
+
+ case 'mp4a':
+ default:
+ $info['quicktime']['audio']['codec'] = $this->QuicktimeAudioCodecLookup($atom_structure['sample_description_table'][$i]['data_format']);
+ $info['quicktime']['audio']['sample_rate'] = $atom_structure['sample_description_table'][$i]['audio_sample_rate'];
+ $info['quicktime']['audio']['channels'] = $atom_structure['sample_description_table'][$i]['audio_channels'];
+ $info['quicktime']['audio']['bit_depth'] = $atom_structure['sample_description_table'][$i]['audio_bit_depth'];
+ $info['audio']['codec'] = $info['quicktime']['audio']['codec'];
+ $info['audio']['sample_rate'] = $info['quicktime']['audio']['sample_rate'];
+ $info['audio']['channels'] = $info['quicktime']['audio']['channels'];
+ $info['audio']['bits_per_sample'] = $info['quicktime']['audio']['bit_depth'];
+ switch ($atom_structure['sample_description_table'][$i]['data_format']) {
+ case 'raw ': // PCM
+ case 'alac': // Apple Lossless Audio Codec
+ case 'sowt': // signed/two's complement (Little Endian)
+ case 'twos': // signed/two's complement (Big Endian)
+ case 'in24': // 24-bit Integer
+ case 'in32': // 32-bit Integer
+ case 'fl32': // 32-bit Floating Point
+ case 'fl64': // 64-bit Floating Point
+ $info['audio']['lossless'] = $info['quicktime']['audio']['lossless'] = true;
+ $info['audio']['bitrate'] = $info['quicktime']['audio']['bitrate'] = $info['audio']['channels'] * $info['audio']['bits_per_sample'] * $info['audio']['sample_rate'];
+ break;
+ default:
+ $info['audio']['lossless'] = false;
+ break;
+ }
+ break;
+ }
+ break;
+
+ default:
+ switch ($atom_structure['sample_description_table'][$i]['data_format']) {
+ case 'mp4s':
+ $info['fileformat'] = 'mp4';
+ break;
+
+ default:
+ // video atom
+ $atom_structure['sample_description_table'][$i]['video_temporal_quality'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 8, 4));
+ $atom_structure['sample_description_table'][$i]['video_spatial_quality'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 12, 4));
+ $atom_structure['sample_description_table'][$i]['video_frame_width'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 16, 2));
+ $atom_structure['sample_description_table'][$i]['video_frame_height'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 18, 2));
+ $atom_structure['sample_description_table'][$i]['video_resolution_x'] = getid3_lib::FixedPoint16_16(substr($atom_structure['sample_description_table'][$i]['data'], 20, 4));
+ $atom_structure['sample_description_table'][$i]['video_resolution_y'] = getid3_lib::FixedPoint16_16(substr($atom_structure['sample_description_table'][$i]['data'], 24, 4));
+ $atom_structure['sample_description_table'][$i]['video_data_size'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 28, 4));
+ $atom_structure['sample_description_table'][$i]['video_frame_count'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 32, 2));
+ $atom_structure['sample_description_table'][$i]['video_encoder_name_len'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 34, 1));
+ $atom_structure['sample_description_table'][$i]['video_encoder_name'] = substr($atom_structure['sample_description_table'][$i]['data'], 35, $atom_structure['sample_description_table'][$i]['video_encoder_name_len']);
+ $atom_structure['sample_description_table'][$i]['video_pixel_color_depth'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 66, 2));
+ $atom_structure['sample_description_table'][$i]['video_color_table_id'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 68, 2));
+
+ $atom_structure['sample_description_table'][$i]['video_pixel_color_type'] = (((int) $atom_structure['sample_description_table'][$i]['video_pixel_color_depth'] > 32) ? 'grayscale' : 'color');
+ $atom_structure['sample_description_table'][$i]['video_pixel_color_name'] = $this->QuicktimeColorNameLookup($atom_structure['sample_description_table'][$i]['video_pixel_color_depth']);
+
+ if ($atom_structure['sample_description_table'][$i]['video_pixel_color_name'] != 'invalid') {
+ $info['quicktime']['video']['codec_fourcc'] = $atom_structure['sample_description_table'][$i]['data_format'];
+ $info['quicktime']['video']['codec_fourcc_lookup'] = $this->QuicktimeVideoCodecLookup($atom_structure['sample_description_table'][$i]['data_format']);
+ $info['quicktime']['video']['codec'] = (((int) $atom_structure['sample_description_table'][$i]['video_encoder_name_len'] > 0) ? $atom_structure['sample_description_table'][$i]['video_encoder_name'] : $atom_structure['sample_description_table'][$i]['data_format']);
+ $info['quicktime']['video']['color_depth'] = $atom_structure['sample_description_table'][$i]['video_pixel_color_depth'];
+ $info['quicktime']['video']['color_depth_name'] = $atom_structure['sample_description_table'][$i]['video_pixel_color_name'];
+
+ $info['video']['codec'] = $info['quicktime']['video']['codec'];
+ $info['video']['bits_per_sample'] = $info['quicktime']['video']['color_depth'];
+ }
+ $info['video']['lossless'] = false;
+ $info['video']['pixel_aspect_ratio'] = (float) 1;
+ break;
+ }
+ break;
+ }
+ switch (strtolower($atom_structure['sample_description_table'][$i]['data_format'])) {
+ case 'mp4a':
+ $info['audio']['dataformat'] = 'mp4';
+ $info['quicktime']['audio']['codec'] = 'mp4';
+ break;
+
+ case '3ivx':
+ case '3iv1':
+ case '3iv2':
+ $info['video']['dataformat'] = '3ivx';
+ break;
+
+ case 'xvid':
+ $info['video']['dataformat'] = 'xvid';
+ break;
+
+ case 'mp4v':
+ $info['video']['dataformat'] = 'mpeg4';
+ break;
+
+ case 'divx':
+ case 'div1':
+ case 'div2':
+ case 'div3':
+ case 'div4':
+ case 'div5':
+ case 'div6':
+ $info['video']['dataformat'] = 'divx';
+ break;
+
+ default:
+ // do nothing
+ break;
+ }
+ unset($atom_structure['sample_description_table'][$i]['data']);
}
- unset($atomstructure['sample_description_table'][$i]['data']);
- }
- break;
+ break;
- case 'stts': // Sample Table Time-to-Sample atom
- //if ($ParseAllPossibleAtoms) {
- $atomstructure['version'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 1));
- $atomstructure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 1, 3)); // hardcoded: 0x0000
- $atomstructure['number_entries'] = getid3_lib::BigEndian2Int(substr($atomdata, 4, 4));
+ case 'stts': // Sample Table Time-to-Sample atom
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+ $atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
$sttsEntriesDataOffset = 8;
- $FrameRateCalculatorArray = array();
- for ($i = 0; $i < $atomstructure['number_entries']; $i++) {
- $atomstructure['time_to_sample_table'][$i]['sample_count'] = getid3_lib::BigEndian2Int(substr($atomdata, $sttsEntriesDataOffset, 4));
+ //$FrameRateCalculatorArray = array();
+ $frames_count = 0;
+
+ $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']) {
+ $this->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).');
+ }
+ for ($i = 0; $i < $max_stts_entries_to_scan; $i++) {
+ $atom_structure['time_to_sample_table'][$i]['sample_count'] = getid3_lib::BigEndian2Int(substr($atom_data, $sttsEntriesDataOffset, 4));
$sttsEntriesDataOffset += 4;
- $atomstructure['time_to_sample_table'][$i]['sample_duration'] = getid3_lib::BigEndian2Int(substr($atomdata, $sttsEntriesDataOffset, 4));
+ $atom_structure['time_to_sample_table'][$i]['sample_duration'] = getid3_lib::BigEndian2Int(substr($atom_data, $sttsEntriesDataOffset, 4));
$sttsEntriesDataOffset += 4;
- if (!empty($ThisFileInfo['quicktime']['time_scale']) && (@$atomstructure['time_to_sample_table'][$i]['sample_duration'] > 0)) {
- $stts_new_framerate = $ThisFileInfo['quicktime']['time_scale'] / $atomstructure['time_to_sample_table'][$i]['sample_duration'];
- if ($stts_new_framerate <= 60) {
- // some atoms have durations of "1" giving a very large framerate, which probably is not right
- $ThisFileInfo['video']['frame_rate'] = max(@$ThisFileInfo['video']['frame_rate'], $stts_new_framerate);
- }
- }
- //@$FrameRateCalculatorArray[($ThisFileInfo['quicktime']['time_scale'] / $atomstructure['time_to_sample_table'][$i]['sample_duration'])] += $atomstructure['time_to_sample_table'][$i]['sample_count'];
+ $frames_count += $atom_structure['time_to_sample_table'][$i]['sample_count'];
+
+ // THIS SECTION REPLACED WITH CODE IN "stbl" ATOM
+ //if (!empty($info['quicktime']['time_scale']) && ($atom_structure['time_to_sample_table'][$i]['sample_duration'] > 0)) {
+ // $stts_new_framerate = $info['quicktime']['time_scale'] / $atom_structure['time_to_sample_table'][$i]['sample_duration'];
+ // if ($stts_new_framerate <= 60) {
+ // // some atoms have durations of "1" giving a very large framerate, which probably is not right
+ // $info['video']['frame_rate'] = max($info['video']['frame_rate'], $stts_new_framerate);
+ // }
+ //}
+ //
+ //$FrameRateCalculatorArray[($info['quicktime']['time_scale'] / $atom_structure['time_to_sample_table'][$i]['sample_duration'])] += $atom_structure['time_to_sample_table'][$i]['sample_count'];
}
+ $info['quicktime']['stts_framecount'][] = $frames_count;
//$sttsFramesTotal = 0;
//$sttsSecondsTotal = 0;
//foreach ($FrameRateCalculatorArray as $frames_per_second => $frame_count) {
@@ -542,584 +1010,1249 @@
// $sttsSecondsTotal += $frame_count / $frames_per_second;
//}
//if (($sttsFramesTotal > 0) && ($sttsSecondsTotal > 0)) {
- // if (($sttsFramesTotal / $sttsSecondsTotal) > @$ThisFileInfo['video']['frame_rate']) {
- // $ThisFileInfo['video']['frame_rate'] = $sttsFramesTotal / $sttsSecondsTotal;
+ // if (($sttsFramesTotal / $sttsSecondsTotal) > $info['video']['frame_rate']) {
+ // $info['video']['frame_rate'] = $sttsFramesTotal / $sttsSecondsTotal;
// }
//}
- //}
- break;
+ break;
- case 'stss': // Sample Table Sync Sample (key frames) atom
- if ($ParseAllPossibleAtoms) {
- $atomstructure['version'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 1));
- $atomstructure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 1, 3)); // hardcoded: 0x0000
- $atomstructure['number_entries'] = getid3_lib::BigEndian2Int(substr($atomdata, 4, 4));
- $stssEntriesDataOffset = 8;
- for ($i = 0; $i < $atomstructure['number_entries']; $i++) {
- $atomstructure['time_to_sample_table'][$i] = getid3_lib::BigEndian2Int(substr($atomdata, $stssEntriesDataOffset, 4));
- $stssEntriesDataOffset += 4;
+ case 'stss': // Sample Table Sync Sample (key frames) atom
+ if ($ParseAllPossibleAtoms) {
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+ $atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
+ $stssEntriesDataOffset = 8;
+ for ($i = 0; $i < $atom_structure['number_entries']; $i++) {
+ $atom_structure['time_to_sample_table'][$i] = getid3_lib::BigEndian2Int(substr($atom_data, $stssEntriesDataOffset, 4));
+ $stssEntriesDataOffset += 4;
+ }
}
- }
- break;
+ break;
- case 'stsc': // Sample Table Sample-to-Chunk atom
- if ($ParseAllPossibleAtoms) {
- $atomstructure['version'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 1));
- $atomstructure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 1, 3)); // hardcoded: 0x0000
- $atomstructure['number_entries'] = getid3_lib::BigEndian2Int(substr($atomdata, 4, 4));
- $stscEntriesDataOffset = 8;
- for ($i = 0; $i < $atomstructure['number_entries']; $i++) {
- $atomstructure['sample_to_chunk_table'][$i]['first_chunk'] = getid3_lib::BigEndian2Int(substr($atomdata, $stscEntriesDataOffset, 4));
- $stscEntriesDataOffset += 4;
- $atomstructure['sample_to_chunk_table'][$i]['samples_per_chunk'] = getid3_lib::BigEndian2Int(substr($atomdata, $stscEntriesDataOffset, 4));
- $stscEntriesDataOffset += 4;
- $atomstructure['sample_to_chunk_table'][$i]['sample_description'] = getid3_lib::BigEndian2Int(substr($atomdata, $stscEntriesDataOffset, 4));
- $stscEntriesDataOffset += 4;
+ case 'stsc': // Sample Table Sample-to-Chunk atom
+ if ($ParseAllPossibleAtoms) {
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+ $atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
+ $stscEntriesDataOffset = 8;
+ for ($i = 0; $i < $atom_structure['number_entries']; $i++) {
+ $atom_structure['sample_to_chunk_table'][$i]['first_chunk'] = getid3_lib::BigEndian2Int(substr($atom_data, $stscEntriesDataOffset, 4));
+ $stscEntriesDataOffset += 4;
+ $atom_structure['sample_to_chunk_table'][$i]['samples_per_chunk'] = getid3_lib::BigEndian2Int(substr($atom_data, $stscEntriesDataOffset, 4));
+ $stscEntriesDataOffset += 4;
+ $atom_structure['sample_to_chunk_table'][$i]['sample_description'] = getid3_lib::BigEndian2Int(substr($atom_data, $stscEntriesDataOffset, 4));
+ $stscEntriesDataOffset += 4;
+ }
}
- }
- break;
+ break;
- case 'stsz': // Sample Table SiZe atom
- if ($ParseAllPossibleAtoms) {
- $atomstructure['version'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 1));
- $atomstructure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 1, 3)); // hardcoded: 0x0000
- $atomstructure['sample_size'] = getid3_lib::BigEndian2Int(substr($atomdata, 4, 4));
- $atomstructure['number_entries'] = getid3_lib::BigEndian2Int(substr($atomdata, 8, 4));
- $stszEntriesDataOffset = 12;
- if ($atomstructure['sample_size'] == 0) {
- for ($i = 0; $i < $atomstructure['number_entries']; $i++) {
- $atomstructure['sample_size_table'][$i] = getid3_lib::BigEndian2Int(substr($atomdata, $stszEntriesDataOffset, 4));
- $stszEntriesDataOffset += 4;
+ case 'stsz': // Sample Table SiZe atom
+ if ($ParseAllPossibleAtoms) {
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+ $atom_structure['sample_size'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
+ $atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data, 8, 4));
+ $stszEntriesDataOffset = 12;
+ if ($atom_structure['sample_size'] == 0) {
+ for ($i = 0; $i < $atom_structure['number_entries']; $i++) {
+ $atom_structure['sample_size_table'][$i] = getid3_lib::BigEndian2Int(substr($atom_data, $stszEntriesDataOffset, 4));
+ $stszEntriesDataOffset += 4;
+ }
}
}
- }
- break;
+ break;
- case 'stco': // Sample Table Chunk Offset atom
- if ($ParseAllPossibleAtoms) {
- $atomstructure['version'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 1));
- $atomstructure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 1, 3)); // hardcoded: 0x0000
- $atomstructure['number_entries'] = getid3_lib::BigEndian2Int(substr($atomdata, 4, 4));
- $stcoEntriesDataOffset = 8;
- for ($i = 0; $i < $atomstructure['number_entries']; $i++) {
- $atomstructure['chunk_offset_table'][$i] = getid3_lib::BigEndian2Int(substr($atomdata, $stcoEntriesDataOffset, 4));
- $stcoEntriesDataOffset += 4;
+ case 'stco': // Sample Table Chunk Offset atom
+// if (true) {
+ if ($ParseAllPossibleAtoms) {
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+ $atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
+ $stcoEntriesDataOffset = 8;
+ for ($i = 0; $i < $atom_structure['number_entries']; $i++) {
+ $atom_structure['chunk_offset_table'][$i] = getid3_lib::BigEndian2Int(substr($atom_data, $stcoEntriesDataOffset, 4));
+ $stcoEntriesDataOffset += 4;
+ }
}
- }
- break;
+ break;
- case 'dref': // Data REFerence atom
- $atomstructure['version'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 1));
- $atomstructure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 1, 3)); // hardcoded: 0x0000
- $atomstructure['number_entries'] = getid3_lib::BigEndian2Int(substr($atomdata, 4, 4));
- $drefDataOffset = 8;
- for ($i = 0; $i < $atomstructure['number_entries']; $i++) {
- $atomstructure['data_references'][$i]['size'] = getid3_lib::BigEndian2Int(substr($atomdata, $drefDataOffset, 4));
- $drefDataOffset += 4;
- $atomstructure['data_references'][$i]['type'] = substr($atomdata, $drefDataOffset, 4);
- $drefDataOffset += 4;
- $atomstructure['data_references'][$i]['version'] = getid3_lib::BigEndian2Int(substr($atomdata, $drefDataOffset, 1));
- $drefDataOffset += 1;
- $atomstructure['data_references'][$i]['flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, $drefDataOffset, 3)); // hardcoded: 0x0000
- $drefDataOffset += 3;
- $atomstructure['data_references'][$i]['data'] = substr($atomdata, $drefDataOffset, ($atomstructure['data_references'][$i]['size'] - 4 - 4 - 1 - 3));
- $drefDataOffset += ($atomstructure['data_references'][$i]['size'] - 4 - 4 - 1 - 3);
+ case 'co64': // Chunk Offset 64-bit (version of "stco" that supports > 2GB files)
+ if ($ParseAllPossibleAtoms) {
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+ $atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
+ $stcoEntriesDataOffset = 8;
+ for ($i = 0; $i < $atom_structure['number_entries']; $i++) {
+ $atom_structure['chunk_offset_table'][$i] = getid3_lib::BigEndian2Int(substr($atom_data, $stcoEntriesDataOffset, 8));
+ $stcoEntriesDataOffset += 8;
+ }
+ }
+ break;
- $atomstructure['data_references'][$i]['flags']['self_reference'] = (bool) ($atomstructure['data_references'][$i]['flags_raw'] & 0x001);
- }
- break;
+ case 'dref': // Data REFerence atom
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+ $atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
+ $drefDataOffset = 8;
+ for ($i = 0; $i < $atom_structure['number_entries']; $i++) {
+ $atom_structure['data_references'][$i]['size'] = getid3_lib::BigEndian2Int(substr($atom_data, $drefDataOffset, 4));
+ $drefDataOffset += 4;
+ $atom_structure['data_references'][$i]['type'] = substr($atom_data, $drefDataOffset, 4);
+ $drefDataOffset += 4;
+ $atom_structure['data_references'][$i]['version'] = getid3_lib::BigEndian2Int(substr($atom_data, $drefDataOffset, 1));
+ $drefDataOffset += 1;
+ $atom_structure['data_references'][$i]['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, $drefDataOffset, 3)); // hardcoded: 0x0000
+ $drefDataOffset += 3;
+ $atom_structure['data_references'][$i]['data'] = substr($atom_data, $drefDataOffset, ($atom_structure['data_references'][$i]['size'] - 4 - 4 - 1 - 3));
+ $drefDataOffset += ($atom_structure['data_references'][$i]['size'] - 4 - 4 - 1 - 3);
- case 'gmin': // base Media INformation atom
- $atomstructure['version'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 1));
- $atomstructure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 1, 3)); // hardcoded: 0x0000
- $atomstructure['graphics_mode'] = getid3_lib::BigEndian2Int(substr($atomdata, 4, 2));
- $atomstructure['opcolor_red'] = getid3_lib::BigEndian2Int(substr($atomdata, 6, 2));
- $atomstructure['opcolor_green'] = getid3_lib::BigEndian2Int(substr($atomdata, 8, 2));
- $atomstructure['opcolor_blue'] = getid3_lib::BigEndian2Int(substr($atomdata, 10, 2));
- $atomstructure['balance'] = getid3_lib::BigEndian2Int(substr($atomdata, 12, 2));
- $atomstructure['reserved'] = getid3_lib::BigEndian2Int(substr($atomdata, 14, 2));
- break;
+ $atom_structure['data_references'][$i]['flags']['self_reference'] = (bool) ($atom_structure['data_references'][$i]['flags_raw'] & 0x001);
+ }
+ break;
- case 'smhd': // Sound Media information HeaDer atom
- $atomstructure['version'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 1));
- $atomstructure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 1, 3)); // hardcoded: 0x0000
- $atomstructure['balance'] = getid3_lib::BigEndian2Int(substr($atomdata, 4, 2));
- $atomstructure['reserved'] = getid3_lib::BigEndian2Int(substr($atomdata, 6, 2));
- break;
+ case 'gmin': // base Media INformation atom
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+ $atom_structure['graphics_mode'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 2));
+ $atom_structure['opcolor_red'] = getid3_lib::BigEndian2Int(substr($atom_data, 6, 2));
+ $atom_structure['opcolor_green'] = getid3_lib::BigEndian2Int(substr($atom_data, 8, 2));
+ $atom_structure['opcolor_blue'] = getid3_lib::BigEndian2Int(substr($atom_data, 10, 2));
+ $atom_structure['balance'] = getid3_lib::BigEndian2Int(substr($atom_data, 12, 2));
+ $atom_structure['reserved'] = getid3_lib::BigEndian2Int(substr($atom_data, 14, 2));
+ break;
- case 'vmhd': // Video Media information HeaDer atom
- $atomstructure['version'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 1));
- $atomstructure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 1, 3));
- $atomstructure['graphics_mode'] = getid3_lib::BigEndian2Int(substr($atomdata, 4, 2));
- $atomstructure['opcolor_red'] = getid3_lib::BigEndian2Int(substr($atomdata, 6, 2));
- $atomstructure['opcolor_green'] = getid3_lib::BigEndian2Int(substr($atomdata, 8, 2));
- $atomstructure['opcolor_blue'] = getid3_lib::BigEndian2Int(substr($atomdata, 10, 2));
+ case 'smhd': // Sound Media information HeaDer atom
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+ $atom_structure['balance'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 2));
+ $atom_structure['reserved'] = getid3_lib::BigEndian2Int(substr($atom_data, 6, 2));
+ break;
- $atomstructure['flags']['no_lean_ahead'] = (bool) ($atomstructure['flags_raw'] & 0x001);
- break;
+ case 'vmhd': // Video Media information HeaDer atom
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3));
+ $atom_structure['graphics_mode'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 2));
+ $atom_structure['opcolor_red'] = getid3_lib::BigEndian2Int(substr($atom_data, 6, 2));
+ $atom_structure['opcolor_green'] = getid3_lib::BigEndian2Int(substr($atom_data, 8, 2));
+ $atom_structure['opcolor_blue'] = getid3_lib::BigEndian2Int(substr($atom_data, 10, 2));
- case 'hdlr': // HanDLeR reference atom
- $atomstructure['version'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 1));
- $atomstructure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 1, 3)); // hardcoded: 0x0000
- $atomstructure['component_type'] = substr($atomdata, 4, 4);
- $atomstructure['component_subtype'] = substr($atomdata, 8, 4);
- $atomstructure['component_manufacturer'] = substr($atomdata, 12, 4);
- $atomstructure['component_flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 16, 4));
- $atomstructure['component_flags_mask'] = getid3_lib::BigEndian2Int(substr($atomdata, 20, 4));
- $atomstructure['component_name'] = $this->Pascal2String(substr($atomdata, 24));
+ $atom_structure['flags']['no_lean_ahead'] = (bool) ($atom_structure['flags_raw'] & 0x001);
+ break;
- if (($atomstructure['component_subtype'] == 'STpn') && ($atomstructure['component_manufacturer'] == 'zzzz')) {
- $ThisFileInfo['video']['dataformat'] = 'quicktimevr';
- }
- break;
+ case 'hdlr': // HanDLeR reference atom
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+ $atom_structure['component_type'] = substr($atom_data, 4, 4);
+ $atom_structure['component_subtype'] = substr($atom_data, 8, 4);
+ $atom_structure['component_manufacturer'] = substr($atom_data, 12, 4);
+ $atom_structure['component_flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 16, 4));
+ $atom_structure['component_flags_mask'] = getid3_lib::BigEndian2Int(substr($atom_data, 20, 4));
+ $atom_structure['component_name'] = $this->MaybePascal2String(substr($atom_data, 24));
- case 'mdhd': // MeDia HeaDer atom
- $atomstructure['version'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 1));
- $atomstructure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 1, 3)); // hardcoded: 0x0000
- $atomstructure['creation_time'] = getid3_lib::BigEndian2Int(substr($atomdata, 4, 4));
- $atomstructure['modify_time'] = getid3_lib::BigEndian2Int(substr($atomdata, 8, 4));
- $atomstructure['time_scale'] = getid3_lib::BigEndian2Int(substr($atomdata, 12, 4));
- $atomstructure['duration'] = getid3_lib::BigEndian2Int(substr($atomdata, 16, 4));
- $atomstructure['language_id'] = getid3_lib::BigEndian2Int(substr($atomdata, 20, 2));
- $atomstructure['quality'] = getid3_lib::BigEndian2Int(substr($atomdata, 22, 2));
+ if (($atom_structure['component_subtype'] == 'STpn') && ($atom_structure['component_manufacturer'] == 'zzzz')) {
+ $info['video']['dataformat'] = 'quicktimevr';
+ }
+ break;
- if ($atomstructure['time_scale'] == 0) {
- $ThisFileInfo['error'][] = 'Corrupt Quicktime file: mdhd.time_scale == zero';
- return false;
- }
- $atomstructure['creation_time_unix'] = getid3_lib::DateMac2Unix($atomstructure['creation_time']);
- $atomstructure['modify_time_unix'] = getid3_lib::DateMac2Unix($atomstructure['modify_time']);
- $atomstructure['playtime_seconds'] = $atomstructure['duration'] / $atomstructure['time_scale'];
- $atomstructure['language'] = $this->QuicktimeLanguageLookup($atomstructure['language_id']);
- if (empty($ThisFileInfo['comments']['language']) || (!in_array($atomstructure['language'], $ThisFileInfo['comments']['language']))) {
- $ThisFileInfo['comments']['language'][] = $atomstructure['language'];
- }
- break;
+ case 'mdhd': // MeDia HeaDer atom
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+ $atom_structure['creation_time'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
+ $atom_structure['modify_time'] = getid3_lib::BigEndian2Int(substr($atom_data, 8, 4));
+ $atom_structure['time_scale'] = getid3_lib::BigEndian2Int(substr($atom_data, 12, 4));
+ $atom_structure['duration'] = getid3_lib::BigEndian2Int(substr($atom_data, 16, 4));
+ $atom_structure['language_id'] = getid3_lib::BigEndian2Int(substr($atom_data, 20, 2));
+ $atom_structure['quality'] = getid3_lib::BigEndian2Int(substr($atom_data, 22, 2));
- case 'pnot': // Preview atom
- $atomstructure['modification_date'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 4)); // "standard Macintosh format"
- $atomstructure['version_number'] = getid3_lib::BigEndian2Int(substr($atomdata, 4, 2)); // hardcoded: 0x00
- $atomstructure['atom_type'] = substr($atomdata, 6, 4); // usually: 'PICT'
- $atomstructure['atom_index'] = getid3_lib::BigEndian2Int(substr($atomdata, 10, 2)); // usually: 0x01
+ if ($atom_structure['time_scale'] == 0) {
+ $this->error('Corrupt Quicktime file: mdhd.time_scale == zero');
+ return false;
+ }
+ $info['quicktime']['time_scale'] = ((isset($info['quicktime']['time_scale']) && ($info['quicktime']['time_scale'] < 1000)) ? max($info['quicktime']['time_scale'], $atom_structure['time_scale']) : $atom_structure['time_scale']);
- $atomstructure['modification_date_unix'] = getid3_lib::DateMac2Unix($atomstructure['modification_date']);
- break;
+ $atom_structure['creation_time_unix'] = getid3_lib::DateMac2Unix($atom_structure['creation_time']);
+ $atom_structure['modify_time_unix'] = getid3_lib::DateMac2Unix($atom_structure['modify_time']);
+ $atom_structure['playtime_seconds'] = $atom_structure['duration'] / $atom_structure['time_scale'];
+ $atom_structure['language'] = $this->QuicktimeLanguageLookup($atom_structure['language_id']);
+ if (empty($info['comments']['language']) || (!in_array($atom_structure['language'], $info['comments']['language']))) {
+ $info['comments']['language'][] = $atom_structure['language'];
+ }
+ $info['quicktime']['timestamps_unix']['create'][$atom_structure['hierarchy']] = $atom_structure['creation_time_unix'];
+ $info['quicktime']['timestamps_unix']['modify'][$atom_structure['hierarchy']] = $atom_structure['modify_time_unix'];
+ break;
- case 'crgn': // Clipping ReGioN atom
- $atomstructure['region_size'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 2)); // The Region size, Region boundary box,
- $atomstructure['boundary_box'] = getid3_lib::BigEndian2Int(substr($atomdata, 2, 8)); // and Clipping region data fields
- $atomstructure['clipping_data'] = substr($atomdata, 10); // constitute a QuickDraw region.
- break;
+ case 'pnot': // Preview atom
+ $atom_structure['modification_date'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 4)); // "standard Macintosh format"
+ $atom_structure['version_number'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 2)); // hardcoded: 0x00
+ $atom_structure['atom_type'] = substr($atom_data, 6, 4); // usually: 'PICT'
+ $atom_structure['atom_index'] = getid3_lib::BigEndian2Int(substr($atom_data, 10, 2)); // usually: 0x01
+ $atom_structure['modification_date_unix'] = getid3_lib::DateMac2Unix($atom_structure['modification_date']);
+ $info['quicktime']['timestamps_unix']['modify'][$atom_structure['hierarchy']] = $atom_structure['modification_date_unix'];
+ break;
- case 'load': // track LOAD settings atom
- $atomstructure['preload_start_time'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 4));
- $atomstructure['preload_duration'] = getid3_lib::BigEndian2Int(substr($atomdata, 4, 4));
- $atomstructure['preload_flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 8, 4));
- $atomstructure['default_hints_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 12, 4));
- $atomstructure['default_hints']['double_buffer'] = (bool) ($atomstructure['default_hints_raw'] & 0x0020);
- $atomstructure['default_hints']['high_quality'] = (bool) ($atomstructure['default_hints_raw'] & 0x0100);
- break;
+ case 'crgn': // Clipping ReGioN atom
+ $atom_structure['region_size'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 2)); // The Region size, Region boundary box,
+ $atom_structure['boundary_box'] = getid3_lib::BigEndian2Int(substr($atom_data, 2, 8)); // and Clipping region data fields
+ $atom_structure['clipping_data'] = substr($atom_data, 10); // constitute a QuickDraw region.
+ break;
- case 'tmcd': // TiMe CoDe atom
- case 'chap': // CHAPter list atom
- case 'sync': // SYNChronization atom
- case 'scpt': // tranSCriPT atom
- case 'ssrc': // non-primary SouRCe atom
- for ($i = 0; $i < (strlen($atomdata) % 4); $i++) {
- $atomstructure['track_id'][$i] = getid3_lib::BigEndian2Int(substr($atomdata, $i * 4, 4));
- }
- break;
+ case 'load': // track LOAD settings atom
+ $atom_structure['preload_start_time'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 4));
+ $atom_structure['preload_duration'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
+ $atom_structure['preload_flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 8, 4));
+ $atom_structure['default_hints_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 12, 4));
+ $atom_structure['default_hints']['double_buffer'] = (bool) ($atom_structure['default_hints_raw'] & 0x0020);
+ $atom_structure['default_hints']['high_quality'] = (bool) ($atom_structure['default_hints_raw'] & 0x0100);
+ break;
- case 'elst': // Edit LiST atom
- $atomstructure['version'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 1));
- $atomstructure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 1, 3)); // hardcoded: 0x0000
- $atomstructure['number_entries'] = getid3_lib::BigEndian2Int(substr($atomdata, 4, 4));
- for ($i = 0; $i < $atomstructure['number_entries']; $i++ ) {
- $atomstructure['edit_list'][$i]['track_duration'] = getid3_lib::BigEndian2Int(substr($atomdata, 8 + ($i * 12) + 0, 4));
- $atomstructure['edit_list'][$i]['media_time'] = getid3_lib::BigEndian2Int(substr($atomdata, 8 + ($i * 12) + 4, 4));
- $atomstructure['edit_list'][$i]['media_rate'] = getid3_lib::FixedPoint16_16(substr($atomdata, 8 + ($i * 12) + 8, 4));
- }
- break;
+ case 'tmcd': // TiMe CoDe atom
+ case 'chap': // CHAPter list atom
+ case 'sync': // SYNChronization atom
+ case 'scpt': // tranSCriPT atom
+ case 'ssrc': // non-primary SouRCe atom
+ for ($i = 0; $i < strlen($atom_data); $i += 4) {
+ @$atom_structure['track_id'][] = getid3_lib::BigEndian2Int(substr($atom_data, $i, 4));
+ }
+ break;
- case 'kmat': // compressed MATte atom
- $atomstructure['version'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 1));
- $atomstructure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 1, 3)); // hardcoded: 0x0000
- $atomstructure['matte_data_raw'] = substr($atomdata, 4);
- break;
+ case 'elst': // Edit LiST atom
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+ $atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
+ for ($i = 0; $i < $atom_structure['number_entries']; $i++ ) {
+ $atom_structure['edit_list'][$i]['track_duration'] = getid3_lib::BigEndian2Int(substr($atom_data, 8 + ($i * 12) + 0, 4));
+ $atom_structure['edit_list'][$i]['media_time'] = getid3_lib::BigEndian2Int(substr($atom_data, 8 + ($i * 12) + 4, 4));
+ $atom_structure['edit_list'][$i]['media_rate'] = getid3_lib::FixedPoint16_16(substr($atom_data, 8 + ($i * 12) + 8, 4));
+ }
+ break;
- case 'ctab': // Color TABle atom
- $atomstructure['color_table_seed'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 4)); // hardcoded: 0x00000000
- $atomstructure['color_table_flags'] = getid3_lib::BigEndian2Int(substr($atomdata, 4, 2)); // hardcoded: 0x8000
- $atomstructure['color_table_size'] = getid3_lib::BigEndian2Int(substr($atomdata, 6, 2)) + 1;
- for ($colortableentry = 0; $colortableentry < $atomstructure['color_table_size']; $colortableentry++) {
- $atomstructure['color_table'][$colortableentry]['alpha'] = getid3_lib::BigEndian2Int(substr($atomdata, 8 + ($colortableentry * 8) + 0, 2));
- $atomstructure['color_table'][$colortableentry]['red'] = getid3_lib::BigEndian2Int(substr($atomdata, 8 + ($colortableentry * 8) + 2, 2));
- $atomstructure['color_table'][$colortableentry]['green'] = getid3_lib::BigEndian2Int(substr($atomdata, 8 + ($colortableentry * 8) + 4, 2));
- $atomstructure['color_table'][$colortableentry]['blue'] = getid3_lib::BigEndian2Int(substr($atomdata, 8 + ($colortableentry * 8) + 6, 2));
- }
- break;
+ case 'kmat': // compressed MATte atom
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+ $atom_structure['matte_data_raw'] = substr($atom_data, 4);
+ break;
- case 'mvhd': // MoVie HeaDer atom
- $atomstructure['version'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 1));
- $atomstructure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 1, 3));
- $atomstructure['creation_time'] = getid3_lib::BigEndian2Int(substr($atomdata, 4, 4));
- $atomstructure['modify_time'] = getid3_lib::BigEndian2Int(substr($atomdata, 8, 4));
- $atomstructure['time_scale'] = getid3_lib::BigEndian2Int(substr($atomdata, 12, 4));
- $atomstructure['duration'] = getid3_lib::BigEndian2Int(substr($atomdata, 16, 4));
- $atomstructure['preferred_rate'] = getid3_lib::FixedPoint16_16(substr($atomdata, 20, 4));
- $atomstructure['preferred_volume'] = getid3_lib::FixedPoint8_8(substr($atomdata, 24, 2));
- $atomstructure['reserved'] = substr($atomdata, 26, 10);
- $atomstructure['matrix_a'] = getid3_lib::FixedPoint16_16(substr($atomdata, 36, 4));
- $atomstructure['matrix_b'] = getid3_lib::FixedPoint16_16(substr($atomdata, 40, 4));
- $atomstructure['matrix_u'] = getid3_lib::FixedPoint2_30(substr($atomdata, 44, 4));
- $atomstructure['matrix_c'] = getid3_lib::FixedPoint16_16(substr($atomdata, 48, 4));
- $atomstructure['matrix_d'] = getid3_lib::FixedPoint16_16(substr($atomdata, 52, 4));
- $atomstructure['matrix_v'] = getid3_lib::FixedPoint2_30(substr($atomdata, 56, 4));
- $atomstructure['matrix_x'] = getid3_lib::FixedPoint16_16(substr($atomdata, 60, 4));
- $atomstructure['matrix_y'] = getid3_lib::FixedPoint16_16(substr($atomdata, 64, 4));
- $atomstructure['matrix_w'] = getid3_lib::FixedPoint2_30(substr($atomdata, 68, 4));
- $atomstructure['preview_time'] = getid3_lib::BigEndian2Int(substr($atomdata, 72, 4));
- $atomstructure['preview_duration'] = getid3_lib::BigEndian2Int(substr($atomdata, 76, 4));
- $atomstructure['poster_time'] = getid3_lib::BigEndian2Int(substr($atomdata, 80, 4));
- $atomstructure['selection_time'] = getid3_lib::BigEndian2Int(substr($atomdata, 84, 4));
- $atomstructure['selection_duration'] = getid3_lib::BigEndian2Int(substr($atomdata, 88, 4));
- $atomstructure['current_time'] = getid3_lib::BigEndian2Int(substr($atomdata, 92, 4));
- $atomstructure['next_track_id'] = getid3_lib::BigEndian2Int(substr($atomdata, 96, 4));
- if ($atomstructure['time_scale'] == 0) {
- $ThisFileInfo['error'][] = 'Corrupt Quicktime file: mvhd.time_scale == zero';
- return false;
- }
- $atomstructure['creation_time_unix'] = getid3_lib::DateMac2Unix($atomstructure['creation_time']);
- $atomstructure['modify_time_unix'] = getid3_lib::DateMac2Unix($atomstructure['modify_time']);
- $ThisFileInfo['quicktime']['time_scale'] = $atomstructure['time_scale'];
- $ThisFileInfo['quicktime']['display_scale'] = $atomstructure['matrix_a'];
- $ThisFileInfo['playtime_seconds'] = $atomstructure['duration'] / $atomstructure['time_scale'];
- break;
+ case 'ctab': // Color TABle atom
+ $atom_structure['color_table_seed'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 4)); // hardcoded: 0x00000000
+ $atom_structure['color_table_flags'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 2)); // hardcoded: 0x8000
+ $atom_structure['color_table_size'] = getid3_lib::BigEndian2Int(substr($atom_data, 6, 2)) + 1;
+ for ($colortableentry = 0; $colortableentry < $atom_structure['color_table_size']; $colortableentry++) {
+ $atom_structure['color_table'][$colortableentry]['alpha'] = getid3_lib::BigEndian2Int(substr($atom_data, 8 + ($colortableentry * 8) + 0, 2));
+ $atom_structure['color_table'][$colortableentry]['red'] = getid3_lib::BigEndian2Int(substr($atom_data, 8 + ($colortableentry * 8) + 2, 2));
+ $atom_structure['color_table'][$colortableentry]['green'] = getid3_lib::BigEndian2Int(substr($atom_data, 8 + ($colortableentry * 8) + 4, 2));
+ $atom_structure['color_table'][$colortableentry]['blue'] = getid3_lib::BigEndian2Int(substr($atom_data, 8 + ($colortableentry * 8) + 6, 2));
+ }
+ break;
- case 'tkhd': // TracK HeaDer atom
- $atomstructure['version'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 1));
- $atomstructure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atomdata, 1, 3));
- $atomstructure['creation_time'] = getid3_lib::BigEndian2Int(substr($atomdata, 4, 4));
- $atomstructure['modify_time'] = getid3_lib::BigEndian2Int(substr($atomdata, 8, 4));
- $atomstructure['trackid'] = getid3_lib::BigEndian2Int(substr($atomdata, 12, 4));
- $atomstructure['reserved1'] = getid3_lib::BigEndian2Int(substr($atomdata, 16, 4));
- $atomstructure['duration'] = getid3_lib::BigEndian2Int(substr($atomdata, 20, 4));
- $atomstructure['reserved2'] = getid3_lib::BigEndian2Int(substr($atomdata, 24, 8));
- $atomstructure['layer'] = getid3_lib::BigEndian2Int(substr($atomdata, 32, 2));
- $atomstructure['alternate_group'] = getid3_lib::BigEndian2Int(substr($atomdata, 34, 2));
- $atomstructure['volume'] = getid3_lib::FixedPoint8_8(substr($atomdata, 36, 2));
- $atomstructure['reserved3'] = getid3_lib::BigEndian2Int(substr($atomdata, 38, 2));
- $atomstructure['matrix_a'] = getid3_lib::FixedPoint16_16(substr($atomdata, 40, 4));
- $atomstructure['matrix_b'] = getid3_lib::FixedPoint16_16(substr($atomdata, 44, 4));
- $atomstructure['matrix_u'] = getid3_lib::FixedPoint16_16(substr($atomdata, 48, 4));
- $atomstructure['matrix_c'] = getid3_lib::FixedPoint16_16(substr($atomdata, 52, 4));
- $atomstructure['matrix_v'] = getid3_lib::FixedPoint16_16(substr($atomdata, 56, 4));
- $atomstructure['matrix_d'] = getid3_lib::FixedPoint16_16(substr($atomdata, 60, 4));
- $atomstructure['matrix_x'] = getid3_lib::FixedPoint2_30(substr($atomdata, 64, 4));
- $atomstructure['matrix_y'] = getid3_lib::FixedPoint2_30(substr($atomdata, 68, 4));
- $atomstructure['matrix_w'] = getid3_lib::FixedPoint2_30(substr($atomdata, 72, 4));
- $atomstructure['width'] = getid3_lib::FixedPoint16_16(substr($atomdata, 76, 4));
- $atomstructure['height'] = getid3_lib::FixedPoint16_16(substr($atomdata, 80, 4));
+ case 'mvhd': // MoVie HeaDer atom
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3));
+ $atom_structure['creation_time'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
+ $atom_structure['modify_time'] = getid3_lib::BigEndian2Int(substr($atom_data, 8, 4));
+ $atom_structure['time_scale'] = getid3_lib::BigEndian2Int(substr($atom_data, 12, 4));
+ $atom_structure['duration'] = getid3_lib::BigEndian2Int(substr($atom_data, 16, 4));
+ $atom_structure['preferred_rate'] = getid3_lib::FixedPoint16_16(substr($atom_data, 20, 4));
+ $atom_structure['preferred_volume'] = getid3_lib::FixedPoint8_8(substr($atom_data, 24, 2));
+ $atom_structure['reserved'] = substr($atom_data, 26, 10);
+ $atom_structure['matrix_a'] = getid3_lib::FixedPoint16_16(substr($atom_data, 36, 4));
+ $atom_structure['matrix_b'] = getid3_lib::FixedPoint16_16(substr($atom_data, 40, 4));
+ $atom_structure['matrix_u'] = getid3_lib::FixedPoint2_30(substr($atom_data, 44, 4));
+ $atom_structure['matrix_c'] = getid3_lib::FixedPoint16_16(substr($atom_data, 48, 4));
+ $atom_structure['matrix_d'] = getid3_lib::FixedPoint16_16(substr($atom_data, 52, 4));
+ $atom_structure['matrix_v'] = getid3_lib::FixedPoint2_30(substr($atom_data, 56, 4));
+ $atom_structure['matrix_x'] = getid3_lib::FixedPoint16_16(substr($atom_data, 60, 4));
+ $atom_structure['matrix_y'] = getid3_lib::FixedPoint16_16(substr($atom_data, 64, 4));
+ $atom_structure['matrix_w'] = getid3_lib::FixedPoint2_30(substr($atom_data, 68, 4));
+ $atom_structure['preview_time'] = getid3_lib::BigEndian2Int(substr($atom_data, 72, 4));
+ $atom_structure['preview_duration'] = getid3_lib::BigEndian2Int(substr($atom_data, 76, 4));
+ $atom_structure['poster_time'] = getid3_lib::BigEndian2Int(substr($atom_data, 80, 4));
+ $atom_structure['selection_time'] = getid3_lib::BigEndian2Int(substr($atom_data, 84, 4));
+ $atom_structure['selection_duration'] = getid3_lib::BigEndian2Int(substr($atom_data, 88, 4));
+ $atom_structure['current_time'] = getid3_lib::BigEndian2Int(substr($atom_data, 92, 4));
+ $atom_structure['next_track_id'] = getid3_lib::BigEndian2Int(substr($atom_data, 96, 4));
- $atomstructure['flags']['enabled'] = (bool) ($atomstructure['flags_raw'] & 0x0001);
- $atomstructure['flags']['in_movie'] = (bool) ($atomstructure['flags_raw'] & 0x0002);
- $atomstructure['flags']['in_preview'] = (bool) ($atomstructure['flags_raw'] & 0x0004);
- $atomstructure['flags']['in_poster'] = (bool) ($atomstructure['flags_raw'] & 0x0008);
- $atomstructure['creation_time_unix'] = getid3_lib::DateMac2Unix($atomstructure['creation_time']);
- $atomstructure['modify_time_unix'] = getid3_lib::DateMac2Unix($atomstructure['modify_time']);
+ if ($atom_structure['time_scale'] == 0) {
+ $this->error('Corrupt Quicktime file: mvhd.time_scale == zero');
+ return false;
+ }
+ $atom_structure['creation_time_unix'] = getid3_lib::DateMac2Unix($atom_structure['creation_time']);
+ $atom_structure['modify_time_unix'] = getid3_lib::DateMac2Unix($atom_structure['modify_time']);
+ $info['quicktime']['timestamps_unix']['create'][$atom_structure['hierarchy']] = $atom_structure['creation_time_unix'];
+ $info['quicktime']['timestamps_unix']['modify'][$atom_structure['hierarchy']] = $atom_structure['modify_time_unix'];
+ $info['quicktime']['time_scale'] = ((isset($info['quicktime']['time_scale']) && ($info['quicktime']['time_scale'] < 1000)) ? max($info['quicktime']['time_scale'], $atom_structure['time_scale']) : $atom_structure['time_scale']);
+ $info['quicktime']['display_scale'] = $atom_structure['matrix_a'];
+ $info['playtime_seconds'] = $atom_structure['duration'] / $atom_structure['time_scale'];
+ break;
- if (!isset($ThisFileInfo['video']['resolution_x']) || !isset($ThisFileInfo['video']['resolution_y'])) {
- $ThisFileInfo['video']['resolution_x'] = $atomstructure['width'];
- $ThisFileInfo['video']['resolution_y'] = $atomstructure['height'];
- }
- if ($atomstructure['flags']['enabled'] == 1) {
- $ThisFileInfo['video']['resolution_x'] = max($ThisFileInfo['video']['resolution_x'], $atomstructure['width']);
- $ThisFileInfo['video']['resolution_y'] = max($ThisFileInfo['video']['resolution_y'], $atomstructure['height']);
- }
- if (!empty($ThisFileInfo['video']['resolution_x']) && !empty($ThisFileInfo['video']['resolution_y'])) {
- $ThisFileInfo['quicktime']['video']['resolution_x'] = $ThisFileInfo['video']['resolution_x'];
- $ThisFileInfo['quicktime']['video']['resolution_y'] = $ThisFileInfo['video']['resolution_y'];
- } else {
- unset($ThisFileInfo['video']['resolution_x']);
- unset($ThisFileInfo['video']['resolution_y']);
- unset($ThisFileInfo['quicktime']['video']);
- }
- break;
+ case 'tkhd': // TracK HeaDer atom
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3));
+ $atom_structure['creation_time'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
+ $atom_structure['modify_time'] = getid3_lib::BigEndian2Int(substr($atom_data, 8, 4));
+ $atom_structure['trackid'] = getid3_lib::BigEndian2Int(substr($atom_data, 12, 4));
+ $atom_structure['reserved1'] = getid3_lib::BigEndian2Int(substr($atom_data, 16, 4));
+ $atom_structure['duration'] = getid3_lib::BigEndian2Int(substr($atom_data, 20, 4));
+ $atom_structure['reserved2'] = getid3_lib::BigEndian2Int(substr($atom_data, 24, 8));
+ $atom_structure['layer'] = getid3_lib::BigEndian2Int(substr($atom_data, 32, 2));
+ $atom_structure['alternate_group'] = getid3_lib::BigEndian2Int(substr($atom_data, 34, 2));
+ $atom_structure['volume'] = getid3_lib::FixedPoint8_8(substr($atom_data, 36, 2));
+ $atom_structure['reserved3'] = getid3_lib::BigEndian2Int(substr($atom_data, 38, 2));
+ // http://developer.apple.com/library/mac/#documentation/QuickTime/RM/MovieBasics/MTEditing/K-Chapter/11MatrixFunctions.html
+ // http://developer.apple.com/library/mac/#documentation/QuickTime/qtff/QTFFChap4/qtff4.html#//apple_ref/doc/uid/TP40000939-CH206-18737
+ $atom_structure['matrix_a'] = getid3_lib::FixedPoint16_16(substr($atom_data, 40, 4));
+ $atom_structure['matrix_b'] = getid3_lib::FixedPoint16_16(substr($atom_data, 44, 4));
+ $atom_structure['matrix_u'] = getid3_lib::FixedPoint2_30(substr($atom_data, 48, 4));
+ $atom_structure['matrix_c'] = getid3_lib::FixedPoint16_16(substr($atom_data, 52, 4));
+ $atom_structure['matrix_d'] = getid3_lib::FixedPoint16_16(substr($atom_data, 56, 4));
+ $atom_structure['matrix_v'] = getid3_lib::FixedPoint2_30(substr($atom_data, 60, 4));
+ $atom_structure['matrix_x'] = getid3_lib::FixedPoint16_16(substr($atom_data, 64, 4));
+ $atom_structure['matrix_y'] = getid3_lib::FixedPoint16_16(substr($atom_data, 68, 4));
+ $atom_structure['matrix_w'] = getid3_lib::FixedPoint2_30(substr($atom_data, 72, 4));
+ $atom_structure['width'] = getid3_lib::FixedPoint16_16(substr($atom_data, 76, 4));
+ $atom_structure['height'] = getid3_lib::FixedPoint16_16(substr($atom_data, 80, 4));
+ $atom_structure['flags']['enabled'] = (bool) ($atom_structure['flags_raw'] & 0x0001);
+ $atom_structure['flags']['in_movie'] = (bool) ($atom_structure['flags_raw'] & 0x0002);
+ $atom_structure['flags']['in_preview'] = (bool) ($atom_structure['flags_raw'] & 0x0004);
+ $atom_structure['flags']['in_poster'] = (bool) ($atom_structure['flags_raw'] & 0x0008);
+ $atom_structure['creation_time_unix'] = getid3_lib::DateMac2Unix($atom_structure['creation_time']);
+ $atom_structure['modify_time_unix'] = getid3_lib::DateMac2Unix($atom_structure['modify_time']);
+ $info['quicktime']['timestamps_unix']['create'][$atom_structure['hierarchy']] = $atom_structure['creation_time_unix'];
+ $info['quicktime']['timestamps_unix']['modify'][$atom_structure['hierarchy']] = $atom_structure['modify_time_unix'];
- case 'meta': // METAdata atom
- // http://www.geocities.com/xhelmboyx/quicktime/formats/qti-layout.txt
- $NextTagPosition = strpos($atomdata, '©');
- while ($NextTagPosition < strlen($atomdata)) {
- $metaItemSize = getid3_lib::BigEndian2Int(substr($atomdata, $NextTagPosition - 4, 4)) - 4;
- if ($metaItemSize == -4) {
- break;
+ // https://www.getid3.org/phpBB3/viewtopic.php?t=1908
+ // attempt to compute rotation from matrix values
+ // 2017-Dec-28: uncertain if 90/270 are correctly oriented; values returned by FixedPoint16_16 should perhaps be -1 instead of 65535(?)
+ $matrixRotation = 0;
+ switch ($atom_structure['matrix_a'].':'.$atom_structure['matrix_b'].':'.$atom_structure['matrix_c'].':'.$atom_structure['matrix_d']) {
+ case '1:0:0:1': $matrixRotation = 0; break;
+ case '0:1:65535:0': $matrixRotation = 90; break;
+ case '65535:0:0:65535': $matrixRotation = 180; break;
+ case '0:65535:1:0': $matrixRotation = 270; break;
+ default: break;
}
- $metaItemRaw = substr($atomdata, $NextTagPosition, $metaItemSize);
- $metaItemKey = substr($metaItemRaw, 0, 4);
- $metaItemData = substr($metaItemRaw, 20);
- $NextTagPosition += $metaItemSize + 4;
- $this->CopyToAppropriateCommentsSection($metaItemKey, $metaItemData, $ThisFileInfo);
- }
- break;
+ // https://www.getid3.org/phpBB3/viewtopic.php?t=2468
+ // The rotation matrix can appear in the Quicktime file multiple times, at least once for each track,
+ // and it's possible that only the video track (or, in theory, one of the video tracks) is flagged as
+ // rotated while the other tracks (e.g. audio) is tagged as rotation=0 (behavior noted on iPhone 8 Plus)
+ // The correct solution would be to check if the TrackID associated with the rotation matrix is indeed
+ // a video track (or the main video track) and only set the rotation then, but since information about
+ // what track is what is not trivially there to be examined, the lazy solution is to set the rotation
+ // if it is found to be nonzero, on the assumption that tracks that don't need it will have rotation set
+ // to zero (and be effectively ignored) and the video track will have rotation set correctly, which will
+ // either be zero and automatically correct, or nonzero and be set correctly.
+ if (!isset($info['video']['rotate']) || (($info['video']['rotate'] == 0) && ($matrixRotation > 0))) {
+ $info['quicktime']['video']['rotate'] = $info['video']['rotate'] = $matrixRotation;
+ }
- case 'ftyp': // FileTYPe (?) atom (for MP4 it seems)
- $atomstructure['signature'] = substr($atomdata, 0, 4);
- $atomstructure['unknown_1'] = getid3_lib::BigEndian2Int(substr($atomdata, 4, 4));
- $atomstructure['fourcc'] = substr($atomdata, 8, 4);
- break;
+ if ($atom_structure['flags']['enabled'] == 1) {
+ if (!isset($info['video']['resolution_x']) || !isset($info['video']['resolution_y'])) {
+ $info['video']['resolution_x'] = $atom_structure['width'];
+ $info['video']['resolution_y'] = $atom_structure['height'];
+ }
+ $info['video']['resolution_x'] = max($info['video']['resolution_x'], $atom_structure['width']);
+ $info['video']['resolution_y'] = max($info['video']['resolution_y'], $atom_structure['height']);
+ $info['quicktime']['video']['resolution_x'] = $info['video']['resolution_x'];
+ $info['quicktime']['video']['resolution_y'] = $info['video']['resolution_y'];
+ } else {
+ // see: https://www.getid3.org/phpBB3/viewtopic.php?t=1295
+ //if (isset($info['video']['resolution_x'])) { unset($info['video']['resolution_x']); }
+ //if (isset($info['video']['resolution_y'])) { unset($info['video']['resolution_y']); }
+ //if (isset($info['quicktime']['video'])) { unset($info['quicktime']['video']); }
+ }
+ break;
- case 'mdat': // Media DATa atom
- case 'free': // FREE space atom
- case 'skip': // SKIP atom
- case 'wide': // 64-bit expansion placeholder atom
- // 'mdat' data is too big to deal with, contains no useful metadata
- // 'free', 'skip' and 'wide' are just padding, contains no useful data at all
- // When writing QuickTime files, it is sometimes necessary to update an atom's size.
- // It is impossible to update a 32-bit atom to a 64-bit atom since the 32-bit atom
- // is only 8 bytes in size, and the 64-bit atom requires 16 bytes. Therefore, QuickTime
- // puts an 8-byte placeholder atom before any atoms it may have to update the size of.
- // In this way, if the atom needs to be converted from a 32-bit to a 64-bit atom, the
- // placeholder atom can be overwritten to obtain the necessary 8 extra bytes.
- // The placeholder atom has a type of kWideAtomPlaceholderType ( 'wide' ).
- break;
+ case 'iods': // Initial Object DeScriptor atom
+ // http://www.koders.com/c/fid1FAB3E762903DC482D8A246D4A4BF9F28E049594.aspx?s=windows.h
+ // http://libquicktime.sourcearchive.com/documentation/1.0.2plus-pdebian/iods_8c-source.html
+ $offset = 0;
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
+ $offset += 1;
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 3));
+ $offset += 3;
+ $atom_structure['mp4_iod_tag'] = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
+ $offset += 1;
+ $atom_structure['length'] = $this->quicktime_read_mp4_descr_length($atom_data, $offset);
+ //$offset already adjusted by quicktime_read_mp4_descr_length()
+ $atom_structure['object_descriptor_id'] = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 2));
+ $offset += 2;
+ $atom_structure['od_profile_level'] = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
+ $offset += 1;
+ $atom_structure['scene_profile_level'] = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
+ $offset += 1;
+ $atom_structure['audio_profile_id'] = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
+ $offset += 1;
+ $atom_structure['video_profile_id'] = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
+ $offset += 1;
+ $atom_structure['graphics_profile_level'] = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
+ $offset += 1;
+ $atom_structure['num_iods_tracks'] = ($atom_structure['length'] - 7) / 6; // 6 bytes would only be right if all tracks use 1-byte length fields
+ for ($i = 0; $i < $atom_structure['num_iods_tracks']; $i++) {
+ $atom_structure['track'][$i]['ES_ID_IncTag'] = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
+ $offset += 1;
+ $atom_structure['track'][$i]['length'] = $this->quicktime_read_mp4_descr_length($atom_data, $offset);
+ //$offset already adjusted by quicktime_read_mp4_descr_length()
+ $atom_structure['track'][$i]['track_id'] = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 4));
+ $offset += 4;
+ }
- case 'nsav': // NoSAVe atom
- // http://developer.apple.com/technotes/tn/tn2038.html
- $atomstructure['data'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 4));
- break;
+ $atom_structure['audio_profile_name'] = $this->QuicktimeIODSaudioProfileName($atom_structure['audio_profile_id']);
+ $atom_structure['video_profile_name'] = $this->QuicktimeIODSvideoProfileName($atom_structure['video_profile_id']);
+ break;
- case 'ctyp': // Controller TYPe atom (seen on QTVR)
- // http://homepages.slingshot.co.nz/~helmboy/quicktime/formats/qtm-layout.txt
- // some controller names are:
- // 0x00 + 'std' for linear movie
- // 'none' for no controls
- $atomstructure['ctyp'] = substr($atomdata, 0, 4);
- switch ($atomstructure['ctyp']) {
- case 'qtvr':
- $ThisFileInfo['video']['dataformat'] = 'quicktimevr';
- break;
- }
- break;
+ case 'ftyp': // FileTYPe (?) atom (for MP4 it seems)
+ $atom_structure['signature'] = substr($atom_data, 0, 4);
+ $atom_structure['unknown_1'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
+ $atom_structure['fourcc'] = substr($atom_data, 8, 4);
+ break;
- case 'pano': // PANOrama track (seen on QTVR)
- $atomstructure['pano'] = getid3_lib::BigEndian2Int(substr($atomdata, 0, 4));
- break;
+ case 'mdat': // Media DATa atom
+ // 'mdat' contains the actual data for the audio/video, possibly also subtitles
- case 'hint': // HINT track
- case 'hinf': //
- case 'hinv': //
- case 'hnti': //
- $ThisFileInfo['quicktime']['hinting'] = true;
- break;
+ /* due to lack of known documentation, this is a kludge implementation. If you know of documentation on how mdat is properly structed, please send it to info at getid3.org */
- case 'imgt': // IMaGe Track reference (kQTVRImageTrackRefType) (seen on QTVR)
- for ($i = 0; $i < ($atomstructure['size'] - 8); $i += 4) {
- $atomstructure['imgt'][] = getid3_lib::BigEndian2Int(substr($atomdata, $i, 4));
- }
- break;
+ // first, skip any 'wide' padding, and second 'mdat' header (with specified size of zero?)
+ $mdat_offset = 0;
+ while (true) {
+ if (substr($atom_data, $mdat_offset, 8) == "\x00\x00\x00\x08".'wide') {
+ $mdat_offset += 8;
+ } elseif (substr($atom_data, $mdat_offset, 8) == "\x00\x00\x00\x00".'mdat') {
+ $mdat_offset += 8;
+ } else {
+ break;
+ }
+ }
+ if (substr($atom_data, $mdat_offset, 4) == 'GPRO') {
+ $GOPRO_chunk_length = getid3_lib::LittleEndian2Int(substr($atom_data, $mdat_offset + 4, 4));
+ $GOPRO_offset = 8;
+ $atom_structure['GPRO']['raw'] = substr($atom_data, $mdat_offset + 8, $GOPRO_chunk_length - 8);
+ $atom_structure['GPRO']['firmware'] = substr($atom_structure['GPRO']['raw'], 0, 15);
+ $atom_structure['GPRO']['unknown1'] = substr($atom_structure['GPRO']['raw'], 15, 16);
+ $atom_structure['GPRO']['unknown2'] = substr($atom_structure['GPRO']['raw'], 31, 32);
+ $atom_structure['GPRO']['unknown3'] = substr($atom_structure['GPRO']['raw'], 63, 16);
+ $atom_structure['GPRO']['camera'] = substr($atom_structure['GPRO']['raw'], 79, 32);
+ $info['quicktime']['camera']['model'] = rtrim($atom_structure['GPRO']['camera'], "\x00");
+ }
- case 'FXTC': // Something to do with Adobe After Effects (?)
- case 'PrmA':
- case 'code':
- case 'FIEL': // this is NOT "fiel" (Field Ordering) as describe here: http://developer.apple.com/documentation/QuickTime/QTFF/QTFFChap3/chapter_4_section_2.html
- // Observed-but-not-handled atom types are just listed here
- // to prevent warnings being generated
- $atomstructure['data'] = $atomdata;
- break;
+ // check to see if it looks like chapter titles, in the form of unterminated strings with a leading 16-bit size field
+ while (($mdat_offset < (strlen($atom_data) - 8))
+ && ($chapter_string_length = getid3_lib::BigEndian2Int(substr($atom_data, $mdat_offset, 2)))
+ && ($chapter_string_length < 1000)
+ && ($chapter_string_length <= (strlen($atom_data) - $mdat_offset - 2))
+ && preg_match('#^([\x00-\xFF]{2})([\x20-\xFF]+)$#', substr($atom_data, $mdat_offset, $chapter_string_length + 2), $chapter_matches)) {
+ list($dummy, $chapter_string_length_hex, $chapter_string) = $chapter_matches;
+ $mdat_offset += (2 + $chapter_string_length);
+ @$info['quicktime']['comments']['chapters'][] = $chapter_string;
- default:
- $ThisFileInfo['warning'][] = 'Unknown QuickTime atom type: "'.$atomname.'" at offset '.$baseoffset;
- $atomstructure['data'] = $atomdata;
- break;
+ // "encd" atom specifies encoding. In theory could be anything, almost always UTF-8, but may be UTF-16 with BOM (not currently handled)
+ if (substr($atom_data, $mdat_offset, 12) == "\x00\x00\x00\x0C\x65\x6E\x63\x64\x00\x00\x01\x00") { // UTF-8
+ $mdat_offset += 12;
+ }
+ }
+
+ if (($atomsize > 8) && (!isset($info['avdataend_tmp']) || ($info['quicktime'][$atomname]['size'] > ($info['avdataend_tmp'] - $info['avdataoffset'])))) {
+
+ $info['avdataoffset'] = $atom_structure['offset'] + 8; // $info['quicktime'][$atomname]['offset'] + 8;
+ $OldAVDataEnd = $info['avdataend'];
+ $info['avdataend'] = $atom_structure['offset'] + $atom_structure['size']; // $info['quicktime'][$atomname]['offset'] + $info['quicktime'][$atomname]['size'];
+
+ $getid3_temp = new getID3();
+ $getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
+ $getid3_temp->info['avdataoffset'] = $info['avdataoffset'];
+ $getid3_temp->info['avdataend'] = $info['avdataend'];
+ $getid3_mp3 = new getid3_mp3($getid3_temp);
+ if ($getid3_mp3->MPEGaudioHeaderValid($getid3_mp3->MPEGaudioHeaderDecode($this->fread(4)))) {
+ $getid3_mp3->getOnlyMPEGaudioInfo($getid3_temp->info['avdataoffset'], false);
+ if (!empty($getid3_temp->info['warning'])) {
+ foreach ($getid3_temp->info['warning'] as $value) {
+ $this->warning($value);
+ }
+ }
+ if (!empty($getid3_temp->info['mpeg'])) {
+ $info['mpeg'] = $getid3_temp->info['mpeg'];
+ if (isset($info['mpeg']['audio'])) {
+ $info['audio']['dataformat'] = 'mp3';
+ $info['audio']['codec'] = (!empty($info['mpeg']['audio']['encoder']) ? $info['mpeg']['audio']['encoder'] : (!empty($info['mpeg']['audio']['codec']) ? $info['mpeg']['audio']['codec'] : (!empty($info['mpeg']['audio']['LAME']) ? 'LAME' :'mp3')));
+ $info['audio']['sample_rate'] = $info['mpeg']['audio']['sample_rate'];
+ $info['audio']['channels'] = $info['mpeg']['audio']['channels'];
+ $info['audio']['bitrate'] = $info['mpeg']['audio']['bitrate'];
+ $info['audio']['bitrate_mode'] = strtolower($info['mpeg']['audio']['bitrate_mode']);
+ $info['bitrate'] = $info['audio']['bitrate'];
+ }
+ }
+ }
+ unset($getid3_mp3, $getid3_temp);
+ $info['avdataend'] = $OldAVDataEnd;
+ unset($OldAVDataEnd);
+
+ }
+
+ unset($mdat_offset, $chapter_string_length, $chapter_matches);
+ break;
+
+ case 'free': // FREE space atom
+ case 'skip': // SKIP atom
+ case 'wide': // 64-bit expansion placeholder atom
+ // 'free', 'skip' and 'wide' are just padding, contains no useful data at all
+
+ // When writing QuickTime files, it is sometimes necessary to update an atom's size.
+ // It is impossible to update a 32-bit atom to a 64-bit atom since the 32-bit atom
+ // is only 8 bytes in size, and the 64-bit atom requires 16 bytes. Therefore, QuickTime
+ // puts an 8-byte placeholder atom before any atoms it may have to update the size of.
+ // In this way, if the atom needs to be converted from a 32-bit to a 64-bit atom, the
+ // placeholder atom can be overwritten to obtain the necessary 8 extra bytes.
+ // The placeholder atom has a type of kWideAtomPlaceholderType ( 'wide' ).
+ break;
+
+
+ case 'nsav': // NoSAVe atom
+ // http://developer.apple.com/technotes/tn/tn2038.html
+ $atom_structure['data'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 4));
+ break;
+
+ case 'ctyp': // Controller TYPe atom (seen on QTVR)
+ // http://homepages.slingshot.co.nz/~helmboy/quicktime/formats/qtm-layout.txt
+ // some controller names are:
+ // 0x00 + 'std' for linear movie
+ // 'none' for no controls
+ $atom_structure['ctyp'] = substr($atom_data, 0, 4);
+ $info['quicktime']['controller'] = $atom_structure['ctyp'];
+ switch ($atom_structure['ctyp']) {
+ case 'qtvr':
+ $info['video']['dataformat'] = 'quicktimevr';
+ break;
+ }
+ break;
+
+ case 'pano': // PANOrama track (seen on QTVR)
+ $atom_structure['pano'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 4));
+ break;
+
+ case 'hint': // HINT track
+ case 'hinf': //
+ case 'hinv': //
+ case 'hnti': //
+ $info['quicktime']['hinting'] = true;
+ break;
+
+ case 'imgt': // IMaGe Track reference (kQTVRImageTrackRefType) (seen on QTVR)
+ for ($i = 0; $i < ($atom_structure['size'] - 8); $i += 4) {
+ $atom_structure['imgt'][] = getid3_lib::BigEndian2Int(substr($atom_data, $i, 4));
+ }
+ break;
+
+
+ // Observed-but-not-handled atom types are just listed here to prevent warnings being generated
+ case 'FXTC': // Something to do with Adobe After Effects (?)
+ case 'PrmA':
+ case 'code':
+ case 'FIEL': // this is NOT "fiel" (Field Ordering) as describe here: http://developer.apple.com/documentation/QuickTime/QTFF/QTFFChap3/chapter_4_section_2.html
+ case 'tapt': // TrackApertureModeDimensionsAID - http://developer.apple.com/documentation/QuickTime/Reference/QT7-1_Update_Reference/Constants/Constants.html
+ // tapt seems to be used to compute the video size [https://www.getid3.org/phpBB3/viewtopic.php?t=838]
+ // * http://lists.apple.com/archives/quicktime-api/2006/Aug/msg00014.html
+ // * http://handbrake.fr/irclogs/handbrake-dev/handbrake-dev20080128_pg2.html
+ case 'ctts':// STCompositionOffsetAID - http://developer.apple.com/documentation/QuickTime/Reference/QTRef_Constants/Reference/reference.html
+ case 'cslg':// STCompositionShiftLeastGreatestAID - http://developer.apple.com/documentation/QuickTime/Reference/QTRef_Constants/Reference/reference.html
+ case 'sdtp':// STSampleDependencyAID - http://developer.apple.com/documentation/QuickTime/Reference/QTRef_Constants/Reference/reference.html
+ case 'stps':// STPartialSyncSampleAID - http://developer.apple.com/documentation/QuickTime/Reference/QTRef_Constants/Reference/reference.html
+ //$atom_structure['data'] = $atom_data;
+ break;
+
+ case "\xA9".'xyz': // GPS latitude+longitude+altitude
+ $atom_structure['data'] = $atom_data;
+ if (preg_match('#([\\+\\-][0-9\\.]+)([\\+\\-][0-9\\.]+)([\\+\\-][0-9\\.]+)?/$#i', $atom_data, $matches)) {
+ @list($all, $latitude, $longitude, $altitude) = $matches;
+ $info['quicktime']['comments']['gps_latitude'][] = floatval($latitude);
+ $info['quicktime']['comments']['gps_longitude'][] = floatval($longitude);
+ if (!empty($altitude)) {
+ $info['quicktime']['comments']['gps_altitude'][] = floatval($altitude);
+ }
+ } else {
+ $this->warning('QuickTime atom "©xyz" data does not match expected data pattern at offset '.$baseoffset.'. Please report as getID3() bug.');
+ }
+ break;
+
+ case 'NCDT':
+ // http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html
+ // Nikon-specific QuickTime tags found in the NCDT atom of MOV videos from some Nikon cameras such as the Coolpix S8000 and D5100
+ $atom_structure['subatoms'] = $this->QuicktimeParseContainerAtom($atom_data, $baseoffset + 4, $atomHierarchy, $ParseAllPossibleAtoms);
+ break;
+ case 'NCTH': // Nikon Camera THumbnail image
+ case 'NCVW': // Nikon Camera preVieW image
+ // http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html
+ if (preg_match('/^\xFF\xD8\xFF/', $atom_data)) {
+ $atom_structure['data'] = $atom_data;
+ $atom_structure['image_mime'] = 'image/jpeg';
+ $atom_structure['description'] = (($atomname == 'NCTH') ? 'Nikon Camera Thumbnail Image' : (($atomname == 'NCVW') ? 'Nikon Camera Preview Image' : 'Nikon preview image'));
+ $info['quicktime']['comments']['picture'][] = array('image_mime'=>$atom_structure['image_mime'], 'data'=>$atom_data, 'description'=>$atom_structure['description']);
+ }
+ break;
+ case 'NCTG': // Nikon - http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html#NCTG
+ $atom_structure['data'] = $this->QuicktimeParseNikonNCTG($atom_data);
+ break;
+ case 'NCHD': // Nikon:MakerNoteVersion - http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html
+ case 'NCDB': // Nikon - http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html
+ case 'CNCV': // Canon:CompressorVersion - http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Canon.html
+ $atom_structure['data'] = $atom_data;
+ break;
+
+ case "\x00\x00\x00\x00":
+ // some kind of metacontainer, may contain a big data dump such as:
+ // 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
+
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3));
+ $atom_structure['subatoms'] = $this->QuicktimeParseContainerAtom(substr($atom_data, 4), $baseoffset + 8, $atomHierarchy, $ParseAllPossibleAtoms);
+ //$atom_structure['subatoms'] = $this->QuicktimeParseContainerAtom($atom_data, $baseoffset + 8, $atomHierarchy, $ParseAllPossibleAtoms);
+ break;
+
+ case 'meta': // METAdata atom
+ // https://developer.apple.com/library/mac/documentation/QuickTime/QTFF/Metadata/Metadata.html
+
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3));
+ $atom_structure['subatoms'] = $this->QuicktimeParseContainerAtom($atom_data, $baseoffset + 8, $atomHierarchy, $ParseAllPossibleAtoms);
+ break;
+
+ case 'data': // metaDATA atom
+ static $metaDATAkey = 1; // real ugly, but so is the QuickTime structure that stores keys and values in different multinested locations that are hard to relate to each other
+ // seems to be 2 bytes language code (ASCII), 2 bytes unknown (set to 0x10B5 in sample I have), remainder is useful data
+ $atom_structure['language'] = substr($atom_data, 4 + 0, 2);
+ $atom_structure['unknown'] = getid3_lib::BigEndian2Int(substr($atom_data, 4 + 2, 2));
+ $atom_structure['data'] = substr($atom_data, 4 + 4);
+ $atom_structure['key_name'] = @$info['quicktime']['temp_meta_key_names'][$metaDATAkey++];
+
+ if ($atom_structure['key_name'] && $atom_structure['data']) {
+ @$info['quicktime']['comments'][str_replace('com.apple.quicktime.', '', $atom_structure['key_name'])][] = $atom_structure['data'];
+ }
+ break;
+
+ case 'keys': // KEYS that may be present in the metadata atom.
+ // https://developer.apple.com/library/mac/documentation/QuickTime/QTFF/Metadata/Metadata.html#//apple_ref/doc/uid/TP40000939-CH1-SW21
+ // The metadata item keys atom holds a list of the metadata keys that may be present in the metadata atom.
+ // This list is indexed starting with 1; 0 is a reserved index value. The metadata item keys atom is a full atom with an atom type of "keys".
+ $atom_structure['version'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+ $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3));
+ $atom_structure['entry_count'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
+ $keys_atom_offset = 8;
+ for ($i = 1; $i <= $atom_structure['entry_count']; $i++) {
+ $atom_structure['keys'][$i]['key_size'] = getid3_lib::BigEndian2Int(substr($atom_data, $keys_atom_offset + 0, 4));
+ $atom_structure['keys'][$i]['key_namespace'] = substr($atom_data, $keys_atom_offset + 4, 4);
+ $atom_structure['keys'][$i]['key_value'] = substr($atom_data, $keys_atom_offset + 8, $atom_structure['keys'][$i]['key_size'] - 8);
+ $keys_atom_offset += $atom_structure['keys'][$i]['key_size']; // key_size includes the 4+4 bytes for key_size and key_namespace
+
+ $info['quicktime']['temp_meta_key_names'][$i] = $atom_structure['keys'][$i]['key_value'];
+ }
+ break;
+
+ case 'uuid': // user-defined atom often seen containing XML data, also used for potentially many other purposes, only a few specifically handled by getID3 (e.g. 360fly spatial data)
+ //Get the UUID ID in first 16 bytes
+ $uuid_bytes_read = unpack('H8time_low/H4time_mid/H4time_hi/H4clock_seq_hi/H12clock_seq_low', substr($atom_data, 0, 16));
+ $atom_structure['uuid_field_id'] = implode('-', $uuid_bytes_read);
+
+ switch ($atom_structure['uuid_field_id']) { // http://fileformats.archiveteam.org/wiki/Boxes/atoms_format#UUID_boxes
+
+ case '0537cdab-9d0c-4431-a72a-fa561f2a113e': // Exif - http://fileformats.archiveteam.org/wiki/Exif
+ case '2c4c0100-8504-40b9-a03e-562148d6dfeb': // Photoshop Image Resources - http://fileformats.archiveteam.org/wiki/Photoshop_Image_Resources
+ case '33c7a4d2-b81d-4723-a0ba-f1a3e097ad38': // IPTC-IIM - http://fileformats.archiveteam.org/wiki/IPTC-IIM
+ case '8974dbce-7be7-4c51-84f9-7148f9882554': // PIFF Track Encryption Box - http://fileformats.archiveteam.org/wiki/Protected_Interoperable_File_Format
+ case '96a9f1f1-dc98-402d-a7ae-d68e34451809': // GeoJP2 World File Box - http://fileformats.archiveteam.org/wiki/GeoJP2
+ case 'a2394f52-5a9b-4f14-a244-6c427c648df4': // PIFF Sample Encryption Box - http://fileformats.archiveteam.org/wiki/Protected_Interoperable_File_Format
+ case 'b14bf8bd-083d-4b43-a5ae-8cd7d5a6ce03': // GeoJP2 GeoTIFF Box - http://fileformats.archiveteam.org/wiki/GeoJP2
+ case 'd08a4f18-10f3-4a82-b6c8-32d8aba183d3': // PIFF Protection System Specific Header Box - http://fileformats.archiveteam.org/wiki/Protected_Interoperable_File_Format
+ $this->warning('Unhandled (but recognized) "uuid" atom identified by "'.$atom_structure['uuid_field_id'].'" at offset '.$atom_structure['offset'].' ('.strlen($atom_data).' bytes)');
+ break;
+
+ case 'be7acfcb-97a9-42e8-9c71-999491e3afac': // XMP data (in XML format)
+ $atom_structure['xml'] = substr($atom_data, 16, strlen($atom_data) - 16 - 8); // 16 bytes for UUID, 8 bytes header(?)
+ break;
+
+ case 'efe1589a-bb77-49ef-8095-27759eb1dc6f': // 360fly data
+ /* 360fly code in this block by Paul Lewis 2019-Oct-31 */
+ /* Sensor Timestamps need to be calculated using the recordings base time at ['quicktime']['moov']['subatoms'][0]['creation_time_unix']. */
+ $atom_structure['title'] = '360Fly Sensor Data';
+
+ //Get the UUID HEADER data
+ $uuid_bytes_read = unpack('vheader_size/vheader_version/vtimescale/vhardware_version/x/x/x/x/x/x/x/x/x/x/x/x/x/x/x/x/', substr($atom_data, 16, 32));
+ $atom_structure['uuid_header'] = $uuid_bytes_read;
+
+ $start_byte = 48;
+ $atom_SENSOR_data = substr($atom_data, $start_byte);
+ $atom_structure['sensor_data']['data_type'] = array(
+ 'fusion_count' => 0, // ID 250
+ 'fusion_data' => array(),
+ 'accel_count' => 0, // ID 1
+ 'accel_data' => array(),
+ 'gyro_count' => 0, // ID 2
+ 'gyro_data' => array(),
+ 'magno_count' => 0, // ID 3
+ 'magno_data' => array(),
+ 'gps_count' => 0, // ID 5
+ 'gps_data' => array(),
+ 'rotation_count' => 0, // ID 6
+ 'rotation_data' => array(),
+ 'unknown_count' => 0, // ID ??
+ 'unknown_data' => array(),
+ 'debug_list' => '', // Used to debug variables stored as comma delimited strings
+ );
+ $debug_structure['debug_items'] = array();
+ // Can start loop here to decode all sensor data in 32 Byte chunks:
+ foreach (str_split($atom_SENSOR_data, 32) as $sensor_key => $sensor_data) {
+ // This gets me a data_type code to work out what data is in the next 31 bytes.
+ $sensor_data_type = substr($sensor_data, 0, 1);
+ $sensor_data_content = substr($sensor_data, 1);
+ $uuid_bytes_read = unpack('C*', $sensor_data_type);
+ $sensor_data_array = array();
+ switch ($uuid_bytes_read[1]) {
+ case 250:
+ $atom_structure['sensor_data']['data_type']['fusion_count']++;
+ $uuid_bytes_read = unpack('cmode/Jtimestamp/Gyaw/Gpitch/Groll/x*', $sensor_data_content);
+ $sensor_data_array['mode'] = $uuid_bytes_read['mode'];
+ $sensor_data_array['timestamp'] = $uuid_bytes_read['timestamp'];
+ $sensor_data_array['yaw'] = $uuid_bytes_read['yaw'];
+ $sensor_data_array['pitch'] = $uuid_bytes_read['pitch'];
+ $sensor_data_array['roll'] = $uuid_bytes_read['roll'];
+ array_push($atom_structure['sensor_data']['data_type']['fusion_data'], $sensor_data_array);
+ break;
+ case 1:
+ $atom_structure['sensor_data']['data_type']['accel_count']++;
+ $uuid_bytes_read = unpack('cmode/Jtimestamp/Gyaw/Gpitch/Groll/x*', $sensor_data_content);
+ $sensor_data_array['mode'] = $uuid_bytes_read['mode'];
+ $sensor_data_array['timestamp'] = $uuid_bytes_read['timestamp'];
+ $sensor_data_array['yaw'] = $uuid_bytes_read['yaw'];
+ $sensor_data_array['pitch'] = $uuid_bytes_read['pitch'];
+ $sensor_data_array['roll'] = $uuid_bytes_read['roll'];
+ array_push($atom_structure['sensor_data']['data_type']['accel_data'], $sensor_data_array);
+ break;
+ case 2:
+ $atom_structure['sensor_data']['data_type']['gyro_count']++;
+ $uuid_bytes_read = unpack('cmode/Jtimestamp/Gyaw/Gpitch/Groll/x*', $sensor_data_content);
+ $sensor_data_array['mode'] = $uuid_bytes_read['mode'];
+ $sensor_data_array['timestamp'] = $uuid_bytes_read['timestamp'];
+ $sensor_data_array['yaw'] = $uuid_bytes_read['yaw'];
+ $sensor_data_array['pitch'] = $uuid_bytes_read['pitch'];
+ $sensor_data_array['roll'] = $uuid_bytes_read['roll'];
+ array_push($atom_structure['sensor_data']['data_type']['gyro_data'], $sensor_data_array);
+ break;
+ case 3:
+ $atom_structure['sensor_data']['data_type']['magno_count']++;
+ $uuid_bytes_read = unpack('cmode/Jtimestamp/Gmagx/Gmagy/Gmagz/x*', $sensor_data_content);
+ $sensor_data_array['mode'] = $uuid_bytes_read['mode'];
+ $sensor_data_array['timestamp'] = $uuid_bytes_read['timestamp'];
+ $sensor_data_array['magx'] = $uuid_bytes_read['magx'];
+ $sensor_data_array['magy'] = $uuid_bytes_read['magy'];
+ $sensor_data_array['magz'] = $uuid_bytes_read['magz'];
+ array_push($atom_structure['sensor_data']['data_type']['magno_data'], $sensor_data_array);
+ break;
+ case 5:
+ $atom_structure['sensor_data']['data_type']['gps_count']++;
+ $uuid_bytes_read = unpack('cmode/Jtimestamp/Glat/Glon/Galt/Gspeed/nbearing/nacc/x*', $sensor_data_content);
+ $sensor_data_array['mode'] = $uuid_bytes_read['mode'];
+ $sensor_data_array['timestamp'] = $uuid_bytes_read['timestamp'];
+ $sensor_data_array['lat'] = $uuid_bytes_read['lat'];
+ $sensor_data_array['lon'] = $uuid_bytes_read['lon'];
+ $sensor_data_array['alt'] = $uuid_bytes_read['alt'];
+ $sensor_data_array['speed'] = $uuid_bytes_read['speed'];
+ $sensor_data_array['bearing'] = $uuid_bytes_read['bearing'];
+ $sensor_data_array['acc'] = $uuid_bytes_read['acc'];
+ array_push($atom_structure['sensor_data']['data_type']['gps_data'], $sensor_data_array);
+ //array_push($debug_structure['debug_items'], $uuid_bytes_read['timestamp']);
+ break;
+ case 6:
+ $atom_structure['sensor_data']['data_type']['rotation_count']++;
+ $uuid_bytes_read = unpack('cmode/Jtimestamp/Grotx/Groty/Grotz/x*', $sensor_data_content);
+ $sensor_data_array['mode'] = $uuid_bytes_read['mode'];
+ $sensor_data_array['timestamp'] = $uuid_bytes_read['timestamp'];
+ $sensor_data_array['rotx'] = $uuid_bytes_read['rotx'];
+ $sensor_data_array['roty'] = $uuid_bytes_read['roty'];
+ $sensor_data_array['rotz'] = $uuid_bytes_read['rotz'];
+ array_push($atom_structure['sensor_data']['data_type']['rotation_data'], $sensor_data_array);
+ break;
+ default:
+ $atom_structure['sensor_data']['data_type']['unknown_count']++;
+ break;
+ }
+ }
+ //if (isset($debug_structure['debug_items']) && count($debug_structure['debug_items']) > 0) {
+ // $atom_structure['sensor_data']['data_type']['debug_list'] = implode(',', $debug_structure['debug_items']);
+ //} else {
+ $atom_structure['sensor_data']['data_type']['debug_list'] = 'No debug items in list!';
+ //}
+ break;
+
+ default:
+ $this->warning('Unhandled "uuid" atom identified by "'.$atom_structure['uuid_field_id'].'" at offset '.$atom_structure['offset'].' ('.strlen($atom_data).' bytes)');
+ }
+ break;
+
+ case 'gps ':
+ // https://dashcamtalk.com/forum/threads/script-to-extract-gps-data-from-novatek-mp4.20808/page-2#post-291730
+ // The 'gps ' contains simple look up table made up of 8byte rows, that point to the 'free' atoms that contains the actual GPS data.
+ // The first row is version/metadata/notsure, I skip that.
+ // The following rows consist of 4byte address (absolute) and 4byte size (0x1000), these point to the GPS data in the file.
+
+ $GPS_rowsize = 8; // 4 bytes for offset, 4 bytes for size
+ if (strlen($atom_data) > 0) {
+ if ((strlen($atom_data) % $GPS_rowsize) == 0) {
+ $atom_structure['gps_toc'] = array();
+ foreach (str_split($atom_data, $GPS_rowsize) as $counter => $datapair) {
+ $atom_structure['gps_toc'][] = unpack('Noffset/Nsize', substr($atom_data, $counter * $GPS_rowsize, $GPS_rowsize));
+ }
+
+ $atom_structure['gps_entries'] = array();
+ $previous_offset = $this->ftell();
+ foreach ($atom_structure['gps_toc'] as $key => $gps_pointer) {
+ if ($key == 0) {
+ // "The first row is version/metadata/notsure, I skip that."
+ continue;
+ }
+ $this->fseek($gps_pointer['offset']);
+ $GPS_free_data = $this->fread($gps_pointer['size']);
+
+ /*
+ // 2017-05-10: I see some of the data, notably the Hour-Minute-Second, but cannot reconcile the rest of the data. However, the NMEA "GPRMC" line is there and relatively easy to parse, so I'm using that instead
+
+ // https://dashcamtalk.com/forum/threads/script-to-extract-gps-data-from-novatek-mp4.20808/page-2#post-291730
+ // The structure of the GPS data atom (the 'free' atoms mentioned above) is following:
+ // hour,minute,second,year,month,day,active,latitude_b,longitude_b,unknown2,latitude,longitude,speed = struct.unpack_from('<IIIIIIssssfff',data, 48)
+ // For those unfamiliar with python struct:
+ // I = int
+ // s = is string (size 1, in this case)
+ // f = float
+
+ //$atom_structure['gps_entries'][$key] = unpack('Vhour/Vminute/Vsecond/Vyear/Vmonth/Vday/Vactive/Vlatitude_b/Vlongitude_b/Vunknown2/flatitude/flongitude/fspeed', substr($GPS_free_data, 48));
+ */
+
+ // $GPRMC,081836,A,3751.65,S,14507.36,E,000.0,360.0,130998,011.3,E*62
+ // $GPRMC,183731,A,3907.482,N,12102.436,W,000.0,360.0,080301,015.5,E*67
+ // $GPRMC,002454,A,3553.5295,N,13938.6570,E,0.0,43.1,180700,7.1,W,A*3F
+ // $GPRMC,094347.000,A,5342.0061,N,00737.9908,W,0.01,156.75,140217,,,A*7D
+ if (preg_match('#\\$GPRMC,([0-9\\.]*),([AV]),([0-9\\.]*),([NS]),([0-9\\.]*),([EW]),([0-9\\.]*),([0-9\\.]*),([0-9]*),([0-9\\.]*),([EW]?)(,[A])?(\\*[0-9A-F]{2})#', $GPS_free_data, $matches)) {
+ $GPS_this_GPRMC = array();
+ $GPS_this_GPRMC_raw = array();
+ list(
+ $GPS_this_GPRMC_raw['gprmc'],
+ $GPS_this_GPRMC_raw['timestamp'],
+ $GPS_this_GPRMC_raw['status'],
+ $GPS_this_GPRMC_raw['latitude'],
+ $GPS_this_GPRMC_raw['latitude_direction'],
+ $GPS_this_GPRMC_raw['longitude'],
+ $GPS_this_GPRMC_raw['longitude_direction'],
+ $GPS_this_GPRMC_raw['knots'],
+ $GPS_this_GPRMC_raw['angle'],
+ $GPS_this_GPRMC_raw['datestamp'],
+ $GPS_this_GPRMC_raw['variation'],
+ $GPS_this_GPRMC_raw['variation_direction'],
+ $dummy,
+ $GPS_this_GPRMC_raw['checksum'],
+ ) = $matches;
+ $GPS_this_GPRMC['raw'] = $GPS_this_GPRMC_raw;
+
+ $hour = substr($GPS_this_GPRMC['raw']['timestamp'], 0, 2);
+ $minute = substr($GPS_this_GPRMC['raw']['timestamp'], 2, 2);
+ $second = substr($GPS_this_GPRMC['raw']['timestamp'], 4, 2);
+ $ms = substr($GPS_this_GPRMC['raw']['timestamp'], 6); // may contain decimal seconds
+ $day = substr($GPS_this_GPRMC['raw']['datestamp'], 0, 2);
+ $month = substr($GPS_this_GPRMC['raw']['datestamp'], 2, 2);
+ $year = (int) substr($GPS_this_GPRMC['raw']['datestamp'], 4, 2);
+ $year += (($year > 90) ? 1900 : 2000); // complete lack of foresight: datestamps are stored with 2-digit years, take best guess
+ $GPS_this_GPRMC['timestamp'] = $year.'-'.$month.'-'.$day.' '.$hour.':'.$minute.':'.$second.$ms;
+
+ $GPS_this_GPRMC['active'] = ($GPS_this_GPRMC['raw']['status'] == 'A'); // A=Active,V=Void
+
+ foreach (array('latitude','longitude') as $latlon) {
+ preg_match('#^([0-9]{1,3})([0-9]{2}\\.[0-9]+)$#', $GPS_this_GPRMC['raw'][$latlon], $matches);
+ list($dummy, $deg, $min) = $matches;
+ $GPS_this_GPRMC[$latlon] = $deg + ($min / 60);
+ }
+ $GPS_this_GPRMC['latitude'] *= (($GPS_this_GPRMC['raw']['latitude_direction'] == 'S') ? -1 : 1);
+ $GPS_this_GPRMC['longitude'] *= (($GPS_this_GPRMC['raw']['longitude_direction'] == 'W') ? -1 : 1);
+
+ $GPS_this_GPRMC['heading'] = $GPS_this_GPRMC['raw']['angle'];
+ $GPS_this_GPRMC['speed_knot'] = $GPS_this_GPRMC['raw']['knots'];
+ $GPS_this_GPRMC['speed_kmh'] = $GPS_this_GPRMC['raw']['knots'] * 1.852;
+ if ($GPS_this_GPRMC['raw']['variation']) {
+ $GPS_this_GPRMC['variation'] = $GPS_this_GPRMC['raw']['variation'];
+ $GPS_this_GPRMC['variation'] *= (($GPS_this_GPRMC['raw']['variation_direction'] == 'W') ? -1 : 1);
+ }
+
+ $atom_structure['gps_entries'][$key] = $GPS_this_GPRMC;
+
+ @$info['quicktime']['gps_track'][$GPS_this_GPRMC['timestamp']] = array(
+ 'latitude' => (float) $GPS_this_GPRMC['latitude'],
+ 'longitude' => (float) $GPS_this_GPRMC['longitude'],
+ 'speed_kmh' => (float) $GPS_this_GPRMC['speed_kmh'],
+ 'heading' => (float) $GPS_this_GPRMC['heading'],
+ );
+
+ } else {
+ $this->warning('Unhandled GPS format in "free" atom at offset '.$gps_pointer['offset']);
+ }
+ }
+ $this->fseek($previous_offset);
+
+ } else {
+ $this->warning('QuickTime atom "'.$atomname.'" is not mod-8 bytes long ('.$atomsize.' bytes) at offset '.$baseoffset);
+ }
+ } else {
+ $this->warning('QuickTime atom "'.$atomname.'" is zero bytes long at offset '.$baseoffset);
+ }
+ break;
+
+ case 'loci':// 3GP location (El Loco)
+ $loffset = 0;
+ $info['quicktime']['comments']['gps_flags'] = array( getid3_lib::BigEndian2Int(substr($atom_data, 0, 4)));
+ $info['quicktime']['comments']['gps_lang'] = array( getid3_lib::BigEndian2Int(substr($atom_data, 4, 2)));
+ $info['quicktime']['comments']['gps_location'] = array( $this->LociString(substr($atom_data, 6), $loffset));
+ $loci_data = substr($atom_data, 6 + $loffset);
+ $info['quicktime']['comments']['gps_role'] = array( getid3_lib::BigEndian2Int(substr($loci_data, 0, 1)));
+ $info['quicktime']['comments']['gps_longitude'] = array(getid3_lib::FixedPoint16_16(substr($loci_data, 1, 4)));
+ $info['quicktime']['comments']['gps_latitude'] = array(getid3_lib::FixedPoint16_16(substr($loci_data, 5, 4)));
+ $info['quicktime']['comments']['gps_altitude'] = array(getid3_lib::FixedPoint16_16(substr($loci_data, 9, 4)));
+ $info['quicktime']['comments']['gps_body'] = array( $this->LociString(substr($loci_data, 13 ), $loffset));
+ $info['quicktime']['comments']['gps_notes'] = array( $this->LociString(substr($loci_data, 13 + $loffset), $loffset));
+ break;
+
+ case 'chpl': // CHaPter List
+ // https://www.adobe.com/content/dam/Adobe/en/devnet/flv/pdfs/video_file_format_spec_v10.pdf
+ $chpl_version = getid3_lib::BigEndian2Int(substr($atom_data, 4, 1)); // Expected to be 0
+ $chpl_flags = getid3_lib::BigEndian2Int(substr($atom_data, 5, 3)); // Reserved, set to 0
+ $chpl_count = getid3_lib::BigEndian2Int(substr($atom_data, 8, 1));
+ $chpl_offset = 9;
+ for ($i = 0; $i < $chpl_count; $i++) {
+ if (($chpl_offset + 9) >= strlen($atom_data)) {
+ $this->warning('QuickTime chapter '.$i.' extends beyond end of "chpl" atom');
+ break;
+ }
+ $info['quicktime']['chapters'][$i]['timestamp'] = getid3_lib::BigEndian2Int(substr($atom_data, $chpl_offset, 8)) / 10000000; // timestamps are stored as 100-nanosecond units
+ $chpl_offset += 8;
+ $chpl_title_size = getid3_lib::BigEndian2Int(substr($atom_data, $chpl_offset, 1));
+ $chpl_offset += 1;
+ $info['quicktime']['chapters'][$i]['title'] = substr($atom_data, $chpl_offset, $chpl_title_size);
+ $chpl_offset += $chpl_title_size;
+ }
+ break;
+
+ case 'FIRM': // FIRMware version(?), seen on GoPro Hero4
+ $info['quicktime']['camera']['firmware'] = $atom_data;
+ break;
+
+ case 'CAME': // FIRMware version(?), seen on GoPro Hero4
+ $info['quicktime']['camera']['serial_hash'] = unpack('H*', $atom_data);
+ break;
+
+ case 'dscp':
+ case 'rcif':
+ // https://www.getid3.org/phpBB3/viewtopic.php?t=1908
+ if (substr($atom_data, 0, 7) == "\x00\x00\x00\x00\x55\xC4".'{') {
+ if ($json_decoded = @json_decode(rtrim(substr($atom_data, 6), "\x00"), true)) {
+ $info['quicktime']['camera'][$atomname] = $json_decoded;
+ if (($atomname == 'rcif') && isset($info['quicktime']['camera']['rcif']['wxcamera']['rotate'])) {
+ $info['video']['rotate'] = $info['quicktime']['video']['rotate'] = $info['quicktime']['camera']['rcif']['wxcamera']['rotate'];
+ }
+ } else {
+ $this->warning('Failed to JSON decode atom "'.$atomname.'"');
+ $atom_structure['data'] = $atom_data;
+ }
+ unset($json_decoded);
+ } else {
+ $this->warning('Expecting 55 C4 7B at start of atom "'.$atomname.'", found '.getid3_lib::PrintHexBytes(substr($atom_data, 4, 3)).' instead');
+ $atom_structure['data'] = $atom_data;
+ }
+ break;
+
+ case 'frea':
+ // https://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Kodak.html#frea
+ // may contain "scra" (PreviewImage) and/or "thma" (ThumbnailImage)
+ $atom_structure['subatoms'] = $this->QuicktimeParseContainerAtom($atom_data, $baseoffset + 4, $atomHierarchy, $ParseAllPossibleAtoms);
+ break;
+ case 'tima': // subatom to "frea"
+ // no idea what this does, the one sample file I've seen has a value of 0x00000027
+ $atom_structure['data'] = $atom_data;
+ break;
+ case 'ver ': // subatom to "frea"
+ // some kind of version number, the one sample file I've seen has a value of "3.00.073"
+ $atom_structure['data'] = $atom_data;
+ break;
+ case 'thma': // subatom to "frea" -- "ThumbnailImage"
+ // https://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Kodak.html#frea
+ if (strlen($atom_data) > 0) {
+ $info['quicktime']['comments']['picture'][] = array('data'=>$atom_data, 'image_mime'=>'image/jpeg', 'description'=>'ThumbnailImage');
+ }
+ break;
+ case 'scra': // subatom to "frea" -- "PreviewImage"
+ // https://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Kodak.html#frea
+ // but the only sample file I've seen has no useful data here
+ if (strlen($atom_data) > 0) {
+ $info['quicktime']['comments']['picture'][] = array('data'=>$atom_data, 'image_mime'=>'image/jpeg', 'description'=>'PreviewImage');
+ }
+ break;
+
+ case 'cdsc': // timed metadata reference
+ // A QuickTime movie can contain none, one, or several timed metadata tracks. Timed metadata tracks can refer to multiple tracks.
+ // Metadata tracks are linked to the tracks they describe using a track-reference of type 'cdsc'. The metadata track holds the 'cdsc' track reference.
+ $atom_structure['track_number'] = getid3_lib::BigEndian2Int($atom_data);
+ break;
+
+ default:
+ $this->warning('Unknown QuickTime atom type: "'.preg_replace('#[^a-zA-Z0-9 _\\-]#', '?', $atomname).'" ('.trim(getid3_lib::PrintHexBytes($atomname)).'), '.$atomsize.' bytes at offset '.$baseoffset);
+ $atom_structure['data'] = $atom_data;
+ break;
+ }
}
array_pop($atomHierarchy);
- return $atomstructure;
+ return $atom_structure;
}
- function QuicktimeParseContainerAtom($atomdata, &$ThisFileInfo, $baseoffset, &$atomHierarchy, $ParseAllPossibleAtoms) {
- $atomstructure = false;
+ /**
+ * @param string $atom_data
+ * @param int $baseoffset
+ * @param array $atomHierarchy
+ * @param bool $ParseAllPossibleAtoms
+ *
+ * @return array|false
+ */
+ public function QuicktimeParseContainerAtom($atom_data, $baseoffset, &$atomHierarchy, $ParseAllPossibleAtoms) {
+ $atom_structure = false;
$subatomoffset = 0;
$subatomcounter = 0;
- if ((strlen($atomdata) == 4) && (getid3_lib::BigEndian2Int($atomdata) == 0x00000000)) {
+ if ((strlen($atom_data) == 4) && (getid3_lib::BigEndian2Int($atom_data) == 0x00000000)) {
return false;
}
- while ($subatomoffset < strlen($atomdata)) {
- $subatomsize = getid3_lib::BigEndian2Int(substr($atomdata, $subatomoffset + 0, 4));
- $subatomname = substr($atomdata, $subatomoffset + 4, 4);
- $subatomdata = substr($atomdata, $subatomoffset + 8, $subatomsize - 8);
+ while ($subatomoffset < strlen($atom_data)) {
+ $subatomsize = getid3_lib::BigEndian2Int(substr($atom_data, $subatomoffset + 0, 4));
+ $subatomname = substr($atom_data, $subatomoffset + 4, 4);
+ $subatomdata = substr($atom_data, $subatomoffset + 8, $subatomsize - 8);
if ($subatomsize == 0) {
// Furthermore, for historical reasons the list of atoms is optionally
// terminated by a 32-bit integer set to 0. If you are writing a program
// to read user data atoms, you should allow for the terminating 0.
- return $atomstructure;
+ if (strlen($atom_data) > 12) {
+ $subatomoffset += 4;
+ continue;
+ }
+ return $atom_structure;
}
-
- $atomstructure[$subatomcounter] = $this->QuicktimeParseAtom($subatomname, $subatomsize, $subatomdata, $ThisFileInfo, $baseoffset + $subatomoffset, $atomHierarchy, $ParseAllPossibleAtoms);
-
+ if (strlen($subatomdata) < ($subatomsize - 8)) {
+ // we don't have enough data to decode the subatom.
+ // this may be because we are refusing to parse large subatoms, or it may be because this atom had its size set too large
+ // so we passed in the start of a following atom incorrectly?
+ return $atom_structure;
+ }
+ $atom_structure[$subatomcounter++] = $this->QuicktimeParseAtom($subatomname, $subatomsize, $subatomdata, $baseoffset + $subatomoffset, $atomHierarchy, $ParseAllPossibleAtoms);
$subatomoffset += $subatomsize;
- $subatomcounter++;
}
- return $atomstructure;
+ return $atom_structure;
}
+ /**
+ * @param string $data
+ * @param int $offset
+ *
+ * @return int
+ */
+ public function quicktime_read_mp4_descr_length($data, &$offset) {
+ // http://libquicktime.sourcearchive.com/documentation/2:1.0.2plus-pdebian-2build1/esds_8c-source.html
+ $num_bytes = 0;
+ $length = 0;
+ do {
+ $b = ord(substr($data, $offset++, 1));
+ $length = ($length << 7) | ($b & 0x7F);
+ } while (($b & 0x80) && ($num_bytes++ < 4));
+ return $length;
+ }
- function QuicktimeLanguageLookup($languageid) {
+ /**
+ * @param int $languageid
+ *
+ * @return string
+ */
+ public function QuicktimeLanguageLookup($languageid) {
+ // http://developer.apple.com/library/mac/#documentation/QuickTime/QTFF/QTFFChap4/qtff4.html#//apple_ref/doc/uid/TP40000939-CH206-34353
static $QuicktimeLanguageLookup = array();
if (empty($QuicktimeLanguageLookup)) {
- $QuicktimeLanguageLookup[0] = 'English';
- $QuicktimeLanguageLookup[1] = 'French';
- $QuicktimeLanguageLookup[2] = 'German';
- $QuicktimeLanguageLookup[3] = 'Italian';
- $QuicktimeLanguageLookup[4] = 'Dutch';
- $QuicktimeLanguageLookup[5] = 'Swedish';
- $QuicktimeLanguageLookup[6] = 'Spanish';
- $QuicktimeLanguageLookup[7] = 'Danish';
- $QuicktimeLanguageLookup[8] = 'Portuguese';
- $QuicktimeLanguageLookup[9] = 'Norwegian';
- $QuicktimeLanguageLookup[10] = 'Hebrew';
- $QuicktimeLanguageLookup[11] = 'Japanese';
- $QuicktimeLanguageLookup[12] = 'Arabic';
- $QuicktimeLanguageLookup[13] = 'Finnish';
- $QuicktimeLanguageLookup[14] = 'Greek';
- $QuicktimeLanguageLookup[15] = 'Icelandic';
- $QuicktimeLanguageLookup[16] = 'Maltese';
- $QuicktimeLanguageLookup[17] = 'Turkish';
- $QuicktimeLanguageLookup[18] = 'Croatian';
- $QuicktimeLanguageLookup[19] = 'Chinese (Traditional)';
- $QuicktimeLanguageLookup[20] = 'Urdu';
- $QuicktimeLanguageLookup[21] = 'Hindi';
- $QuicktimeLanguageLookup[22] = 'Thai';
- $QuicktimeLanguageLookup[23] = 'Korean';
- $QuicktimeLanguageLookup[24] = 'Lithuanian';
- $QuicktimeLanguageLookup[25] = 'Polish';
- $QuicktimeLanguageLookup[26] = 'Hungarian';
- $QuicktimeLanguageLookup[27] = 'Estonian';
- $QuicktimeLanguageLookup[28] = 'Lettish';
- $QuicktimeLanguageLookup[28] = 'Latvian';
- $QuicktimeLanguageLookup[29] = 'Saamisk';
- $QuicktimeLanguageLookup[29] = 'Lappish';
- $QuicktimeLanguageLookup[30] = 'Faeroese';
- $QuicktimeLanguageLookup[31] = 'Farsi';
- $QuicktimeLanguageLookup[31] = 'Persian';
- $QuicktimeLanguageLookup[32] = 'Russian';
- $QuicktimeLanguageLookup[33] = 'Chinese (Simplified)';
- $QuicktimeLanguageLookup[34] = 'Flemish';
- $QuicktimeLanguageLookup[35] = 'Irish';
- $QuicktimeLanguageLookup[36] = 'Albanian';
- $QuicktimeLanguageLookup[37] = 'Romanian';
- $QuicktimeLanguageLookup[38] = 'Czech';
- $QuicktimeLanguageLookup[39] = 'Slovak';
- $QuicktimeLanguageLookup[40] = 'Slovenian';
- $QuicktimeLanguageLookup[41] = 'Yiddish';
- $QuicktimeLanguageLookup[42] = 'Serbian';
- $QuicktimeLanguageLookup[43] = 'Macedonian';
- $QuicktimeLanguageLookup[44] = 'Bulgarian';
- $QuicktimeLanguageLookup[45] = 'Ukrainian';
- $QuicktimeLanguageLookup[46] = 'Byelorussian';
- $QuicktimeLanguageLookup[47] = 'Uzbek';
- $QuicktimeLanguageLookup[48] = 'Kazakh';
- $QuicktimeLanguageLookup[49] = 'Azerbaijani';
- $QuicktimeLanguageLookup[50] = 'AzerbaijanAr';
- $QuicktimeLanguageLookup[51] = 'Armenian';
- $QuicktimeLanguageLookup[52] = 'Georgian';
- $QuicktimeLanguageLookup[53] = 'Moldavian';
- $QuicktimeLanguageLookup[54] = 'Kirghiz';
- $QuicktimeLanguageLookup[55] = 'Tajiki';
- $QuicktimeLanguageLookup[56] = 'Turkmen';
- $QuicktimeLanguageLookup[57] = 'Mongolian';
- $QuicktimeLanguageLookup[58] = 'MongolianCyr';
- $QuicktimeLanguageLookup[59] = 'Pashto';
- $QuicktimeLanguageLookup[60] = 'Kurdish';
- $QuicktimeLanguageLookup[61] = 'Kashmiri';
- $QuicktimeLanguageLookup[62] = 'Sindhi';
- $QuicktimeLanguageLookup[63] = 'Tibetan';
- $QuicktimeLanguageLookup[64] = 'Nepali';
- $QuicktimeLanguageLookup[65] = 'Sanskrit';
- $QuicktimeLanguageLookup[66] = 'Marathi';
- $QuicktimeLanguageLookup[67] = 'Bengali';
- $QuicktimeLanguageLookup[68] = 'Assamese';
- $QuicktimeLanguageLookup[69] = 'Gujarati';
- $QuicktimeLanguageLookup[70] = 'Punjabi';
- $QuicktimeLanguageLookup[71] = 'Oriya';
- $QuicktimeLanguageLookup[72] = 'Malayalam';
- $QuicktimeLanguageLookup[73] = 'Kannada';
- $QuicktimeLanguageLookup[74] = 'Tamil';
- $QuicktimeLanguageLookup[75] = 'Telugu';
- $QuicktimeLanguageLookup[76] = 'Sinhalese';
- $QuicktimeLanguageLookup[77] = 'Burmese';
- $QuicktimeLanguageLookup[78] = 'Khmer';
- $QuicktimeLanguageLookup[79] = 'Lao';
- $QuicktimeLanguageLookup[80] = 'Vietnamese';
- $QuicktimeLanguageLookup[81] = 'Indonesian';
- $QuicktimeLanguageLookup[82] = 'Tagalog';
- $QuicktimeLanguageLookup[83] = 'MalayRoman';
- $QuicktimeLanguageLookup[84] = 'MalayArabic';
- $QuicktimeLanguageLookup[85] = 'Amharic';
- $QuicktimeLanguageLookup[86] = 'Tigrinya';
- $QuicktimeLanguageLookup[87] = 'Galla';
- $QuicktimeLanguageLookup[87] = 'Oromo';
- $QuicktimeLanguageLookup[88] = 'Somali';
- $QuicktimeLanguageLookup[89] = 'Swahili';
- $QuicktimeLanguageLookup[90] = 'Ruanda';
- $QuicktimeLanguageLookup[91] = 'Rundi';
- $QuicktimeLanguageLookup[92] = 'Chewa';
- $QuicktimeLanguageLookup[93] = 'Malagasy';
- $QuicktimeLanguageLookup[94] = 'Esperanto';
- $QuicktimeLanguageLookup[128] = 'Welsh';
- $QuicktimeLanguageLookup[129] = 'Basque';
- $QuicktimeLanguageLookup[130] = 'Catalan';
- $QuicktimeLanguageLookup[131] = 'Latin';
- $QuicktimeLanguageLookup[132] = 'Quechua';
- $QuicktimeLanguageLookup[133] = 'Guarani';
- $QuicktimeLanguageLookup[134] = 'Aymara';
- $QuicktimeLanguageLookup[135] = 'Tatar';
- $QuicktimeLanguageLookup[136] = 'Uighur';
- $QuicktimeLanguageLookup[137] = 'Dzongkha';
- $QuicktimeLanguageLookup[138] = 'JavaneseRom';
+ $QuicktimeLanguageLookup[0] = 'English';
+ $QuicktimeLanguageLookup[1] = 'French';
+ $QuicktimeLanguageLookup[2] = 'German';
+ $QuicktimeLanguageLookup[3] = 'Italian';
+ $QuicktimeLanguageLookup[4] = 'Dutch';
+ $QuicktimeLanguageLookup[5] = 'Swedish';
+ $QuicktimeLanguageLookup[6] = 'Spanish';
+ $QuicktimeLanguageLookup[7] = 'Danish';
+ $QuicktimeLanguageLookup[8] = 'Portuguese';
+ $QuicktimeLanguageLookup[9] = 'Norwegian';
+ $QuicktimeLanguageLookup[10] = 'Hebrew';
+ $QuicktimeLanguageLookup[11] = 'Japanese';
+ $QuicktimeLanguageLookup[12] = 'Arabic';
+ $QuicktimeLanguageLookup[13] = 'Finnish';
+ $QuicktimeLanguageLookup[14] = 'Greek';
+ $QuicktimeLanguageLookup[15] = 'Icelandic';
+ $QuicktimeLanguageLookup[16] = 'Maltese';
+ $QuicktimeLanguageLookup[17] = 'Turkish';
+ $QuicktimeLanguageLookup[18] = 'Croatian';
+ $QuicktimeLanguageLookup[19] = 'Chinese (Traditional)';
+ $QuicktimeLanguageLookup[20] = 'Urdu';
+ $QuicktimeLanguageLookup[21] = 'Hindi';
+ $QuicktimeLanguageLookup[22] = 'Thai';
+ $QuicktimeLanguageLookup[23] = 'Korean';
+ $QuicktimeLanguageLookup[24] = 'Lithuanian';
+ $QuicktimeLanguageLookup[25] = 'Polish';
+ $QuicktimeLanguageLookup[26] = 'Hungarian';
+ $QuicktimeLanguageLookup[27] = 'Estonian';
+ $QuicktimeLanguageLookup[28] = 'Lettish';
+ $QuicktimeLanguageLookup[28] = 'Latvian';
+ $QuicktimeLanguageLookup[29] = 'Saamisk';
+ $QuicktimeLanguageLookup[29] = 'Lappish';
+ $QuicktimeLanguageLookup[30] = 'Faeroese';
+ $QuicktimeLanguageLookup[31] = 'Farsi';
+ $QuicktimeLanguageLookup[31] = 'Persian';
+ $QuicktimeLanguageLookup[32] = 'Russian';
+ $QuicktimeLanguageLookup[33] = 'Chinese (Simplified)';
+ $QuicktimeLanguageLookup[34] = 'Flemish';
+ $QuicktimeLanguageLookup[35] = 'Irish';
+ $QuicktimeLanguageLookup[36] = 'Albanian';
+ $QuicktimeLanguageLookup[37] = 'Romanian';
+ $QuicktimeLanguageLookup[38] = 'Czech';
+ $QuicktimeLanguageLookup[39] = 'Slovak';
+ $QuicktimeLanguageLookup[40] = 'Slovenian';
+ $QuicktimeLanguageLookup[41] = 'Yiddish';
+ $QuicktimeLanguageLookup[42] = 'Serbian';
+ $QuicktimeLanguageLookup[43] = 'Macedonian';
+ $QuicktimeLanguageLookup[44] = 'Bulgarian';
+ $QuicktimeLanguageLookup[45] = 'Ukrainian';
+ $QuicktimeLanguageLookup[46] = 'Byelorussian';
+ $QuicktimeLanguageLookup[47] = 'Uzbek';
+ $QuicktimeLanguageLookup[48] = 'Kazakh';
+ $QuicktimeLanguageLookup[49] = 'Azerbaijani';
+ $QuicktimeLanguageLookup[50] = 'AzerbaijanAr';
+ $QuicktimeLanguageLookup[51] = 'Armenian';
+ $QuicktimeLanguageLookup[52] = 'Georgian';
+ $QuicktimeLanguageLookup[53] = 'Moldavian';
+ $QuicktimeLanguageLookup[54] = 'Kirghiz';
+ $QuicktimeLanguageLookup[55] = 'Tajiki';
+ $QuicktimeLanguageLookup[56] = 'Turkmen';
+ $QuicktimeLanguageLookup[57] = 'Mongolian';
+ $QuicktimeLanguageLookup[58] = 'MongolianCyr';
+ $QuicktimeLanguageLookup[59] = 'Pashto';
+ $QuicktimeLanguageLookup[60] = 'Kurdish';
+ $QuicktimeLanguageLookup[61] = 'Kashmiri';
+ $QuicktimeLanguageLookup[62] = 'Sindhi';
+ $QuicktimeLanguageLookup[63] = 'Tibetan';
+ $QuicktimeLanguageLookup[64] = 'Nepali';
+ $QuicktimeLanguageLookup[65] = 'Sanskrit';
+ $QuicktimeLanguageLookup[66] = 'Marathi';
+ $QuicktimeLanguageLookup[67] = 'Bengali';
+ $QuicktimeLanguageLookup[68] = 'Assamese';
+ $QuicktimeLanguageLookup[69] = 'Gujarati';
+ $QuicktimeLanguageLookup[70] = 'Punjabi';
+ $QuicktimeLanguageLookup[71] = 'Oriya';
+ $QuicktimeLanguageLookup[72] = 'Malayalam';
+ $QuicktimeLanguageLookup[73] = 'Kannada';
+ $QuicktimeLanguageLookup[74] = 'Tamil';
+ $QuicktimeLanguageLookup[75] = 'Telugu';
+ $QuicktimeLanguageLookup[76] = 'Sinhalese';
+ $QuicktimeLanguageLookup[77] = 'Burmese';
+ $QuicktimeLanguageLookup[78] = 'Khmer';
+ $QuicktimeLanguageLookup[79] = 'Lao';
+ $QuicktimeLanguageLookup[80] = 'Vietnamese';
+ $QuicktimeLanguageLookup[81] = 'Indonesian';
+ $QuicktimeLanguageLookup[82] = 'Tagalog';
+ $QuicktimeLanguageLookup[83] = 'MalayRoman';
+ $QuicktimeLanguageLookup[84] = 'MalayArabic';
+ $QuicktimeLanguageLookup[85] = 'Amharic';
+ $QuicktimeLanguageLookup[86] = 'Tigrinya';
+ $QuicktimeLanguageLookup[87] = 'Galla';
+ $QuicktimeLanguageLookup[87] = 'Oromo';
+ $QuicktimeLanguageLookup[88] = 'Somali';
+ $QuicktimeLanguageLookup[89] = 'Swahili';
+ $QuicktimeLanguageLookup[90] = 'Ruanda';
+ $QuicktimeLanguageLookup[91] = 'Rundi';
+ $QuicktimeLanguageLookup[92] = 'Chewa';
+ $QuicktimeLanguageLookup[93] = 'Malagasy';
+ $QuicktimeLanguageLookup[94] = 'Esperanto';
+ $QuicktimeLanguageLookup[128] = 'Welsh';
+ $QuicktimeLanguageLookup[129] = 'Basque';
+ $QuicktimeLanguageLookup[130] = 'Catalan';
+ $QuicktimeLanguageLookup[131] = 'Latin';
+ $QuicktimeLanguageLookup[132] = 'Quechua';
+ $QuicktimeLanguageLookup[133] = 'Guarani';
+ $QuicktimeLanguageLookup[134] = 'Aymara';
+ $QuicktimeLanguageLookup[135] = 'Tatar';
+ $QuicktimeLanguageLookup[136] = 'Uighur';
+ $QuicktimeLanguageLookup[137] = 'Dzongkha';
+ $QuicktimeLanguageLookup[138] = 'JavaneseRom';
+ $QuicktimeLanguageLookup[32767] = 'Unspecified';
}
+ if (($languageid > 138) && ($languageid < 32767)) {
+ /*
+ ISO Language Codes - http://www.loc.gov/standards/iso639-2/php/code_list.php
+ Because the language codes specified by ISO 639-2/T are three characters long, they must be packed to fit into a 16-bit field.
+ The packing algorithm must map each of the three characters, which are always lowercase, into a 5-bit integer and then concatenate
+ these integers into the least significant 15 bits of a 16-bit integer, leaving the 16-bit integer's most significant bit set to zero.
+
+ One algorithm for performing this packing is to treat each ISO character as a 16-bit integer. Subtract 0x60 from the first character
+ and multiply by 2^10 (0x400), subtract 0x60 from the second character and multiply by 2^5 (0x20), subtract 0x60 from the third character,
+ and add the three 16-bit values. This will result in a single 16-bit value with the three codes correctly packed into the 15 least
+ significant bits and the most significant bit set to zero.
+ */
+ $iso_language_id = '';
+ $iso_language_id .= chr((($languageid & 0x7C00) >> 10) + 0x60);
+ $iso_language_id .= chr((($languageid & 0x03E0) >> 5) + 0x60);
+ $iso_language_id .= chr((($languageid & 0x001F) >> 0) + 0x60);
+ $QuicktimeLanguageLookup[$languageid] = getid3_id3v2::LanguageLookup($iso_language_id);
+ }
return (isset($QuicktimeLanguageLookup[$languageid]) ? $QuicktimeLanguageLookup[$languageid] : 'invalid');
}
- function QuicktimeVideoCodecLookup($codecid) {
+ /**
+ * @param string $codecid
+ *
+ * @return string
+ */
+ public function QuicktimeVideoCodecLookup($codecid) {
static $QuicktimeVideoCodecLookup = array();
if (empty($QuicktimeVideoCodecLookup)) {
- $QuicktimeVideoCodecLookup['3IVX'] = '3ivx MPEG-4';
+ $QuicktimeVideoCodecLookup['.SGI'] = 'SGI';
$QuicktimeVideoCodecLookup['3IV1'] = '3ivx MPEG-4 v1';
$QuicktimeVideoCodecLookup['3IV2'] = '3ivx MPEG-4 v2';
+ $QuicktimeVideoCodecLookup['3IVX'] = '3ivx MPEG-4';
+ $QuicktimeVideoCodecLookup['8BPS'] = 'Planar RGB';
+ $QuicktimeVideoCodecLookup['avc1'] = 'H.264/MPEG-4 AVC';
$QuicktimeVideoCodecLookup['avr '] = 'AVR-JPEG';
+ $QuicktimeVideoCodecLookup['b16g'] = '16Gray';
+ $QuicktimeVideoCodecLookup['b32a'] = '32AlphaGray';
+ $QuicktimeVideoCodecLookup['b48r'] = '48RGB';
+ $QuicktimeVideoCodecLookup['b64a'] = '64ARGB';
$QuicktimeVideoCodecLookup['base'] = 'Base';
- $QuicktimeVideoCodecLookup['WRLE'] = 'BMP';
- $QuicktimeVideoCodecLookup['cvid'] = 'Cinepak';
$QuicktimeVideoCodecLookup['clou'] = 'Cloud';
$QuicktimeVideoCodecLookup['cmyk'] = 'CMYK';
- $QuicktimeVideoCodecLookup['yuv2'] = 'ComponentVideo';
- $QuicktimeVideoCodecLookup['yuvu'] = 'ComponentVideoSigned';
- $QuicktimeVideoCodecLookup['yuvs'] = 'ComponentVideoUnsigned';
+ $QuicktimeVideoCodecLookup['cvid'] = 'Cinepak';
+ $QuicktimeVideoCodecLookup['dmb1'] = 'OpenDML JPEG';
$QuicktimeVideoCodecLookup['dvc '] = 'DVC-NTSC';
$QuicktimeVideoCodecLookup['dvcp'] = 'DVC-PAL';
$QuicktimeVideoCodecLookup['dvpn'] = 'DVCPro-NTSC';
@@ -1126,44 +2259,46 @@
$QuicktimeVideoCodecLookup['dvpp'] = 'DVCPro-PAL';
$QuicktimeVideoCodecLookup['fire'] = 'Fire';
$QuicktimeVideoCodecLookup['flic'] = 'FLC';
- $QuicktimeVideoCodecLookup['b48r'] = '48RGB';
$QuicktimeVideoCodecLookup['gif '] = 'GIF';
- $QuicktimeVideoCodecLookup['smc '] = 'Graphics';
$QuicktimeVideoCodecLookup['h261'] = 'H261';
$QuicktimeVideoCodecLookup['h263'] = 'H263';
$QuicktimeVideoCodecLookup['IV41'] = 'Indeo4';
$QuicktimeVideoCodecLookup['jpeg'] = 'JPEG';
- $QuicktimeVideoCodecLookup['PNTG'] = 'MacPaint';
- $QuicktimeVideoCodecLookup['msvc'] = 'Microsoft Video1';
+ $QuicktimeVideoCodecLookup['kpcd'] = 'PhotoCD';
$QuicktimeVideoCodecLookup['mjpa'] = 'Motion JPEG-A';
$QuicktimeVideoCodecLookup['mjpb'] = 'Motion JPEG-B';
+ $QuicktimeVideoCodecLookup['msvc'] = 'Microsoft Video1';
$QuicktimeVideoCodecLookup['myuv'] = 'MPEG YUV420';
- $QuicktimeVideoCodecLookup['dmb1'] = 'OpenDML JPEG';
- $QuicktimeVideoCodecLookup['kpcd'] = 'PhotoCD';
- $QuicktimeVideoCodecLookup['8BPS'] = 'Planar RGB';
+ $QuicktimeVideoCodecLookup['path'] = 'Vector';
$QuicktimeVideoCodecLookup['png '] = 'PNG';
+ $QuicktimeVideoCodecLookup['PNTG'] = 'MacPaint';
+ $QuicktimeVideoCodecLookup['qdgx'] = 'QuickDrawGX';
$QuicktimeVideoCodecLookup['qdrw'] = 'QuickDraw';
- $QuicktimeVideoCodecLookup['qdgx'] = 'QuickDrawGX';
$QuicktimeVideoCodecLookup['raw '] = 'RAW';
- $QuicktimeVideoCodecLookup['.SGI'] = 'SGI';
- $QuicktimeVideoCodecLookup['b16g'] = '16Gray';
- $QuicktimeVideoCodecLookup['b64a'] = '64ARGB';
+ $QuicktimeVideoCodecLookup['ripl'] = 'WaterRipple';
+ $QuicktimeVideoCodecLookup['rpza'] = 'Video';
+ $QuicktimeVideoCodecLookup['smc '] = 'Graphics';
$QuicktimeVideoCodecLookup['SVQ1'] = 'Sorenson Video 1';
$QuicktimeVideoCodecLookup['SVQ1'] = 'Sorenson Video 3';
$QuicktimeVideoCodecLookup['syv9'] = 'Sorenson YUV9';
$QuicktimeVideoCodecLookup['tga '] = 'Targa';
- $QuicktimeVideoCodecLookup['b32a'] = '32AlphaGray';
$QuicktimeVideoCodecLookup['tiff'] = 'TIFF';
- $QuicktimeVideoCodecLookup['path'] = 'Vector';
- $QuicktimeVideoCodecLookup['rpza'] = 'Video';
- $QuicktimeVideoCodecLookup['ripl'] = 'WaterRipple';
$QuicktimeVideoCodecLookup['WRAW'] = 'Windows RAW';
+ $QuicktimeVideoCodecLookup['WRLE'] = 'BMP';
$QuicktimeVideoCodecLookup['y420'] = 'YUV420';
+ $QuicktimeVideoCodecLookup['yuv2'] = 'ComponentVideo';
+ $QuicktimeVideoCodecLookup['yuvs'] = 'ComponentVideoUnsigned';
+ $QuicktimeVideoCodecLookup['yuvu'] = 'ComponentVideoSigned';
}
return (isset($QuicktimeVideoCodecLookup[$codecid]) ? $QuicktimeVideoCodecLookup[$codecid] : '');
}
- function QuicktimeAudioCodecLookup($codecid) {
+ /**
+ * @param string $codecid
+ *
+ * @return mixed|string
+ */
+ public function QuicktimeAudioCodecLookup($codecid) {
static $QuicktimeAudioCodecLookup = array();
if (empty($QuicktimeAudioCodecLookup)) {
$QuicktimeAudioCodecLookup['.mp3'] = 'Fraunhofer MPEG Layer-III alias';
@@ -1208,7 +2343,12 @@
return (isset($QuicktimeAudioCodecLookup[$codecid]) ? $QuicktimeAudioCodecLookup[$codecid] : '');
}
- function QuicktimeDCOMLookup($compressionid) {
+ /**
+ * @param string $compressionid
+ *
+ * @return string
+ */
+ public function QuicktimeDCOMLookup($compressionid) {
static $QuicktimeDCOMLookup = array();
if (empty($QuicktimeDCOMLookup)) {
$QuicktimeDCOMLookup['zlib'] = 'ZLib Deflate';
@@ -1217,7 +2357,12 @@
return (isset($QuicktimeDCOMLookup[$compressionid]) ? $QuicktimeDCOMLookup[$compressionid] : '');
}
- function QuicktimeColorNameLookup($colordepthid) {
+ /**
+ * @param int $colordepthid
+ *
+ * @return string
+ */
+ public function QuicktimeColorNameLookup($colordepthid) {
static $QuicktimeColorNameLookup = array();
if (empty($QuicktimeColorNameLookup)) {
$QuicktimeColorNameLookup[1] = '2-color (monochrome)';
@@ -1235,56 +2380,591 @@
return (isset($QuicktimeColorNameLookup[$colordepthid]) ? $QuicktimeColorNameLookup[$colordepthid] : 'invalid');
}
- function CopyToAppropriateCommentsSection($keyname, $data, &$ThisFileInfo) {
+ /**
+ * @param int $stik
+ *
+ * @return string
+ */
+ public function QuicktimeSTIKLookup($stik) {
+ static $QuicktimeSTIKLookup = array();
+ if (empty($QuicktimeSTIKLookup)) {
+ $QuicktimeSTIKLookup[0] = 'Movie';
+ $QuicktimeSTIKLookup[1] = 'Normal';
+ $QuicktimeSTIKLookup[2] = 'Audiobook';
+ $QuicktimeSTIKLookup[5] = 'Whacked Bookmark';
+ $QuicktimeSTIKLookup[6] = 'Music Video';
+ $QuicktimeSTIKLookup[9] = 'Short Film';
+ $QuicktimeSTIKLookup[10] = 'TV Show';
+ $QuicktimeSTIKLookup[11] = 'Booklet';
+ $QuicktimeSTIKLookup[14] = 'Ringtone';
+ $QuicktimeSTIKLookup[21] = 'Podcast';
+ }
+ return (isset($QuicktimeSTIKLookup[$stik]) ? $QuicktimeSTIKLookup[$stik] : 'invalid');
+ }
+
+ /**
+ * @param int $audio_profile_id
+ *
+ * @return string
+ */
+ public function QuicktimeIODSaudioProfileName($audio_profile_id) {
+ static $QuicktimeIODSaudioProfileNameLookup = array();
+ if (empty($QuicktimeIODSaudioProfileNameLookup)) {
+ $QuicktimeIODSaudioProfileNameLookup = array(
+ 0x00 => 'ISO Reserved (0x00)',
+ 0x01 => 'Main Audio Profile @ Level 1',
+ 0x02 => 'Main Audio Profile @ Level 2',
+ 0x03 => 'Main Audio Profile @ Level 3',
+ 0x04 => 'Main Audio Profile @ Level 4',
+ 0x05 => 'Scalable Audio Profile @ Level 1',
+ 0x06 => 'Scalable Audio Profile @ Level 2',
+ 0x07 => 'Scalable Audio Profile @ Level 3',
+ 0x08 => 'Scalable Audio Profile @ Level 4',
+ 0x09 => 'Speech Audio Profile @ Level 1',
+ 0x0A => 'Speech Audio Profile @ Level 2',
+ 0x0B => 'Synthetic Audio Profile @ Level 1',
+ 0x0C => 'Synthetic Audio Profile @ Level 2',
+ 0x0D => 'Synthetic Audio Profile @ Level 3',
+ 0x0E => 'High Quality Audio Profile @ Level 1',
+ 0x0F => 'High Quality Audio Profile @ Level 2',
+ 0x10 => 'High Quality Audio Profile @ Level 3',
+ 0x11 => 'High Quality Audio Profile @ Level 4',
+ 0x12 => 'High Quality Audio Profile @ Level 5',
+ 0x13 => 'High Quality Audio Profile @ Level 6',
+ 0x14 => 'High Quality Audio Profile @ Level 7',
+ 0x15 => 'High Quality Audio Profile @ Level 8',
+ 0x16 => 'Low Delay Audio Profile @ Level 1',
+ 0x17 => 'Low Delay Audio Profile @ Level 2',
+ 0x18 => 'Low Delay Audio Profile @ Level 3',
+ 0x19 => 'Low Delay Audio Profile @ Level 4',
+ 0x1A => 'Low Delay Audio Profile @ Level 5',
+ 0x1B => 'Low Delay Audio Profile @ Level 6',
+ 0x1C => 'Low Delay Audio Profile @ Level 7',
+ 0x1D => 'Low Delay Audio Profile @ Level 8',
+ 0x1E => 'Natural Audio Profile @ Level 1',
+ 0x1F => 'Natural Audio Profile @ Level 2',
+ 0x20 => 'Natural Audio Profile @ Level 3',
+ 0x21 => 'Natural Audio Profile @ Level 4',
+ 0x22 => 'Mobile Audio Internetworking Profile @ Level 1',
+ 0x23 => 'Mobile Audio Internetworking Profile @ Level 2',
+ 0x24 => 'Mobile Audio Internetworking Profile @ Level 3',
+ 0x25 => 'Mobile Audio Internetworking Profile @ Level 4',
+ 0x26 => 'Mobile Audio Internetworking Profile @ Level 5',
+ 0x27 => 'Mobile Audio Internetworking Profile @ Level 6',
+ 0x28 => 'AAC Profile @ Level 1',
+ 0x29 => 'AAC Profile @ Level 2',
+ 0x2A => 'AAC Profile @ Level 4',
+ 0x2B => 'AAC Profile @ Level 5',
+ 0x2C => 'High Efficiency AAC Profile @ Level 2',
+ 0x2D => 'High Efficiency AAC Profile @ Level 3',
+ 0x2E => 'High Efficiency AAC Profile @ Level 4',
+ 0x2F => 'High Efficiency AAC Profile @ Level 5',
+ 0xFE => 'Not part of MPEG-4 audio profiles',
+ 0xFF => 'No audio capability required',
+ );
+ }
+ return (isset($QuicktimeIODSaudioProfileNameLookup[$audio_profile_id]) ? $QuicktimeIODSaudioProfileNameLookup[$audio_profile_id] : 'ISO Reserved / User Private');
+ }
+
+ /**
+ * @param int $video_profile_id
+ *
+ * @return string
+ */
+ public function QuicktimeIODSvideoProfileName($video_profile_id) {
+ static $QuicktimeIODSvideoProfileNameLookup = array();
+ if (empty($QuicktimeIODSvideoProfileNameLookup)) {
+ $QuicktimeIODSvideoProfileNameLookup = array(
+ 0x00 => 'Reserved (0x00) Profile',
+ 0x01 => 'Simple Profile @ Level 1',
+ 0x02 => 'Simple Profile @ Level 2',
+ 0x03 => 'Simple Profile @ Level 3',
+ 0x08 => 'Simple Profile @ Level 0',
+ 0x10 => 'Simple Scalable Profile @ Level 0',
+ 0x11 => 'Simple Scalable Profile @ Level 1',
+ 0x12 => 'Simple Scalable Profile @ Level 2',
+ 0x15 => 'AVC/H264 Profile',
+ 0x21 => 'Core Profile @ Level 1',
+ 0x22 => 'Core Profile @ Level 2',
+ 0x32 => 'Main Profile @ Level 2',
+ 0x33 => 'Main Profile @ Level 3',
+ 0x34 => 'Main Profile @ Level 4',
+ 0x42 => 'N-bit Profile @ Level 2',
+ 0x51 => 'Scalable Texture Profile @ Level 1',
+ 0x61 => 'Simple Face Animation Profile @ Level 1',
+ 0x62 => 'Simple Face Animation Profile @ Level 2',
+ 0x63 => 'Simple FBA Profile @ Level 1',
+ 0x64 => 'Simple FBA Profile @ Level 2',
+ 0x71 => 'Basic Animated Texture Profile @ Level 1',
+ 0x72 => 'Basic Animated Texture Profile @ Level 2',
+ 0x81 => 'Hybrid Profile @ Level 1',
+ 0x82 => 'Hybrid Profile @ Level 2',
+ 0x91 => 'Advanced Real Time Simple Profile @ Level 1',
+ 0x92 => 'Advanced Real Time Simple Profile @ Level 2',
+ 0x93 => 'Advanced Real Time Simple Profile @ Level 3',
+ 0x94 => 'Advanced Real Time Simple Profile @ Level 4',
+ 0xA1 => 'Core Scalable Profile @ Level1',
+ 0xA2 => 'Core Scalable Profile @ Level2',
+ 0xA3 => 'Core Scalable Profile @ Level3',
+ 0xB1 => 'Advanced Coding Efficiency Profile @ Level 1',
+ 0xB2 => 'Advanced Coding Efficiency Profile @ Level 2',
+ 0xB3 => 'Advanced Coding Efficiency Profile @ Level 3',
+ 0xB4 => 'Advanced Coding Efficiency Profile @ Level 4',
+ 0xC1 => 'Advanced Core Profile @ Level 1',
+ 0xC2 => 'Advanced Core Profile @ Level 2',
+ 0xD1 => 'Advanced Scalable Texture @ Level1',
+ 0xD2 => 'Advanced Scalable Texture @ Level2',
+ 0xE1 => 'Simple Studio Profile @ Level 1',
+ 0xE2 => 'Simple Studio Profile @ Level 2',
+ 0xE3 => 'Simple Studio Profile @ Level 3',
+ 0xE4 => 'Simple Studio Profile @ Level 4',
+ 0xE5 => 'Core Studio Profile @ Level 1',
+ 0xE6 => 'Core Studio Profile @ Level 2',
+ 0xE7 => 'Core Studio Profile @ Level 3',
+ 0xE8 => 'Core Studio Profile @ Level 4',
+ 0xF0 => 'Advanced Simple Profile @ Level 0',
+ 0xF1 => 'Advanced Simple Profile @ Level 1',
+ 0xF2 => 'Advanced Simple Profile @ Level 2',
+ 0xF3 => 'Advanced Simple Profile @ Level 3',
+ 0xF4 => 'Advanced Simple Profile @ Level 4',
+ 0xF5 => 'Advanced Simple Profile @ Level 5',
+ 0xF7 => 'Advanced Simple Profile @ Level 3b',
+ 0xF8 => 'Fine Granularity Scalable Profile @ Level 0',
+ 0xF9 => 'Fine Granularity Scalable Profile @ Level 1',
+ 0xFA => 'Fine Granularity Scalable Profile @ Level 2',
+ 0xFB => 'Fine Granularity Scalable Profile @ Level 3',
+ 0xFC => 'Fine Granularity Scalable Profile @ Level 4',
+ 0xFD => 'Fine Granularity Scalable Profile @ Level 5',
+ 0xFE => 'Not part of MPEG-4 Visual profiles',
+ 0xFF => 'No visual capability required',
+ );
+ }
+ return (isset($QuicktimeIODSvideoProfileNameLookup[$video_profile_id]) ? $QuicktimeIODSvideoProfileNameLookup[$video_profile_id] : 'ISO Reserved Profile');
+ }
+
+ /**
+ * @param int $rtng
+ *
+ * @return string
+ */
+ public function QuicktimeContentRatingLookup($rtng) {
+ static $QuicktimeContentRatingLookup = array();
+ if (empty($QuicktimeContentRatingLookup)) {
+ $QuicktimeContentRatingLookup[0] = 'None';
+ $QuicktimeContentRatingLookup[2] = 'Clean';
+ $QuicktimeContentRatingLookup[4] = 'Explicit';
+ }
+ return (isset($QuicktimeContentRatingLookup[$rtng]) ? $QuicktimeContentRatingLookup[$rtng] : 'invalid');
+ }
+
+ /**
+ * @param int $akid
+ *
+ * @return string
+ */
+ public function QuicktimeStoreAccountTypeLookup($akid) {
+ static $QuicktimeStoreAccountTypeLookup = array();
+ if (empty($QuicktimeStoreAccountTypeLookup)) {
+ $QuicktimeStoreAccountTypeLookup[0] = 'iTunes';
+ $QuicktimeStoreAccountTypeLookup[1] = 'AOL';
+ }
+ return (isset($QuicktimeStoreAccountTypeLookup[$akid]) ? $QuicktimeStoreAccountTypeLookup[$akid] : 'invalid');
+ }
+
+ /**
+ * @param int $sfid
+ *
+ * @return string
+ */
+ public function QuicktimeStoreFrontCodeLookup($sfid) {
+ static $QuicktimeStoreFrontCodeLookup = array();
+ if (empty($QuicktimeStoreFrontCodeLookup)) {
+ $QuicktimeStoreFrontCodeLookup[143460] = 'Australia';
+ $QuicktimeStoreFrontCodeLookup[143445] = 'Austria';
+ $QuicktimeStoreFrontCodeLookup[143446] = 'Belgium';
+ $QuicktimeStoreFrontCodeLookup[143455] = 'Canada';
+ $QuicktimeStoreFrontCodeLookup[143458] = 'Denmark';
+ $QuicktimeStoreFrontCodeLookup[143447] = 'Finland';
+ $QuicktimeStoreFrontCodeLookup[143442] = 'France';
+ $QuicktimeStoreFrontCodeLookup[143443] = 'Germany';
+ $QuicktimeStoreFrontCodeLookup[143448] = 'Greece';
+ $QuicktimeStoreFrontCodeLookup[143449] = 'Ireland';
+ $QuicktimeStoreFrontCodeLookup[143450] = 'Italy';
+ $QuicktimeStoreFrontCodeLookup[143462] = 'Japan';
+ $QuicktimeStoreFrontCodeLookup[143451] = 'Luxembourg';
+ $QuicktimeStoreFrontCodeLookup[143452] = 'Netherlands';
+ $QuicktimeStoreFrontCodeLookup[143461] = 'New Zealand';
+ $QuicktimeStoreFrontCodeLookup[143457] = 'Norway';
+ $QuicktimeStoreFrontCodeLookup[143453] = 'Portugal';
+ $QuicktimeStoreFrontCodeLookup[143454] = 'Spain';
+ $QuicktimeStoreFrontCodeLookup[143456] = 'Sweden';
+ $QuicktimeStoreFrontCodeLookup[143459] = 'Switzerland';
+ $QuicktimeStoreFrontCodeLookup[143444] = 'United Kingdom';
+ $QuicktimeStoreFrontCodeLookup[143441] = 'United States';
+ }
+ return (isset($QuicktimeStoreFrontCodeLookup[$sfid]) ? $QuicktimeStoreFrontCodeLookup[$sfid] : 'invalid');
+ }
+
+ /**
+ * @param string $atom_data
+ *
+ * @return array
+ */
+ public function QuicktimeParseNikonNCTG($atom_data) {
+ // http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html#NCTG
+ // Nikon-specific QuickTime tags found in the NCDT atom of MOV videos from some Nikon cameras such as the Coolpix S8000 and D5100
+ // Data is stored as records of:
+ // * 4 bytes record type
+ // * 2 bytes size of data field type:
+ // 0x0001 = flag (size field *= 1-byte)
+ // 0x0002 = char (size field *= 1-byte)
+ // 0x0003 = DWORD+ (size field *= 2-byte), values are stored CDAB
+ // 0x0004 = QWORD+ (size field *= 4-byte), values are stored EFGHABCD
+ // 0x0005 = float (size field *= 8-byte), values are stored aaaabbbb where value is aaaa/bbbb; possibly multiple sets of values appended together
+ // 0x0007 = bytes (size field *= 1-byte), values are stored as ??????
+ // 0x0008 = ????? (size field *= 2-byte), values are stored as ??????
+ // * 2 bytes data size field
+ // * ? bytes data (string data may be null-padded; datestamp fields are in the format "2011:05:25 20:24:15")
+ // all integers are stored BigEndian
+
+ $NCTGtagName = array(
+ 0x00000001 => 'Make',
+ 0x00000002 => 'Model',
+ 0x00000003 => 'Software',
+ 0x00000011 => 'CreateDate',
+ 0x00000012 => 'DateTimeOriginal',
+ 0x00000013 => 'FrameCount',
+ 0x00000016 => 'FrameRate',
+ 0x00000022 => 'FrameWidth',
+ 0x00000023 => 'FrameHeight',
+ 0x00000032 => 'AudioChannels',
+ 0x00000033 => 'AudioBitsPerSample',
+ 0x00000034 => 'AudioSampleRate',
+ 0x02000001 => 'MakerNoteVersion',
+ 0x02000005 => 'WhiteBalance',
+ 0x0200000b => 'WhiteBalanceFineTune',
+ 0x0200001e => 'ColorSpace',
+ 0x02000023 => 'PictureControlData',
+ 0x02000024 => 'WorldTime',
+ 0x02000032 => 'UnknownInfo',
+ 0x02000083 => 'LensType',
+ 0x02000084 => 'Lens',
+ );
+
+ $offset = 0;
+ $data = null;
+ $datalength = strlen($atom_data);
+ $parsed = array();
+ while ($offset < $datalength) {
+ $record_type = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 4)); $offset += 4;
+ $data_size_type = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 2)); $offset += 2;
+ $data_size = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 2)); $offset += 2;
+ switch ($data_size_type) {
+ case 0x0001: // 0x0001 = flag (size field *= 1-byte)
+ $data = getid3_lib::BigEndian2Int(substr($atom_data, $offset, $data_size * 1));
+ $offset += ($data_size * 1);
+ break;
+ case 0x0002: // 0x0002 = char (size field *= 1-byte)
+ $data = substr($atom_data, $offset, $data_size * 1);
+ $offset += ($data_size * 1);
+ $data = rtrim($data, "\x00");
+ break;
+ case 0x0003: // 0x0003 = DWORD+ (size field *= 2-byte), values are stored CDAB
+ $data = '';
+ for ($i = $data_size - 1; $i >= 0; $i--) {
+ $data .= substr($atom_data, $offset + ($i * 2), 2);
+ }
+ $data = getid3_lib::BigEndian2Int($data);
+ $offset += ($data_size * 2);
+ break;
+ case 0x0004: // 0x0004 = QWORD+ (size field *= 4-byte), values are stored EFGHABCD
+ $data = '';
+ for ($i = $data_size - 1; $i >= 0; $i--) {
+ $data .= substr($atom_data, $offset + ($i * 4), 4);
+ }
+ $data = getid3_lib::BigEndian2Int($data);
+ $offset += ($data_size * 4);
+ break;
+ case 0x0005: // 0x0005 = float (size field *= 8-byte), values are stored aaaabbbb where value is aaaa/bbbb; possibly multiple sets of values appended together
+ $data = array();
+ for ($i = 0; $i < $data_size; $i++) {
+ $numerator = getid3_lib::BigEndian2Int(substr($atom_data, $offset + ($i * 8) + 0, 4));
+ $denomninator = getid3_lib::BigEndian2Int(substr($atom_data, $offset + ($i * 8) + 4, 4));
+ if ($denomninator == 0) {
+ $data[$i] = false;
+ } else {
+ $data[$i] = (double) $numerator / $denomninator;
+ }
+ }
+ $offset += (8 * $data_size);
+ if (count($data) == 1) {
+ $data = $data[0];
+ }
+ break;
+ case 0x0007: // 0x0007 = bytes (size field *= 1-byte), values are stored as ??????
+ $data = substr($atom_data, $offset, $data_size * 1);
+ $offset += ($data_size * 1);
+ break;
+ case 0x0008: // 0x0008 = ????? (size field *= 2-byte), values are stored as ??????
+ $data = substr($atom_data, $offset, $data_size * 2);
+ $offset += ($data_size * 2);
+ break;
+ default:
+ echo 'QuicktimeParseNikonNCTG()::unknown $data_size_type: '.$data_size_type.'<br>';
+ break 2;
+ }
+
+ switch ($record_type) {
+ case 0x00000011: // CreateDate
+ case 0x00000012: // DateTimeOriginal
+ $data = strtotime($data);
+ break;
+ case 0x0200001e: // ColorSpace
+ switch ($data) {
+ case 1:
+ $data = 'sRGB';
+ break;
+ case 2:
+ $data = 'Adobe RGB';
+ break;
+ }
+ break;
+ case 0x02000023: // PictureControlData
+ $PictureControlAdjust = array(0=>'default', 1=>'quick', 2=>'full');
+ $FilterEffect = array(0x80=>'off', 0x81=>'yellow', 0x82=>'orange', 0x83=>'red', 0x84=>'green', 0xff=>'n/a');
+ $ToningEffect = array(0x80=>'b&w', 0x81=>'sepia', 0x82=>'cyanotype', 0x83=>'red', 0x84=>'yellow', 0x85=>'green', 0x86=>'blue-green', 0x87=>'blue', 0x88=>'purple-blue', 0x89=>'red-purple', 0xff=>'n/a');
+ $data = array(
+ 'PictureControlVersion' => substr($data, 0, 4),
+ 'PictureControlName' => rtrim(substr($data, 4, 20), "\x00"),
+ 'PictureControlBase' => rtrim(substr($data, 24, 20), "\x00"),
+ //'?' => substr($data, 44, 4),
+ 'PictureControlAdjust' => $PictureControlAdjust[ord(substr($data, 48, 1))],
+ 'PictureControlQuickAdjust' => ord(substr($data, 49, 1)),
+ 'Sharpness' => ord(substr($data, 50, 1)),
+ 'Contrast' => ord(substr($data, 51, 1)),
+ 'Brightness' => ord(substr($data, 52, 1)),
+ 'Saturation' => ord(substr($data, 53, 1)),
+ 'HueAdjustment' => ord(substr($data, 54, 1)),
+ 'FilterEffect' => $FilterEffect[ord(substr($data, 55, 1))],
+ 'ToningEffect' => $ToningEffect[ord(substr($data, 56, 1))],
+ 'ToningSaturation' => ord(substr($data, 57, 1)),
+ );
+ break;
+ case 0x02000024: // WorldTime
+ // http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Nikon.html#WorldTime
+ // timezone is stored as offset from GMT in minutes
+ $timezone = getid3_lib::BigEndian2Int(substr($data, 0, 2));
+ if ($timezone & 0x8000) {
+ $timezone = 0 - (0x10000 - $timezone);
+ }
+ $timezone /= 60;
+
+ $dst = (bool) getid3_lib::BigEndian2Int(substr($data, 2, 1));
+ switch (getid3_lib::BigEndian2Int(substr($data, 3, 1))) {
+ case 2:
+ $datedisplayformat = 'D/M/Y'; break;
+ case 1:
+ $datedisplayformat = 'M/D/Y'; break;
+ case 0:
+ default:
+ $datedisplayformat = 'Y/M/D'; break;
+ }
+
+ $data = array('timezone'=>floatval($timezone), 'dst'=>$dst, 'display'=>$datedisplayformat);
+ break;
+ case 0x02000083: // LensType
+ $data = array(
+ //'_' => $data,
+ 'mf' => (bool) ($data & 0x01),
+ 'd' => (bool) ($data & 0x02),
+ 'g' => (bool) ($data & 0x04),
+ 'vr' => (bool) ($data & 0x08),
+ );
+ break;
+ }
+ $tag_name = (isset($NCTGtagName[$record_type]) ? $NCTGtagName[$record_type] : '0x'.str_pad(dechex($record_type), 8, '0', STR_PAD_LEFT));
+ $parsed[$tag_name] = $data;
+ }
+ return $parsed;
+ }
+
+ /**
+ * @param string $keyname
+ * @param string|array $data
+ * @param string $boxname
+ *
+ * @return bool
+ */
+ public function CopyToAppropriateCommentsSection($keyname, $data, $boxname='') {
static $handyatomtranslatorarray = array();
if (empty($handyatomtranslatorarray)) {
- $handyatomtranslatorarray['©cpy'] = 'copyright';
- $handyatomtranslatorarray['©day'] = 'creation_date';
- $handyatomtranslatorarray['©dir'] = 'director';
- $handyatomtranslatorarray['©ed1'] = 'edit1';
- $handyatomtranslatorarray['©ed2'] = 'edit2';
- $handyatomtranslatorarray['©ed3'] = 'edit3';
- $handyatomtranslatorarray['©ed4'] = 'edit4';
- $handyatomtranslatorarray['©ed5'] = 'edit5';
- $handyatomtranslatorarray['©ed6'] = 'edit6';
- $handyatomtranslatorarray['©ed7'] = 'edit7';
- $handyatomtranslatorarray['©ed8'] = 'edit8';
- $handyatomtranslatorarray['©ed9'] = 'edit9';
- $handyatomtranslatorarray['©fmt'] = 'format';
- $handyatomtranslatorarray['©inf'] = 'information';
- $handyatomtranslatorarray['©prd'] = 'producer';
- $handyatomtranslatorarray['©prf'] = 'performers';
- $handyatomtranslatorarray['©req'] = 'system_requirements';
- $handyatomtranslatorarray['©src'] = 'source_credit';
- $handyatomtranslatorarray['©wrt'] = 'writer';
+ // http://www.geocities.com/xhelmboyx/quicktime/formats/qtm-layout.txt
+ // http://www.geocities.com/xhelmboyx/quicktime/formats/mp4-layout.txt
+ // http://atomicparsley.sourceforge.net/mpeg-4files.html
+ // https://code.google.com/p/mp4v2/wiki/iTunesMetadata
+ $handyatomtranslatorarray["\xA9".'alb'] = 'album'; // iTunes 4.0
+ $handyatomtranslatorarray["\xA9".'ART'] = 'artist';
+ $handyatomtranslatorarray["\xA9".'art'] = 'artist'; // iTunes 4.0
+ $handyatomtranslatorarray["\xA9".'aut'] = 'author';
+ $handyatomtranslatorarray["\xA9".'cmt'] = 'comment'; // iTunes 4.0
+ $handyatomtranslatorarray["\xA9".'com'] = 'comment';
+ $handyatomtranslatorarray["\xA9".'cpy'] = 'copyright';
+ $handyatomtranslatorarray["\xA9".'day'] = 'creation_date'; // iTunes 4.0
+ $handyatomtranslatorarray["\xA9".'dir'] = 'director';
+ $handyatomtranslatorarray["\xA9".'ed1'] = 'edit1';
+ $handyatomtranslatorarray["\xA9".'ed2'] = 'edit2';
+ $handyatomtranslatorarray["\xA9".'ed3'] = 'edit3';
+ $handyatomtranslatorarray["\xA9".'ed4'] = 'edit4';
+ $handyatomtranslatorarray["\xA9".'ed5'] = 'edit5';
+ $handyatomtranslatorarray["\xA9".'ed6'] = 'edit6';
+ $handyatomtranslatorarray["\xA9".'ed7'] = 'edit7';
+ $handyatomtranslatorarray["\xA9".'ed8'] = 'edit8';
+ $handyatomtranslatorarray["\xA9".'ed9'] = 'edit9';
+ $handyatomtranslatorarray["\xA9".'enc'] = 'encoded_by';
+ $handyatomtranslatorarray["\xA9".'fmt'] = 'format';
+ $handyatomtranslatorarray["\xA9".'gen'] = 'genre'; // iTunes 4.0
+ $handyatomtranslatorarray["\xA9".'grp'] = 'grouping'; // iTunes 4.2
+ $handyatomtranslatorarray["\xA9".'hst'] = 'host_computer';
+ $handyatomtranslatorarray["\xA9".'inf'] = 'information';
+ $handyatomtranslatorarray["\xA9".'lyr'] = 'lyrics'; // iTunes 5.0
+ $handyatomtranslatorarray["\xA9".'mak'] = 'make';
+ $handyatomtranslatorarray["\xA9".'mod'] = 'model';
+ $handyatomtranslatorarray["\xA9".'nam'] = 'title'; // iTunes 4.0
+ $handyatomtranslatorarray["\xA9".'ope'] = 'composer';
+ $handyatomtranslatorarray["\xA9".'prd'] = 'producer';
+ $handyatomtranslatorarray["\xA9".'PRD'] = 'product';
+ $handyatomtranslatorarray["\xA9".'prf'] = 'performers';
+ $handyatomtranslatorarray["\xA9".'req'] = 'system_requirements';
+ $handyatomtranslatorarray["\xA9".'src'] = 'source_credit';
+ $handyatomtranslatorarray["\xA9".'swr'] = 'software';
+ $handyatomtranslatorarray["\xA9".'too'] = 'encoding_tool'; // iTunes 4.0
+ $handyatomtranslatorarray["\xA9".'trk'] = 'track_number';
+ $handyatomtranslatorarray["\xA9".'url'] = 'url';
+ $handyatomtranslatorarray["\xA9".'wrn'] = 'warning';
+ $handyatomtranslatorarray["\xA9".'wrt'] = 'composer';
+ $handyatomtranslatorarray['aART'] = 'album_artist';
+ $handyatomtranslatorarray['apID'] = 'purchase_account';
+ $handyatomtranslatorarray['catg'] = 'category'; // iTunes 4.9
+ $handyatomtranslatorarray['covr'] = 'picture'; // iTunes 4.0
+ $handyatomtranslatorarray['cpil'] = 'compilation'; // iTunes 4.0
+ $handyatomtranslatorarray['cprt'] = 'copyright'; // iTunes 4.0?
+ $handyatomtranslatorarray['desc'] = 'description'; // iTunes 5.0
+ $handyatomtranslatorarray['disk'] = 'disc_number'; // iTunes 4.0
+ $handyatomtranslatorarray['egid'] = 'episode_guid'; // iTunes 4.9
+ $handyatomtranslatorarray['gnre'] = 'genre'; // iTunes 4.0
+ $handyatomtranslatorarray['hdvd'] = 'hd_video'; // iTunes 4.0
+ $handyatomtranslatorarray['ldes'] = 'description_long'; //
+ $handyatomtranslatorarray['keyw'] = 'keyword'; // iTunes 4.9
+ $handyatomtranslatorarray['pcst'] = 'podcast'; // iTunes 4.9
+ $handyatomtranslatorarray['pgap'] = 'gapless_playback'; // iTunes 7.0
+ $handyatomtranslatorarray['purd'] = 'purchase_date'; // iTunes 6.0.2
+ $handyatomtranslatorarray['purl'] = 'podcast_url'; // iTunes 4.9
+ $handyatomtranslatorarray['rtng'] = 'rating'; // iTunes 4.0
+ $handyatomtranslatorarray['soaa'] = 'sort_album_artist'; //
+ $handyatomtranslatorarray['soal'] = 'sort_album'; //
+ $handyatomtranslatorarray['soar'] = 'sort_artist'; //
+ $handyatomtranslatorarray['soco'] = 'sort_composer'; //
+ $handyatomtranslatorarray['sonm'] = 'sort_title'; //
+ $handyatomtranslatorarray['sosn'] = 'sort_show'; //
+ $handyatomtranslatorarray['stik'] = 'stik'; // iTunes 4.9
+ $handyatomtranslatorarray['tmpo'] = 'bpm'; // iTunes 4.0
+ $handyatomtranslatorarray['trkn'] = 'track_number'; // iTunes 4.0
+ $handyatomtranslatorarray['tven'] = 'tv_episode_id'; //
+ $handyatomtranslatorarray['tves'] = 'tv_episode'; // iTunes 6.0
+ $handyatomtranslatorarray['tvnn'] = 'tv_network_name'; // iTunes 6.0
+ $handyatomtranslatorarray['tvsh'] = 'tv_show_name'; // iTunes 6.0
+ $handyatomtranslatorarray['tvsn'] = 'tv_season'; // iTunes 6.0
- // http://www.geocities.com/xhelmboyx/quicktime/formats/qtm-layout.txt
- $handyatomtranslatorarray['©nam'] = 'title';
- $handyatomtranslatorarray['©cmt'] = 'comment';
- $handyatomtranslatorarray['©wrn'] = 'warning';
- $handyatomtranslatorarray['©hst'] = 'host_computer';
- $handyatomtranslatorarray['©mak'] = 'make';
- $handyatomtranslatorarray['©mod'] = 'model';
- $handyatomtranslatorarray['©PRD'] = 'product';
- $handyatomtranslatorarray['©swr'] = 'software';
- $handyatomtranslatorarray['©aut'] = 'author';
- $handyatomtranslatorarray['©ART'] = 'artist';
- $handyatomtranslatorarray['©trk'] = 'track';
- $handyatomtranslatorarray['©alb'] = 'album';
- $handyatomtranslatorarray['©com'] = 'comment';
- $handyatomtranslatorarray['©gen'] = 'genre';
- $handyatomtranslatorarray['©ope'] = 'composer';
- $handyatomtranslatorarray['©url'] = 'url';
- $handyatomtranslatorarray['©enc'] = 'encoder';
+ // boxnames:
+ /*
+ $handyatomtranslatorarray['iTunSMPB'] = 'iTunSMPB';
+ $handyatomtranslatorarray['iTunNORM'] = 'iTunNORM';
+ $handyatomtranslatorarray['Encoding Params'] = 'Encoding Params';
+ $handyatomtranslatorarray['replaygain_track_gain'] = 'replaygain_track_gain';
+ $handyatomtranslatorarray['replaygain_track_peak'] = 'replaygain_track_peak';
+ $handyatomtranslatorarray['replaygain_track_minmax'] = 'replaygain_track_minmax';
+ $handyatomtranslatorarray['MusicIP PUID'] = 'MusicIP PUID';
+ $handyatomtranslatorarray['MusicBrainz Artist Id'] = 'MusicBrainz Artist Id';
+ $handyatomtranslatorarray['MusicBrainz Album Id'] = 'MusicBrainz Album Id';
+ $handyatomtranslatorarray['MusicBrainz Album Artist Id'] = 'MusicBrainz Album Artist Id';
+ $handyatomtranslatorarray['MusicBrainz Track Id'] = 'MusicBrainz Track Id';
+ $handyatomtranslatorarray['MusicBrainz Disc Id'] = 'MusicBrainz Disc Id';
+
+ // http://age.hobba.nl/audio/tag_frame_reference.html
+ $handyatomtranslatorarray['PLAY_COUNTER'] = 'play_counter'; // Foobar2000 - https://www.getid3.org/phpBB3/viewtopic.php?t=1355
+ $handyatomtranslatorarray['MEDIATYPE'] = 'mediatype'; // Foobar2000 - https://www.getid3.org/phpBB3/viewtopic.php?t=1355
+ */
}
- if (isset($handyatomtranslatorarray[$keyname])) {
- $ThisFileInfo['quicktime']['comments'][$handyatomtranslatorarray[$keyname]][] = $data;
+ $info = &$this->getid3->info;
+ $comment_key = '';
+ if ($boxname && ($boxname != $keyname)) {
+ $comment_key = (isset($handyatomtranslatorarray[$boxname]) ? $handyatomtranslatorarray[$boxname] : $boxname);
+ } elseif (isset($handyatomtranslatorarray[$keyname])) {
+ $comment_key = $handyatomtranslatorarray[$keyname];
}
-
+ if ($comment_key) {
+ if ($comment_key == 'picture') {
+ // already copied directly into [comments][picture] elsewhere, do not re-copy here
+ return true;
+ }
+ $gooddata = array($data);
+ if ($comment_key == 'genre') {
+ // some other taggers separate multiple genres with semicolon, e.g. "Heavy Metal;Thrash Metal;Metal"
+ $gooddata = explode(';', $data);
+ }
+ foreach ($gooddata as $data) {
+ if (!empty($info['quicktime']['comments'][$comment_key]) && in_array($data, $info['quicktime']['comments'][$comment_key], true)) {
+ // avoid duplicate copies of identical data
+ continue;
+ }
+ $info['quicktime']['comments'][$comment_key][] = $data;
+ }
+ }
return true;
}
- function NoNullString($nullterminatedstring) {
+ /**
+ * @param string $lstring
+ * @param int $count
+ *
+ * @return string
+ */
+ public function LociString($lstring, &$count) {
+ // Loci strings are UTF-8 or UTF-16 and null (x00/x0000) terminated. UTF-16 has a BOM
+ // Also need to return the number of bytes the string occupied so additional fields can be extracted
+ $len = strlen($lstring);
+ if ($len == 0) {
+ $count = 0;
+ return '';
+ }
+ if ($lstring[0] == "\x00") {
+ $count = 1;
+ return '';
+ }
+ // check for BOM
+ if (($len > 2) && ((($lstring[0] == "\xFE") && ($lstring[1] == "\xFF")) || (($lstring[0] == "\xFF") && ($lstring[1] == "\xFE")))) {
+ // UTF-16
+ if (preg_match('/(.*)\x00/', $lstring, $lmatches)) {
+ $count = strlen($lmatches[1]) * 2 + 2; //account for 2 byte characters and trailing \x0000
+ return getid3_lib::iconv_fallback_utf16_utf8($lmatches[1]);
+ } else {
+ return '';
+ }
+ }
+ // UTF-8
+ if (preg_match('/(.*)\x00/', $lstring, $lmatches)) {
+ $count = strlen($lmatches[1]) + 1; //account for trailing \x00
+ return $lmatches[1];
+ }
+ return '';
+ }
+
+ /**
+ * @param string $nullterminatedstring
+ *
+ * @return string
+ */
+ public function NoNullString($nullterminatedstring) {
// remove the single null terminator on null terminated strings
if (substr($nullterminatedstring, strlen($nullterminatedstring) - 1, 1) === "\x00") {
return substr($nullterminatedstring, 0, strlen($nullterminatedstring) - 1);
@@ -1292,11 +2972,128 @@
return $nullterminatedstring;
}
- function Pascal2String($pascalstring) {
+ /**
+ * @param string $pascalstring
+ *
+ * @return string
+ */
+ public function Pascal2String($pascalstring) {
// Pascal strings have 1 unsigned byte at the beginning saying how many chars (1-255) are in the string
return substr($pascalstring, 1);
}
+ /**
+ * @param string $pascalstring
+ *
+ * @return string
+ */
+ public function MaybePascal2String($pascalstring) {
+ // Pascal strings have 1 unsigned byte at the beginning saying how many chars (1-255) are in the string
+ // Check if string actually is in this format or written incorrectly, straight string, or null-terminated string
+ if (ord(substr($pascalstring, 0, 1)) == (strlen($pascalstring) - 1)) {
+ return substr($pascalstring, 1);
+ } elseif (substr($pascalstring, -1, 1) == "\x00") {
+ // appears to be null-terminated instead of Pascal-style
+ return substr($pascalstring, 0, -1);
+ }
+ return $pascalstring;
+ }
+
+
+ /**
+ * Helper functions for m4b audiobook chapters
+ * code by Steffen Hartmann 2015-Nov-08.
+ *
+ * @param array $info
+ * @param string $tag
+ * @param string $history
+ * @param array $result
+ */
+ public function search_tag_by_key($info, $tag, $history, &$result) {
+ foreach ($info as $key => $value) {
+ $key_history = $history.'/'.$key;
+ if ($key === $tag) {
+ $result[] = array($key_history, $info);
+ } else {
+ if (is_array($value)) {
+ $this->search_tag_by_key($value, $tag, $key_history, $result);
+ }
+ }
+ }
+ }
+
+ /**
+ * @param array $info
+ * @param string $k
+ * @param string $v
+ * @param string $history
+ * @param array $result
+ */
+ public function search_tag_by_pair($info, $k, $v, $history, &$result) {
+ foreach ($info as $key => $value) {
+ $key_history = $history.'/'.$key;
+ if (($key === $k) && ($value === $v)) {
+ $result[] = array($key_history, $info);
+ } else {
+ if (is_array($value)) {
+ $this->search_tag_by_pair($value, $k, $v, $key_history, $result);
+ }
+ }
+ }
+ }
+
+ /**
+ * @param array $info
+ *
+ * @return array
+ */
+ public function quicktime_time_to_sample_table($info) {
+ $res = array();
+ $this->search_tag_by_pair($info['quicktime']['moov'], 'name', 'stbl', 'quicktime/moov', $res);
+ foreach ($res as $value) {
+ $stbl_res = array();
+ $this->search_tag_by_pair($value[1], 'data_format', 'text', $value[0], $stbl_res);
+ if (count($stbl_res) > 0) {
+ $stts_res = array();
+ $this->search_tag_by_key($value[1], 'time_to_sample_table', $value[0], $stts_res);
+ if (count($stts_res) > 0) {
+ return $stts_res[0][1]['time_to_sample_table'];
+ }
+ }
+ }
+ return array();
+ }
+
+ /**
+ * @param array $info
+ *
+ * @return int
+ */
+ public function quicktime_bookmark_time_scale($info) {
+ $time_scale = '';
+ $ts_prefix_len = 0;
+ $res = array();
+ $this->search_tag_by_pair($info['quicktime']['moov'], 'name', 'stbl', 'quicktime/moov', $res);
+ foreach ($res as $value) {
+ $stbl_res = array();
+ $this->search_tag_by_pair($value[1], 'data_format', 'text', $value[0], $stbl_res);
+ if (count($stbl_res) > 0) {
+ $ts_res = array();
+ $this->search_tag_by_key($info['quicktime']['moov'], 'time_scale', 'quicktime/moov', $ts_res);
+ foreach ($ts_res as $sub_value) {
+ $prefix = substr($sub_value[0], 0, -12);
+ if ((substr($stbl_res[0][0], 0, strlen($prefix)) === $prefix) && ($ts_prefix_len < strlen($prefix))) {
+ $time_scale = $sub_value[1]['time_scale'];
+ $ts_prefix_len = strlen($prefix);
+ }
+ }
+ }
+ }
+ return $time_scale;
+ }
+ /*
+ // END helper functions for m4b audiobook chapters
+ */
+
+
}
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.real.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.real.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.real.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio-video.real.php //
// module for analyzing Real Audio/Video files //
@@ -13,69 +14,76 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, true);
-class getid3_real
+class getid3_real extends getid3_handler
{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- function getid3_real(&$fd, &$ThisFileInfo) {
- $ThisFileInfo['fileformat'] = 'real';
- $ThisFileInfo['bitrate'] = 0;
- $ThisFileInfo['playtime_seconds'] = 0;
+ $info['fileformat'] = 'real';
+ $info['bitrate'] = 0;
+ $info['playtime_seconds'] = 0;
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
+ $this->fseek($info['avdataoffset']);
$ChunkCounter = 0;
- while (ftell($fd) < $ThisFileInfo['avdataend']) {
- $ChunkData = fread($fd, 8);
+ while ($this->ftell() < $info['avdataend']) {
+ $ChunkData = $this->fread(8);
$ChunkName = substr($ChunkData, 0, 4);
$ChunkSize = getid3_lib::BigEndian2Int(substr($ChunkData, 4, 4));
if ($ChunkName == '.ra'."\xFD") {
- $ChunkData .= fread($fd, $ChunkSize - 8);
- if ($this->ParseOldRAheader(substr($ChunkData, 0, 128), $ThisFileInfo['real']['old_ra_header'])) {
- $ThisFileInfo['audio']['dataformat'] = 'real';
- $ThisFileInfo['audio']['lossless'] = false;
- $ThisFileInfo['audio']['sample_rate'] = $ThisFileInfo['real']['old_ra_header']['sample_rate'];
- $ThisFileInfo['audio']['bits_per_sample'] = $ThisFileInfo['real']['old_ra_header']['bits_per_sample'];
- $ThisFileInfo['audio']['channels'] = $ThisFileInfo['real']['old_ra_header']['channels'];
+ $ChunkData .= $this->fread($ChunkSize - 8);
+ if ($this->ParseOldRAheader(substr($ChunkData, 0, 128), $info['real']['old_ra_header'])) {
+ $info['audio']['dataformat'] = 'real';
+ $info['audio']['lossless'] = false;
+ $info['audio']['sample_rate'] = $info['real']['old_ra_header']['sample_rate'];
+ $info['audio']['bits_per_sample'] = $info['real']['old_ra_header']['bits_per_sample'];
+ $info['audio']['channels'] = $info['real']['old_ra_header']['channels'];
- $ThisFileInfo['playtime_seconds'] = 60 * ($ThisFileInfo['real']['old_ra_header']['audio_bytes'] / $ThisFileInfo['real']['old_ra_header']['bytes_per_minute']);
- $ThisFileInfo['audio']['bitrate'] = 8 * ($ThisFileInfo['real']['old_ra_header']['audio_bytes'] / $ThisFileInfo['playtime_seconds']);
- $ThisFileInfo['audio']['codec'] = $this->RealAudioCodecFourCClookup($ThisFileInfo['real']['old_ra_header']['fourcc'], $ThisFileInfo['audio']['bitrate']);
+ $info['playtime_seconds'] = 60 * ($info['real']['old_ra_header']['audio_bytes'] / $info['real']['old_ra_header']['bytes_per_minute']);
+ $info['audio']['bitrate'] = 8 * ($info['real']['old_ra_header']['audio_bytes'] / $info['playtime_seconds']);
+ $info['audio']['codec'] = $this->RealAudioCodecFourCClookup($info['real']['old_ra_header']['fourcc'], $info['audio']['bitrate']);
- foreach ($ThisFileInfo['real']['old_ra_header']['comments'] as $key => $valuearray) {
+ foreach ($info['real']['old_ra_header']['comments'] as $key => $valuearray) {
if (strlen(trim($valuearray[0])) > 0) {
- $ThisFileInfo['real']['comments'][$key][] = trim($valuearray[0]);
+ $info['real']['comments'][$key][] = trim($valuearray[0]);
}
}
return true;
}
- $ThisFileInfo['error'][] = 'There was a problem parsing this RealAudio file. Please submit it for analysis to http://www.getid3.org/upload/ or info at getid3.org';
- unset($ThisFileInfo['bitrate']);
- unset($ThisFileInfo['playtime_seconds']);
+ $this->error('There was a problem parsing this RealAudio file. Please submit it for analysis to info at getid3.org');
+ unset($info['bitrate']);
+ unset($info['playtime_seconds']);
return false;
}
// shortcut
- $ThisFileInfo['real']['chunks'][$ChunkCounter] = array();
- $thisfile_real_chunks_currentchunk = &$ThisFileInfo['real']['chunks'][$ChunkCounter];
+ $info['real']['chunks'][$ChunkCounter] = array();
+ $thisfile_real_chunks_currentchunk = &$info['real']['chunks'][$ChunkCounter];
$thisfile_real_chunks_currentchunk['name'] = $ChunkName;
- $thisfile_real_chunks_currentchunk['offset'] = ftell($fd) - 8;
+ $thisfile_real_chunks_currentchunk['offset'] = $this->ftell() - 8;
$thisfile_real_chunks_currentchunk['length'] = $ChunkSize;
- if (($thisfile_real_chunks_currentchunk['offset'] + $thisfile_real_chunks_currentchunk['length']) > $ThisFileInfo['avdataend']) {
- $ThisFileInfo['warning'][] = 'Chunk "'.$thisfile_real_chunks_currentchunk['name'].'" at offset '.$thisfile_real_chunks_currentchunk['offset'].' claims to be '.$thisfile_real_chunks_currentchunk['length'].' bytes long, which is beyond end of file';
+ if (($thisfile_real_chunks_currentchunk['offset'] + $thisfile_real_chunks_currentchunk['length']) > $info['avdataend']) {
+ $this->warning('Chunk "'.$thisfile_real_chunks_currentchunk['name'].'" at offset '.$thisfile_real_chunks_currentchunk['offset'].' claims to be '.$thisfile_real_chunks_currentchunk['length'].' bytes long, which is beyond end of file');
return false;
}
- if ($ChunkSize > (GETID3_FREAD_BUFFER_SIZE + 8)) {
+ if ($ChunkSize > ($this->getid3->fread_buffer_size() + 8)) {
- $ChunkData .= fread($fd, GETID3_FREAD_BUFFER_SIZE - 8);
- fseek($fd, $thisfile_real_chunks_currentchunk['offset'] + $ChunkSize, SEEK_SET);
+ $ChunkData .= $this->fread($this->getid3->fread_buffer_size() - 8);
+ $this->fseek($thisfile_real_chunks_currentchunk['offset'] + $ChunkSize);
- } else {
+ } elseif(($ChunkSize - 8) > 0) {
- $ChunkData .= fread($fd, $ChunkSize - 8);
+ $ChunkData .= $this->fread($ChunkSize - 8);
}
$offset = 8;
@@ -95,7 +103,7 @@
break;
default:
- //$ThisFileInfo['warning'][] = 'Expected .RMF-object_version to be "0", actual value is "'.$thisfile_real_chunks_currentchunk['object_version'].'" (should not be a problem)';
+ //$this->warning('Expected .RMF-object_version to be "0", actual value is "'.$thisfile_real_chunks_currentchunk['object_version'].'" (should not be a problem)');
break;
}
@@ -128,9 +136,9 @@
$offset += 2;
$thisfile_real_chunks_currentchunk['flags_raw'] = getid3_lib::BigEndian2Int(substr($ChunkData, $offset, 2));
$offset += 2;
- $ThisFileInfo['playtime_seconds'] = $thisfile_real_chunks_currentchunk['duration'] / 1000;
+ $info['playtime_seconds'] = $thisfile_real_chunks_currentchunk['duration'] / 1000;
if ($thisfile_real_chunks_currentchunk['duration'] > 0) {
- $ThisFileInfo['bitrate'] += $thisfile_real_chunks_currentchunk['avg_bit_rate'];
+ $info['bitrate'] += $thisfile_real_chunks_currentchunk['avg_bit_rate'];
}
$thisfile_real_chunks_currentchunk['flags']['save_enabled'] = (bool) ($thisfile_real_chunks_currentchunk['flags_raw'] & 0x0001);
$thisfile_real_chunks_currentchunk['flags']['perfect_play'] = (bool) ($thisfile_real_chunks_currentchunk['flags_raw'] & 0x0002);
@@ -200,13 +208,13 @@
//$thisfile_real_chunks_currentchunk_videoinfo['unknown8'] = getid3_lib::BigEndian2Int(substr($thisfile_real_chunks_currentchunk_typespecificdata, 34, 2));
//$thisfile_real_chunks_currentchunk_videoinfo['unknown9'] = getid3_lib::BigEndian2Int(substr($thisfile_real_chunks_currentchunk_typespecificdata, 36, 2));
- $thisfile_real_chunks_currentchunk_videoinfo['codec'] = getid3_riff::RIFFfourccLookup($thisfile_real_chunks_currentchunk_videoinfo['fourcc2']);
+ $thisfile_real_chunks_currentchunk_videoinfo['codec'] = getid3_riff::fourccLookup($thisfile_real_chunks_currentchunk_videoinfo['fourcc2']);
- $ThisFileInfo['video']['resolution_x'] = $thisfile_real_chunks_currentchunk_videoinfo['width'];
- $ThisFileInfo['video']['resolution_y'] = $thisfile_real_chunks_currentchunk_videoinfo['height'];
- $ThisFileInfo['video']['frame_rate'] = (float) $thisfile_real_chunks_currentchunk_videoinfo['frames_per_second'];
- $ThisFileInfo['video']['codec'] = $thisfile_real_chunks_currentchunk_videoinfo['codec'];
- $ThisFileInfo['video']['bits_per_sample'] = $thisfile_real_chunks_currentchunk_videoinfo['bits_per_sample'];
+ $info['video']['resolution_x'] = $thisfile_real_chunks_currentchunk_videoinfo['width'];
+ $info['video']['resolution_y'] = $thisfile_real_chunks_currentchunk_videoinfo['height'];
+ $info['video']['frame_rate'] = (float) $thisfile_real_chunks_currentchunk_videoinfo['frames_per_second'];
+ $info['video']['codec'] = $thisfile_real_chunks_currentchunk_videoinfo['codec'];
+ $info['video']['bits_per_sample'] = $thisfile_real_chunks_currentchunk_videoinfo['bits_per_sample'];
break;
case 'audio/x-pn-realaudio':
@@ -213,13 +221,13 @@
case 'audio/x-pn-multirate-realaudio':
$this->ParseOldRAheader($thisfile_real_chunks_currentchunk_typespecificdata, $thisfile_real_chunks_currentchunk['parsed_audio_data']);
- $ThisFileInfo['audio']['sample_rate'] = $thisfile_real_chunks_currentchunk['parsed_audio_data']['sample_rate'];
- $ThisFileInfo['audio']['bits_per_sample'] = $thisfile_real_chunks_currentchunk['parsed_audio_data']['bits_per_sample'];
- $ThisFileInfo['audio']['channels'] = $thisfile_real_chunks_currentchunk['parsed_audio_data']['channels'];
- if (!empty($ThisFileInfo['audio']['dataformat'])) {
- foreach ($ThisFileInfo['audio'] as $key => $value) {
+ $info['audio']['sample_rate'] = $thisfile_real_chunks_currentchunk['parsed_audio_data']['sample_rate'];
+ $info['audio']['bits_per_sample'] = $thisfile_real_chunks_currentchunk['parsed_audio_data']['bits_per_sample'];
+ $info['audio']['channels'] = $thisfile_real_chunks_currentchunk['parsed_audio_data']['channels'];
+ if (!empty($info['audio']['dataformat'])) {
+ foreach ($info['audio'] as $key => $value) {
if ($key != 'streams') {
- $ThisFileInfo['audio']['streams'][$thisfile_real_chunks_currentchunk['stream_number']][$key] = $value;
+ $info['audio']['streams'][$thisfile_real_chunks_currentchunk['stream_number']][$key] = $value;
}
}
}
@@ -255,36 +263,36 @@
}
- if (empty($ThisFileInfo['playtime_seconds'])) {
- $ThisFileInfo['playtime_seconds'] = max($ThisFileInfo['playtime_seconds'], ($thisfile_real_chunks_currentchunk['duration'] + $thisfile_real_chunks_currentchunk['start_time']) / 1000);
+ if (empty($info['playtime_seconds'])) {
+ $info['playtime_seconds'] = max($info['playtime_seconds'], ($thisfile_real_chunks_currentchunk['duration'] + $thisfile_real_chunks_currentchunk['start_time']) / 1000);
}
if ($thisfile_real_chunks_currentchunk['duration'] > 0) {
switch ($thisfile_real_chunks_currentchunk['mime_type']) {
case 'audio/x-pn-realaudio':
case 'audio/x-pn-multirate-realaudio':
- $ThisFileInfo['audio']['bitrate'] = (isset($ThisFileInfo['audio']['bitrate']) ? $ThisFileInfo['audio']['bitrate'] : 0) + $thisfile_real_chunks_currentchunk['avg_bit_rate'];
- $ThisFileInfo['audio']['codec'] = $this->RealAudioCodecFourCClookup($thisfile_real_chunks_currentchunk['parsed_audio_data']['fourcc'], $ThisFileInfo['audio']['bitrate']);
- $ThisFileInfo['audio']['dataformat'] = 'real';
- $ThisFileInfo['audio']['lossless'] = false;
+ $info['audio']['bitrate'] = (isset($info['audio']['bitrate']) ? $info['audio']['bitrate'] : 0) + $thisfile_real_chunks_currentchunk['avg_bit_rate'];
+ $info['audio']['codec'] = $this->RealAudioCodecFourCClookup($thisfile_real_chunks_currentchunk['parsed_audio_data']['fourcc'], $info['audio']['bitrate']);
+ $info['audio']['dataformat'] = 'real';
+ $info['audio']['lossless'] = false;
break;
case 'video/x-pn-realvideo':
case 'video/x-pn-multirate-realvideo':
- $ThisFileInfo['video']['bitrate'] = (isset($ThisFileInfo['video']['bitrate']) ? $ThisFileInfo['video']['bitrate'] : 0) + $thisfile_real_chunks_currentchunk['avg_bit_rate'];
- $ThisFileInfo['video']['bitrate_mode'] = 'cbr';
- $ThisFileInfo['video']['dataformat'] = 'real';
- $ThisFileInfo['video']['lossless'] = false;
- $ThisFileInfo['video']['pixel_aspect_ratio'] = (float) 1;
+ $info['video']['bitrate'] = (isset($info['video']['bitrate']) ? $info['video']['bitrate'] : 0) + $thisfile_real_chunks_currentchunk['avg_bit_rate'];
+ $info['video']['bitrate_mode'] = 'cbr';
+ $info['video']['dataformat'] = 'real';
+ $info['video']['lossless'] = false;
+ $info['video']['pixel_aspect_ratio'] = (float) 1;
break;
case 'audio/x-ralf-mpeg4-generic':
- $ThisFileInfo['audio']['bitrate'] = (isset($ThisFileInfo['audio']['bitrate']) ? $ThisFileInfo['audio']['bitrate'] : 0) + $thisfile_real_chunks_currentchunk['avg_bit_rate'];
- $ThisFileInfo['audio']['codec'] = 'RealAudio Lossless';
- $ThisFileInfo['audio']['dataformat'] = 'real';
- $ThisFileInfo['audio']['lossless'] = true;
+ $info['audio']['bitrate'] = (isset($info['audio']['bitrate']) ? $info['audio']['bitrate'] : 0) + $thisfile_real_chunks_currentchunk['avg_bit_rate'];
+ $info['audio']['codec'] = 'RealAudio Lossless';
+ $info['audio']['dataformat'] = 'real';
+ $info['audio']['lossless'] = true;
break;
}
- $ThisFileInfo['bitrate'] = (isset($ThisFileInfo['video']['bitrate']) ? $ThisFileInfo['video']['bitrate'] : 0) + (isset($ThisFileInfo['audio']['bitrate']) ? $ThisFileInfo['audio']['bitrate'] : 0);
+ $info['bitrate'] = (isset($info['video']['bitrate']) ? $info['video']['bitrate'] : 0) + (isset($info['audio']['bitrate']) ? $info['audio']['bitrate'] : 0);
}
}
break;
@@ -317,7 +325,7 @@
$commentkeystocopy = array('title'=>'title', 'artist'=>'artist', 'copyright'=>'copyright', 'comment'=>'comment');
foreach ($commentkeystocopy as $key => $val) {
if ($thisfile_real_chunks_currentchunk[$key]) {
- $ThisFileInfo['real']['comments'][$val][] = trim($thisfile_real_chunks_currentchunk[$key]);
+ $info['real']['comments'][$val][] = trim($thisfile_real_chunks_currentchunk[$key]);
}
}
@@ -345,22 +353,22 @@
break 2;
} else {
// non-last index chunk, seek to next index chunk (skipping actual index data)
- fseek($fd, $thisfile_real_chunks_currentchunk['next_index_header'], SEEK_SET);
+ $this->fseek($thisfile_real_chunks_currentchunk['next_index_header']);
}
}
break;
default:
- $ThisFileInfo['warning'][] = 'Unhandled RealMedia chunk "'.$ChunkName.'" at offset '.$thisfile_real_chunks_currentchunk['offset'];
+ $this->warning('Unhandled RealMedia chunk "'.$ChunkName.'" at offset '.$thisfile_real_chunks_currentchunk['offset']);
break;
}
$ChunkCounter++;
}
- if (!empty($ThisFileInfo['audio']['streams'])) {
- $ThisFileInfo['audio']['bitrate'] = 0;
- foreach ($ThisFileInfo['audio']['streams'] as $key => $valuearray) {
- $ThisFileInfo['audio']['bitrate'] += $valuearray['bitrate'];
+ if (!empty($info['audio']['streams'])) {
+ $info['audio']['bitrate'] = 0;
+ foreach ($info['audio']['streams'] as $key => $valuearray) {
+ $info['audio']['bitrate'] += $valuearray['bitrate'];
}
}
@@ -367,8 +375,13 @@
return true;
}
-
- function ParseOldRAheader($OldRAheaderData, &$ParsedArray) {
+ /**
+ * @param string $OldRAheaderData
+ * @param array $ParsedArray
+ *
+ * @return bool
+ */
+ public function ParseOldRAheader($OldRAheaderData, &$ParsedArray) {
// http://www.freelists.org/archives/matroska-devel/07-2003/msg00010.html
$ParsedArray = array();
@@ -473,8 +486,9 @@
$ParsedArray['fourcc'] = $ParsedArray['fourcc3'];
}
+ /** @var string[]|false[] $value */
foreach ($ParsedArray['comments'] as $key => $value) {
- if ($ParsedArray['comments'][$key][0] === false) {
+ if ($value[0] === false) {
$ParsedArray['comments'][$key][0] = '';
}
}
@@ -482,7 +496,13 @@
return true;
}
- function RealAudioCodecFourCClookup($fourcc, $bitrate) {
+ /**
+ * @param string $fourcc
+ * @param int $bitrate
+ *
+ * @return string
+ */
+ public function RealAudioCodecFourCClookup($fourcc, $bitrate) {
static $RealAudioCodecFourCClookup = array();
if (empty($RealAudioCodecFourCClookup)) {
// http://www.its.msstate.edu/net/real/reports/config/tags.stats
@@ -523,6 +543,3 @@
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.riff.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.riff.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.riff.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio-video.riff.php //
// module for analyzing RIFF files //
@@ -12,59 +13,158 @@
// multiple formats supported by this module: //
// Wave, AVI, AIFF/AIFC, (MP3,AC3)/RIFF, Wavpack v3, 8SVX //
// dependencies: module.audio.mp3.php //
-// module.audio.ac3.php (optional) //
+// module.audio.ac3.php //
+// module.audio.dts.php //
// ///
/////////////////////////////////////////////////////////////////
+/**
+* @todo Parse AC-3/DTS audio inside WAVE correctly
+* @todo Rewrite RIFF parser totally
+*/
+
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.mp3.php', __FILE__, true);
+getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.ac3.php', __FILE__, true);
+getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.dts.php', __FILE__, true);
-class getid3_riff
+class getid3_riff extends getid3_handler
{
+ protected $container = 'riff'; // default
- function getid3_riff(&$fd, &$ThisFileInfo) {
+ /**
+ * @return bool
+ *
+ * @throws getid3_exception
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
// initialize these values to an empty array, otherwise they default to NULL
// and you can't append array values to a NULL value
- $ThisFileInfo['riff'] = array('raw'=>array());
+ $info['riff'] = array('raw'=>array());
// Shortcuts
- $thisfile_riff = &$ThisFileInfo['riff'];
+ $thisfile_riff = &$info['riff'];
$thisfile_riff_raw = &$thisfile_riff['raw'];
- $thisfile_audio = &$ThisFileInfo['audio'];
- $thisfile_video = &$ThisFileInfo['video'];
- $thisfile_avdataoffset = &$ThisFileInfo['avdataoffset'];
- $thisfile_avdataend = &$ThisFileInfo['avdataend'];
+ $thisfile_audio = &$info['audio'];
+ $thisfile_video = &$info['video'];
$thisfile_audio_dataformat = &$thisfile_audio['dataformat'];
$thisfile_riff_audio = &$thisfile_riff['audio'];
$thisfile_riff_video = &$thisfile_riff['video'];
+ $thisfile_riff_WAVE = array();
+ $Original['avdataoffset'] = $info['avdataoffset'];
+ $Original['avdataend'] = $info['avdataend'];
- $Original['avdataoffset'] = $thisfile_avdataoffset;
- $Original['avdataend'] = $thisfile_avdataend;
+ $this->fseek($info['avdataoffset']);
+ $RIFFheader = $this->fread(12);
+ $offset = $this->ftell();
+ $RIFFtype = substr($RIFFheader, 0, 4);
+ $RIFFsize = substr($RIFFheader, 4, 4);
+ $RIFFsubtype = substr($RIFFheader, 8, 4);
- fseek($fd, $thisfile_avdataoffset, SEEK_SET);
- $RIFFheader = fread($fd, 12);
- $RIFFsubtype = substr($RIFFheader, 8, 4);
- switch (substr($RIFFheader, 0, 4)) {
- case 'FORM':
- $ThisFileInfo['fileformat'] = 'aiff';
- $RIFFheaderSize = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($RIFFheader, 4, 4));
- $thisfile_riff[$RIFFsubtype] = getid3_riff::ParseRIFF($fd, $thisfile_avdataoffset + 12, $thisfile_avdataoffset + $RIFFheaderSize, $ThisFileInfo);
- $thisfile_riff['header_size'] = $RIFFheaderSize;
+ switch ($RIFFtype) {
+
+ case 'FORM': // AIFF, AIFC
+ //$info['fileformat'] = 'aiff';
+ $this->container = 'aiff';
+ $thisfile_riff['header_size'] = $this->EitherEndian2Int($RIFFsize);
+ $thisfile_riff[$RIFFsubtype] = $this->ParseRIFF($offset, ($offset + $thisfile_riff['header_size'] - 4));
break;
- case 'RIFF':
+ case 'RIFF': // AVI, WAV, etc
case 'SDSS': // SDSS is identical to RIFF, just renamed. Used by SmartSound QuickTracks (www.smartsound.com)
case 'RMP3': // RMP3 is identical to RIFF, just renamed. Used by [unknown program] when creating RIFF-MP3s
+ //$info['fileformat'] = 'riff';
+ $this->container = 'riff';
+ $thisfile_riff['header_size'] = $this->EitherEndian2Int($RIFFsize);
if ($RIFFsubtype == 'RMP3') {
// RMP3 is identical to WAVE, just renamed. Used by [unknown program] when creating RIFF-MP3s
$RIFFsubtype = 'WAVE';
}
+ if ($RIFFsubtype != 'AMV ') {
+ // AMV files are RIFF-AVI files with parts of the spec deliberately broken, such as chunk size fields hardcoded to zero (because players known in hardware that these fields are always a certain size
+ // Handled separately in ParseRIFFAMV()
+ $thisfile_riff[$RIFFsubtype] = $this->ParseRIFF($offset, ($offset + $thisfile_riff['header_size'] - 4));
+ }
+ if (($info['avdataend'] - $info['filesize']) == 1) {
+ // LiteWave appears to incorrectly *not* pad actual output file
+ // to nearest WORD boundary so may appear to be short by one
+ // byte, in which case - skip warning
+ $info['avdataend'] = $info['filesize'];
+ }
- $ThisFileInfo['fileformat'] = 'riff';
- $RIFFheaderSize = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($RIFFheader, 4, 4));
- $thisfile_riff[$RIFFsubtype] = getid3_riff::ParseRIFF($fd, $thisfile_avdataoffset + 12, $thisfile_avdataoffset + $RIFFheaderSize, $ThisFileInfo);
- $thisfile_riff['header_size'] = $RIFFheaderSize;
+ $nextRIFFoffset = $Original['avdataoffset'] + 8 + $thisfile_riff['header_size']; // 8 = "RIFF" + 32-bit offset
+ while ($nextRIFFoffset < min($info['filesize'], $info['avdataend'])) {
+ try {
+ $this->fseek($nextRIFFoffset);
+ } catch (getid3_exception $e) {
+ if ($e->getCode() == 10) {
+ //$this->warning('RIFF parser: '.$e->getMessage());
+ $this->error('AVI extends beyond '.round(PHP_INT_MAX / 1073741824).'GB and PHP filesystem functions cannot read that far, playtime may be wrong');
+ $this->warning('[avdataend] value may be incorrect, multiple AVIX chunks may be present');
+ break;
+ } else {
+ throw $e;
+ }
+ }
+ $nextRIFFheader = $this->fread(12);
+ if ($nextRIFFoffset == ($info['avdataend'] - 1)) {
+ if (substr($nextRIFFheader, 0, 1) == "\x00") {
+ // RIFF padded to WORD boundary, we're actually already at the end
+ break;
+ }
+ }
+ $nextRIFFheaderID = substr($nextRIFFheader, 0, 4);
+ $nextRIFFsize = $this->EitherEndian2Int(substr($nextRIFFheader, 4, 4));
+ $nextRIFFtype = substr($nextRIFFheader, 8, 4);
+ $chunkdata = array();
+ $chunkdata['offset'] = $nextRIFFoffset + 8;
+ $chunkdata['size'] = $nextRIFFsize;
+ $nextRIFFoffset = $chunkdata['offset'] + $chunkdata['size'];
+
+ switch ($nextRIFFheaderID) {
+ case 'RIFF':
+ $chunkdata['chunks'] = $this->ParseRIFF($chunkdata['offset'] + 4, $nextRIFFoffset);
+ if (!isset($thisfile_riff[$nextRIFFtype])) {
+ $thisfile_riff[$nextRIFFtype] = array();
+ }
+ $thisfile_riff[$nextRIFFtype][] = $chunkdata;
+ break;
+
+ case 'AMV ':
+ unset($info['riff']);
+ $info['amv'] = $this->ParseRIFFAMV($chunkdata['offset'] + 4, $nextRIFFoffset);
+ break;
+
+ case 'JUNK':
+ // ignore
+ $thisfile_riff[$nextRIFFheaderID][] = $chunkdata;
+ break;
+
+ case 'IDVX':
+ $info['divxtag']['comments'] = self::ParseDIVXTAG($this->fread($chunkdata['size']));
+ break;
+
+ default:
+ if ($info['filesize'] == ($chunkdata['offset'] - 8 + 128)) {
+ $DIVXTAG = $nextRIFFheader.$this->fread(128 - 12);
+ if (substr($DIVXTAG, -7) == 'DIVXTAG') {
+ // DIVXTAG is supposed to be inside an IDVX chunk in a LIST chunk, but some bad encoders just slap it on the end of a file
+ $this->warning('Found wrongly-structured DIVXTAG at offset '.($this->ftell() - 128).', parsing anyway');
+ $info['divxtag']['comments'] = self::ParseDIVXTAG($DIVXTAG);
+ break 2;
+ }
+ }
+ $this->warning('Expecting "RIFF|JUNK|IDVX" at '.$nextRIFFoffset.', found "'.$nextRIFFheaderID.'" ('.getid3_lib::PrintHexBytes($nextRIFFheaderID).') - skipping rest of file');
+ break 2;
+
+ }
+
+ }
if ($RIFFsubtype == 'WAVE') {
$thisfile_riff_WAVE = &$thisfile_riff['WAVE'];
}
@@ -71,15 +171,18 @@
break;
default:
- $ThisFileInfo['error'][] = 'Cannot parse RIFF (this is maybe not a RIFF / WAV / AVI file?) - expecting "FORM|RIFF|SDSS|RMP3" found "'.$RIFFsubtype.'" instead';
- unset($ThisFileInfo['fileformat']);
+ $this->error('Cannot parse RIFF (this is maybe not a RIFF / WAV / AVI file?) - expecting "FORM|RIFF|SDSS|RMP3" found "'.$RIFFsubtype.'" instead');
+ //unset($info['fileformat']);
return false;
- break;
}
$streamindex = 0;
switch ($RIFFsubtype) {
+
+ // http://en.wikipedia.org/wiki/Wav
case 'WAVE':
+ $info['fileformat'] = 'wav';
+
if (empty($thisfile_audio['bitrate_mode'])) {
$thisfile_audio['bitrate_mode'] = 'cbr';
}
@@ -88,15 +191,15 @@
}
if (isset($thisfile_riff_WAVE['data'][0]['offset'])) {
- $thisfile_avdataoffset = $thisfile_riff_WAVE['data'][0]['offset'] + 8;
- $thisfile_avdataend = $thisfile_avdataoffset + $thisfile_riff_WAVE['data'][0]['size'];
+ $info['avdataoffset'] = $thisfile_riff_WAVE['data'][0]['offset'] + 8;
+ $info['avdataend'] = $info['avdataoffset'] + $thisfile_riff_WAVE['data'][0]['size'];
}
if (isset($thisfile_riff_WAVE['fmt '][0]['data'])) {
- $thisfile_riff_audio[$streamindex] = getid3_riff::RIFFparseWAVEFORMATex($thisfile_riff_WAVE['fmt '][0]['data']);
+ $thisfile_riff_audio[$streamindex] = self::parseWAVEFORMATex($thisfile_riff_WAVE['fmt '][0]['data']);
$thisfile_audio['wformattag'] = $thisfile_riff_audio[$streamindex]['raw']['wFormatTag'];
- if (@$thisfile_riff_audio[$streamindex]['bitrate'] == 0) {
- $ThisFileInfo['error'][] = 'Corrupt RIFF file: bitrate_audio == zero';
+ if (!isset($thisfile_riff_audio[$streamindex]['bitrate']) || ($thisfile_riff_audio[$streamindex]['bitrate'] == 0)) {
+ $this->error('Corrupt RIFF file: bitrate_audio == zero');
return false;
}
$thisfile_riff_raw['fmt '] = $thisfile_riff_audio[$streamindex]['raw'];
@@ -103,13 +206,15 @@
unset($thisfile_riff_audio[$streamindex]['raw']);
$thisfile_audio['streams'][$streamindex] = $thisfile_riff_audio[$streamindex];
- $thisfile_audio = getid3_lib::array_merge_noclobber($thisfile_audio, $thisfile_riff_audio[$streamindex]);
+ $thisfile_audio = (array) getid3_lib::array_merge_noclobber($thisfile_audio, $thisfile_riff_audio[$streamindex]);
if (substr($thisfile_audio['codec'], 0, strlen('unknown: 0x')) == 'unknown: 0x') {
- $ThisFileInfo['warning'][] = 'Audio codec = '.$thisfile_audio['codec'];
+ $this->warning('Audio codec = '.$thisfile_audio['codec']);
}
$thisfile_audio['bitrate'] = $thisfile_riff_audio[$streamindex]['bitrate'];
- $ThisFileInfo['playtime_seconds'] = (float) ((($thisfile_avdataend - $thisfile_avdataoffset) * 8) / $thisfile_audio['bitrate']);
+ 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']);
+ }
$thisfile_audio['lossless'] = false;
if (isset($thisfile_riff_WAVE['data'][0]['offset']) && isset($thisfile_riff_raw['fmt ']['wFormatTag'])) {
@@ -144,9 +249,9 @@
$thisfile_riff_raw_rgad_track = &$thisfile_riff_raw_rgad['track'];
$thisfile_riff_raw_rgad_album = &$thisfile_riff_raw_rgad['album'];
- $thisfile_riff_raw_rgad['fPeakAmplitude'] = getid3_lib::LittleEndian2Float(substr($rgadData, 0, 4));
- $thisfile_riff_raw_rgad['nRadioRgAdjust'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($rgadData, 4, 2));
- $thisfile_riff_raw_rgad['nAudiophileRgAdjust'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($rgadData, 6, 2));
+ $thisfile_riff_raw_rgad['fPeakAmplitude'] = getid3_lib::LittleEndian2Float(substr($rgadData, 0, 4));
+ $thisfile_riff_raw_rgad['nRadioRgAdjust'] = $this->EitherEndian2Int(substr($rgadData, 4, 2));
+ $thisfile_riff_raw_rgad['nAudiophileRgAdjust'] = $this->EitherEndian2Int(substr($rgadData, 6, 2));
$nRadioRgAdjustBitstring = str_pad(getid3_lib::Dec2Bin($thisfile_riff_raw_rgad['nRadioRgAdjust']), 16, '0', STR_PAD_LEFT);
$nAudiophileRgAdjustBitstring = str_pad(getid3_lib::Dec2Bin($thisfile_riff_raw_rgad['nAudiophileRgAdjust']), 16, '0', STR_PAD_LEFT);
@@ -173,7 +278,7 @@
}
if (isset($thisfile_riff_WAVE['fact'][0]['data'])) {
- $thisfile_riff_raw['fact']['NumberOfSamples'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($thisfile_riff_WAVE['fact'][0]['data'], 0, 4));
+ $thisfile_riff_raw['fact']['NumberOfSamples'] = $this->EitherEndian2Int(substr($thisfile_riff_WAVE['fact'][0]['data'], 0, 4));
// This should be a good way of calculating exact playtime,
// but some sample files have had incorrect number of samples,
@@ -180,7 +285,7 @@
// so cannot use this method
// if (!empty($thisfile_riff_raw['fmt ']['nSamplesPerSec'])) {
- // $ThisFileInfo['playtime_seconds'] = (float) $thisfile_riff_raw['fact']['NumberOfSamples'] / $thisfile_riff_raw['fmt ']['nSamplesPerSec'];
+ // $info['playtime_seconds'] = (float) $thisfile_riff_raw['fact']['NumberOfSamples'] / $thisfile_riff_raw['fmt ']['nSamplesPerSec'];
// }
}
if (!empty($thisfile_riff_raw['fmt ']['nAvgBytesPerSec'])) {
@@ -198,17 +303,19 @@
$thisfile_riff_WAVE_bext_0['origin_time'] = substr($thisfile_riff_WAVE_bext_0['data'], 330, 8);
$thisfile_riff_WAVE_bext_0['time_reference'] = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE_bext_0['data'], 338, 8));
$thisfile_riff_WAVE_bext_0['bwf_version'] = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE_bext_0['data'], 346, 1));
- $thisfile_riff_WAVE_bext_0['reserved'] = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE_bext_0['data'], 347, 254));
+ $thisfile_riff_WAVE_bext_0['reserved'] = substr($thisfile_riff_WAVE_bext_0['data'], 347, 254);
$thisfile_riff_WAVE_bext_0['coding_history'] = explode("\r\n", trim(substr($thisfile_riff_WAVE_bext_0['data'], 601)));
-
- $thisfile_riff_WAVE_bext_0['origin_date_unix'] = gmmktime(
- substr($thisfile_riff_WAVE_bext_0['origin_time'], 0, 2),
- substr($thisfile_riff_WAVE_bext_0['origin_time'], 3, 2),
- substr($thisfile_riff_WAVE_bext_0['origin_time'], 6, 2),
- substr($thisfile_riff_WAVE_bext_0['origin_date'], 5, 2),
- substr($thisfile_riff_WAVE_bext_0['origin_date'], 8, 2),
- substr($thisfile_riff_WAVE_bext_0['origin_date'], 0, 4));
-
+ if (preg_match('#^([0-9]{4}).([0-9]{2}).([0-9]{2})$#', $thisfile_riff_WAVE_bext_0['origin_date'], $matches_bext_date)) {
+ if (preg_match('#^([0-9]{2}).([0-9]{2}).([0-9]{2})$#', $thisfile_riff_WAVE_bext_0['origin_time'], $matches_bext_time)) {
+ list($dummy, $bext_timestamp['year'], $bext_timestamp['month'], $bext_timestamp['day']) = $matches_bext_date;
+ list($dummy, $bext_timestamp['hour'], $bext_timestamp['minute'], $bext_timestamp['second']) = $matches_bext_time;
+ $thisfile_riff_WAVE_bext_0['origin_date_unix'] = gmmktime($bext_timestamp['hour'], $bext_timestamp['minute'], $bext_timestamp['second'], $bext_timestamp['month'], $bext_timestamp['day'], $bext_timestamp['year']);
+ } else {
+ $this->warning('RIFF.WAVE.BEXT.origin_time is invalid');
+ }
+ } else {
+ $this->warning('RIFF.WAVE.BEXT.origin_date is invalid');
+ }
$thisfile_riff['comments']['author'][] = $thisfile_riff_WAVE_bext_0['author'];
$thisfile_riff['comments']['title'][] = $thisfile_riff_WAVE_bext_0['title'];
}
@@ -237,22 +344,22 @@
// shortcut
$thisfile_riff_WAVE_cart_0 = &$thisfile_riff_WAVE['cart'][0];
- $thisfile_riff_WAVE_cart_0['version'] = substr($thisfile_riff_WAVE_cart_0['data'], 0, 4);
- $thisfile_riff_WAVE_cart_0['title'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 4, 64));
- $thisfile_riff_WAVE_cart_0['artist'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 68, 64));
- $thisfile_riff_WAVE_cart_0['cut_id'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 132, 64));
- $thisfile_riff_WAVE_cart_0['client_id'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 196, 64));
- $thisfile_riff_WAVE_cart_0['category'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 260, 64));
- $thisfile_riff_WAVE_cart_0['classification'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 324, 64));
- $thisfile_riff_WAVE_cart_0['out_cue'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 388, 64));
- $thisfile_riff_WAVE_cart_0['start_date'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 452, 10));
- $thisfile_riff_WAVE_cart_0['start_time'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 462, 8));
- $thisfile_riff_WAVE_cart_0['end_date'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 470, 10));
- $thisfile_riff_WAVE_cart_0['end_time'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 480, 8));
- $thisfile_riff_WAVE_cart_0['producer_app_id'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 488, 64));
- $thisfile_riff_WAVE_cart_0['producer_app_version'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 552, 64));
- $thisfile_riff_WAVE_cart_0['user_defined_text'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 616, 64));
- $thisfile_riff_WAVE_cart_0['zero_db_reference'] = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE_cart_0['data'], 680, 4), true);
+ $thisfile_riff_WAVE_cart_0['version'] = substr($thisfile_riff_WAVE_cart_0['data'], 0, 4);
+ $thisfile_riff_WAVE_cart_0['title'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 4, 64));
+ $thisfile_riff_WAVE_cart_0['artist'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 68, 64));
+ $thisfile_riff_WAVE_cart_0['cut_id'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 132, 64));
+ $thisfile_riff_WAVE_cart_0['client_id'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 196, 64));
+ $thisfile_riff_WAVE_cart_0['category'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 260, 64));
+ $thisfile_riff_WAVE_cart_0['classification'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 324, 64));
+ $thisfile_riff_WAVE_cart_0['out_cue'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 388, 64));
+ $thisfile_riff_WAVE_cart_0['start_date'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 452, 10));
+ $thisfile_riff_WAVE_cart_0['start_time'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 462, 8));
+ $thisfile_riff_WAVE_cart_0['end_date'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 470, 10));
+ $thisfile_riff_WAVE_cart_0['end_time'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 480, 8));
+ $thisfile_riff_WAVE_cart_0['producer_app_id'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 488, 64));
+ $thisfile_riff_WAVE_cart_0['producer_app_version'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 552, 64));
+ $thisfile_riff_WAVE_cart_0['user_defined_text'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 616, 64));
+ $thisfile_riff_WAVE_cart_0['zero_db_reference'] = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE_cart_0['data'], 680, 4), true);
for ($i = 0; $i < 8; $i++) {
$thisfile_riff_WAVE_cart_0['post_time'][$i]['usage_fourcc'] = substr($thisfile_riff_WAVE_cart_0['data'], 684 + ($i * 8), 4);
$thisfile_riff_WAVE_cart_0['post_time'][$i]['timer_value'] = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE_cart_0['data'], 684 + ($i * 8) + 4, 4));
@@ -259,34 +366,116 @@
}
$thisfile_riff_WAVE_cart_0['url'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 748, 1024));
$thisfile_riff_WAVE_cart_0['tag_text'] = explode("\r\n", trim(substr($thisfile_riff_WAVE_cart_0['data'], 1772)));
+ $thisfile_riff['comments']['tag_text'][] = substr($thisfile_riff_WAVE_cart_0['data'], 1772);
$thisfile_riff['comments']['artist'][] = $thisfile_riff_WAVE_cart_0['artist'];
$thisfile_riff['comments']['title'][] = $thisfile_riff_WAVE_cart_0['title'];
}
+ if (isset($thisfile_riff_WAVE['SNDM'][0]['data'])) {
+ // SoundMiner metadata
+
+ // shortcuts
+ $thisfile_riff_WAVE_SNDM_0 = &$thisfile_riff_WAVE['SNDM'][0];
+ $thisfile_riff_WAVE_SNDM_0_data = &$thisfile_riff_WAVE_SNDM_0['data'];
+ $SNDM_startoffset = 0;
+ $SNDM_endoffset = $thisfile_riff_WAVE_SNDM_0['size'];
+
+ while ($SNDM_startoffset < $SNDM_endoffset) {
+ $SNDM_thisTagOffset = 0;
+ $SNDM_thisTagSize = getid3_lib::BigEndian2Int(substr($thisfile_riff_WAVE_SNDM_0_data, $SNDM_startoffset + $SNDM_thisTagOffset, 4));
+ $SNDM_thisTagOffset += 4;
+ $SNDM_thisTagKey = substr($thisfile_riff_WAVE_SNDM_0_data, $SNDM_startoffset + $SNDM_thisTagOffset, 4);
+ $SNDM_thisTagOffset += 4;
+ $SNDM_thisTagDataSize = getid3_lib::BigEndian2Int(substr($thisfile_riff_WAVE_SNDM_0_data, $SNDM_startoffset + $SNDM_thisTagOffset, 2));
+ $SNDM_thisTagOffset += 2;
+ $SNDM_thisTagDataFlags = getid3_lib::BigEndian2Int(substr($thisfile_riff_WAVE_SNDM_0_data, $SNDM_startoffset + $SNDM_thisTagOffset, 2));
+ $SNDM_thisTagOffset += 2;
+ $SNDM_thisTagDataText = substr($thisfile_riff_WAVE_SNDM_0_data, $SNDM_startoffset + $SNDM_thisTagOffset, $SNDM_thisTagDataSize);
+ $SNDM_thisTagOffset += $SNDM_thisTagDataSize;
+
+ if ($SNDM_thisTagSize != (4 + 4 + 2 + 2 + $SNDM_thisTagDataSize)) {
+ $this->warning('RIFF.WAVE.SNDM.data contains tag not expected length (expected: '.$SNDM_thisTagSize.', found: '.(4 + 4 + 2 + 2 + $SNDM_thisTagDataSize).') at offset '.$SNDM_startoffset.' (file offset '.($thisfile_riff_WAVE_SNDM_0['offset'] + $SNDM_startoffset).')');
+ break;
+ } elseif ($SNDM_thisTagSize <= 0) {
+ $this->warning('RIFF.WAVE.SNDM.data contains zero-size tag at offset '.$SNDM_startoffset.' (file offset '.($thisfile_riff_WAVE_SNDM_0['offset'] + $SNDM_startoffset).')');
+ break;
+ }
+ $SNDM_startoffset += $SNDM_thisTagSize;
+
+ $thisfile_riff_WAVE_SNDM_0['parsed_raw'][$SNDM_thisTagKey] = $SNDM_thisTagDataText;
+ if ($parsedkey = self::waveSNDMtagLookup($SNDM_thisTagKey)) {
+ $thisfile_riff_WAVE_SNDM_0['parsed'][$parsedkey] = $SNDM_thisTagDataText;
+ } else {
+ $this->warning('RIFF.WAVE.SNDM contains unknown tag "'.$SNDM_thisTagKey.'" at offset '.$SNDM_startoffset.' (file offset '.($thisfile_riff_WAVE_SNDM_0['offset'] + $SNDM_startoffset).')');
+ }
+ }
+
+ $tagmapping = array(
+ 'tracktitle'=>'title',
+ 'category' =>'genre',
+ 'cdtitle' =>'album',
+ );
+ foreach ($tagmapping as $fromkey => $tokey) {
+ if (isset($thisfile_riff_WAVE_SNDM_0['parsed'][$fromkey])) {
+ $thisfile_riff['comments'][$tokey][] = $thisfile_riff_WAVE_SNDM_0['parsed'][$fromkey];
+ }
+ }
+ }
+
+ if (isset($thisfile_riff_WAVE['iXML'][0]['data'])) {
+ // requires functions simplexml_load_string and get_object_vars
+ if ($parsedXML = getid3_lib::XML2array($thisfile_riff_WAVE['iXML'][0]['data'])) {
+ $thisfile_riff_WAVE['iXML'][0]['parsed'] = $parsedXML;
+ 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);
+ }
+ 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);
+ }
+ if (isset($parsedXML['SPEED']['TIMESTAMP_SAMPLES_SINCE_MIDNIGHT_LO']) && !empty($parsedXML['SPEED']['TIMESTAMP_SAMPLE_RATE']) && !empty($thisfile_riff_WAVE['iXML'][0]['timecode_rate'])) {
+ $samples_since_midnight = floatval(ltrim($parsedXML['SPEED']['TIMESTAMP_SAMPLES_SINCE_MIDNIGHT_HI'].$parsedXML['SPEED']['TIMESTAMP_SAMPLES_SINCE_MIDNIGHT_LO'], '0'));
+ $timestamp_sample_rate = (is_array($parsedXML['SPEED']['TIMESTAMP_SAMPLE_RATE']) ? max($parsedXML['SPEED']['TIMESTAMP_SAMPLE_RATE']) : $parsedXML['SPEED']['TIMESTAMP_SAMPLE_RATE']); // XML could possibly contain more than one TIMESTAMP_SAMPLE_RATE tag, returning as array instead of integer [why? does it make sense? perhaps doesn't matter but getID3 needs to deal with it] - see https://github.com/JamesHeinrich/getID3/issues/105
+ $thisfile_riff_WAVE['iXML'][0]['timecode_seconds'] = $samples_since_midnight / $timestamp_sample_rate;
+ $h = floor( $thisfile_riff_WAVE['iXML'][0]['timecode_seconds'] / 3600);
+ $m = floor(($thisfile_riff_WAVE['iXML'][0]['timecode_seconds'] - ($h * 3600)) / 60);
+ $s = floor( $thisfile_riff_WAVE['iXML'][0]['timecode_seconds'] - ($h * 3600) - ($m * 60));
+ $f = ($thisfile_riff_WAVE['iXML'][0]['timecode_seconds'] - ($h * 3600) - ($m * 60) - $s) * $thisfile_riff_WAVE['iXML'][0]['timecode_rate'];
+ $thisfile_riff_WAVE['iXML'][0]['timecode_string'] = sprintf('%02d:%02d:%02d:%05.2f', $h, $m, $s, $f);
+ $thisfile_riff_WAVE['iXML'][0]['timecode_string_round'] = sprintf('%02d:%02d:%02d:%02d', $h, $m, $s, round($f));
+ unset($samples_since_midnight, $timestamp_sample_rate, $h, $m, $s, $f);
+ }
+ unset($parsedXML);
+ }
+ }
+
+
+
if (!isset($thisfile_audio['bitrate']) && isset($thisfile_riff_audio[$streamindex]['bitrate'])) {
$thisfile_audio['bitrate'] = $thisfile_riff_audio[$streamindex]['bitrate'];
- $ThisFileInfo['playtime_seconds'] = (float) ((($thisfile_avdataend - $thisfile_avdataoffset) * 8) / $thisfile_audio['bitrate']);
+ $info['playtime_seconds'] = (float) ((($info['avdataend'] - $info['avdataoffset']) * 8) / $thisfile_audio['bitrate']);
}
- if (!empty($ThisFileInfo['wavpack'])) {
+ if (!empty($info['wavpack'])) {
$thisfile_audio_dataformat = 'wavpack';
$thisfile_audio['bitrate_mode'] = 'vbr';
- $thisfile_audio['encoder'] = 'WavPack v'.$ThisFileInfo['wavpack']['version'];
+ $thisfile_audio['encoder'] = 'WavPack v'.$info['wavpack']['version'];
// Reset to the way it was - RIFF parsing will have messed this up
- $thisfile_avdataend = $Original['avdataend'];
- $thisfile_audio['bitrate'] = (($thisfile_avdataend - $thisfile_avdataoffset) * 8) / $ThisFileInfo['playtime_seconds'];
+ $info['avdataend'] = $Original['avdataend'];
+ $thisfile_audio['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
- fseek($fd, $thisfile_avdataoffset - 44, SEEK_SET);
- $RIFFdata = fread($fd, 44);
+ $this->fseek($info['avdataoffset'] - 44);
+ $RIFFdata = $this->fread(44);
$OrignalRIFFheaderSize = getid3_lib::LittleEndian2Int(substr($RIFFdata, 4, 4)) + 8;
$OrignalRIFFdataSize = getid3_lib::LittleEndian2Int(substr($RIFFdata, 40, 4)) + 44;
if ($OrignalRIFFheaderSize > $OrignalRIFFdataSize) {
- $thisfile_avdataend -= ($OrignalRIFFheaderSize - $OrignalRIFFdataSize);
- fseek($fd, $thisfile_avdataend, SEEK_SET);
- $RIFFdata .= fread($fd, $OrignalRIFFheaderSize - $OrignalRIFFdataSize);
+ $info['avdataend'] -= ($OrignalRIFFheaderSize - $OrignalRIFFdataSize);
+ $this->fseek($info['avdataend']);
+ $RIFFdata .= $this->fread($OrignalRIFFheaderSize - $OrignalRIFFdataSize);
}
// move the data chunk after all other chunks (if any)
@@ -293,11 +482,31 @@
// so that the RIFF parser doesn't see EOF when trying
// to skip over the data chunk
$RIFFdata = substr($RIFFdata, 0, 36).substr($RIFFdata, 44).substr($RIFFdata, 36, 8);
- getid3_riff::ParseRIFFdata($RIFFdata, $ThisFileInfo);
+ $getid3_riff = new getid3_riff($this->getid3);
+ $getid3_riff->ParseRIFFdata($RIFFdata);
+ unset($getid3_riff);
}
if (isset($thisfile_riff_raw['fmt ']['wFormatTag'])) {
switch ($thisfile_riff_raw['fmt ']['wFormatTag']) {
+ case 0x0001: // PCM
+ if (!empty($info['ac3'])) {
+ // Dolby Digital WAV files masquerade as PCM-WAV, but they're not
+ $thisfile_audio['wformattag'] = 0x2000;
+ $thisfile_audio['codec'] = self::wFormatTagLookup($thisfile_audio['wformattag']);
+ $thisfile_audio['lossless'] = false;
+ $thisfile_audio['bitrate'] = $info['ac3']['bitrate'];
+ $thisfile_audio['sample_rate'] = $info['ac3']['sample_rate'];
+ }
+ if (!empty($info['dts'])) {
+ // Dolby DTS files masquerade as PCM-WAV, but they're not
+ $thisfile_audio['wformattag'] = 0x2001;
+ $thisfile_audio['codec'] = self::wFormatTagLookup($thisfile_audio['wformattag']);
+ $thisfile_audio['lossless'] = false;
+ $thisfile_audio['bitrate'] = $info['dts']['bitrate'];
+ $thisfile_audio['sample_rate'] = $info['dts']['sample_rate'];
+ }
+ break;
case 0x08AE: // ClearJump LiteWave
$thisfile_audio['bitrate_mode'] = 'vbr';
$thisfile_audio_dataformat = 'litewave';
@@ -320,29 +529,36 @@
// shortcut
$thisfile_riff['litewave']['raw'] = array();
- $thisfile_riff_litewave = &$thisfile_riff['litewave'];
- $thisfile_riff_litewave_raw = &$thisfile_riff_litewave['raw'];
+ $riff_litewave = &$thisfile_riff['litewave'];
+ $riff_litewave_raw = &$riff_litewave['raw'];
- $thisfile_riff_litewave_raw['compression_method'] = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE['fmt '][0]['data'], 18, 1));
- $thisfile_riff_litewave_raw['compression_flags'] = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE['fmt '][0]['data'], 19, 1));
- $thisfile_riff_litewave_raw['m_dwScale'] = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE['fmt '][0]['data'], 20, 4));
- $thisfile_riff_litewave_raw['m_dwBlockSize'] = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE['fmt '][0]['data'], 24, 4));
- $thisfile_riff_litewave_raw['m_wQuality'] = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE['fmt '][0]['data'], 28, 2));
- $thisfile_riff_litewave_raw['m_wMarkDistance'] = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE['fmt '][0]['data'], 30, 2));
- $thisfile_riff_litewave_raw['m_wReserved'] = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE['fmt '][0]['data'], 32, 2));
- $thisfile_riff_litewave_raw['m_dwOrgSize'] = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE['fmt '][0]['data'], 34, 4));
- $thisfile_riff_litewave_raw['m_bFactExists'] = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE['fmt '][0]['data'], 38, 2));
- $thisfile_riff_litewave_raw['m_dwRiffChunkSize'] = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE['fmt '][0]['data'], 40, 4));
+ $flags = array(
+ 'compression_method' => 1,
+ 'compression_flags' => 1,
+ 'm_dwScale' => 4,
+ 'm_dwBlockSize' => 4,
+ 'm_wQuality' => 2,
+ 'm_wMarkDistance' => 2,
+ 'm_wReserved' => 2,
+ 'm_dwOrgSize' => 4,
+ 'm_bFactExists' => 2,
+ 'm_dwRiffChunkSize' => 4,
+ );
+ $litewave_offset = 18;
+ foreach ($flags as $flag => $length) {
+ $riff_litewave_raw[$flag] = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE['fmt '][0]['data'], $litewave_offset, $length));
+ $litewave_offset += $length;
+ }
- //$thisfile_riff_litewave['quality_factor'] = intval(round((2000 - $thisfile_riff_litewave_raw['m_dwScale']) / 20));
- $thisfile_riff_litewave['quality_factor'] = $thisfile_riff_litewave_raw['m_wQuality'];
+ //$riff_litewave['quality_factor'] = intval(round((2000 - $riff_litewave_raw['m_dwScale']) / 20));
+ $riff_litewave['quality_factor'] = $riff_litewave_raw['m_wQuality'];
- $thisfile_riff_litewave['flags']['raw_source'] = ($thisfile_riff_litewave_raw['compression_flags'] & 0x01) ? false : true;
- $thisfile_riff_litewave['flags']['vbr_blocksize'] = ($thisfile_riff_litewave_raw['compression_flags'] & 0x02) ? false : true;
- $thisfile_riff_litewave['flags']['seekpoints'] = (bool) ($thisfile_riff_litewave_raw['compression_flags'] & 0x04);
+ $riff_litewave['flags']['raw_source'] = ($riff_litewave_raw['compression_flags'] & 0x01) ? false : true;
+ $riff_litewave['flags']['vbr_blocksize'] = ($riff_litewave_raw['compression_flags'] & 0x02) ? false : true;
+ $riff_litewave['flags']['seekpoints'] = (bool) ($riff_litewave_raw['compression_flags'] & 0x04);
- $thisfile_audio['lossless'] = (($thisfile_riff_litewave_raw['m_wQuality'] == 100) ? true : false);
- $thisfile_audio['encoder_options'] = '-q'.$thisfile_riff_litewave['quality_factor'];
+ $thisfile_audio['lossless'] = (($riff_litewave_raw['m_wQuality'] == 100) ? true : false);
+ $thisfile_audio['encoder_options'] = '-q'.$riff_litewave['quality_factor'];
break;
default:
@@ -349,8 +565,8 @@
break;
}
}
- if ($thisfile_avdataend > $ThisFileInfo['filesize']) {
- switch (@$thisfile_audio_dataformat) {
+ if ($info['avdataend'] > $info['filesize']) {
+ switch (!empty($thisfile_audio_dataformat) ? $thisfile_audio_dataformat : '') {
case 'wavpack': // WavPack
case 'lpac': // LPAC
case 'ofr': // OptimFROG
@@ -359,59 +575,95 @@
break;
case 'litewave':
- if (($thisfile_avdataend - $ThisFileInfo['filesize']) == 1) {
+ if (($info['avdataend'] - $info['filesize']) == 1) {
// LiteWave appears to incorrectly *not* pad actual output file
// to nearest WORD boundary so may appear to be short by one
// byte, in which case - skip warning
} else {
// Short by more than one byte, throw warning
- $ThisFileInfo['warning'][] = 'Probably truncated file - expecting '.$thisfile_riff[$RIFFsubtype]['data'][0]['size'].' bytes of data, only found '.($ThisFileInfo['filesize'] - $thisfile_avdataoffset).' (short by '.($thisfile_riff[$RIFFsubtype]['data'][0]['size'] - ($ThisFileInfo['filesize'] - $thisfile_avdataoffset)).' bytes)';
- $thisfile_avdataend = $ThisFileInfo['filesize'];
+ $this->warning('Probably truncated file - expecting '.$thisfile_riff[$RIFFsubtype]['data'][0]['size'].' bytes of data, only found '.($info['filesize'] - $info['avdataoffset']).' (short by '.($thisfile_riff[$RIFFsubtype]['data'][0]['size'] - ($info['filesize'] - $info['avdataoffset'])).' bytes)');
+ $info['avdataend'] = $info['filesize'];
}
break;
default:
- if ((($thisfile_avdataend - $ThisFileInfo['filesize']) == 1) && (($thisfile_riff[$RIFFsubtype]['data'][0]['size'] % 2) == 0) && ((($ThisFileInfo['filesize'] - $thisfile_avdataoffset) % 2) == 1)) {
+ if ((($info['avdataend'] - $info['filesize']) == 1) && (($thisfile_riff[$RIFFsubtype]['data'][0]['size'] % 2) == 0) && ((($info['filesize'] - $info['avdataoffset']) % 2) == 1)) {
// output file appears to be incorrectly *not* padded to nearest WORD boundary
// Output less severe warning
- $ThisFileInfo['warning'][] = 'File should probably be padded to nearest WORD boundary, but it is not (expecting '.$thisfile_riff[$RIFFsubtype]['data'][0]['size'].' bytes of data, only found '.($ThisFileInfo['filesize'] - $thisfile_avdataoffset).' therefore short by '.($thisfile_riff[$RIFFsubtype]['data'][0]['size'] - ($ThisFileInfo['filesize'] - $thisfile_avdataoffset)).' bytes)';
- $thisfile_avdataend = $ThisFileInfo['filesize'];
- break;
+ $this->warning('File should probably be padded to nearest WORD boundary, but it is not (expecting '.$thisfile_riff[$RIFFsubtype]['data'][0]['size'].' bytes of data, only found '.($info['filesize'] - $info['avdataoffset']).' therefore short by '.($thisfile_riff[$RIFFsubtype]['data'][0]['size'] - ($info['filesize'] - $info['avdataoffset'])).' bytes)');
+ $info['avdataend'] = $info['filesize'];
+ } else {
+ // Short by more than one byte, throw warning
+ $this->warning('Probably truncated file - expecting '.$thisfile_riff[$RIFFsubtype]['data'][0]['size'].' bytes of data, only found '.($info['filesize'] - $info['avdataoffset']).' (short by '.($thisfile_riff[$RIFFsubtype]['data'][0]['size'] - ($info['filesize'] - $info['avdataoffset'])).' bytes)');
+ $info['avdataend'] = $info['filesize'];
}
- // Short by more than one byte, throw warning
- $ThisFileInfo['warning'][] = 'Probably truncated file - expecting '.$thisfile_riff[$RIFFsubtype]['data'][0]['size'].' bytes of data, only found '.($ThisFileInfo['filesize'] - $thisfile_avdataoffset).' (short by '.($thisfile_riff[$RIFFsubtype]['data'][0]['size'] - ($ThisFileInfo['filesize'] - $thisfile_avdataoffset)).' bytes)';
- $thisfile_avdataend = $ThisFileInfo['filesize'];
break;
}
}
- if (!empty($ThisFileInfo['mpeg']['audio']['LAME']['audio_bytes'])) {
- if ((($thisfile_avdataend - $thisfile_avdataoffset) - $ThisFileInfo['mpeg']['audio']['LAME']['audio_bytes']) == 1) {
- $thisfile_avdataend--;
- $ThisFileInfo['warning'][] = 'Extra null byte at end of MP3 data assumed to be RIFF padding and therefore ignored';
+ if (!empty($info['mpeg']['audio']['LAME']['audio_bytes'])) {
+ if ((($info['avdataend'] - $info['avdataoffset']) - $info['mpeg']['audio']['LAME']['audio_bytes']) == 1) {
+ $info['avdataend']--;
+ $this->warning('Extra null byte at end of MP3 data assumed to be RIFF padding and therefore ignored');
}
}
- if (@$thisfile_audio_dataformat == 'ac3') {
+ if (isset($thisfile_audio_dataformat) && ($thisfile_audio_dataformat == 'ac3')) {
unset($thisfile_audio['bits_per_sample']);
- if (!empty($ThisFileInfo['ac3']['bitrate']) && ($ThisFileInfo['ac3']['bitrate'] != $thisfile_audio['bitrate'])) {
- $thisfile_audio['bitrate'] = $ThisFileInfo['ac3']['bitrate'];
+ if (!empty($info['ac3']['bitrate']) && ($info['ac3']['bitrate'] != $thisfile_audio['bitrate'])) {
+ $thisfile_audio['bitrate'] = $info['ac3']['bitrate'];
}
}
break;
+ // http://en.wikipedia.org/wiki/Audio_Video_Interleave
case 'AVI ':
+ $info['fileformat'] = 'avi';
+ $info['mime_type'] = 'video/avi';
+
$thisfile_video['bitrate_mode'] = 'vbr'; // maybe not, but probably
$thisfile_video['dataformat'] = 'avi';
- $ThisFileInfo['mime_type'] = 'video/avi';
+ $thisfile_riff_video_current = array();
+
if (isset($thisfile_riff[$RIFFsubtype]['movi']['offset'])) {
- $thisfile_avdataoffset = $thisfile_riff[$RIFFsubtype]['movi']['offset'] + 8;
- $thisfile_avdataend = $thisfile_avdataoffset + $thisfile_riff[$RIFFsubtype]['movi']['size'];
- if ($thisfile_avdataend > $ThisFileInfo['filesize']) {
- $ThisFileInfo['warning'][] = 'Probably truncated file - expecting '.$thisfile_riff[$RIFFsubtype]['movi']['size'].' bytes of data, only found '.($ThisFileInfo['filesize'] - $thisfile_avdataoffset).' (short by '.($thisfile_riff[$RIFFsubtype]['movi']['size'] - ($ThisFileInfo['filesize'] - $thisfile_avdataoffset)).' bytes)';
- $thisfile_avdataend = $ThisFileInfo['filesize'];
+ $info['avdataoffset'] = $thisfile_riff[$RIFFsubtype]['movi']['offset'] + 8;
+ if (isset($thisfile_riff['AVIX'])) {
+ $info['avdataend'] = $thisfile_riff['AVIX'][(count($thisfile_riff['AVIX']) - 1)]['chunks']['movi']['offset'] + $thisfile_riff['AVIX'][(count($thisfile_riff['AVIX']) - 1)]['chunks']['movi']['size'];
+ } else {
+ $info['avdataend'] = $thisfile_riff['AVI ']['movi']['offset'] + $thisfile_riff['AVI ']['movi']['size'];
}
+ if ($info['avdataend'] > $info['filesize']) {
+ $this->warning('Probably truncated file - expecting '.($info['avdataend'] - $info['avdataoffset']).' bytes of data, only found '.($info['filesize'] - $info['avdataoffset']).' (short by '.($info['avdataend'] - $info['filesize']).' bytes)');
+ $info['avdataend'] = $info['filesize'];
+ }
}
+ if (isset($thisfile_riff['AVI ']['hdrl']['strl']['indx'])) {
+ //$bIndexType = array(
+ // 0x00 => 'AVI_INDEX_OF_INDEXES',
+ // 0x01 => 'AVI_INDEX_OF_CHUNKS',
+ // 0x80 => 'AVI_INDEX_IS_DATA',
+ //);
+ //$bIndexSubtype = array(
+ // 0x01 => array(
+ // 0x01 => 'AVI_INDEX_2FIELD',
+ // ),
+ //);
+ foreach ($thisfile_riff['AVI ']['hdrl']['strl']['indx'] as $streamnumber => $steamdataarray) {
+ $ahsisd = &$thisfile_riff['AVI ']['hdrl']['strl']['indx'][$streamnumber]['data'];
+
+ $thisfile_riff_raw['indx'][$streamnumber]['wLongsPerEntry'] = $this->EitherEndian2Int(substr($ahsisd, 0, 2));
+ $thisfile_riff_raw['indx'][$streamnumber]['bIndexSubType'] = $this->EitherEndian2Int(substr($ahsisd, 2, 1));
+ $thisfile_riff_raw['indx'][$streamnumber]['bIndexType'] = $this->EitherEndian2Int(substr($ahsisd, 3, 1));
+ $thisfile_riff_raw['indx'][$streamnumber]['nEntriesInUse'] = $this->EitherEndian2Int(substr($ahsisd, 4, 4));
+ $thisfile_riff_raw['indx'][$streamnumber]['dwChunkId'] = substr($ahsisd, 8, 4);
+ $thisfile_riff_raw['indx'][$streamnumber]['dwReserved'] = $this->EitherEndian2Int(substr($ahsisd, 12, 4));
+
+ //$thisfile_riff_raw['indx'][$streamnumber]['bIndexType_name'] = $bIndexType[$thisfile_riff_raw['indx'][$streamnumber]['bIndexType']];
+ //$thisfile_riff_raw['indx'][$streamnumber]['bIndexSubType_name'] = $bIndexSubtype[$thisfile_riff_raw['indx'][$streamnumber]['bIndexType']][$thisfile_riff_raw['indx'][$streamnumber]['bIndexSubType']];
+
+ unset($ahsisd);
+ }
+ }
if (isset($thisfile_riff['AVI ']['hdrl']['avih'][$streamindex]['data'])) {
$avihData = $thisfile_riff['AVI ']['hdrl']['avih'][$streamindex]['data'];
@@ -419,34 +671,48 @@
$thisfile_riff_raw['avih'] = array();
$thisfile_riff_raw_avih = &$thisfile_riff_raw['avih'];
- $thisfile_riff_raw_avih['dwMicroSecPerFrame'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($avihData, 0, 4)); // frame display rate (or 0L)
+ $thisfile_riff_raw_avih['dwMicroSecPerFrame'] = $this->EitherEndian2Int(substr($avihData, 0, 4)); // frame display rate (or 0L)
if ($thisfile_riff_raw_avih['dwMicroSecPerFrame'] == 0) {
- $ThisFileInfo['error'][] = 'Corrupt RIFF file: avih.dwMicroSecPerFrame == zero';
+ $this->error('Corrupt RIFF file: avih.dwMicroSecPerFrame == zero');
return false;
}
- $thisfile_riff_raw_avih['dwMaxBytesPerSec'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($avihData, 4, 4)); // max. transfer rate
- $thisfile_riff_raw_avih['dwPaddingGranularity'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($avihData, 8, 4)); // pad to multiples of this size; normally 2K.
- $thisfile_riff_raw_avih['dwFlags'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($avihData, 12, 4)); // the ever-present flags
- $thisfile_riff_raw_avih['dwTotalFrames'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($avihData, 16, 4)); // # frames in file
- $thisfile_riff_raw_avih['dwInitialFrames'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($avihData, 20, 4));
- $thisfile_riff_raw_avih['dwStreams'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($avihData, 24, 4));
- $thisfile_riff_raw_avih['dwSuggestedBufferSize'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($avihData, 28, 4));
- $thisfile_riff_raw_avih['dwWidth'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($avihData, 32, 4));
- $thisfile_riff_raw_avih['dwHeight'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($avihData, 36, 4));
- $thisfile_riff_raw_avih['dwScale'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($avihData, 40, 4));
- $thisfile_riff_raw_avih['dwRate'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($avihData, 44, 4));
- $thisfile_riff_raw_avih['dwStart'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($avihData, 48, 4));
- $thisfile_riff_raw_avih['dwLength'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($avihData, 52, 4));
- $thisfile_riff_raw_avih['flags']['hasindex'] = (bool) ($thisfile_riff_raw_avih['dwFlags'] & 0x00000010);
- $thisfile_riff_raw_avih['flags']['mustuseindex'] = (bool) ($thisfile_riff_raw_avih['dwFlags'] & 0x00000020);
- $thisfile_riff_raw_avih['flags']['interleaved'] = (bool) ($thisfile_riff_raw_avih['dwFlags'] & 0x00000100);
- $thisfile_riff_raw_avih['flags']['trustcktype'] = (bool) ($thisfile_riff_raw_avih['dwFlags'] & 0x00000800);
- $thisfile_riff_raw_avih['flags']['capturedfile'] = (bool) ($thisfile_riff_raw_avih['dwFlags'] & 0x00010000);
- $thisfile_riff_raw_avih['flags']['copyrighted'] = (bool) ($thisfile_riff_raw_avih['dwFlags'] & 0x00020010);
+ $flags = array(
+ 'dwMaxBytesPerSec', // max. transfer rate
+ 'dwPaddingGranularity', // pad to multiples of this size; normally 2K.
+ 'dwFlags', // the ever-present flags
+ 'dwTotalFrames', // # frames in file
+ 'dwInitialFrames', //
+ 'dwStreams', //
+ 'dwSuggestedBufferSize', //
+ 'dwWidth', //
+ 'dwHeight', //
+ 'dwScale', //
+ 'dwRate', //
+ 'dwStart', //
+ 'dwLength', //
+ );
+ $avih_offset = 4;
+ foreach ($flags as $flag) {
+ $thisfile_riff_raw_avih[$flag] = $this->EitherEndian2Int(substr($avihData, $avih_offset, 4));
+ $avih_offset += 4;
+ }
+ $flags = array(
+ 'hasindex' => 0x00000010,
+ 'mustuseindex' => 0x00000020,
+ 'interleaved' => 0x00000100,
+ 'trustcktype' => 0x00000800,
+ 'capturedfile' => 0x00010000,
+ 'copyrighted' => 0x00020010,
+ );
+ foreach ($flags as $flag => $value) {
+ $thisfile_riff_raw_avih['flags'][$flag] = (bool) ($thisfile_riff_raw_avih['dwFlags'] & $value);
+ }
+
// shortcut
$thisfile_riff_video[$streamindex] = array();
+ /** @var array $thisfile_riff_video_current */
$thisfile_riff_video_current = &$thisfile_riff_video[$streamindex];
if ($thisfile_riff_raw_avih['dwWidth'] > 0) {
@@ -486,7 +752,7 @@
$streamindex = count($thisfile_riff_audio);
}
- $thisfile_riff_audio[$streamindex] = getid3_riff::RIFFparseWAVEFORMATex($strfData);
+ $thisfile_riff_audio[$streamindex] = self::parseWAVEFORMATex($strfData);
$thisfile_audio['wformattag'] = $thisfile_riff_audio[$streamindex]['raw']['wFormatTag'];
// shortcut
@@ -554,25 +820,25 @@
$thisfile_riff_raw['strh'][$i] = array();
$thisfile_riff_raw_strh_current = &$thisfile_riff_raw['strh'][$i];
- $thisfile_riff_raw_strh_current['fccType'] = substr($strhData, 0, 4); // same as $strhfccType;
- $thisfile_riff_raw_strh_current['fccHandler'] = substr($strhData, 4, 4);
- $thisfile_riff_raw_strh_current['dwFlags'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($strhData, 8, 4)); // Contains AVITF_* flags
- $thisfile_riff_raw_strh_current['wPriority'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($strhData, 12, 2));
- $thisfile_riff_raw_strh_current['wLanguage'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($strhData, 14, 2));
- $thisfile_riff_raw_strh_current['dwInitialFrames'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($strhData, 16, 4));
- $thisfile_riff_raw_strh_current['dwScale'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($strhData, 20, 4));
- $thisfile_riff_raw_strh_current['dwRate'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($strhData, 24, 4));
- $thisfile_riff_raw_strh_current['dwStart'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($strhData, 28, 4));
- $thisfile_riff_raw_strh_current['dwLength'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($strhData, 32, 4));
- $thisfile_riff_raw_strh_current['dwSuggestedBufferSize'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($strhData, 36, 4));
- $thisfile_riff_raw_strh_current['dwQuality'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($strhData, 40, 4));
- $thisfile_riff_raw_strh_current['dwSampleSize'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($strhData, 44, 4));
- $thisfile_riff_raw_strh_current['rcFrame'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($strhData, 48, 4));
+ $thisfile_riff_raw_strh_current['fccType'] = substr($strhData, 0, 4); // same as $strhfccType;
+ $thisfile_riff_raw_strh_current['fccHandler'] = substr($strhData, 4, 4);
+ $thisfile_riff_raw_strh_current['dwFlags'] = $this->EitherEndian2Int(substr($strhData, 8, 4)); // Contains AVITF_* flags
+ $thisfile_riff_raw_strh_current['wPriority'] = $this->EitherEndian2Int(substr($strhData, 12, 2));
+ $thisfile_riff_raw_strh_current['wLanguage'] = $this->EitherEndian2Int(substr($strhData, 14, 2));
+ $thisfile_riff_raw_strh_current['dwInitialFrames'] = $this->EitherEndian2Int(substr($strhData, 16, 4));
+ $thisfile_riff_raw_strh_current['dwScale'] = $this->EitherEndian2Int(substr($strhData, 20, 4));
+ $thisfile_riff_raw_strh_current['dwRate'] = $this->EitherEndian2Int(substr($strhData, 24, 4));
+ $thisfile_riff_raw_strh_current['dwStart'] = $this->EitherEndian2Int(substr($strhData, 28, 4));
+ $thisfile_riff_raw_strh_current['dwLength'] = $this->EitherEndian2Int(substr($strhData, 32, 4));
+ $thisfile_riff_raw_strh_current['dwSuggestedBufferSize'] = $this->EitherEndian2Int(substr($strhData, 36, 4));
+ $thisfile_riff_raw_strh_current['dwQuality'] = $this->EitherEndian2Int(substr($strhData, 40, 4));
+ $thisfile_riff_raw_strh_current['dwSampleSize'] = $this->EitherEndian2Int(substr($strhData, 44, 4));
+ $thisfile_riff_raw_strh_current['rcFrame'] = $this->EitherEndian2Int(substr($strhData, 48, 4));
- $thisfile_riff_video_current['codec'] = getid3_riff::RIFFfourccLookup($thisfile_riff_raw_strh_current['fccHandler']);
+ $thisfile_riff_video_current['codec'] = self::fourccLookup($thisfile_riff_raw_strh_current['fccHandler']);
$thisfile_video['fourcc'] = $thisfile_riff_raw_strh_current['fccHandler'];
- if (!$thisfile_riff_video_current['codec'] && isset($thisfile_riff_raw_strf_strhfccType_streamindex['fourcc']) && getid3_riff::RIFFfourccLookup($thisfile_riff_raw_strf_strhfccType_streamindex['fourcc'])) {
- $thisfile_riff_video_current['codec'] = getid3_riff::RIFFfourccLookup($thisfile_riff_raw_strf_strhfccType_streamindex['fourcc']);
+ if (!$thisfile_riff_video_current['codec'] && isset($thisfile_riff_raw_strf_strhfccType_streamindex['fourcc']) && self::fourccLookup($thisfile_riff_raw_strf_strhfccType_streamindex['fourcc'])) {
+ $thisfile_riff_video_current['codec'] = self::fourccLookup($thisfile_riff_raw_strf_strhfccType_streamindex['fourcc']);
$thisfile_video['fourcc'] = $thisfile_riff_raw_strf_strhfccType_streamindex['fourcc'];
}
$thisfile_video['codec'] = $thisfile_riff_video_current['codec'];
@@ -591,18 +857,7 @@
switch ($strhfccType) {
case 'vids':
- $thisfile_riff_raw_strf_strhfccType_streamindex['biSize'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($strfData, 0, 4)); // number of bytes required by the BITMAPINFOHEADER structure
- $thisfile_riff_raw_strf_strhfccType_streamindex['biWidth'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($strfData, 4, 4)); // width of the bitmap in pixels
- $thisfile_riff_raw_strf_strhfccType_streamindex['biHeight'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($strfData, 8, 4)); // height of the bitmap in pixels. If biHeight is positive, the bitmap is a 'bottom-up' DIB and its origin is the lower left corner. If biHeight is negative, the bitmap is a 'top-down' DIB and its origin is the upper left corner
- $thisfile_riff_raw_strf_strhfccType_streamindex['biPlanes'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($strfData, 12, 2)); // number of color planes on the target device. In most cases this value must be set to 1
- $thisfile_riff_raw_strf_strhfccType_streamindex['biBitCount'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($strfData, 14, 2)); // Specifies the number of bits per pixels
- $thisfile_riff_raw_strf_strhfccType_streamindex['fourcc'] = substr($strfData, 16, 4); //
- $thisfile_riff_raw_strf_strhfccType_streamindex['biSizeImage'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($strfData, 20, 4)); // size of the bitmap data section of the image (the actual pixel data, excluding BITMAPINFOHEADER and RGBQUAD structures)
- $thisfile_riff_raw_strf_strhfccType_streamindex['biXPelsPerMeter'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($strfData, 24, 4)); // horizontal resolution, in pixels per metre, of the target device
- $thisfile_riff_raw_strf_strhfccType_streamindex['biYPelsPerMeter'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($strfData, 28, 4)); // vertical resolution, in pixels per metre, of the target device
- $thisfile_riff_raw_strf_strhfccType_streamindex['biClrUsed'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($strfData, 32, 4)); // actual number of color indices in the color table used by the bitmap. If this value is zero, the bitmap uses the maximum number of colors corresponding to the value of the biBitCount member for the compression mode specified by biCompression
- $thisfile_riff_raw_strf_strhfccType_streamindex['biClrImportant'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($strfData, 36, 4)); // number of color indices that are considered important for displaying the bitmap. If this value is zero, all colors are important
-
+ $thisfile_riff_raw_strf_strhfccType_streamindex = self::ParseBITMAPINFOHEADER(substr($strfData, 0, 40), ($this->container == 'riff'));
$thisfile_video['bits_per_sample'] = $thisfile_riff_raw_strf_strhfccType_streamindex['biBitCount'];
if ($thisfile_riff_video_current['codec'] == 'DV') {
@@ -617,7 +872,7 @@
break;
default:
- $ThisFileInfo['warning'][] = 'Unhandled fccType for stream ('.$i.'): "'.$strhfccType.'"';
+ $this->warning('Unhandled fccType for stream ('.$i.'): "'.$strhfccType.'"');
break;
}
@@ -624,11 +879,13 @@
}
}
- if (isset($thisfile_riff_raw_strf_strhfccType_streamindex['fourcc']) && getid3_riff::RIFFfourccLookup($thisfile_riff_raw_strf_strhfccType_streamindex['fourcc'])) {
+ if (isset($thisfile_riff_raw_strf_strhfccType_streamindex) && isset($thisfile_riff_raw_strf_strhfccType_streamindex['fourcc'])) {
- $thisfile_riff_video_current['codec'] = getid3_riff::RIFFfourccLookup($thisfile_riff_raw_strf_strhfccType_streamindex['fourcc']);
- $thisfile_video['codec'] = $thisfile_riff_video_current['codec'];
- $thisfile_video['fourcc'] = $thisfile_riff_raw_strf_strhfccType_streamindex['fourcc'];
+ $thisfile_video['fourcc'] = $thisfile_riff_raw_strf_strhfccType_streamindex['fourcc'];
+ if (self::fourccLookup($thisfile_video['fourcc'])) {
+ $thisfile_riff_video_current['codec'] = self::fourccLookup($thisfile_video['fourcc']);
+ $thisfile_video['codec'] = $thisfile_riff_video_current['codec'];
+ }
switch ($thisfile_riff_raw_strf_strhfccType_streamindex['fourcc']) {
case 'HFYU': // Huffman Lossless Codec
@@ -635,12 +892,12 @@
case 'IRAW': // Intel YUV Uncompressed
case 'YUY2': // Uncompressed YUV 4:2:2
$thisfile_video['lossless'] = true;
- $thisfile_video['bits_per_sample'] = 24;
+ //$thisfile_video['bits_per_sample'] = 24;
break;
default:
$thisfile_video['lossless'] = false;
- $thisfile_video['bits_per_sample'] = 24;
+ //$thisfile_video['bits_per_sample'] = 24;
break;
}
@@ -650,32 +907,50 @@
}
break;
+
+ case 'AMV ':
+ $info['fileformat'] = 'amv';
+ $info['mime_type'] = 'video/amv';
+
+ $thisfile_video['bitrate_mode'] = 'vbr'; // it's MJPEG, presumably contant-quality encoding, thereby VBR
+ $thisfile_video['dataformat'] = 'mjpeg';
+ $thisfile_video['codec'] = 'mjpeg';
+ $thisfile_video['lossless'] = false;
+ $thisfile_video['bits_per_sample'] = 24;
+
+ $thisfile_audio['dataformat'] = 'adpcm';
+ $thisfile_audio['lossless'] = false;
+ break;
+
+
+ // http://en.wikipedia.org/wiki/CD-DA
case 'CDDA':
- $thisfile_audio['bitrate_mode'] = 'cbr';
+ $info['fileformat'] = 'cda';
+ unset($info['mime_type']);
+
$thisfile_audio_dataformat = 'cda';
- $thisfile_audio['lossless'] = true;
- unset($ThisFileInfo['mime_type']);
- $thisfile_avdataoffset = 44;
+ $info['avdataoffset'] = 44;
if (isset($thisfile_riff['CDDA']['fmt '][0]['data'])) {
// shortcut
$thisfile_riff_CDDA_fmt_0 = &$thisfile_riff['CDDA']['fmt '][0];
- $thisfile_riff_CDDA_fmt_0['unknown1'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($thisfile_riff_CDDA_fmt_0['data'], 0, 2));
- $thisfile_riff_CDDA_fmt_0['track_num'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($thisfile_riff_CDDA_fmt_0['data'], 2, 2));
- $thisfile_riff_CDDA_fmt_0['disc_id'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($thisfile_riff_CDDA_fmt_0['data'], 4, 4));
- $thisfile_riff_CDDA_fmt_0['start_offset_frame'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($thisfile_riff_CDDA_fmt_0['data'], 8, 4));
- $thisfile_riff_CDDA_fmt_0['playtime_frames'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($thisfile_riff_CDDA_fmt_0['data'], 12, 4));
- $thisfile_riff_CDDA_fmt_0['unknown6'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($thisfile_riff_CDDA_fmt_0['data'], 16, 4));
- $thisfile_riff_CDDA_fmt_0['unknown7'] = getid3_riff::EitherEndian2Int($ThisFileInfo, substr($thisfile_riff_CDDA_fmt_0['data'], 20, 4));
+ $thisfile_riff_CDDA_fmt_0['unknown1'] = $this->EitherEndian2Int(substr($thisfile_riff_CDDA_fmt_0['data'], 0, 2));
+ $thisfile_riff_CDDA_fmt_0['track_num'] = $this->EitherEndian2Int(substr($thisfile_riff_CDDA_fmt_0['data'], 2, 2));
+ $thisfile_riff_CDDA_fmt_0['disc_id'] = $this->EitherEndian2Int(substr($thisfile_riff_CDDA_fmt_0['data'], 4, 4));
+ $thisfile_riff_CDDA_fmt_0['start_offset_frame'] = $this->EitherEndian2Int(substr($thisfile_riff_CDDA_fmt_0['data'], 8, 4));
+ $thisfile_riff_CDDA_fmt_0['playtime_frames'] = $this->EitherEndian2Int(substr($thisfile_riff_CDDA_fmt_0['data'], 12, 4));
+ $thisfile_riff_CDDA_fmt_0['unknown6'] = $this->EitherEndian2Int(substr($thisfile_riff_CDDA_fmt_0['data'], 16, 4));
+ $thisfile_riff_CDDA_fmt_0['unknown7'] = $this->EitherEndian2Int(substr($thisfile_riff_CDDA_fmt_0['data'], 20, 4));
$thisfile_riff_CDDA_fmt_0['start_offset_seconds'] = (float) $thisfile_riff_CDDA_fmt_0['start_offset_frame'] / 75;
$thisfile_riff_CDDA_fmt_0['playtime_seconds'] = (float) $thisfile_riff_CDDA_fmt_0['playtime_frames'] / 75;
- $ThisFileInfo['comments']['track'] = $thisfile_riff_CDDA_fmt_0['track_num'];
- $ThisFileInfo['playtime_seconds'] = $thisfile_riff_CDDA_fmt_0['playtime_seconds'];
+ $info['comments']['track_number'] = $thisfile_riff_CDDA_fmt_0['track_num'];
+ $info['playtime_seconds'] = $thisfile_riff_CDDA_fmt_0['playtime_seconds'];
// hardcoded data for CD-audio
+ $thisfile_audio['lossless'] = true;
$thisfile_audio['sample_rate'] = 44100;
$thisfile_audio['channels'] = 2;
$thisfile_audio['bits_per_sample'] = 16;
@@ -684,25 +959,27 @@
}
break;
-
+ // http://en.wikipedia.org/wiki/AIFF
case 'AIFF':
case 'AIFC':
+ $info['fileformat'] = 'aiff';
+ $info['mime_type'] = 'audio/x-aiff';
+
$thisfile_audio['bitrate_mode'] = 'cbr';
$thisfile_audio_dataformat = 'aiff';
$thisfile_audio['lossless'] = true;
- $ThisFileInfo['mime_type'] = 'audio/x-aiff';
if (isset($thisfile_riff[$RIFFsubtype]['SSND'][0]['offset'])) {
- $thisfile_avdataoffset = $thisfile_riff[$RIFFsubtype]['SSND'][0]['offset'] + 8;
- $thisfile_avdataend = $thisfile_avdataoffset + $thisfile_riff[$RIFFsubtype]['SSND'][0]['size'];
- if ($thisfile_avdataend > $ThisFileInfo['filesize']) {
- if (($thisfile_avdataend == ($ThisFileInfo['filesize'] + 1)) && (($ThisFileInfo['filesize'] % 2) == 1)) {
+ $info['avdataoffset'] = $thisfile_riff[$RIFFsubtype]['SSND'][0]['offset'] + 8;
+ $info['avdataend'] = $info['avdataoffset'] + $thisfile_riff[$RIFFsubtype]['SSND'][0]['size'];
+ if ($info['avdataend'] > $info['filesize']) {
+ if (($info['avdataend'] == ($info['filesize'] + 1)) && (($info['filesize'] % 2) == 1)) {
// structures rounded to 2-byte boundary, but dumb encoders
// forget to pad end of file to make this actually work
} else {
- $ThisFileInfo['warning'][] = 'Probable truncated AIFF file: expecting '.$thisfile_riff[$RIFFsubtype]['SSND'][0]['size'].' bytes of audio data, only '.($ThisFileInfo['filesize'] - $thisfile_avdataoffset).' bytes found';
+ $this->warning('Probable truncated AIFF file: expecting '.$thisfile_riff[$RIFFsubtype]['SSND'][0]['size'].' bytes of audio data, only '.($info['filesize'] - $info['avdataoffset']).' bytes found');
}
- $thisfile_avdataend = $ThisFileInfo['filesize'];
+ $info['avdataend'] = $info['filesize'];
}
}
@@ -757,28 +1034,28 @@
}
$thisfile_audio['sample_rate'] = $thisfile_riff_audio['sample_rate'];
if ($thisfile_audio['sample_rate'] == 0) {
- $ThisFileInfo['error'][] = 'Corrupted AIFF file: sample_rate == zero';
+ $this->error('Corrupted AIFF file: sample_rate == zero');
return false;
}
- $ThisFileInfo['playtime_seconds'] = $thisfile_riff_audio['total_samples'] / $thisfile_audio['sample_rate'];
+ $info['playtime_seconds'] = $thisfile_riff_audio['total_samples'] / $thisfile_audio['sample_rate'];
}
if (isset($thisfile_riff[$RIFFsubtype]['COMT'])) {
$offset = 0;
- $CommentCount = getid3_lib::BigEndian2Int(substr($thisfile_riff[$RIFFsubtype]['COMT'][0]['data'], $offset, 2), false);
+ $CommentCount = getid3_lib::BigEndian2Int(substr($thisfile_riff[$RIFFsubtype]['COMT'][0]['data'], $offset, 2), false);
$offset += 2;
for ($i = 0; $i < $CommentCount; $i++) {
- $ThisFileInfo['comments_raw'][$i]['timestamp'] = getid3_lib::BigEndian2Int(substr($thisfile_riff[$RIFFsubtype]['COMT'][0]['data'], $offset, 4), false);
+ $info['comments_raw'][$i]['timestamp'] = getid3_lib::BigEndian2Int(substr($thisfile_riff[$RIFFsubtype]['COMT'][0]['data'], $offset, 4), false);
$offset += 4;
- $ThisFileInfo['comments_raw'][$i]['marker_id'] = getid3_lib::BigEndian2Int(substr($thisfile_riff[$RIFFsubtype]['COMT'][0]['data'], $offset, 2), true);
+ $info['comments_raw'][$i]['marker_id'] = getid3_lib::BigEndian2Int(substr($thisfile_riff[$RIFFsubtype]['COMT'][0]['data'], $offset, 2), true);
$offset += 2;
- $CommentLength = getid3_lib::BigEndian2Int(substr($thisfile_riff[$RIFFsubtype]['COMT'][0]['data'], $offset, 2), false);
+ $CommentLength = getid3_lib::BigEndian2Int(substr($thisfile_riff[$RIFFsubtype]['COMT'][0]['data'], $offset, 2), false);
$offset += 2;
- $ThisFileInfo['comments_raw'][$i]['comment'] = substr($thisfile_riff[$RIFFsubtype]['COMT'][0]['data'], $offset, $CommentLength);
+ $info['comments_raw'][$i]['comment'] = substr($thisfile_riff[$RIFFsubtype]['COMT'][0]['data'], $offset, $CommentLength);
$offset += $CommentLength;
- $ThisFileInfo['comments_raw'][$i]['timestamp_unix'] = getid3_lib::DateMac2Unix($ThisFileInfo['comments_raw'][$i]['timestamp']);
- $thisfile_riff['comments']['comment'][] = $ThisFileInfo['comments_raw'][$i]['comment'];
+ $info['comments_raw'][$i]['timestamp_unix'] = getid3_lib::DateMac2Unix($info['comments_raw'][$i]['timestamp']);
+ $thisfile_riff['comments']['comment'][] = $info['comments_raw'][$i]['comment'];
}
}
@@ -788,20 +1065,37 @@
$thisfile_riff['comments'][$value][] = $thisfile_riff[$RIFFsubtype][$key][0]['data'];
}
}
+/*
+ if (isset($thisfile_riff[$RIFFsubtype]['ID3 '])) {
+ getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v2.php', __FILE__, true);
+ $getid3_temp = new getID3();
+ $getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp);
+ $getid3_id3v2 = new getid3_id3v2($getid3_temp);
+ $getid3_id3v2->StartingOffset = $thisfile_riff[$RIFFsubtype]['ID3 '][0]['offset'] + 8;
+ if ($thisfile_riff[$RIFFsubtype]['ID3 '][0]['valid'] = $getid3_id3v2->Analyze()) {
+ $info['id3v2'] = $getid3_temp->info['id3v2'];
+ }
+ unset($getid3_temp, $getid3_id3v2);
+ }
+*/
break;
+ // http://en.wikipedia.org/wiki/8SVX
case '8SVX':
+ $info['fileformat'] = '8svx';
+ $info['mime_type'] = 'audio/8svx';
+
$thisfile_audio['bitrate_mode'] = 'cbr';
$thisfile_audio_dataformat = '8svx';
$thisfile_audio['bits_per_sample'] = 8;
$thisfile_audio['channels'] = 1; // overridden below, if need be
- $ThisFileInfo['mime_type'] = 'audio/x-aiff';
+ $ActualBitsPerSample = 0;
if (isset($thisfile_riff[$RIFFsubtype]['BODY'][0]['offset'])) {
- $thisfile_avdataoffset = $thisfile_riff[$RIFFsubtype]['BODY'][0]['offset'] + 8;
- $thisfile_avdataend = $thisfile_avdataoffset + $thisfile_riff[$RIFFsubtype]['BODY'][0]['size'];
- if ($thisfile_avdataend > $ThisFileInfo['filesize']) {
- $ThisFileInfo['warning'][] = 'Probable truncated AIFF file: expecting '.$thisfile_riff[$RIFFsubtype]['BODY'][0]['size'].' bytes of audio data, only '.($ThisFileInfo['filesize'] - $thisfile_avdataoffset).' bytes found';
+ $info['avdataoffset'] = $thisfile_riff[$RIFFsubtype]['BODY'][0]['offset'] + 8;
+ $info['avdataend'] = $info['avdataoffset'] + $thisfile_riff[$RIFFsubtype]['BODY'][0]['size'];
+ if ($info['avdataend'] > $info['filesize']) {
+ $this->warning('Probable truncated AIFF file: expecting '.$thisfile_riff[$RIFFsubtype]['BODY'][0]['size'].' bytes of audio data, only '.($info['filesize'] - $info['avdataoffset']).' bytes found');
}
}
@@ -823,17 +1117,17 @@
case 0:
$thisfile_audio['codec'] = 'Pulse Code Modulation (PCM)';
$thisfile_audio['lossless'] = true;
- $ActualBitsPerSample = 8;
+ $ActualBitsPerSample = 8;
break;
case 1:
$thisfile_audio['codec'] = 'Fibonacci-delta encoding';
$thisfile_audio['lossless'] = false;
- $ActualBitsPerSample = 4;
+ $ActualBitsPerSample = 4;
break;
default:
- $ThisFileInfo['warning'][] = 'Unexpected sCompression value in 8SVX.VHDR chunk - expecting 0 or 1, found "'.sCompression.'"';
+ $this->warning('Unexpected sCompression value in 8SVX.VHDR chunk - expecting 0 or 1, found "'.$thisfile_riff_RIFFsubtype_VHDR_0['sCompression'].'"');
break;
}
}
@@ -851,7 +1145,7 @@
break;
default:
- $ThisFileInfo['warning'][] = 'Unexpected value in 8SVX.CHAN chunk - expecting 2 or 4 or 6, found "'.$ChannelsIndex.'"';
+ $this->warning('Unexpected value in 8SVX.CHAN chunk - expecting 2 or 4 or 6, found "'.$ChannelsIndex.'"');
break;
}
@@ -866,33 +1160,112 @@
$thisfile_audio['bitrate'] = $thisfile_audio['sample_rate'] * $ActualBitsPerSample * $thisfile_audio['channels'];
if (!empty($thisfile_audio['bitrate'])) {
- $ThisFileInfo['playtime_seconds'] = ($thisfile_avdataend - $thisfile_avdataoffset) / ($thisfile_audio['bitrate'] / 8);
+ $info['playtime_seconds'] = ($info['avdataend'] - $info['avdataoffset']) / ($thisfile_audio['bitrate'] / 8);
}
break;
+ case 'CDXA':
+ $info['fileformat'] = 'vcd'; // Asume Video CD
+ $info['mime_type'] = 'video/mpeg';
- case 'CDXA':
- $ThisFileInfo['mime_type'] = 'video/mpeg';
if (!empty($thisfile_riff['CDXA']['data'][0]['size'])) {
- $GETID3_ERRORARRAY = &$ThisFileInfo['warning'];
- if (getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.mpeg.php', __FILE__, false)) {
- $dummy = $ThisFileInfo;
- $dummy['error'] = array();
- $mpeg_scanner = new getid3_mpeg($fd, $dummy);
- if (empty($dummy['error'])) {
- $ThisFileInfo['audio'] = $dummy['audio'];
- $ThisFileInfo['video'] = $dummy['video'];
- $ThisFileInfo['mpeg'] = $dummy['mpeg'];
- $ThisFileInfo['warning'] = $dummy['warning'];
- }
+ getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.mpeg.php', __FILE__, true);
+
+ $getid3_temp = new getID3();
+ $getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp);
+ $getid3_mpeg = new getid3_mpeg($getid3_temp);
+ $getid3_mpeg->Analyze();
+ if (empty($getid3_temp->info['error'])) {
+ $info['audio'] = $getid3_temp->info['audio'];
+ $info['video'] = $getid3_temp->info['video'];
+ $info['mpeg'] = $getid3_temp->info['mpeg'];
+ $info['warning'] = $getid3_temp->info['warning'];
}
+ unset($getid3_temp, $getid3_mpeg);
}
break;
+ case 'WEBP':
+ // https://developers.google.com/speed/webp/docs/riff_container
+ // https://tools.ietf.org/html/rfc6386
+ // https://chromium.googlesource.com/webm/libwebp/+/master/doc/webp-lossless-bitstream-spec.txt
+ $info['fileformat'] = 'webp';
+ $info['mime_type'] = 'image/webp';
+ if (!empty($thisfile_riff['WEBP']['VP8 '][0]['size'])) {
+ $old_offset = $this->ftell();
+ $this->fseek($thisfile_riff['WEBP']['VP8 '][0]['offset'] + 8); // 4 bytes "VP8 " + 4 bytes chunk size
+ $WEBP_VP8_header = $this->fread(10);
+ $this->fseek($old_offset);
+ if (substr($WEBP_VP8_header, 3, 3) == "\x9D\x01\x2A") {
+ $thisfile_riff['WEBP']['VP8 '][0]['keyframe'] = !(getid3_lib::LittleEndian2Int(substr($WEBP_VP8_header, 0, 3)) & 0x800000);
+ $thisfile_riff['WEBP']['VP8 '][0]['version'] = (getid3_lib::LittleEndian2Int(substr($WEBP_VP8_header, 0, 3)) & 0x700000) >> 20;
+ $thisfile_riff['WEBP']['VP8 '][0]['show_frame'] = (getid3_lib::LittleEndian2Int(substr($WEBP_VP8_header, 0, 3)) & 0x080000);
+ $thisfile_riff['WEBP']['VP8 '][0]['data_bytes'] = (getid3_lib::LittleEndian2Int(substr($WEBP_VP8_header, 0, 3)) & 0x07FFFF) >> 0;
+
+ $thisfile_riff['WEBP']['VP8 '][0]['scale_x'] = (getid3_lib::LittleEndian2Int(substr($WEBP_VP8_header, 6, 2)) & 0xC000) >> 14;
+ $thisfile_riff['WEBP']['VP8 '][0]['width'] = (getid3_lib::LittleEndian2Int(substr($WEBP_VP8_header, 6, 2)) & 0x3FFF);
+ $thisfile_riff['WEBP']['VP8 '][0]['scale_y'] = (getid3_lib::LittleEndian2Int(substr($WEBP_VP8_header, 8, 2)) & 0xC000) >> 14;
+ $thisfile_riff['WEBP']['VP8 '][0]['height'] = (getid3_lib::LittleEndian2Int(substr($WEBP_VP8_header, 8, 2)) & 0x3FFF);
+
+ $info['video']['resolution_x'] = $thisfile_riff['WEBP']['VP8 '][0]['width'];
+ $info['video']['resolution_y'] = $thisfile_riff['WEBP']['VP8 '][0]['height'];
+ } else {
+ $this->error('Expecting 9D 01 2A at offset '.($thisfile_riff['WEBP']['VP8 '][0]['offset'] + 8 + 3).', found "'.getid3_lib::PrintHexBytes(substr($WEBP_VP8_header, 3, 3)).'"');
+ }
+
+ }
+ if (!empty($thisfile_riff['WEBP']['VP8L'][0]['size'])) {
+ $old_offset = $this->ftell();
+ $this->fseek($thisfile_riff['WEBP']['VP8L'][0]['offset'] + 8); // 4 bytes "VP8L" + 4 bytes chunk size
+ $WEBP_VP8L_header = $this->fread(10);
+ $this->fseek($old_offset);
+ if (substr($WEBP_VP8L_header, 0, 1) == "\x2F") {
+ $width_height_flags = getid3_lib::LittleEndian2Bin(substr($WEBP_VP8L_header, 1, 4));
+ $thisfile_riff['WEBP']['VP8L'][0]['width'] = bindec(substr($width_height_flags, 18, 14)) + 1;
+ $thisfile_riff['WEBP']['VP8L'][0]['height'] = bindec(substr($width_height_flags, 4, 14)) + 1;
+ $thisfile_riff['WEBP']['VP8L'][0]['alpha_is_used'] = (bool) bindec(substr($width_height_flags, 3, 1));
+ $thisfile_riff['WEBP']['VP8L'][0]['version'] = bindec(substr($width_height_flags, 0, 3));
+
+ $info['video']['resolution_x'] = $thisfile_riff['WEBP']['VP8L'][0]['width'];
+ $info['video']['resolution_y'] = $thisfile_riff['WEBP']['VP8L'][0]['height'];
+ } else {
+ $this->error('Expecting 2F at offset '.($thisfile_riff['WEBP']['VP8L'][0]['offset'] + 8).', found "'.getid3_lib::PrintHexBytes(substr($WEBP_VP8L_header, 0, 1)).'"');
+ }
+
+ }
+ break;
+
default:
- $ThisFileInfo['error'][] = 'Unknown RIFF type: expecting one of (WAVE|RMP3|AVI |CDDA|AIFF|AIFC|8SVX|CDXA), found "'.$RIFFsubtype.'" instead';
- unset($ThisFileInfo['fileformat']);
+ $this->error('Unknown RIFF type: expecting one of (WAVE|RMP3|AVI |CDDA|AIFF|AIFC|8SVX|CDXA|WEBP), found "'.$RIFFsubtype.'" instead');
+ //unset($info['fileformat']);
+ }
+
+ switch ($RIFFsubtype) {
+ case 'WAVE':
+ case 'AIFF':
+ case 'AIFC':
+ $ID3v2_key_good = 'id3 ';
+ $ID3v2_keys_bad = array('ID3 ', 'tag ');
+ foreach ($ID3v2_keys_bad as $ID3v2_key_bad) {
+ if (isset($thisfile_riff[$RIFFsubtype][$ID3v2_key_bad]) && !array_key_exists($ID3v2_key_good, $thisfile_riff[$RIFFsubtype])) {
+ $thisfile_riff[$RIFFsubtype][$ID3v2_key_good] = $thisfile_riff[$RIFFsubtype][$ID3v2_key_bad];
+ $this->warning('mapping "'.$ID3v2_key_bad.'" chunk to "'.$ID3v2_key_good.'"');
+ }
+ }
+
+ if (isset($thisfile_riff[$RIFFsubtype]['id3 '])) {
+ getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v2.php', __FILE__, true);
+
+ $getid3_temp = new getID3();
+ $getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp);
+ $getid3_id3v2 = new getid3_id3v2($getid3_temp);
+ $getid3_id3v2->StartingOffset = $thisfile_riff[$RIFFsubtype]['id3 '][0]['offset'] + 8;
+ if ($thisfile_riff[$RIFFsubtype]['id3 '][0]['valid'] = $getid3_id3v2->Analyze()) {
+ $info['id3v2'] = $getid3_temp->info['id3v2'];
+ }
+ unset($getid3_temp, $getid3_id3v2);
+ }
break;
}
@@ -900,37 +1273,43 @@
$thisfile_riff['comments']['title'][] = trim(substr($thisfile_riff_WAVE['DISP'][count($thisfile_riff_WAVE['DISP']) - 1]['data'], 4));
}
if (isset($thisfile_riff_WAVE['INFO']) && is_array($thisfile_riff_WAVE['INFO'])) {
- $this->RIFFcommentsParse($thisfile_riff_WAVE['INFO'], $thisfile_riff['comments']);
+ self::parseComments($thisfile_riff_WAVE['INFO'], $thisfile_riff['comments']);
}
+ if (isset($thisfile_riff['AVI ']['INFO']) && is_array($thisfile_riff['AVI ']['INFO'])) {
+ self::parseComments($thisfile_riff['AVI ']['INFO'], $thisfile_riff['comments']);
+ }
- if (empty($thisfile_audio['encoder']) && !empty($ThisFileInfo['mpeg']['audio']['LAME']['short_version'])) {
- $thisfile_audio['encoder'] = $ThisFileInfo['mpeg']['audio']['LAME']['short_version'];
+ if (empty($thisfile_audio['encoder']) && !empty($info['mpeg']['audio']['LAME']['short_version'])) {
+ $thisfile_audio['encoder'] = $info['mpeg']['audio']['LAME']['short_version'];
}
- if (!isset($ThisFileInfo['playtime_seconds'])) {
- $ThisFileInfo['playtime_seconds'] = 0;
+ if (!isset($info['playtime_seconds'])) {
+ $info['playtime_seconds'] = 0;
}
- if (isset($thisfile_riff_raw['avih']['dwTotalFrames']) && isset($thisfile_riff_raw['avih']['dwMicroSecPerFrame'])) {
- $ThisFileInfo['playtime_seconds'] = $thisfile_riff_raw['avih']['dwTotalFrames'] * ($thisfile_riff_raw['avih']['dwMicroSecPerFrame'] / 1000000);
+ if (isset($thisfile_riff_raw['strh'][0]['dwLength']) && isset($thisfile_riff_raw['avih']['dwMicroSecPerFrame'])) {
+ // needed for >2GB AVIs where 'avih' chunk only lists number of frames in that chunk, not entire movie
+ $info['playtime_seconds'] = $thisfile_riff_raw['strh'][0]['dwLength'] * ($thisfile_riff_raw['avih']['dwMicroSecPerFrame'] / 1000000);
+ } elseif (isset($thisfile_riff_raw['avih']['dwTotalFrames']) && isset($thisfile_riff_raw['avih']['dwMicroSecPerFrame'])) {
+ $info['playtime_seconds'] = $thisfile_riff_raw['avih']['dwTotalFrames'] * ($thisfile_riff_raw['avih']['dwMicroSecPerFrame'] / 1000000);
}
- if ($ThisFileInfo['playtime_seconds'] > 0) {
+ if ($info['playtime_seconds'] > 0) {
if (isset($thisfile_riff_audio) && isset($thisfile_riff_video)) {
- if (!isset($ThisFileInfo['bitrate'])) {
- $ThisFileInfo['bitrate'] = ((($thisfile_avdataend - $thisfile_avdataoffset) / $ThisFileInfo['playtime_seconds']) * 8);
+ if (!isset($info['bitrate'])) {
+ $info['bitrate'] = ((($info['avdataend'] - $info['avdataoffset']) / $info['playtime_seconds']) * 8);
}
} elseif (isset($thisfile_riff_audio) && !isset($thisfile_riff_video)) {
if (!isset($thisfile_audio['bitrate'])) {
- $thisfile_audio['bitrate'] = ((($thisfile_avdataend - $thisfile_avdataoffset) / $ThisFileInfo['playtime_seconds']) * 8);
+ $thisfile_audio['bitrate'] = ((($info['avdataend'] - $info['avdataoffset']) / $info['playtime_seconds']) * 8);
}
} elseif (!isset($thisfile_riff_audio) && isset($thisfile_riff_video)) {
if (!isset($thisfile_video['bitrate'])) {
- $thisfile_video['bitrate'] = ((($thisfile_avdataend - $thisfile_avdataoffset) / $ThisFileInfo['playtime_seconds']) * 8);
+ $thisfile_video['bitrate'] = ((($info['avdataend'] - $info['avdataoffset']) / $info['playtime_seconds']) * 8);
}
}
@@ -937,11 +1316,11 @@
}
- if (isset($thisfile_riff_video) && isset($thisfile_audio['bitrate']) && ($thisfile_audio['bitrate'] > 0) && ($ThisFileInfo['playtime_seconds'] > 0)) {
+ if (isset($thisfile_riff_video) && isset($thisfile_audio['bitrate']) && ($thisfile_audio['bitrate'] > 0) && ($info['playtime_seconds'] > 0)) {
- $ThisFileInfo['bitrate'] = ((($thisfile_avdataend - $thisfile_avdataoffset) / $ThisFileInfo['playtime_seconds']) * 8);
+ $info['bitrate'] = ((($info['avdataend'] - $info['avdataoffset']) / $info['playtime_seconds']) * 8);
$thisfile_audio['bitrate'] = 0;
- $thisfile_video['bitrate'] = $ThisFileInfo['bitrate'];
+ $thisfile_video['bitrate'] = $info['bitrate'];
foreach ($thisfile_riff_audio as $channelnumber => $audioinfoarray) {
$thisfile_video['bitrate'] -= $audioinfoarray['bitrate'];
$thisfile_audio['bitrate'] += $audioinfoarray['bitrate'];
@@ -954,14 +1333,14 @@
}
}
- if (isset($ThisFileInfo['mpeg']['audio'])) {
- $thisfile_audio_dataformat = 'mp'.$ThisFileInfo['mpeg']['audio']['layer'];
- $thisfile_audio['sample_rate'] = $ThisFileInfo['mpeg']['audio']['sample_rate'];
- $thisfile_audio['channels'] = $ThisFileInfo['mpeg']['audio']['channels'];
- $thisfile_audio['bitrate'] = $ThisFileInfo['mpeg']['audio']['bitrate'];
- $thisfile_audio['bitrate_mode'] = strtolower($ThisFileInfo['mpeg']['audio']['bitrate_mode']);
- if (!empty($ThisFileInfo['mpeg']['audio']['codec'])) {
- $thisfile_audio['codec'] = $ThisFileInfo['mpeg']['audio']['codec'].' '.$thisfile_audio['codec'];
+ if (isset($info['mpeg']['audio'])) {
+ $thisfile_audio_dataformat = 'mp'.$info['mpeg']['audio']['layer'];
+ $thisfile_audio['sample_rate'] = $info['mpeg']['audio']['sample_rate'];
+ $thisfile_audio['channels'] = $info['mpeg']['audio']['channels'];
+ $thisfile_audio['bitrate'] = $info['mpeg']['audio']['bitrate'];
+ $thisfile_audio['bitrate_mode'] = strtolower($info['mpeg']['audio']['bitrate_mode']);
+ if (!empty($info['mpeg']['audio']['codec'])) {
+ $thisfile_audio['codec'] = $info['mpeg']['audio']['codec'].' '.$thisfile_audio['codec'];
}
if (!empty($thisfile_audio['streams'])) {
foreach ($thisfile_audio['streams'] as $streamnumber => $streamdata) {
@@ -974,7 +1353,9 @@
}
}
}
- $thisfile_audio['encoder_options'] = getid3_mp3::GuessEncoderOptions($ThisFileInfo);
+ $getid3_mp3 = new getid3_mp3($this->getid3);
+ $thisfile_audio['encoder_options'] = $getid3_mp3->GuessEncoderOptions();
+ unset($getid3_mp3);
}
@@ -1004,104 +1385,168 @@
return true;
}
+ /**
+ * @param int $startoffset
+ * @param int $maxoffset
+ *
+ * @return array|false
+ *
+ * @throws Exception
+ * @throws getid3_exception
+ */
+ public function ParseRIFFAMV($startoffset, $maxoffset) {
+ // AMV files are RIFF-AVI files with parts of the spec deliberately broken, such as chunk size fields hardcoded to zero (because players known in hardware that these fields are always a certain size
- function RIFFcommentsParse(&$RIFFinfoArray, &$CommentsTargetArray) {
- $RIFFinfoKeyLookup = array(
- 'IARL'=>'archivallocation',
- 'IART'=>'artist',
- 'ICDS'=>'costumedesigner',
- 'ICMS'=>'commissionedby',
- 'ICMT'=>'comment',
- 'ICNT'=>'country',
- 'ICOP'=>'copyright',
- 'ICRD'=>'creationdate',
- 'IDIM'=>'dimensions',
- 'IDIT'=>'digitizationdate',
- 'IDPI'=>'resolution',
- 'IDST'=>'distributor',
- 'IEDT'=>'editor',
- 'IENG'=>'engineers',
- 'IFRM'=>'accountofparts',
- 'IGNR'=>'genre',
- 'IKEY'=>'keywords',
- 'ILGT'=>'lightness',
- 'ILNG'=>'language',
- 'IMED'=>'orignalmedium',
- 'IMUS'=>'composer',
- 'INAM'=>'title',
- 'IPDS'=>'productiondesigner',
- 'IPLT'=>'palette',
- 'IPRD'=>'product',
- 'IPRO'=>'producer',
- 'IPRT'=>'part',
- 'IRTD'=>'rating',
- 'ISBJ'=>'subject',
- 'ISFT'=>'software',
- 'ISGN'=>'secondarygenre',
- 'ISHP'=>'sharpness',
- 'ISRC'=>'sourcesupplier',
- 'ISRF'=>'digitizationsource',
- 'ISTD'=>'productionstudio',
- 'ISTR'=>'starring',
- 'ITCH'=>'encoded_by',
- 'IWEB'=>'url',
- 'IWRI'=>'writer'
- );
- foreach ($RIFFinfoKeyLookup as $key => $value) {
- if (isset($RIFFinfoArray[$key])) {
- foreach ($RIFFinfoArray[$key] as $commentid => $commentdata) {
- if (trim($commentdata['data']) != '') {
- @$CommentsTargetArray[$value][] = trim($commentdata['data']);
- }
- }
- }
- }
- return true;
- }
+ // https://code.google.com/p/amv-codec-tools/wiki/AmvDocumentation
+ //typedef struct _amvmainheader {
+ //FOURCC fcc; // 'amvh'
+ //DWORD cb;
+ //DWORD dwMicroSecPerFrame;
+ //BYTE reserve[28];
+ //DWORD dwWidth;
+ //DWORD dwHeight;
+ //DWORD dwSpeed;
+ //DWORD reserve0;
+ //DWORD reserve1;
+ //BYTE bTimeSec;
+ //BYTE bTimeMin;
+ //WORD wTimeHour;
+ //} AMVMAINHEADER;
- function ParseRIFF(&$fd, $startoffset, $maxoffset, &$ThisFileInfo) {
+ $info = &$this->getid3->info;
+ $RIFFchunk = false;
- $maxoffset = min($maxoffset, $ThisFileInfo['avdataend']);
+ try {
- $RIFFchunk = false;
+ $this->fseek($startoffset);
+ $maxoffset = min($maxoffset, $info['avdataend']);
+ $AMVheader = $this->fread(284);
+ if (substr($AMVheader, 0, 8) != 'hdrlamvh') {
+ throw new Exception('expecting "hdrlamv" at offset '.($startoffset + 0).', found "'.substr($AMVheader, 0, 8).'"');
+ }
+ if (substr($AMVheader, 8, 4) != "\x38\x00\x00\x00") { // "amvh" chunk size, hardcoded to 0x38 = 56 bytes
+ throw new Exception('expecting "0x38000000" at offset '.($startoffset + 8).', found "'.getid3_lib::PrintHexBytes(substr($AMVheader, 8, 4)).'"');
+ }
+ $RIFFchunk = array();
+ $RIFFchunk['amvh']['us_per_frame'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 12, 4));
+ $RIFFchunk['amvh']['reserved28'] = substr($AMVheader, 16, 28); // null? reserved?
+ $RIFFchunk['amvh']['resolution_x'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 44, 4));
+ $RIFFchunk['amvh']['resolution_y'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 48, 4));
+ $RIFFchunk['amvh']['frame_rate_int'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 52, 4));
+ $RIFFchunk['amvh']['reserved0'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 56, 4)); // 1? reserved?
+ $RIFFchunk['amvh']['reserved1'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 60, 4)); // 0? reserved?
+ $RIFFchunk['amvh']['runtime_sec'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 64, 1));
+ $RIFFchunk['amvh']['runtime_min'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 65, 1));
+ $RIFFchunk['amvh']['runtime_hrs'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 66, 2));
- fseek($fd, $startoffset, SEEK_SET);
+ $info['video']['frame_rate'] = 1000000 / $RIFFchunk['amvh']['us_per_frame'];
+ $info['video']['resolution_x'] = $RIFFchunk['amvh']['resolution_x'];
+ $info['video']['resolution_y'] = $RIFFchunk['amvh']['resolution_y'];
+ $info['playtime_seconds'] = ($RIFFchunk['amvh']['runtime_hrs'] * 3600) + ($RIFFchunk['amvh']['runtime_min'] * 60) + $RIFFchunk['amvh']['runtime_sec'];
- while (ftell($fd) < $maxoffset) {
- $chunkname = fread($fd, 4);
- if (strlen($chunkname) < 4) {
- $ThisFileInfo['error'][] = 'Expecting chunk name at offset '.(ftell($fd) - 4).' but found nothing. Aborting RIFF parsing.';
- break;
+ // the rest is all hardcoded(?) and does not appear to be useful until you get to audio info at offset 256, even then everything is probably hardcoded
+
+ if (substr($AMVheader, 68, 20) != 'LIST'."\x00\x00\x00\x00".'strlstrh'."\x38\x00\x00\x00") {
+ throw new Exception('expecting "LIST<0x00000000>strlstrh<0x38000000>" at offset '.($startoffset + 68).', found "'.getid3_lib::PrintHexBytes(substr($AMVheader, 68, 20)).'"');
}
+ // followed by 56 bytes of null: substr($AMVheader, 88, 56) -> 144
+ if (substr($AMVheader, 144, 8) != 'strf'."\x24\x00\x00\x00") {
+ throw new Exception('expecting "strf<0x24000000>" at offset '.($startoffset + 144).', found "'.getid3_lib::PrintHexBytes(substr($AMVheader, 144, 8)).'"');
+ }
+ // followed by 36 bytes of null: substr($AMVheader, 144, 36) -> 180
- $chunksize = getid3_riff::EitherEndian2Int($ThisFileInfo, fread($fd, 4));
- if ($chunksize == 0) {
- $ThisFileInfo['error'][] = 'Chunk size at offset '.(ftell($fd) - 4).' is zero. Aborting RIFF parsing.';
- break;
+ if (substr($AMVheader, 188, 20) != 'LIST'."\x00\x00\x00\x00".'strlstrh'."\x30\x00\x00\x00") {
+ throw new Exception('expecting "LIST<0x00000000>strlstrh<0x30000000>" at offset '.($startoffset + 188).', found "'.getid3_lib::PrintHexBytes(substr($AMVheader, 188, 20)).'"');
}
- if (($chunksize % 2) != 0) {
- // all structures are packed on word boundaries
- $chunksize++;
+ // followed by 48 bytes of null: substr($AMVheader, 208, 48) -> 256
+ if (substr($AMVheader, 256, 8) != 'strf'."\x14\x00\x00\x00") {
+ throw new Exception('expecting "strf<0x14000000>" at offset '.($startoffset + 256).', found "'.getid3_lib::PrintHexBytes(substr($AMVheader, 256, 8)).'"');
}
+ // followed by 20 bytes of a modified WAVEFORMATEX:
+ // typedef struct {
+ // WORD wFormatTag; //(Fixme: this is equal to PCM's 0x01 format code)
+ // WORD nChannels; //(Fixme: this is always 1)
+ // DWORD nSamplesPerSec; //(Fixme: for all known sample files this is equal to 22050)
+ // DWORD nAvgBytesPerSec; //(Fixme: for all known sample files this is equal to 44100)
+ // WORD nBlockAlign; //(Fixme: this seems to be 2 in AMV files, is this correct ?)
+ // WORD wBitsPerSample; //(Fixme: this seems to be 16 in AMV files instead of the expected 4)
+ // WORD cbSize; //(Fixme: this seems to be 0 in AMV files)
+ // WORD reserved;
+ // } WAVEFORMATEX;
+ $RIFFchunk['strf']['wformattag'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 264, 2));
+ $RIFFchunk['strf']['nchannels'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 266, 2));
+ $RIFFchunk['strf']['nsamplespersec'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 268, 4));
+ $RIFFchunk['strf']['navgbytespersec'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 272, 4));
+ $RIFFchunk['strf']['nblockalign'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 276, 2));
+ $RIFFchunk['strf']['wbitspersample'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 278, 2));
+ $RIFFchunk['strf']['cbsize'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 280, 2));
+ $RIFFchunk['strf']['reserved'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 282, 2));
- switch ($chunkname) {
- case 'LIST':
- $listname = fread($fd, 4);
- switch ($listname) {
- case 'movi':
- case 'rec ':
- $RIFFchunk[$listname]['offset'] = ftell($fd) - 4;
- $RIFFchunk[$listname]['size'] = $chunksize;
- static $ParsedAudioStream = false;
- if ($ParsedAudioStream) {
+ $info['audio']['lossless'] = false;
+ $info['audio']['sample_rate'] = $RIFFchunk['strf']['nsamplespersec'];
+ $info['audio']['channels'] = $RIFFchunk['strf']['nchannels'];
+ $info['audio']['bits_per_sample'] = $RIFFchunk['strf']['wbitspersample'];
+ $info['audio']['bitrate'] = $info['audio']['sample_rate'] * $info['audio']['channels'] * $info['audio']['bits_per_sample'];
+ $info['audio']['bitrate_mode'] = 'cbr';
- // skip over
- } else {
+ } catch (getid3_exception $e) {
+ if ($e->getCode() == 10) {
+ $this->warning('RIFFAMV parser: '.$e->getMessage());
+ } else {
+ throw $e;
+ }
+ }
- $WhereWeWere = ftell($fd);
- $AudioChunkHeader = fread($fd, 12);
+ return $RIFFchunk;
+ }
+
+ /**
+ * @param int $startoffset
+ * @param int $maxoffset
+ *
+ * @return array|false
+ * @throws getid3_exception
+ */
+ public function ParseRIFF($startoffset, $maxoffset) {
+ $info = &$this->getid3->info;
+
+ $RIFFchunk = false;
+ $FoundAllChunksWeNeed = false;
+
+ try {
+ $this->fseek($startoffset);
+ $maxoffset = min($maxoffset, $info['avdataend']);
+ while ($this->ftell() < $maxoffset) {
+ $chunknamesize = $this->fread(8);
+ //$chunkname = substr($chunknamesize, 0, 4);
+ $chunkname = str_replace("\x00", '_', substr($chunknamesize, 0, 4)); // note: chunk names of 4 null bytes do appear to be legal (has been observed inside INFO and PRMI chunks, for example), but makes traversing array keys more difficult
+ $chunksize = $this->EitherEndian2Int(substr($chunknamesize, 4, 4));
+ //if (strlen(trim($chunkname, "\x00")) < 4) {
+ if (strlen($chunkname) < 4) {
+ $this->error('Expecting chunk name at offset '.($this->ftell() - 8).' but found nothing. Aborting RIFF parsing.');
+ break;
+ }
+ if (($chunksize == 0) && ($chunkname != 'JUNK')) {
+ $this->warning('Chunk ('.$chunkname.') size at offset '.($this->ftell() - 4).' is zero. Aborting RIFF parsing.');
+ break;
+ }
+ if (($chunksize % 2) != 0) {
+ // all structures are packed on word boundaries
+ $chunksize++;
+ }
+
+ switch ($chunkname) {
+ case 'LIST':
+ $listname = $this->fread(4);
+ if (preg_match('#^(movi|rec )$#i', $listname)) {
+ $RIFFchunk[$listname]['offset'] = $this->ftell() - 4;
+ $RIFFchunk[$listname]['size'] = $chunksize;
+
+ if (!$FoundAllChunksWeNeed) {
+ $WhereWeWere = $this->ftell();
+ $AudioChunkHeader = $this->fread(12);
$AudioChunkStreamNum = substr($AudioChunkHeader, 0, 2);
$AudioChunkStreamType = substr($AudioChunkHeader, 2, 2);
$AudioChunkSize = getid3_lib::LittleEndian2Int(substr($AudioChunkHeader, 4, 4));
@@ -1109,249 +1554,446 @@
if ($AudioChunkStreamType == 'wb') {
$FirstFourBytes = substr($AudioChunkHeader, 8, 4);
if (preg_match('/^\xFF[\xE2-\xE7\xF2-\xF7\xFA-\xFF][\x00-\xEB]/s', $FirstFourBytes)) {
-
// MP3
if (getid3_mp3::MPEGaudioHeaderBytesValid($FirstFourBytes)) {
- $dummy = $ThisFileInfo;
- $dummy['avdataoffset'] = ftell($fd) - 4;
- $dummy['avdataend'] = ftell($fd) + $AudioChunkSize;
- getid3_mp3::getOnlyMPEGaudioInfo($fd, $dummy, $dummy['avdataoffset'], false);
- if (isset($dummy['mpeg']['audio'])) {
- $ThisFileInfo = $dummy;
- $ThisFileInfo['audio']['dataformat'] = 'mp'.$ThisFileInfo['mpeg']['audio']['layer'];
- $ThisFileInfo['audio']['sample_rate'] = $ThisFileInfo['mpeg']['audio']['sample_rate'];
- $ThisFileInfo['audio']['channels'] = $ThisFileInfo['mpeg']['audio']['channels'];
- $ThisFileInfo['audio']['bitrate'] = $ThisFileInfo['mpeg']['audio']['bitrate'];
- $ThisFileInfo['bitrate'] = $ThisFileInfo['audio']['bitrate'];
- $ThisFileInfo['audio']['bitrate_mode'] = strtolower($ThisFileInfo['mpeg']['audio']['bitrate_mode']);
+ $getid3_temp = new getID3();
+ $getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp);
+ $getid3_temp->info['avdataoffset'] = $this->ftell() - 4;
+ $getid3_temp->info['avdataend'] = $this->ftell() + $AudioChunkSize;
+ $getid3_mp3 = new getid3_mp3($getid3_temp, __CLASS__);
+ $getid3_mp3->getOnlyMPEGaudioInfo($getid3_temp->info['avdataoffset'], false);
+ if (isset($getid3_temp->info['mpeg']['audio'])) {
+ $info['mpeg']['audio'] = $getid3_temp->info['mpeg']['audio'];
+ $info['audio'] = $getid3_temp->info['audio'];
+ $info['audio']['dataformat'] = 'mp'.$info['mpeg']['audio']['layer'];
+ $info['audio']['sample_rate'] = $info['mpeg']['audio']['sample_rate'];
+ $info['audio']['channels'] = $info['mpeg']['audio']['channels'];
+ $info['audio']['bitrate'] = $info['mpeg']['audio']['bitrate'];
+ $info['audio']['bitrate_mode'] = strtolower($info['mpeg']['audio']['bitrate_mode']);
+ //$info['bitrate'] = $info['audio']['bitrate'];
}
+ unset($getid3_temp, $getid3_mp3);
}
- } elseif (preg_match('/^\x0B\x77/s', $FirstFourBytes)) {
+ } elseif (strpos($FirstFourBytes, getid3_ac3::syncword) === 0) {
// AC3
- $GETID3_ERRORARRAY = &$ThisFileInfo['warning'];
- if (getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.ac3.php', __FILE__, false)) {
-
- $dummy = $ThisFileInfo;
- $dummy['avdataoffset'] = ftell($fd) - 4;
- $dummy['avdataend'] = ftell($fd) + $AudioChunkSize;
- $dummy['error'] = array();
- $ac3_tag = new getid3_ac3($fd, $dummy);
- if (empty($dummy['error'])) {
- $ThisFileInfo['audio'] = $dummy['audio'];
- $ThisFileInfo['ac3'] = $dummy['ac3'];
- $ThisFileInfo['warning'] = $dummy['warning'];
+ $getid3_temp = new getID3();
+ $getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp);
+ $getid3_temp->info['avdataoffset'] = $this->ftell() - 4;
+ $getid3_temp->info['avdataend'] = $this->ftell() + $AudioChunkSize;
+ $getid3_ac3 = new getid3_ac3($getid3_temp);
+ $getid3_ac3->Analyze();
+ if (empty($getid3_temp->info['error'])) {
+ $info['audio'] = $getid3_temp->info['audio'];
+ $info['ac3'] = $getid3_temp->info['ac3'];
+ if (!empty($getid3_temp->info['warning'])) {
+ foreach ($getid3_temp->info['warning'] as $key => $value) {
+ $this->warning($value);
+ }
}
-
}
-
+ unset($getid3_temp, $getid3_ac3);
}
-
}
+ $FoundAllChunksWeNeed = true;
+ $this->fseek($WhereWeWere);
+ }
+ $this->fseek($chunksize - 4, SEEK_CUR);
- $ParsedAudioStream = true;
- fseek($fd, $WhereWeWere, SEEK_SET);
+ } else {
- }
- fseek($fd, $chunksize - 4, SEEK_CUR);
- break;
-
- default:
if (!isset($RIFFchunk[$listname])) {
$RIFFchunk[$listname] = array();
}
$LISTchunkParent = $listname;
- $LISTchunkMaxOffset = ftell($fd) - 4 + $chunksize;
- if ($parsedChunk = getid3_riff::ParseRIFF($fd, ftell($fd), ftell($fd) + $chunksize - 4, $ThisFileInfo)) {
+ $LISTchunkMaxOffset = $this->ftell() - 4 + $chunksize;
+ if ($parsedChunk = $this->ParseRIFF($this->ftell(), $LISTchunkMaxOffset)) {
$RIFFchunk[$listname] = array_merge_recursive($RIFFchunk[$listname], $parsedChunk);
}
- break;
- }
- break;
- default:
- $thisindex = 0;
- if (isset($RIFFchunk[$chunkname]) && is_array($RIFFchunk[$chunkname])) {
- $thisindex = count($RIFFchunk[$chunkname]);
- }
- $RIFFchunk[$chunkname][$thisindex]['offset'] = ftell($fd) - 8;
- $RIFFchunk[$chunkname][$thisindex]['size'] = $chunksize;
- switch ($chunkname) {
- case 'data':
- $ThisFileInfo['avdataoffset'] = ftell($fd);
- $ThisFileInfo['avdataend'] = $ThisFileInfo['avdataoffset'] + $chunksize;
+ }
+ break;
- $RIFFdataChunkContentsTest = fread($fd, 36);
+ default:
+ if (preg_match('#^[0-9]{2}(wb|pc|dc|db)$#', $chunkname)) {
+ $this->fseek($chunksize, SEEK_CUR);
+ break;
+ }
+ $thisindex = 0;
+ if (isset($RIFFchunk[$chunkname]) && is_array($RIFFchunk[$chunkname])) {
+ $thisindex = count($RIFFchunk[$chunkname]);
+ }
+ $RIFFchunk[$chunkname][$thisindex]['offset'] = $this->ftell() - 8;
+ $RIFFchunk[$chunkname][$thisindex]['size'] = $chunksize;
+ switch ($chunkname) {
+ case 'data':
+ $info['avdataoffset'] = $this->ftell();
+ $info['avdataend'] = $info['avdataoffset'] + $chunksize;
- if ((strlen($RIFFdataChunkContentsTest) > 0) && preg_match('/^\xFF[\xE2-\xE7\xF2-\xF7\xFA-\xFF][\x00-\xEB]/s', substr($RIFFdataChunkContentsTest, 0, 4))) {
-
- // Probably is MP3 data
- if (getid3_mp3::MPEGaudioHeaderBytesValid(substr($RIFFdataChunkContentsTest, 0, 4))) {
- getid3_mp3::getOnlyMPEGaudioInfo($fd, $ThisFileInfo, $RIFFchunk[$chunkname][$thisindex]['offset'], false);
+ $testData = $this->fread(36);
+ if ($testData === '') {
+ break;
}
+ if (preg_match('/^\xFF[\xE2-\xE7\xF2-\xF7\xFA-\xFF][\x00-\xEB]/s', substr($testData, 0, 4))) {
- } elseif ((strlen($RIFFdataChunkContentsTest) > 0) && (substr($RIFFdataChunkContentsTest, 0, 2) == "\x0B\x77")) {
+ // Probably is MP3 data
+ if (getid3_mp3::MPEGaudioHeaderBytesValid(substr($testData, 0, 4))) {
+ $getid3_temp = new getID3();
+ $getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp);
+ $getid3_temp->info['avdataoffset'] = $info['avdataoffset'];
+ $getid3_temp->info['avdataend'] = $info['avdataend'];
+ $getid3_mp3 = new getid3_mp3($getid3_temp, __CLASS__);
+ $getid3_mp3->getOnlyMPEGaudioInfo($info['avdataoffset'], false);
+ if (empty($getid3_temp->info['error'])) {
+ $info['audio'] = $getid3_temp->info['audio'];
+ $info['mpeg'] = $getid3_temp->info['mpeg'];
+ }
+ unset($getid3_temp, $getid3_mp3);
+ }
- // This is probably AC-3 data
- $GETID3_ERRORARRAY = &$ThisFileInfo['warning'];
- if (getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.ac3.php', __FILE__, false)) {
+ } elseif (($isRegularAC3 = (substr($testData, 0, 2) == getid3_ac3::syncword)) || substr($testData, 8, 2) == strrev(getid3_ac3::syncword)) {
- $dummy = $ThisFileInfo;
- $dummy['avdataoffset'] = $RIFFchunk[$chunkname][$thisindex]['offset'];
- $dummy['avdataend'] = $dummy['avdataoffset'] + $RIFFchunk[$chunkname][$thisindex]['size'];
- $dummy['error'] = array();
-
- $ac3_tag = new getid3_ac3($fd, $dummy);
- if (empty($dummy['error'])) {
- $ThisFileInfo['audio'] = $dummy['audio'];
- $ThisFileInfo['ac3'] = $dummy['ac3'];
- $ThisFileInfo['warning'] = $dummy['warning'];
+ // This is probably AC-3 data
+ $getid3_temp = new getID3();
+ if ($isRegularAC3) {
+ $getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp);
+ $getid3_temp->info['avdataoffset'] = $info['avdataoffset'];
+ $getid3_temp->info['avdataend'] = $info['avdataend'];
}
-
- }
-
- } elseif ((strlen($RIFFdataChunkContentsTest) > 0) && (substr($RIFFdataChunkContentsTest, 8, 2) == "\x77\x0B")) {
-
- // Dolby Digital WAV
- // AC-3 content, but not encoded in same format as normal AC-3 file
- // For one thing, byte order is swapped
-
- $GETID3_ERRORARRAY = &$ThisFileInfo['warning'];
- if (getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.ac3.php', __FILE__, false)) {
-
- // ok to use tmpfile here - only 56 bytes
- if ($fd_temp = tmpfile()) {
-
+ $getid3_ac3 = new getid3_ac3($getid3_temp);
+ if ($isRegularAC3) {
+ $getid3_ac3->Analyze();
+ } else {
+ // Dolby Digital WAV
+ // AC-3 content, but not encoded in same format as normal AC-3 file
+ // For one thing, byte order is swapped
+ $ac3_data = '';
for ($i = 0; $i < 28; $i += 2) {
- // swap byte order
- fwrite($fd_temp, substr($RIFFdataChunkContentsTest, 8 + $i + 1, 1));
- fwrite($fd_temp, substr($RIFFdataChunkContentsTest, 8 + $i + 0, 1));
+ $ac3_data .= substr($testData, 8 + $i + 1, 1);
+ $ac3_data .= substr($testData, 8 + $i + 0, 1);
}
+ $getid3_ac3->AnalyzeString($ac3_data);
+ }
- $dummy = $ThisFileInfo;
- $dummy['avdataoffset'] = 0;
- $dummy['avdataend'] = 20;
- $dummy['error'] = array();
- $ac3_tag = new getid3_ac3($fd_temp, $dummy);
- fclose($fd_temp);
- if (empty($dummy['error'])) {
- $ThisFileInfo['audio'] = $dummy['audio'];
- $ThisFileInfo['ac3'] = $dummy['ac3'];
- $ThisFileInfo['warning'] = $dummy['warning'];
- } else {
- $ThisFileInfo['error'][] = 'Errors parsing DolbyDigital WAV: '.explode(';', $dummy['error']);
+ if (empty($getid3_temp->info['error'])) {
+ $info['audio'] = $getid3_temp->info['audio'];
+ $info['ac3'] = $getid3_temp->info['ac3'];
+ if (!empty($getid3_temp->info['warning'])) {
+ foreach ($getid3_temp->info['warning'] as $newerror) {
+ $this->warning('getid3_ac3() says: ['.$newerror.']');
+ }
}
+ }
+ unset($getid3_temp, $getid3_ac3);
- } else {
+ } elseif (preg_match('/^('.implode('|', array_map('preg_quote', getid3_dts::$syncwords)).')/', $testData)) {
- $ThisFileInfo['error'][] = 'Could not create temporary file to analyze DolbyDigital WAV';
-
+ // This is probably DTS data
+ $getid3_temp = new getID3();
+ $getid3_temp->openfile($this->getid3->filename, null, $this->getid3->fp);
+ $getid3_temp->info['avdataoffset'] = $info['avdataoffset'];
+ $getid3_dts = new getid3_dts($getid3_temp);
+ $getid3_dts->Analyze();
+ if (empty($getid3_temp->info['error'])) {
+ $info['audio'] = $getid3_temp->info['audio'];
+ $info['dts'] = $getid3_temp->info['dts'];
+ $info['playtime_seconds'] = $getid3_temp->info['playtime_seconds']; // may not match RIFF calculations since DTS-WAV often used 14/16 bit-word packing
+ if (!empty($getid3_temp->info['warning'])) {
+ foreach ($getid3_temp->info['warning'] as $newerror) {
+ $this->warning('getid3_dts() says: ['.$newerror.']');
+ }
+ }
}
- }
+ unset($getid3_temp, $getid3_dts);
- } elseif ((strlen($RIFFdataChunkContentsTest) > 0) && (substr($RIFFdataChunkContentsTest, 0, 4) == 'wvpk')) {
+ } elseif (substr($testData, 0, 4) == 'wvpk') {
- // This is WavPack data
- $ThisFileInfo['wavpack']['offset'] = $RIFFchunk[$chunkname][$thisindex]['offset'];
- $ThisFileInfo['wavpack']['size'] = getid3_lib::LittleEndian2Int(substr($RIFFdataChunkContentsTest, 4, 4));
- getid3_riff::RIFFparseWavPackHeader(substr($RIFFdataChunkContentsTest, 8, 28), $ThisFileInfo);
+ // This is WavPack data
+ $info['wavpack']['offset'] = $info['avdataoffset'];
+ $info['wavpack']['size'] = getid3_lib::LittleEndian2Int(substr($testData, 4, 4));
+ $this->parseWavPackHeader(substr($testData, 8, 28));
- } else {
+ } else {
+ // This is some other kind of data (quite possibly just PCM)
+ // do nothing special, just skip it
+ }
+ $nextoffset = $info['avdataend'];
+ $this->fseek($nextoffset);
+ break;
- // This is some other kind of data (quite possibly just PCM)
- // do nothing special, just skip it
+ case 'iXML':
+ case 'bext':
+ case 'cart':
+ case 'fmt ':
+ case 'strh':
+ case 'strf':
+ case 'indx':
+ case 'MEXT':
+ case 'DISP':
+ // always read data in
+ case 'JUNK':
+ // should be: never read data in
+ // but some programs write their version strings in a JUNK chunk (e.g. VirtualDub, AVIdemux, etc)
+ if ($chunksize < 1048576) {
+ if ($chunksize > 0) {
+ $RIFFchunk[$chunkname][$thisindex]['data'] = $this->fread($chunksize);
+ if ($chunkname == 'JUNK') {
+ if (preg_match('#^([\\x20-\\x7F]+)#', $RIFFchunk[$chunkname][$thisindex]['data'], $matches)) {
+ // only keep text characters [chr(32)-chr(127)]
+ $info['riff']['comments']['junk'][] = trim($matches[1]);
+ }
+ // but if nothing there, ignore
+ // remove the key in either case
+ unset($RIFFchunk[$chunkname][$thisindex]['data']);
+ }
+ }
+ } else {
+ $this->warning('Chunk "'.$chunkname.'" at offset '.$this->ftell().' is unexpectedly larger than 1MB (claims to be '.number_format($chunksize).' bytes), skipping data');
+ $this->fseek($chunksize, SEEK_CUR);
+ }
+ break;
- }
- fseek($fd, $RIFFchunk[$chunkname][$thisindex]['offset'] + 8 + $chunksize, SEEK_SET);
- break;
+ //case 'IDVX':
+ // $info['divxtag']['comments'] = self::ParseDIVXTAG($this->fread($chunksize));
+ // break;
- case 'bext':
- case 'cart':
- case 'fmt ':
- case 'MEXT':
- case 'DISP':
- // always read data in
- $RIFFchunk[$chunkname][$thisindex]['data'] = fread($fd, $chunksize);
- break;
+ case 'scot':
+ // https://cmsdk.com/node-js/adding-scot-chunk-to-wav-file.html
+ $RIFFchunk[$chunkname][$thisindex]['data'] = $this->fread($chunksize);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['alter'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 0, 1);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['attrib'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 1, 1);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['artnum'] = getid3_lib::LittleEndian2Int(substr($RIFFchunk[$chunkname][$thisindex]['data'], 2, 2));
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['title'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 4, 43); // "name" in other documentation
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['copy'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 47, 4);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['padd'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 51, 1);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['asclen'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 52, 5);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['startseconds'] = getid3_lib::LittleEndian2Int(substr($RIFFchunk[$chunkname][$thisindex]['data'], 57, 2));
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['starthundredths'] = getid3_lib::LittleEndian2Int(substr($RIFFchunk[$chunkname][$thisindex]['data'], 59, 2));
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['endseconds'] = getid3_lib::LittleEndian2Int(substr($RIFFchunk[$chunkname][$thisindex]['data'], 61, 2));
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['endhundreths'] = getid3_lib::LittleEndian2Int(substr($RIFFchunk[$chunkname][$thisindex]['data'], 63, 2));
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['sdate'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 65, 6);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['kdate'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 71, 6);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['start_hr'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 77, 1);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['kill_hr'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 78, 1);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['digital'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 79, 1);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['sample_rate'] = getid3_lib::LittleEndian2Int(substr($RIFFchunk[$chunkname][$thisindex]['data'], 80, 2));
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['stereo'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 82, 1);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['compress'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 83, 1);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['eomstrt'] = getid3_lib::LittleEndian2Int(substr($RIFFchunk[$chunkname][$thisindex]['data'], 84, 4));
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['eomlen'] = getid3_lib::LittleEndian2Int(substr($RIFFchunk[$chunkname][$thisindex]['data'], 88, 2));
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['attrib2'] = getid3_lib::LittleEndian2Int(substr($RIFFchunk[$chunkname][$thisindex]['data'], 90, 4));
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['future1'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 94, 12);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['catfontcolor'] = getid3_lib::LittleEndian2Int(substr($RIFFchunk[$chunkname][$thisindex]['data'], 106, 4));
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['catcolor'] = getid3_lib::LittleEndian2Int(substr($RIFFchunk[$chunkname][$thisindex]['data'], 110, 4));
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['segeompos'] = getid3_lib::LittleEndian2Int(substr($RIFFchunk[$chunkname][$thisindex]['data'], 114, 4));
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['vt_startsecs'] = getid3_lib::LittleEndian2Int(substr($RIFFchunk[$chunkname][$thisindex]['data'], 118, 2));
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['vt_starthunds'] = getid3_lib::LittleEndian2Int(substr($RIFFchunk[$chunkname][$thisindex]['data'], 120, 2));
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['priorcat'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 122, 3);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['priorcopy'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 125, 4);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['priorpadd'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 129, 1);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['postcat'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 130, 3);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['postcopy'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 133, 4);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['postpadd'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 137, 1);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['hrcanplay'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 138, 21);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['future2'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 159, 108);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['artist'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 267, 34);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['comment'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 301, 34); // "trivia" in other documentation
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['intro'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 335, 2);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['end'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 337, 1);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['year'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 338, 4);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['obsolete2'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 342, 1);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['rec_hr'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 343, 1);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['rdate'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 344, 6);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['mpeg_bitrate'] = getid3_lib::LittleEndian2Int(substr($RIFFchunk[$chunkname][$thisindex]['data'], 350, 2));
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['pitch'] = getid3_lib::LittleEndian2Int(substr($RIFFchunk[$chunkname][$thisindex]['data'], 352, 2));
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['playlevel'] = getid3_lib::LittleEndian2Int(substr($RIFFchunk[$chunkname][$thisindex]['data'], 354, 2));
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['lenvalid'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 356, 1);
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['filelength'] = getid3_lib::LittleEndian2Int(substr($RIFFchunk[$chunkname][$thisindex]['data'], 357, 4));
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['newplaylevel'] = getid3_lib::LittleEndian2Int(substr($RIFFchunk[$chunkname][$thisindex]['data'], 361, 2));
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['chopsize'] = getid3_lib::LittleEndian2Int(substr($RIFFchunk[$chunkname][$thisindex]['data'], 363, 4));
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['vteomovr'] = getid3_lib::LittleEndian2Int(substr($RIFFchunk[$chunkname][$thisindex]['data'], 367, 4));
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['desiredlen'] = getid3_lib::LittleEndian2Int(substr($RIFFchunk[$chunkname][$thisindex]['data'], 371, 4));
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['triggers'] = getid3_lib::LittleEndian2Int(substr($RIFFchunk[$chunkname][$thisindex]['data'], 375, 4));
+ $RIFFchunk[$chunkname][$thisindex]['parsed']['fillout'] = substr($RIFFchunk[$chunkname][$thisindex]['data'], 379, 33);
- default:
- if (!empty($LISTchunkParent) && (($RIFFchunk[$chunkname][$thisindex]['offset'] + $RIFFchunk[$chunkname][$thisindex]['size']) <= $LISTchunkMaxOffset)) {
- $RIFFchunk[$LISTchunkParent][$chunkname][$thisindex]['offset'] = $RIFFchunk[$chunkname][$thisindex]['offset'];
- $RIFFchunk[$LISTchunkParent][$chunkname][$thisindex]['size'] = $RIFFchunk[$chunkname][$thisindex]['size'];
- unset($RIFFchunk[$chunkname][$thisindex]['offset']);
- unset($RIFFchunk[$chunkname][$thisindex]['size']);
- if (isset($RIFFchunk[$chunkname][$thisindex]) && empty($RIFFchunk[$chunkname][$thisindex])) {
- unset($RIFFchunk[$chunkname][$thisindex]);
+ foreach (array('title', 'artist', 'comment') as $key) {
+ if (trim($RIFFchunk[$chunkname][$thisindex]['parsed'][$key])) {
+ $info['riff']['comments'][$key] = array($RIFFchunk[$chunkname][$thisindex]['parsed'][$key]);
+ }
}
- if (isset($RIFFchunk[$chunkname]) && empty($RIFFchunk[$chunkname])) {
- unset($RIFFchunk[$chunkname]);
+ if ($RIFFchunk[$chunkname][$thisindex]['parsed']['filelength'] && !empty($info['filesize']) && ($RIFFchunk[$chunkname][$thisindex]['parsed']['filelength'] != $info['filesize'])) {
+ $this->warning('RIFF.WAVE.scot.filelength ('.$RIFFchunk[$chunkname][$thisindex]['parsed']['filelength'].') different from actual filesize ('.$info['filesize'].')');
}
- $RIFFchunk[$LISTchunkParent][$chunkname][$thisindex]['data'] = fread($fd, $chunksize);
- } elseif ($chunksize < 2048) {
- // only read data in if smaller than 2kB
- $RIFFchunk[$chunkname][$thisindex]['data'] = fread($fd, $chunksize);
- } else {
- fseek($fd, $chunksize, SEEK_CUR);
- }
- break;
- }
- break;
+ break;
+ default:
+ if (!empty($LISTchunkParent) && isset($LISTchunkMaxOffset) && (($RIFFchunk[$chunkname][$thisindex]['offset'] + $RIFFchunk[$chunkname][$thisindex]['size']) <= $LISTchunkMaxOffset)) {
+ $RIFFchunk[$LISTchunkParent][$chunkname][$thisindex]['offset'] = $RIFFchunk[$chunkname][$thisindex]['offset'];
+ $RIFFchunk[$LISTchunkParent][$chunkname][$thisindex]['size'] = $RIFFchunk[$chunkname][$thisindex]['size'];
+ unset($RIFFchunk[$chunkname][$thisindex]['offset']);
+ unset($RIFFchunk[$chunkname][$thisindex]['size']);
+ if (isset($RIFFchunk[$chunkname][$thisindex]) && empty($RIFFchunk[$chunkname][$thisindex])) {
+ unset($RIFFchunk[$chunkname][$thisindex]);
+ }
+ if (isset($RIFFchunk[$chunkname]) && empty($RIFFchunk[$chunkname])) {
+ unset($RIFFchunk[$chunkname]);
+ }
+ $RIFFchunk[$LISTchunkParent][$chunkname][$thisindex]['data'] = $this->fread($chunksize);
+ } elseif ($chunksize < 2048) {
+ // only read data in if smaller than 2kB
+ $RIFFchunk[$chunkname][$thisindex]['data'] = $this->fread($chunksize);
+ } else {
+ $this->fseek($chunksize, SEEK_CUR);
+ }
+ break;
+ }
+ break;
+ }
}
+ } catch (getid3_exception $e) {
+ if ($e->getCode() == 10) {
+ $this->warning('RIFF parser: '.$e->getMessage());
+ } else {
+ throw $e;
+ }
}
return $RIFFchunk;
}
-
- function ParseRIFFdata(&$RIFFdata, &$ThisFileInfo) {
+ /**
+ * @param string $RIFFdata
+ *
+ * @return bool
+ */
+ public function ParseRIFFdata(&$RIFFdata) {
+ $info = &$this->getid3->info;
if ($RIFFdata) {
-
- $tempfile = tempnam('*', 'getID3');
- $fp_temp = fopen($tempfile, "wb");
+ $tempfile = tempnam(GETID3_TEMP_DIR, 'getID3');
+ $fp_temp = fopen($tempfile, 'wb');
$RIFFdataLength = strlen($RIFFdata);
$NewLengthString = getid3_lib::LittleEndian2String($RIFFdataLength, 4);
for ($i = 0; $i < 4; $i++) {
- $RIFFdata{$i + 4} = $NewLengthString{$i};
+ $RIFFdata[($i + 4)] = $NewLengthString[$i];
}
fwrite($fp_temp, $RIFFdata);
fclose($fp_temp);
- $fp_temp = fopen($tempfile, "rb");
- $dummy = array('filesize'=>$RIFFdataLength, 'filenamepath'=>$ThisFileInfo['filenamepath'], 'tags'=>$ThisFileInfo['tags'], 'avdataoffset'=>0, 'avdataend'=>$RIFFdataLength, 'warning'=>$ThisFileInfo['warning'], 'error'=>$ThisFileInfo['error'], 'comments'=>$ThisFileInfo['comments'], 'audio'=>(isset($ThisFileInfo['audio']) ? $ThisFileInfo['audio'] : array()), 'video'=>(isset($ThisFileInfo['video']) ? $ThisFileInfo['video'] : array()));
- $riff = new getid3_riff($fp_temp, $dummy);
- $ThisFileInfo['riff'] = $dummy['riff'];
- $ThisFileInfo['warning'] = $dummy['warning'];
- $ThisFileInfo['error'] = $dummy['error'];
- $ThisFileInfo['tags'] = $dummy['tags'];
- $ThisFileInfo['comments'] = $dummy['comments'];
- fclose($fp_temp);
+ $getid3_temp = new getID3();
+ $getid3_temp->openfile($tempfile);
+ $getid3_temp->info['filesize'] = $RIFFdataLength;
+ $getid3_temp->info['filenamepath'] = $info['filenamepath'];
+ $getid3_temp->info['tags'] = $info['tags'];
+ $getid3_temp->info['warning'] = $info['warning'];
+ $getid3_temp->info['error'] = $info['error'];
+ $getid3_temp->info['comments'] = $info['comments'];
+ $getid3_temp->info['audio'] = (isset($info['audio']) ? $info['audio'] : array());
+ $getid3_temp->info['video'] = (isset($info['video']) ? $info['video'] : array());
+ $getid3_riff = new getid3_riff($getid3_temp);
+ $getid3_riff->Analyze();
+
+ $info['riff'] = $getid3_temp->info['riff'];
+ $info['warning'] = $getid3_temp->info['warning'];
+ $info['error'] = $getid3_temp->info['error'];
+ $info['tags'] = $getid3_temp->info['tags'];
+ $info['comments'] = $getid3_temp->info['comments'];
+ unset($getid3_riff, $getid3_temp);
unlink($tempfile);
- return true;
}
return false;
}
+ /**
+ * @param array $RIFFinfoArray
+ * @param array $CommentsTargetArray
+ *
+ * @return bool
+ */
+ public static function parseComments(&$RIFFinfoArray, &$CommentsTargetArray) {
+ $RIFFinfoKeyLookup = array(
+ 'IARL'=>'archivallocation',
+ 'IART'=>'artist',
+ 'ICDS'=>'costumedesigner',
+ 'ICMS'=>'commissionedby',
+ 'ICMT'=>'comment',
+ 'ICNT'=>'country',
+ 'ICOP'=>'copyright',
+ 'ICRD'=>'creationdate',
+ 'IDIM'=>'dimensions',
+ 'IDIT'=>'digitizationdate',
+ 'IDPI'=>'resolution',
+ 'IDST'=>'distributor',
+ 'IEDT'=>'editor',
+ 'IENG'=>'engineers',
+ 'IFRM'=>'accountofparts',
+ 'IGNR'=>'genre',
+ 'IKEY'=>'keywords',
+ 'ILGT'=>'lightness',
+ 'ILNG'=>'language',
+ 'IMED'=>'orignalmedium',
+ 'IMUS'=>'composer',
+ 'INAM'=>'title',
+ 'IPDS'=>'productiondesigner',
+ 'IPLT'=>'palette',
+ 'IPRD'=>'product',
+ 'IPRO'=>'producer',
+ 'IPRT'=>'part',
+ 'IRTD'=>'rating',
+ 'ISBJ'=>'subject',
+ 'ISFT'=>'software',
+ 'ISGN'=>'secondarygenre',
+ 'ISHP'=>'sharpness',
+ 'ISRC'=>'sourcesupplier',
+ 'ISRF'=>'digitizationsource',
+ 'ISTD'=>'productionstudio',
+ 'ISTR'=>'starring',
+ 'ITCH'=>'encoded_by',
+ 'IWEB'=>'url',
+ 'IWRI'=>'writer',
+ '____'=>'comment',
+ );
+ foreach ($RIFFinfoKeyLookup as $key => $value) {
+ if (isset($RIFFinfoArray[$key])) {
+ foreach ($RIFFinfoArray[$key] as $commentid => $commentdata) {
+ if (trim($commentdata['data']) != '') {
+ if (isset($CommentsTargetArray[$value])) {
+ $CommentsTargetArray[$value][] = trim($commentdata['data']);
+ } else {
+ $CommentsTargetArray[$value] = array(trim($commentdata['data']));
+ }
+ }
+ }
+ }
+ }
+ return true;
+ }
- function RIFFparseWAVEFORMATex($WaveFormatExData) {
+ /**
+ * @param string $WaveFormatExData
+ *
+ * @return array
+ */
+ public static function parseWAVEFORMATex($WaveFormatExData) {
// shortcut
+ $WaveFormatEx = array();
$WaveFormatEx['raw'] = array();
$WaveFormatEx_raw = &$WaveFormatEx['raw'];
- $WaveFormatEx_raw['wFormatTag'] = getid3_lib::LittleEndian2Int(substr($WaveFormatExData, 0, 2));
- $WaveFormatEx_raw['nChannels'] = getid3_lib::LittleEndian2Int(substr($WaveFormatExData, 2, 2));
- $WaveFormatEx_raw['nSamplesPerSec'] = getid3_lib::LittleEndian2Int(substr($WaveFormatExData, 4, 4));
- $WaveFormatEx_raw['nAvgBytesPerSec'] = getid3_lib::LittleEndian2Int(substr($WaveFormatExData, 8, 4));
- $WaveFormatEx_raw['nBlockAlign'] = getid3_lib::LittleEndian2Int(substr($WaveFormatExData, 12, 2));
- $WaveFormatEx_raw['wBitsPerSample'] = getid3_lib::LittleEndian2Int(substr($WaveFormatExData, 14, 2));
+ $WaveFormatEx_raw['wFormatTag'] = substr($WaveFormatExData, 0, 2);
+ $WaveFormatEx_raw['nChannels'] = substr($WaveFormatExData, 2, 2);
+ $WaveFormatEx_raw['nSamplesPerSec'] = substr($WaveFormatExData, 4, 4);
+ $WaveFormatEx_raw['nAvgBytesPerSec'] = substr($WaveFormatExData, 8, 4);
+ $WaveFormatEx_raw['nBlockAlign'] = substr($WaveFormatExData, 12, 2);
+ $WaveFormatEx_raw['wBitsPerSample'] = substr($WaveFormatExData, 14, 2);
if (strlen($WaveFormatExData) > 16) {
- $WaveFormatEx_raw['cbSize'] = getid3_lib::LittleEndian2Int(substr($WaveFormatExData, 16, 2));
+ $WaveFormatEx_raw['cbSize'] = substr($WaveFormatExData, 16, 2);
}
+ $WaveFormatEx_raw = array_map('getid3_lib::LittleEndian2Int', $WaveFormatEx_raw);
- $WaveFormatEx['codec'] = getid3_riff::RIFFwFormatTagLookup($WaveFormatEx_raw['wFormatTag']);
+ $WaveFormatEx['codec'] = self::wFormatTagLookup($WaveFormatEx_raw['wFormatTag']);
$WaveFormatEx['channels'] = $WaveFormatEx_raw['nChannels'];
$WaveFormatEx['sample_rate'] = $WaveFormatEx_raw['nSamplesPerSec'];
$WaveFormatEx['bitrate'] = $WaveFormatEx_raw['nAvgBytesPerSec'] * 8;
@@ -1360,8 +2002,12 @@
return $WaveFormatEx;
}
-
- function RIFFparseWavPackHeader($WavPackChunkData, &$ThisFileInfo) {
+ /**
+ * @param string $WavPackChunkData
+ *
+ * @return bool
+ */
+ public function parseWavPackHeader($WavPackChunkData) {
// typedef struct {
// char ckID [4];
// long ckSize;
@@ -1373,8 +2019,9 @@
// } WavpackHeader;
// shortcut
- $ThisFileInfo['wavpack'] = array();
- $thisfile_wavpack = &$ThisFileInfo['wavpack'];
+ $info = &$this->getid3->info;
+ $info['wavpack'] = array();
+ $thisfile_wavpack = &$info['wavpack'];
$thisfile_wavpack['version'] = getid3_lib::LittleEndian2Int(substr($WavPackChunkData, 0, 2));
if ($thisfile_wavpack['version'] >= 2) {
@@ -1421,12 +2068,151 @@
return true;
}
- function RIFFwFormatTagLookup($wFormatTag) {
+ /**
+ * @param string $BITMAPINFOHEADER
+ * @param bool $littleEndian
+ *
+ * @return array
+ */
+ public static function ParseBITMAPINFOHEADER($BITMAPINFOHEADER, $littleEndian=true) {
+ $parsed['biSize'] = substr($BITMAPINFOHEADER, 0, 4); // number of bytes required by the BITMAPINFOHEADER structure
+ $parsed['biWidth'] = substr($BITMAPINFOHEADER, 4, 4); // width of the bitmap in pixels
+ $parsed['biHeight'] = substr($BITMAPINFOHEADER, 8, 4); // height of the bitmap in pixels. If biHeight is positive, the bitmap is a 'bottom-up' DIB and its origin is the lower left corner. If biHeight is negative, the bitmap is a 'top-down' DIB and its origin is the upper left corner
+ $parsed['biPlanes'] = substr($BITMAPINFOHEADER, 12, 2); // number of color planes on the target device. In most cases this value must be set to 1
+ $parsed['biBitCount'] = substr($BITMAPINFOHEADER, 14, 2); // Specifies the number of bits per pixels
+ $parsed['biSizeImage'] = substr($BITMAPINFOHEADER, 20, 4); // size of the bitmap data section of the image (the actual pixel data, excluding BITMAPINFOHEADER and RGBQUAD structures)
+ $parsed['biXPelsPerMeter'] = substr($BITMAPINFOHEADER, 24, 4); // horizontal resolution, in pixels per metre, of the target device
+ $parsed['biYPelsPerMeter'] = substr($BITMAPINFOHEADER, 28, 4); // vertical resolution, in pixels per metre, of the target device
+ $parsed['biClrUsed'] = substr($BITMAPINFOHEADER, 32, 4); // actual number of color indices in the color table used by the bitmap. If this value is zero, the bitmap uses the maximum number of colors corresponding to the value of the biBitCount member for the compression mode specified by biCompression
+ $parsed['biClrImportant'] = substr($BITMAPINFOHEADER, 36, 4); // number of color indices that are considered important for displaying the bitmap. If this value is zero, all colors are important
+ $parsed = array_map('getid3_lib::'.($littleEndian ? 'Little' : 'Big').'Endian2Int', $parsed);
+
+ $parsed['fourcc'] = substr($BITMAPINFOHEADER, 16, 4); // compression identifier
+
+ return $parsed;
+ }
+
+ /**
+ * @param string $DIVXTAG
+ * @param bool $raw
+ *
+ * @return array
+ */
+ public static function ParseDIVXTAG($DIVXTAG, $raw=false) {
+ // structure from "IDivX" source, Form1.frm, by "Greg Frazier of Daemonic Software Group", email: gfrazier at icestorm.net, web: http://dsg.cjb.net/
+ // source available at http://files.divx-digest.com/download/c663efe7ef8ad2e90bf4af4d3ea6188a/on0SWN2r/edit/IDivX.zip
+ // 'Byte Layout: '1111111111111111
+ // '32 for Movie - 1 '1111111111111111
+ // '28 for Author - 6 '6666666666666666
+ // '4 for year - 2 '6666666666662222
+ // '3 for genre - 3 '7777777777777777
+ // '48 for Comments - 7 '7777777777777777
+ // '1 for Rating - 4 '7777777777777777
+ // '5 for Future Additions - 0 '333400000DIVXTAG
+ // '128 bytes total
+
+ static $DIVXTAGgenre = array(
+ 0 => 'Action',
+ 1 => 'Action/Adventure',
+ 2 => 'Adventure',
+ 3 => 'Adult',
+ 4 => 'Anime',
+ 5 => 'Cartoon',
+ 6 => 'Claymation',
+ 7 => 'Comedy',
+ 8 => 'Commercial',
+ 9 => 'Documentary',
+ 10 => 'Drama',
+ 11 => 'Home Video',
+ 12 => 'Horror',
+ 13 => 'Infomercial',
+ 14 => 'Interactive',
+ 15 => 'Mystery',
+ 16 => 'Music Video',
+ 17 => 'Other',
+ 18 => 'Religion',
+ 19 => 'Sci Fi',
+ 20 => 'Thriller',
+ 21 => 'Western',
+ ),
+ $DIVXTAGrating = array(
+ 0 => 'Unrated',
+ 1 => 'G',
+ 2 => 'PG',
+ 3 => 'PG-13',
+ 4 => 'R',
+ 5 => 'NC-17',
+ );
+
+ $parsed = array();
+ $parsed['title'] = trim(substr($DIVXTAG, 0, 32));
+ $parsed['artist'] = trim(substr($DIVXTAG, 32, 28));
+ $parsed['year'] = intval(trim(substr($DIVXTAG, 60, 4)));
+ $parsed['comment'] = trim(substr($DIVXTAG, 64, 48));
+ $parsed['genre_id'] = intval(trim(substr($DIVXTAG, 112, 3)));
+ $parsed['rating_id'] = ord(substr($DIVXTAG, 115, 1));
+ //$parsed['padding'] = substr($DIVXTAG, 116, 5); // 5-byte null
+ //$parsed['magic'] = substr($DIVXTAG, 121, 7); // "DIVXTAG"
+
+ $parsed['genre'] = (isset($DIVXTAGgenre[$parsed['genre_id']]) ? $DIVXTAGgenre[$parsed['genre_id']] : $parsed['genre_id']);
+ $parsed['rating'] = (isset($DIVXTAGrating[$parsed['rating_id']]) ? $DIVXTAGrating[$parsed['rating_id']] : $parsed['rating_id']);
+
+ if (!$raw) {
+ unset($parsed['genre_id'], $parsed['rating_id']);
+ foreach ($parsed as $key => $value) {
+ if (empty($value)) {
+ unset($parsed[$key]);
+ }
+ }
+ }
+
+ foreach ($parsed as $tag => $value) {
+ $parsed[$tag] = array($value);
+ }
+
+ return $parsed;
+ }
+
+ /**
+ * @param string $tagshortname
+ *
+ * @return string
+ */
+ public static function waveSNDMtagLookup($tagshortname) {
$begin = __LINE__;
/** This is not a comment!
+ ©kwd keywords
+ ©BPM bpm
+ ©trt tracktitle
+ ©des description
+ ©gen category
+ ©fin featuredinstrument
+ ©LID longid
+ ©bex bwdescription
+ ©pub publisher
+ ©cdt cdtitle
+ ©alb library
+ ©com composer
+
+ */
+
+ return getid3_lib::EmbeddedLookup($tagshortname, $begin, __LINE__, __FILE__, 'riff-sndm');
+ }
+
+ /**
+ * @param int $wFormatTag
+ *
+ * @return string
+ */
+ public static function wFormatTagLookup($wFormatTag) {
+
+ $begin = __LINE__;
+
+ /** This is not a comment!
+
0x0000 Microsoft Unknown Wave Format
0x0001 Pulse Code Modulation (PCM)
0x0002 Microsoft ADPCM
@@ -1588,12 +2374,15 @@
*/
return getid3_lib::EmbeddedLookup('0x'.str_pad(strtoupper(dechex($wFormatTag)), 4, '0', STR_PAD_LEFT), $begin, __LINE__, __FILE__, 'riff-wFormatTag');
-
}
+ /**
+ * @param string $fourcc
+ *
+ * @return string
+ */
+ public static function fourccLookup($fourcc) {
- function RIFFfourccLookup($fourcc) {
-
$begin = __LINE__;
/** This is not a comment!
@@ -1696,9 +2485,12 @@
ETV2 eTreppid Video ETV2
ETVC eTreppid Video ETVC
FLIC Autodesk FLI/FLC Animation
+ FLV1 Sorenson Spark
+ FLV4 On2 TrueMotion VP6
FRWT Darim Vision Forward Motion JPEG (www.darvision.com)
FRWU Darim Vision Forward Uncompressed (www.darvision.com)
FLJP D-Vision Field Encoded Motion JPEG
+ FPS1 FRAPS v1
FRWA SoftLab-Nsk Forward Motion JPEG w/ alpha channel
FRWD SoftLab-Nsk Forward Motion JPEG
FVF1 Iterated Systems Fractal Video Frame
@@ -1724,7 +2516,7 @@
IY41 Interlaced version of Y41P (www.leadtools.com)
IYU1 12 bit format used in mode 2 of the IEEE 1394 Digital Camera 1.04 spec IEEE standard
IYU2 24 bit format used in mode 2 of the IEEE 1394 Digital Camera 1.04 spec IEEE standard
- IYUV Planar YUV format (8-bpp Y plane, followed by 8-bpp 2×2 U and V planes)
+ IYUV Planar YUV format (8-bpp Y plane, followed by 8-bpp 2×2 U and V planes)
i263 Intel ITU H.263 Videoconferencing (i263)
I420 Intel Indeo 4
IAN Intel Indeo 4 (RDX)
@@ -1936,6 +2728,7 @@
VLV1 VideoLogic/PURE Digital Videologic Capture
VP30 On2 VP3.0
VP31 On2 VP3.1
+ VP6F On2 TrueMotion VP6
VX1K Lucent VX1000S Video Codec
VX2K Lucent VX2000S Video Codec
VXSP Lucent VX1000SP Video Codec
@@ -1982,9 +2775,14 @@
return getid3_lib::EmbeddedLookup($fourcc, $begin, __LINE__, __FILE__, 'riff-fourcc');
}
-
- function EitherEndian2Int(&$ThisFileInfo, $byteword, $signed=false) {
- if ($ThisFileInfo['fileformat'] == 'riff') {
+ /**
+ * @param string $byteword
+ * @param bool $signed
+ *
+ * @return int|float|false
+ */
+ private function EitherEndian2Int($byteword, $signed=false) {
+ if ($this->container == 'riff') {
return getid3_lib::LittleEndian2Int($byteword, $signed);
}
return getid3_lib::BigEndian2Int($byteword, false, $signed);
@@ -1991,5 +2789,3 @@
}
}
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.swf.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.swf.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio-video.swf.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio-video.swf.php //
// module for analyzing Shockwave Flash files //
@@ -13,65 +14,57 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_swf
+class getid3_swf extends getid3_handler
{
+ public $ReturnAllTagData = false;
- function getid3_swf(&$fd, &$ThisFileInfo, $ReturnAllTagData=false) {
- $ThisFileInfo['fileformat'] = 'swf';
- $ThisFileInfo['video']['dataformat'] = 'swf';
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
+ $info['fileformat'] = 'swf';
+ $info['video']['dataformat'] = 'swf';
+
// http://www.openswf.org/spec/SWFfileformat.html
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
+ $this->fseek($info['avdataoffset']);
-//echo 'reading '.($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']).' bytes<br>';
- $SWFfileData = fread($fd, $ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']); // 8 + 2 + 2 + max(9) bytes NOT including Frame_Size RECT data
+ $SWFfileData = $this->fread($info['avdataend'] - $info['avdataoffset']); // 8 + 2 + 2 + max(9) bytes NOT including Frame_Size RECT data
- $ThisFileInfo['swf']['header']['signature'] = substr($SWFfileData, 0, 3);
- switch ($ThisFileInfo['swf']['header']['signature']) {
+ $info['swf']['header']['signature'] = substr($SWFfileData, 0, 3);
+ switch ($info['swf']['header']['signature']) {
case 'FWS':
- $ThisFileInfo['swf']['header']['compressed'] = false;
+ $info['swf']['header']['compressed'] = false;
break;
case 'CWS':
- $ThisFileInfo['swf']['header']['compressed'] = true;
+ $info['swf']['header']['compressed'] = true;
break;
default:
- $ThisFileInfo['error'][] = 'Expecting "FWS" or "CWS" at offset '.$ThisFileInfo['avdataoffset'].', found "'.$ThisFileInfo['swf']['header']['signature'].'"';
- unset($ThisFileInfo['swf']);
- unset($ThisFileInfo['fileformat']);
+ $this->error('Expecting "FWS" or "CWS" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($info['swf']['header']['signature']).'"');
+ unset($info['swf']);
+ unset($info['fileformat']);
return false;
- break;
}
- $ThisFileInfo['swf']['header']['version'] = getid3_lib::LittleEndian2Int(substr($SWFfileData, 3, 1));
- $ThisFileInfo['swf']['header']['length'] = getid3_lib::LittleEndian2Int(substr($SWFfileData, 4, 4));
+ $info['swf']['header']['version'] = getid3_lib::LittleEndian2Int(substr($SWFfileData, 3, 1));
+ $info['swf']['header']['length'] = getid3_lib::LittleEndian2Int(substr($SWFfileData, 4, 4));
-//echo '1<br>';
- if ($ThisFileInfo['swf']['header']['compressed']) {
-
-//echo '2<br>';
-// $foo = substr($SWFfileData, 8, 4096);
-// echo '['.strlen($foo).']<br>';
-// $fee = gzuncompress($foo);
-// echo '('.strlen($fee).')<br>';
-//return false;
-//echo '<br>time: '.time().'<br>';
-//return false;
- if ($UncompressedFileData = gzuncompress(substr($SWFfileData, 8))) {
-
-//echo '3<br>';
- $SWFfileData = substr($SWFfileData, 0, 8).$UncompressedFileData;
-
+ if ($info['swf']['header']['compressed']) {
+ $SWFHead = substr($SWFfileData, 0, 8);
+ $SWFfileData = substr($SWFfileData, 8);
+ if ($decompressed = @gzuncompress($SWFfileData)) {
+ $SWFfileData = $SWFHead.$decompressed;
} else {
-
-//echo '4<br>';
- $ThisFileInfo['error'][] = 'Error decompressing compressed SWF data';
+ $this->error('Error decompressing compressed SWF data ('.strlen($SWFfileData).' bytes compressed, should be '.($info['swf']['header']['length'] - 8).' bytes uncompressed)');
return false;
-
}
-
}
$FrameSizeBitsPerValue = (ord(substr($SWFfileData, 8, 1)) & 0xF8) >> 3;
@@ -81,8 +74,8 @@
$FrameSizeDataString .= str_pad(decbin(ord(substr($SWFfileData, 8 + $i, 1))), 8, '0', STR_PAD_LEFT);
}
list($X1, $X2, $Y1, $Y2) = explode("\n", wordwrap($FrameSizeDataString, $FrameSizeBitsPerValue, "\n", 1));
- $ThisFileInfo['swf']['header']['frame_width'] = getid3_lib::Bin2Dec($X2);
- $ThisFileInfo['swf']['header']['frame_height'] = getid3_lib::Bin2Dec($Y2);
+ $info['swf']['header']['frame_width'] = getid3_lib::Bin2Dec($X2);
+ $info['swf']['header']['frame_height'] = getid3_lib::Bin2Dec($Y2);
// http://www-lehre.informatik.uni-osnabrueck.de/~fbstark/diplom/docs/swf/Flash_Uncovered.htm
// Next in the header is the frame rate, which is kind of weird.
@@ -91,17 +84,18 @@
// Example: 0x000C -> 0x0C -> 12 So the frame rate is 12 fps.
// Byte at (8 + $FrameSizeDataLength) is always zero and ignored
- $ThisFileInfo['swf']['header']['frame_rate'] = getid3_lib::LittleEndian2Int(substr($SWFfileData, 9 + $FrameSizeDataLength, 1));
- $ThisFileInfo['swf']['header']['frame_count'] = getid3_lib::LittleEndian2Int(substr($SWFfileData, 10 + $FrameSizeDataLength, 2));
+ $info['swf']['header']['frame_rate'] = getid3_lib::LittleEndian2Int(substr($SWFfileData, 9 + $FrameSizeDataLength, 1));
+ $info['swf']['header']['frame_count'] = getid3_lib::LittleEndian2Int(substr($SWFfileData, 10 + $FrameSizeDataLength, 2));
- $ThisFileInfo['video']['frame_rate'] = $ThisFileInfo['swf']['header']['frame_rate'];
- $ThisFileInfo['video']['resolution_x'] = intval(round($ThisFileInfo['swf']['header']['frame_width'] / 20));
- $ThisFileInfo['video']['resolution_y'] = intval(round($ThisFileInfo['swf']['header']['frame_height'] / 20));
- $ThisFileInfo['video']['pixel_aspect_ratio'] = (float) 1;
+ $info['video']['frame_rate'] = $info['swf']['header']['frame_rate'];
+ $info['video']['resolution_x'] = intval(round($info['swf']['header']['frame_width'] / 20));
+ $info['video']['resolution_y'] = intval(round($info['swf']['header']['frame_height'] / 20));
+ $info['video']['pixel_aspect_ratio'] = (float) 1;
- if (($ThisFileInfo['swf']['header']['frame_count'] > 0) && ($ThisFileInfo['swf']['header']['frame_rate'] > 0)) {
- $ThisFileInfo['playtime_seconds'] = $ThisFileInfo['swf']['header']['frame_count'] / $ThisFileInfo['swf']['header']['frame_rate'];
+ if (($info['swf']['header']['frame_count'] > 0) && ($info['swf']['header']['frame_rate'] > 0)) {
+ $info['playtime_seconds'] = $info['swf']['header']['frame_count'] / $info['swf']['header']['frame_rate'];
}
+//echo __LINE__.'='.number_format(microtime(true) - $start_time, 3).'<br>';
// SWF tags
@@ -110,6 +104,7 @@
$SWFdataLength = strlen($SWFfileData);
while ($CurrentOffset < $SWFdataLength) {
+//echo __LINE__.'='.number_format(microtime(true) - $start_time, 3).'<br>';
$TagIDTagLength = getid3_lib::LittleEndian2Int(substr($SWFfileData, $CurrentOffset, 2));
$TagID = ($TagIDTagLength & 0xFFFC) >> 6;
@@ -130,13 +125,13 @@
break 2;
case 9: // Set background color
- //$ThisFileInfo['swf']['tags'][] = $TagData;
- $ThisFileInfo['swf']['bgcolor'] = strtoupper(str_pad(dechex(getid3_lib::BigEndian2Int($TagData['data'])), 6, '0', STR_PAD_LEFT));
+ //$info['swf']['tags'][] = $TagData;
+ $info['swf']['bgcolor'] = strtoupper(str_pad(dechex(getid3_lib::BigEndian2Int($TagData['data'])), 6, '0', STR_PAD_LEFT));
break;
default:
- if ($ReturnAllTagData) {
- $ThisFileInfo['swf']['tags'][] = $TagData;
+ if ($this->ReturnAllTagData) {
+ $info['swf']['tags'][] = $TagData;
}
break;
}
@@ -148,6 +143,3 @@
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.aac.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.aac.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.aac.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio.aac.php //
// module for analyzing AAC Audio files //
@@ -13,30 +14,37 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_aac
+class getid3_aac extends getid3_handler
{
-
- // new combined constructor
- function getid3_aac(&$fd, &$ThisFileInfo, $option) {
-
- if ($option === 'adif') {
- $this->getAACADIFheaderFilepointer($fd, $ThisFileInfo);
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
+ $this->fseek($info['avdataoffset']);
+ if ($this->fread(4) == 'ADIF') {
+ $this->getAACADIFheaderFilepointer();
+ } else {
+ $this->getAACADTSheaderFilepointer();
}
- elseif ($option === 'adts') {
- $this->getAACADTSheaderFilepointer($fd, $ThisFileInfo);
- }
+ return true;
}
+ /**
+ * @return bool
+ */
+ public function getAACADIFheaderFilepointer() {
+ $info = &$this->getid3->info;
+ $info['fileformat'] = 'aac';
+ $info['audio']['dataformat'] = 'aac';
+ $info['audio']['lossless'] = false;
-
- function getAACADIFheaderFilepointer(&$fd, &$ThisFileInfo) {
- $ThisFileInfo['fileformat'] = 'aac';
- $ThisFileInfo['audio']['dataformat'] = 'aac';
- $ThisFileInfo['audio']['lossless'] = false;
-
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
- $AACheader = fread($fd, 1024);
+ $this->fseek($info['avdataoffset']);
+ $AACheader = $this->fread(1024);
$offset = 0;
if (substr($AACheader, 0, 4) == 'ADIF') {
@@ -64,40 +72,40 @@
$AACheaderBitstream = getid3_lib::BigEndian2Bin($AACheader);
$bitoffset = 0;
- $ThisFileInfo['aac']['header_type'] = 'ADIF';
+ $info['aac']['header_type'] = 'ADIF';
$bitoffset += 32;
- $ThisFileInfo['aac']['header']['mpeg_version'] = 4;
+ $info['aac']['header']['mpeg_version'] = 4;
- $ThisFileInfo['aac']['header']['copyright'] = (bool) (substr($AACheaderBitstream, $bitoffset, 1) == '1');
+ $info['aac']['header']['copyright'] = substr($AACheaderBitstream, $bitoffset, 1) == '1';
$bitoffset += 1;
- if ($ThisFileInfo['aac']['header']['copyright']) {
- $ThisFileInfo['aac']['header']['copyright_id'] = getid3_lib::Bin2String(substr($AACheaderBitstream, $bitoffset, 72));
+ if ($info['aac']['header']['copyright']) {
+ $info['aac']['header']['copyright_id'] = getid3_lib::Bin2String(substr($AACheaderBitstream, $bitoffset, 72));
$bitoffset += 72;
}
- $ThisFileInfo['aac']['header']['original_copy'] = (bool) (substr($AACheaderBitstream, $bitoffset, 1) == '1');
+ $info['aac']['header']['original_copy'] = substr($AACheaderBitstream, $bitoffset, 1) == '1';
$bitoffset += 1;
- $ThisFileInfo['aac']['header']['home'] = (bool) (substr($AACheaderBitstream, $bitoffset, 1) == '1');
+ $info['aac']['header']['home'] = substr($AACheaderBitstream, $bitoffset, 1) == '1';
$bitoffset += 1;
- $ThisFileInfo['aac']['header']['is_vbr'] = (bool) (substr($AACheaderBitstream, $bitoffset, 1) == '1');
+ $info['aac']['header']['is_vbr'] = substr($AACheaderBitstream, $bitoffset, 1) == '1';
$bitoffset += 1;
- if ($ThisFileInfo['aac']['header']['is_vbr']) {
- $ThisFileInfo['audio']['bitrate_mode'] = 'vbr';
- $ThisFileInfo['aac']['header']['bitrate_max'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 23));
+ if ($info['aac']['header']['is_vbr']) {
+ $info['audio']['bitrate_mode'] = 'vbr';
+ $info['aac']['header']['bitrate_max'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 23));
$bitoffset += 23;
} else {
- $ThisFileInfo['audio']['bitrate_mode'] = 'cbr';
- $ThisFileInfo['aac']['header']['bitrate'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 23));
+ $info['audio']['bitrate_mode'] = 'cbr';
+ $info['aac']['header']['bitrate'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 23));
$bitoffset += 23;
- $ThisFileInfo['audio']['bitrate'] = $ThisFileInfo['aac']['header']['bitrate'];
+ $info['audio']['bitrate'] = $info['aac']['header']['bitrate'];
}
- if ($ThisFileInfo['audio']['bitrate'] == 0) {
- $ThisFileInfo['error'][] = 'Corrupt AAC file: bitrate_audio == zero';
+ if ($info['audio']['bitrate'] == 0) {
+ $this->error('Corrupt AAC file: bitrate_audio == zero');
return false;
}
- $ThisFileInfo['aac']['header']['num_program_configs'] = 1 + getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
+ $info['aac']['header']['num_program_configs'] = 1 + getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
$bitoffset += 4;
- for ($i = 0; $i < $ThisFileInfo['aac']['header']['num_program_configs']; $i++) {
+ for ($i = 0; $i < $info['aac']['header']['num_program_configs']; $i++) {
// http://www.audiocoding.com/wiki/index.php?page=program_config_element
// buffer_fullness 20
@@ -146,100 +154,100 @@
// comment_field_data[i] 8
// }
- if (!$ThisFileInfo['aac']['header']['is_vbr']) {
- $ThisFileInfo['aac']['program_configs'][$i]['buffer_fullness'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 20));
+ if (!$info['aac']['header']['is_vbr']) {
+ $info['aac']['program_configs'][$i]['buffer_fullness'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 20));
$bitoffset += 20;
}
- $ThisFileInfo['aac']['program_configs'][$i]['element_instance_tag'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
+ $info['aac']['program_configs'][$i]['element_instance_tag'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
$bitoffset += 4;
- $ThisFileInfo['aac']['program_configs'][$i]['object_type'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 2));
+ $info['aac']['program_configs'][$i]['object_type'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 2));
$bitoffset += 2;
- $ThisFileInfo['aac']['program_configs'][$i]['sampling_frequency_index'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
+ $info['aac']['program_configs'][$i]['sampling_frequency_index'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
$bitoffset += 4;
- $ThisFileInfo['aac']['program_configs'][$i]['num_front_channel_elements'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
+ $info['aac']['program_configs'][$i]['num_front_channel_elements'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
$bitoffset += 4;
- $ThisFileInfo['aac']['program_configs'][$i]['num_side_channel_elements'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
+ $info['aac']['program_configs'][$i]['num_side_channel_elements'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
$bitoffset += 4;
- $ThisFileInfo['aac']['program_configs'][$i]['num_back_channel_elements'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
+ $info['aac']['program_configs'][$i]['num_back_channel_elements'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
$bitoffset += 4;
- $ThisFileInfo['aac']['program_configs'][$i]['num_lfe_channel_elements'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 2));
+ $info['aac']['program_configs'][$i]['num_lfe_channel_elements'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 2));
$bitoffset += 2;
- $ThisFileInfo['aac']['program_configs'][$i]['num_assoc_data_elements'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 3));
+ $info['aac']['program_configs'][$i]['num_assoc_data_elements'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 3));
$bitoffset += 3;
- $ThisFileInfo['aac']['program_configs'][$i]['num_valid_cc_elements'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
+ $info['aac']['program_configs'][$i]['num_valid_cc_elements'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
$bitoffset += 4;
- $ThisFileInfo['aac']['program_configs'][$i]['mono_mixdown_present'] = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
+ $info['aac']['program_configs'][$i]['mono_mixdown_present'] = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
$bitoffset += 1;
- if ($ThisFileInfo['aac']['program_configs'][$i]['mono_mixdown_present']) {
- $ThisFileInfo['aac']['program_configs'][$i]['mono_mixdown_element_number'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
+ if ($info['aac']['program_configs'][$i]['mono_mixdown_present']) {
+ $info['aac']['program_configs'][$i]['mono_mixdown_element_number'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
$bitoffset += 4;
}
- $ThisFileInfo['aac']['program_configs'][$i]['stereo_mixdown_present'] = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
+ $info['aac']['program_configs'][$i]['stereo_mixdown_present'] = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
$bitoffset += 1;
- if ($ThisFileInfo['aac']['program_configs'][$i]['stereo_mixdown_present']) {
- $ThisFileInfo['aac']['program_configs'][$i]['stereo_mixdown_element_number'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
+ if ($info['aac']['program_configs'][$i]['stereo_mixdown_present']) {
+ $info['aac']['program_configs'][$i]['stereo_mixdown_element_number'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
$bitoffset += 4;
}
- $ThisFileInfo['aac']['program_configs'][$i]['matrix_mixdown_idx_present'] = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
+ $info['aac']['program_configs'][$i]['matrix_mixdown_idx_present'] = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
$bitoffset += 1;
- if ($ThisFileInfo['aac']['program_configs'][$i]['matrix_mixdown_idx_present']) {
- $ThisFileInfo['aac']['program_configs'][$i]['matrix_mixdown_idx'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 2));
+ if ($info['aac']['program_configs'][$i]['matrix_mixdown_idx_present']) {
+ $info['aac']['program_configs'][$i]['matrix_mixdown_idx'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 2));
$bitoffset += 2;
- $ThisFileInfo['aac']['program_configs'][$i]['pseudo_surround_enable'] = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
+ $info['aac']['program_configs'][$i]['pseudo_surround_enable'] = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
$bitoffset += 1;
}
- for ($j = 0; $j < $ThisFileInfo['aac']['program_configs'][$i]['num_front_channel_elements']; $j++) {
- $ThisFileInfo['aac']['program_configs'][$i]['front_element_is_cpe'][$j] = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
+ for ($j = 0; $j < $info['aac']['program_configs'][$i]['num_front_channel_elements']; $j++) {
+ $info['aac']['program_configs'][$i]['front_element_is_cpe'][$j] = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
$bitoffset += 1;
- $ThisFileInfo['aac']['program_configs'][$i]['front_element_tag_select'][$j] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
+ $info['aac']['program_configs'][$i]['front_element_tag_select'][$j] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
$bitoffset += 4;
}
- for ($j = 0; $j < $ThisFileInfo['aac']['program_configs'][$i]['num_side_channel_elements']; $j++) {
- $ThisFileInfo['aac']['program_configs'][$i]['side_element_is_cpe'][$j] = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
+ for ($j = 0; $j < $info['aac']['program_configs'][$i]['num_side_channel_elements']; $j++) {
+ $info['aac']['program_configs'][$i]['side_element_is_cpe'][$j] = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
$bitoffset += 1;
- $ThisFileInfo['aac']['program_configs'][$i]['side_element_tag_select'][$j] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
+ $info['aac']['program_configs'][$i]['side_element_tag_select'][$j] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
$bitoffset += 4;
}
- for ($j = 0; $j < $ThisFileInfo['aac']['program_configs'][$i]['num_back_channel_elements']; $j++) {
- $ThisFileInfo['aac']['program_configs'][$i]['back_element_is_cpe'][$j] = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
+ for ($j = 0; $j < $info['aac']['program_configs'][$i]['num_back_channel_elements']; $j++) {
+ $info['aac']['program_configs'][$i]['back_element_is_cpe'][$j] = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
$bitoffset += 1;
- $ThisFileInfo['aac']['program_configs'][$i]['back_element_tag_select'][$j] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
+ $info['aac']['program_configs'][$i]['back_element_tag_select'][$j] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
$bitoffset += 4;
}
- for ($j = 0; $j < $ThisFileInfo['aac']['program_configs'][$i]['num_lfe_channel_elements']; $j++) {
- $ThisFileInfo['aac']['program_configs'][$i]['lfe_element_tag_select'][$j] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
+ for ($j = 0; $j < $info['aac']['program_configs'][$i]['num_lfe_channel_elements']; $j++) {
+ $info['aac']['program_configs'][$i]['lfe_element_tag_select'][$j] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
$bitoffset += 4;
}
- for ($j = 0; $j < $ThisFileInfo['aac']['program_configs'][$i]['num_assoc_data_elements']; $j++) {
- $ThisFileInfo['aac']['program_configs'][$i]['assoc_data_element_tag_select'][$j] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
+ for ($j = 0; $j < $info['aac']['program_configs'][$i]['num_assoc_data_elements']; $j++) {
+ $info['aac']['program_configs'][$i]['assoc_data_element_tag_select'][$j] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
$bitoffset += 4;
}
- for ($j = 0; $j < $ThisFileInfo['aac']['program_configs'][$i]['num_valid_cc_elements']; $j++) {
- $ThisFileInfo['aac']['program_configs'][$i]['cc_element_is_ind_sw'][$j] = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
+ for ($j = 0; $j < $info['aac']['program_configs'][$i]['num_valid_cc_elements']; $j++) {
+ $info['aac']['program_configs'][$i]['cc_element_is_ind_sw'][$j] = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
$bitoffset += 1;
- $ThisFileInfo['aac']['program_configs'][$i]['valid_cc_element_tag_select'][$j] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
+ $info['aac']['program_configs'][$i]['valid_cc_element_tag_select'][$j] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
$bitoffset += 4;
}
$bitoffset = ceil($bitoffset / 8) * 8;
- $ThisFileInfo['aac']['program_configs'][$i]['comment_field_bytes'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 8));
+ $info['aac']['program_configs'][$i]['comment_field_bytes'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 8));
$bitoffset += 8;
- $ThisFileInfo['aac']['program_configs'][$i]['comment_field'] = getid3_lib::Bin2String(substr($AACheaderBitstream, $bitoffset, 8 * $ThisFileInfo['aac']['program_configs'][$i]['comment_field_bytes']));
- $bitoffset += 8 * $ThisFileInfo['aac']['program_configs'][$i]['comment_field_bytes'];
+ $info['aac']['program_configs'][$i]['comment_field'] = getid3_lib::Bin2String(substr($AACheaderBitstream, $bitoffset, 8 * $info['aac']['program_configs'][$i]['comment_field_bytes']));
+ $bitoffset += 8 * $info['aac']['program_configs'][$i]['comment_field_bytes'];
- $ThisFileInfo['aac']['header']['profile_text'] = $this->AACprofileLookup($ThisFileInfo['aac']['program_configs'][$i]['object_type'], $ThisFileInfo['aac']['header']['mpeg_version']);
- $ThisFileInfo['aac']['program_configs'][$i]['sampling_frequency'] = $this->AACsampleRateLookup($ThisFileInfo['aac']['program_configs'][$i]['sampling_frequency_index']);
- $ThisFileInfo['audio']['sample_rate'] = $ThisFileInfo['aac']['program_configs'][$i]['sampling_frequency'];
- $ThisFileInfo['audio']['channels'] = $this->AACchannelCountCalculate($ThisFileInfo['aac']['program_configs'][$i]);
- if ($ThisFileInfo['aac']['program_configs'][$i]['comment_field']) {
- $ThisFileInfo['aac']['comments'][] = $ThisFileInfo['aac']['program_configs'][$i]['comment_field'];
+ $info['aac']['header']['profile'] = self::AACprofileLookup($info['aac']['program_configs'][$i]['object_type'], $info['aac']['header']['mpeg_version']);
+ $info['aac']['program_configs'][$i]['sampling_frequency'] = self::AACsampleRateLookup($info['aac']['program_configs'][$i]['sampling_frequency_index']);
+ $info['audio']['sample_rate'] = $info['aac']['program_configs'][$i]['sampling_frequency'];
+ $info['audio']['channels'] = self::AACchannelCountCalculate($info['aac']['program_configs'][$i]);
+ if ($info['aac']['program_configs'][$i]['comment_field']) {
+ $info['aac']['comments'][] = $info['aac']['program_configs'][$i]['comment_field'];
}
}
- $ThisFileInfo['playtime_seconds'] = (($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) * 8) / $ThisFileInfo['audio']['bitrate'];
+ $info['playtime_seconds'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['audio']['bitrate'];
- $ThisFileInfo['audio']['encoder_options'] = $ThisFileInfo['aac']['header_type'].' '.$ThisFileInfo['aac']['header']['profile_text'];
+ $info['audio']['encoder_options'] = $info['aac']['header_type'].' '.$info['aac']['header']['profile'];
@@ -247,9 +255,9 @@
} else {
- unset($ThisFileInfo['fileformat']);
- unset($ThisFileInfo['aac']);
- $ThisFileInfo['error'][] = 'AAC-ADIF synch not found at offset '.$ThisFileInfo['avdataoffset'].' (expected "ADIF", found "'.substr($AACheader, 0, 4).'" instead)';
+ unset($info['fileformat']);
+ unset($info['aac']);
+ $this->error('AAC-ADIF synch not found at offset '.$info['avdataoffset'].' (expected "ADIF", found "'.substr($AACheader, 0, 4).'" instead)');
return false;
}
@@ -256,26 +264,34 @@
}
+ /**
+ * @param int $MaxFramesToScan
+ * @param bool $ReturnExtendedInfo
+ *
+ * @return bool
+ */
+ public function getAACADTSheaderFilepointer($MaxFramesToScan=1000000, $ReturnExtendedInfo=false) {
+ $info = &$this->getid3->info;
- function getAACADTSheaderFilepointer(&$fd, &$ThisFileInfo, $MaxFramesToScan=1000000, $ReturnExtendedInfo=false) {
- // based loosely on code from AACfile by Jurgen Faul <jfaulØgmx.de>
+ // based loosely on code from AACfile by Jurgen Faul <jfaulØgmx.de>
// http://jfaul.de/atl or http://j-faul.virtualave.net/atl/atl.html
- // http://faac.sourceforge.net/wiki/index.php?page=ADTS
+ // http://faac.sourceforge.net/wiki/index.php?page=ADTS // dead link
+ // http://wiki.multimedia.cx/index.php?title=ADTS
// * ADTS Fixed Header: these don't change from frame to frame
// syncword 12 always: '111111111111'
// ID 1 0: MPEG-4, 1: MPEG-2
- // layer 2 always: '00'
- // protection_absent 1
- // profile 2
- // sampling_frequency_index 4
- // private_bit 1
+ // MPEG layer 2 If you send AAC in MPEG-TS, set to 0
+ // protection_absent 1 0: CRC present; 1: no CRC
+ // profile 2 0: AAC Main; 1: AAC LC (Low Complexity); 2: AAC SSR (Scalable Sample Rate); 3: AAC LTP (Long Term Prediction)
+ // sampling_frequency_index 4 15 not allowed
+ // private_bit 1 usually 0
// channel_configuration 3
- // original/copy 1
- // home 1
- // emphasis 2 only if ID == 0 (ie MPEG-4)
+ // original/copy 1 0: original; 1: copy
+ // home 1 usually 0
+ // emphasis 2 only if ID == 0 (ie MPEG-4) // not present in some documentation?
// * ADTS Variable Header: these can change from frame to frame
// copyright_identification_bit 1
@@ -287,7 +303,7 @@
// * ADTS Error check
// crc_check 16 only if protection_absent == 0
- $byteoffset = 0;
+ $byteoffset = $info['avdataoffset'];
$framenumber = 0;
// Init bit pattern array
@@ -306,157 +322,131 @@
// breaks out when end-of-file encountered, or invalid data found,
// or MaxFramesToScan frames have been scanned
- fseek($fd, $byteoffset, SEEK_SET);
+ if (!getid3_lib::intValueSupported($byteoffset)) {
+ $this->warning('Unable to parse AAC file beyond '.$this->ftell().' (PHP does not support file operations beyond '.round(PHP_INT_MAX / 1073741824).'GB)');
+ return false;
+ }
+ $this->fseek($byteoffset);
// First get substring
- $substring = fread($fd, 10);
+ $substring = $this->fread(9); // header is 7 bytes (or 9 if CRC is present)
$substringlength = strlen($substring);
- if ($substringlength != 10) {
- $ThisFileInfo['error'][] = 'Failed to read 10 bytes at offset '.(ftell($fd) - $substringlength).' (only read '.$substringlength.' bytes)';
+ if ($substringlength != 9) {
+ $this->error('Failed to read 7 bytes at offset '.($this->ftell() - $substringlength).' (only read '.$substringlength.' bytes)');
return false;
}
+ // this would be easier with 64-bit math, but split it up to allow for 32-bit:
+ $header1 = getid3_lib::BigEndian2Int(substr($substring, 0, 2));
+ $header2 = getid3_lib::BigEndian2Int(substr($substring, 2, 4));
+ $header3 = getid3_lib::BigEndian2Int(substr($substring, 6, 1));
- // Initialise $AACheaderBitstream
- $AACheaderBitstream = '';
-
- // Loop thru substring chars
- for ($i = 0; $i < 10; $i++) {
- $AACheaderBitstream .= $decbin[$substring{$i}];
- }
-
- $bitoffset = 0;
-
- $synctest = bindec(substr($AACheaderBitstream, $bitoffset, 12));
-
- $bitoffset += 12;
- if ($synctest != 0x0FFF) {
- $ThisFileInfo['error'][] = 'Synch pattern (0x0FFF) not found at offset '.(ftell($fd) - 10).' (found 0x0'.strtoupper(dechex($synctest)).' instead)';
- if ($ThisFileInfo['fileformat'] == 'aac') {
- return true;
- }
+ $info['aac']['header']['raw']['syncword'] = ($header1 & 0xFFF0) >> 4;
+ if ($info['aac']['header']['raw']['syncword'] != 0x0FFF) {
+ $this->error('Synch pattern (0x0FFF) not found at offset '.($this->ftell() - $substringlength).' (found 0x0'.strtoupper(dechex($info['aac']['header']['raw']['syncword'])).' instead)');
+ //if ($info['fileformat'] == 'aac') {
+ // return true;
+ //}
+ unset($info['aac']);
return false;
}
// Gather info for first frame only - this takes time to do 1000 times!
- if ($framenumber > 0) {
+ if ($framenumber == 0) {
+ $info['aac']['header_type'] = 'ADTS';
+ $info['fileformat'] = 'aac';
+ $info['audio']['dataformat'] = 'aac';
- if (!$AACheaderBitstream[$bitoffset]) {
+ $info['aac']['header']['raw']['mpeg_version'] = ($header1 & 0x0008) >> 3;
+ $info['aac']['header']['raw']['mpeg_layer'] = ($header1 & 0x0006) >> 1;
+ $info['aac']['header']['raw']['protection_absent'] = ($header1 & 0x0001) >> 0;
- // MPEG-4
- $bitoffset += 20;
+ $info['aac']['header']['raw']['profile_code'] = ($header2 & 0xC0000000) >> 30;
+ $info['aac']['header']['raw']['sample_rate_code'] = ($header2 & 0x3C000000) >> 26;
+ $info['aac']['header']['raw']['private_stream'] = ($header2 & 0x02000000) >> 25;
+ $info['aac']['header']['raw']['channels_code'] = ($header2 & 0x01C00000) >> 22;
+ $info['aac']['header']['raw']['original'] = ($header2 & 0x00200000) >> 21;
+ $info['aac']['header']['raw']['home'] = ($header2 & 0x00100000) >> 20;
+ $info['aac']['header']['raw']['copyright_stream'] = ($header2 & 0x00080000) >> 19;
+ $info['aac']['header']['raw']['copyright_start'] = ($header2 & 0x00040000) >> 18;
+ $info['aac']['header']['raw']['frame_length'] = ($header2 & 0x0003FFE0) >> 5;
- } else {
-
- // MPEG-2
- $bitoffset += 18;
-
+ $info['aac']['header']['mpeg_version'] = ($info['aac']['header']['raw']['mpeg_version'] ? 2 : 4);
+ $info['aac']['header']['crc_present'] = ($info['aac']['header']['raw']['protection_absent'] ? false: true);
+ $info['aac']['header']['profile'] = self::AACprofileLookup($info['aac']['header']['raw']['profile_code'], $info['aac']['header']['mpeg_version']);
+ $info['aac']['header']['sample_frequency'] = self::AACsampleRateLookup($info['aac']['header']['raw']['sample_rate_code']);
+ $info['aac']['header']['private'] = (bool) $info['aac']['header']['raw']['private_stream'];
+ $info['aac']['header']['original'] = (bool) $info['aac']['header']['raw']['original'];
+ $info['aac']['header']['home'] = (bool) $info['aac']['header']['raw']['home'];
+ $info['aac']['header']['channels'] = (($info['aac']['header']['raw']['channels_code'] == 7) ? 8 : $info['aac']['header']['raw']['channels_code']);
+ if ($ReturnExtendedInfo) {
+ $info['aac'][$framenumber]['copyright_id_bit'] = (bool) $info['aac']['header']['raw']['copyright_stream'];
+ $info['aac'][$framenumber]['copyright_id_start'] = (bool) $info['aac']['header']['raw']['copyright_start'];
}
- } else {
-
- $ThisFileInfo['aac']['header_type'] = 'ADTS';
- $ThisFileInfo['aac']['header']['synch'] = $synctest;
- $ThisFileInfo['fileformat'] = 'aac';
- $ThisFileInfo['audio']['dataformat'] = 'aac';
-
- $ThisFileInfo['aac']['header']['mpeg_version'] = ((substr($AACheaderBitstream, $bitoffset, 1) == '0') ? 4 : 2);
- $bitoffset += 1;
- $ThisFileInfo['aac']['header']['layer'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 2));
- $bitoffset += 2;
- if ($ThisFileInfo['aac']['header']['layer'] != 0) {
- $ThisFileInfo['error'][] = 'Layer error - expected 0x00, found 0x'.dechex($ThisFileInfo['aac']['header']['layer']).' instead';
- return false;
+ if ($info['aac']['header']['raw']['mpeg_layer'] != 0) {
+ $this->warning('Layer error - expected "0", found "'.$info['aac']['header']['raw']['mpeg_layer'].'" instead');
}
- $ThisFileInfo['aac']['header']['crc_present'] = ((substr($AACheaderBitstream, $bitoffset, 1) == '0') ? true : false);
- $bitoffset += 1;
- $ThisFileInfo['aac']['header']['profile_id'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 2));
- $bitoffset += 2;
- $ThisFileInfo['aac']['header']['profile_text'] = $this->AACprofileLookup($ThisFileInfo['aac']['header']['profile_id'], $ThisFileInfo['aac']['header']['mpeg_version']);
-
- $ThisFileInfo['aac']['header']['sample_frequency_index'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 4));
- $bitoffset += 4;
- $ThisFileInfo['aac']['header']['sample_frequency'] = $this->AACsampleRateLookup($ThisFileInfo['aac']['header']['sample_frequency_index']);
- if ($ThisFileInfo['aac']['header']['sample_frequency'] == 0) {
- $ThisFileInfo['error'][] = 'Corrupt AAC file: sample_frequency == zero';
+ if ($info['aac']['header']['sample_frequency'] == 0) {
+ $this->error('Corrupt AAC file: sample_frequency == zero');
return false;
}
- $ThisFileInfo['audio']['sample_rate'] = $ThisFileInfo['aac']['header']['sample_frequency'];
- $ThisFileInfo['aac']['header']['private'] = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
- $bitoffset += 1;
- $ThisFileInfo['aac']['header']['channel_configuration'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 3));
- $bitoffset += 3;
- $ThisFileInfo['audio']['channels'] = $ThisFileInfo['aac']['header']['channel_configuration'];
- $ThisFileInfo['aac']['header']['original'] = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
- $bitoffset += 1;
- $ThisFileInfo['aac']['header']['home'] = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
- $bitoffset += 1;
-
- if ($ThisFileInfo['aac']['header']['mpeg_version'] == 4) {
- $ThisFileInfo['aac']['header']['emphasis'] = getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 2));
- $bitoffset += 2;
- }
-
- if ($ReturnExtendedInfo) {
-
- $ThisFileInfo['aac'][$framenumber]['copyright_id_bit'] = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
- $bitoffset += 1;
- $ThisFileInfo['aac'][$framenumber]['copyright_id_start'] = (bool) getid3_lib::Bin2Dec(substr($AACheaderBitstream, $bitoffset, 1));
- $bitoffset += 1;
-
- } else {
-
- $bitoffset += 2;
-
- }
-
+ $info['audio']['sample_rate'] = $info['aac']['header']['sample_frequency'];
+ $info['audio']['channels'] = $info['aac']['header']['channels'];
}
- $FrameLength = bindec(substr($AACheaderBitstream, $bitoffset, 13));
+ $FrameLength = ($header2 & 0x0003FFE0) >> 5;
if (!isset($BitrateCache[$FrameLength])) {
- $BitrateCache[$FrameLength] = ($ThisFileInfo['aac']['header']['sample_frequency'] / 1024) * $FrameLength * 8;
+ $BitrateCache[$FrameLength] = ($info['aac']['header']['sample_frequency'] / 1024) * $FrameLength * 8;
}
- @$ThisFileInfo['aac']['bitrate_distribution'][$BitrateCache[$FrameLength]]++;
+ getid3_lib::safe_inc($info['aac']['bitrate_distribution'][$BitrateCache[$FrameLength]], 1);
- $ThisFileInfo['aac'][$framenumber]['aac_frame_length'] = $FrameLength;
- $bitoffset += 13;
- $ThisFileInfo['aac'][$framenumber]['adts_buffer_fullness'] = bindec(substr($AACheaderBitstream, $bitoffset, 11));
- $bitoffset += 11;
- if ($ThisFileInfo['aac'][$framenumber]['adts_buffer_fullness'] == 0x07FF) {
- $ThisFileInfo['audio']['bitrate_mode'] = 'vbr';
+ $info['aac'][$framenumber]['aac_frame_length'] = $FrameLength;
+
+ $info['aac'][$framenumber]['adts_buffer_fullness'] = (($header2 & 0x0000001F) << 6) & (($header3 & 0xFC) >> 2);
+ if ($info['aac'][$framenumber]['adts_buffer_fullness'] == 0x07FF) {
+ $info['audio']['bitrate_mode'] = 'vbr';
} else {
- $ThisFileInfo['audio']['bitrate_mode'] = 'cbr';
+ $info['audio']['bitrate_mode'] = 'cbr';
}
- $ThisFileInfo['aac'][$framenumber]['num_raw_data_blocks'] = bindec(substr($AACheaderBitstream, $bitoffset, 2));
- $bitoffset += 2;
+ $info['aac'][$framenumber]['num_raw_data_blocks'] = (($header3 & 0x03) >> 0);
- if ($ThisFileInfo['aac']['header']['crc_present']) {
- //$ThisFileInfo['aac'][$framenumber]['crc'] = bindec(substr($AACheaderBitstream, $bitoffset, 16));
- $bitoffset += 16;
+ if ($info['aac']['header']['crc_present']) {
+ //$info['aac'][$framenumber]['crc'] = getid3_lib::BigEndian2Int(substr($substring, 7, 2);
}
if (!$ReturnExtendedInfo) {
- unset($ThisFileInfo['aac'][$framenumber]);
+ unset($info['aac'][$framenumber]);
}
+ /*
+ $rounded_precision = 5000;
+ $info['aac']['bitrate_distribution_rounded'] = array();
+ foreach ($info['aac']['bitrate_distribution'] as $bitrate => $count) {
+ $rounded_bitrate = round($bitrate / $rounded_precision) * $rounded_precision;
+ getid3_lib::safe_inc($info['aac']['bitrate_distribution_rounded'][$rounded_bitrate], $count);
+ }
+ ksort($info['aac']['bitrate_distribution_rounded']);
+ */
+
$byteoffset += $FrameLength;
- if ((++$framenumber < $MaxFramesToScan) && (($byteoffset + 10) < $ThisFileInfo['avdataend'])) {
+ if ((++$framenumber < $MaxFramesToScan) && (($byteoffset + 10) < $info['avdataend'])) {
// keep scanning
} else {
- $ThisFileInfo['aac']['frames'] = $framenumber;
- $ThisFileInfo['playtime_seconds'] = ($ThisFileInfo['avdataend'] / $byteoffset) * (($framenumber * 1024) / $ThisFileInfo['aac']['header']['sample_frequency']); // (1 / % of file scanned) * (samples / (samples/sec)) = seconds
- if ($ThisFileInfo['playtime_seconds'] == 0) {
- $ThisFileInfo['error'][] = 'Corrupt AAC file: playtime_seconds == zero';
+ $info['aac']['frames'] = $framenumber;
+ $info['playtime_seconds'] = ($info['avdataend'] / $byteoffset) * (($framenumber * 1024) / $info['aac']['header']['sample_frequency']); // (1 / % of file scanned) * (samples / (samples/sec)) = seconds
+ if ($info['playtime_seconds'] == 0) {
+ $this->error('Corrupt AAC file: playtime_seconds == zero');
return false;
}
- $ThisFileInfo['audio']['bitrate'] = (($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) * 8) / $ThisFileInfo['playtime_seconds'];
- ksort($ThisFileInfo['aac']['bitrate_distribution']);
+ $info['audio']['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
+ ksort($info['aac']['bitrate_distribution']);
- $ThisFileInfo['audio']['encoder_options'] = $ThisFileInfo['aac']['header_type'].' '.$ThisFileInfo['aac']['header']['profile_text'];
+ $info['audio']['encoder_options'] = $info['aac']['header_type'].' '.$info['aac']['header']['profile'];
return true;
@@ -465,7 +455,12 @@
// should never get here.
}
- function AACsampleRateLookup($samplerateid) {
+ /**
+ * @param int $samplerateid
+ *
+ * @return int|string
+ */
+ public static function AACsampleRateLookup($samplerateid) {
static $AACsampleRateLookup = array();
if (empty($AACsampleRateLookup)) {
$AACsampleRateLookup[0] = 96000;
@@ -488,7 +483,13 @@
return (isset($AACsampleRateLookup[$samplerateid]) ? $AACsampleRateLookup[$samplerateid] : 'invalid');
}
- function AACprofileLookup($profileid, $mpegversion) {
+ /**
+ * @param int $profileid
+ * @param int $mpegversion
+ *
+ * @return string
+ */
+ public static function AACprofileLookup($profileid, $mpegversion) {
static $AACprofileLookup = array();
if (empty($AACprofileLookup)) {
$AACprofileLookup[2][0] = 'Main profile';
@@ -503,7 +504,12 @@
return (isset($AACprofileLookup[$mpegversion][$profileid]) ? $AACprofileLookup[$mpegversion][$profileid] : 'invalid');
}
- function AACchannelCountCalculate($program_configs) {
+ /**
+ * @param array $program_configs
+ *
+ * @return int
+ */
+ public static function AACchannelCountCalculate($program_configs) {
$channels = 0;
for ($i = 0; $i < $program_configs['num_front_channel_elements']; $i++) {
$channels++;
@@ -533,6 +539,3 @@
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.ac3.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.ac3.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.ac3.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio.ac3.php //
// module for analyzing AC-3 (aka Dolby Digital) audio files //
@@ -13,25 +14,40 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_ac3
+class getid3_ac3 extends getid3_handler
{
+ /**
+ * @var array
+ */
+ private $AC3header = array();
- function getid3_ac3(&$fd, &$ThisFileInfo) {
+ /**
+ * @var int
+ */
+ private $BSIoffset = 0;
+ const syncword = 0x0B77;
+
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
+
///AH
- $ThisFileInfo['ac3']['raw']['bsi'] = array();
- $thisfile_ac3 = &$ThisFileInfo['ac3'];
- $thisfile_ac3_raw = &$thisfile_ac3['raw'];
- $thisfile_ac3_raw_bsi = &$thisfile_ac3_raw['bsi'];
+ $info['ac3']['raw']['bsi'] = array();
+ $thisfile_ac3 = &$info['ac3'];
+ $thisfile_ac3_raw = &$thisfile_ac3['raw'];
+ $thisfile_ac3_raw_bsi = &$thisfile_ac3_raw['bsi'];
// http://www.atsc.org/standards/a_52a.pdf
- $ThisFileInfo['fileformat'] = 'ac3';
- $ThisFileInfo['audio']['dataformat'] = 'ac3';
- $ThisFileInfo['audio']['bitrate_mode'] = 'cbr';
- $ThisFileInfo['audio']['lossless'] = false;
+ $info['fileformat'] = 'ac3';
// An AC-3 serial coded audio bit stream is made up of a sequence of synchronization frames
// Each synchronization frame contains 6 coded audio blocks (AB), each of which represent 256
@@ -44,287 +60,547 @@
//
// syncinfo() | bsi() | AB0 | AB1 | AB2 | AB3 | AB4 | AB5 | Aux | CRC
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
- $AC3header['syncinfo'] = fread($fd, 5);
- $thisfile_ac3_raw['synchinfo']['synchword'] = substr($AC3header['syncinfo'], 0, 2);
+ // syncinfo() {
+ // syncword 16
+ // crc1 16
+ // fscod 2
+ // frmsizecod 6
+ // } /* end of syncinfo */
- if ($thisfile_ac3_raw['synchinfo']['synchword'] != "\x0B\x77") {
+ $this->fseek($info['avdataoffset']);
+ $tempAC3header = $this->fread(100); // should be enough to cover all data, there are some variable-length fields...?
+ $this->AC3header['syncinfo'] = getid3_lib::BigEndian2Int(substr($tempAC3header, 0, 2));
+ $this->AC3header['bsi'] = getid3_lib::BigEndian2Bin(substr($tempAC3header, 2));
+ $thisfile_ac3_raw_bsi['bsid'] = (getid3_lib::LittleEndian2Int(substr($tempAC3header, 5, 1)) & 0xF8) >> 3; // AC3 and E-AC3 put the "bsid" version identifier in the same place, but unfortnately the 4 bytes between the syncword and the version identifier are interpreted differently, so grab it here so the following code structure can make sense
+ unset($tempAC3header);
- $ThisFileInfo['error'][] = 'Expecting "\x0B\x77" at offset '.$ThisFileInfo['avdataoffset'].', found \x'.strtoupper(dechex($AC3header['syncinfo']{0})).'\x'.strtoupper(dechex($AC3header['syncinfo']{1})).' instead';
- unset($thisfile_ac3);
- return false;
-
- } else {
-
- // syncinfo() {
- // syncword 16
- // crc1 16
- // fscod 2
- // frmsizecod 6
- // } /* end of syncinfo */
-
- $thisfile_ac3_raw['synchinfo']['crc1'] = getid3_lib::LittleEndian2Int(substr($AC3header['syncinfo'], 2, 2));
- $ac3_synchinfo_fscod_frmsizecod = getid3_lib::LittleEndian2Int(substr($AC3header['syncinfo'], 4, 1));
- $thisfile_ac3_raw['synchinfo']['fscod'] = ($ac3_synchinfo_fscod_frmsizecod & 0xC0) >> 6;
- $thisfile_ac3_raw['synchinfo']['frmsizecod'] = ($ac3_synchinfo_fscod_frmsizecod & 0x3F);
-
- $thisfile_ac3['sample_rate'] = $this->AC3sampleRateCodeLookup($thisfile_ac3_raw['synchinfo']['fscod']);
- if ($thisfile_ac3_raw['synchinfo']['fscod'] <= 3) {
- $ThisFileInfo['audio']['sample_rate'] = $thisfile_ac3['sample_rate'];
+ if ($this->AC3header['syncinfo'] !== self::syncword) {
+ if (!$this->isDependencyFor('matroska')) {
+ unset($info['fileformat'], $info['ac3']);
+ return $this->error('Expecting "'.dechex(self::syncword).'" at offset '.$info['avdataoffset'].', found "'.dechex($this->AC3header['syncinfo']).'"');
}
+ }
- $thisfile_ac3['frame_length'] = $this->AC3frameSizeLookup($thisfile_ac3_raw['synchinfo']['frmsizecod'], $thisfile_ac3_raw['synchinfo']['fscod']);
- $thisfile_ac3['bitrate'] = $this->AC3bitrateLookup($thisfile_ac3_raw['synchinfo']['frmsizecod']);
- $ThisFileInfo['audio']['bitrate'] = $thisfile_ac3['bitrate'];
+ $info['audio']['dataformat'] = 'ac3';
+ $info['audio']['bitrate_mode'] = 'cbr';
+ $info['audio']['lossless'] = false;
- $AC3header['bsi'] = getid3_lib::BigEndian2Bin(fread($fd, 15));
- $ac3_bsi_offset = 0;
+ if ($thisfile_ac3_raw_bsi['bsid'] <= 8) {
- $thisfile_ac3_raw_bsi['bsid'] = bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 5));
- $ac3_bsi_offset += 5;
- if ($thisfile_ac3_raw_bsi['bsid'] > 8) {
- // Decoders which can decode version 8 will thus be able to decode version numbers less than 8.
- // If this standard is extended by the addition of additional elements or features, a value of bsid greater than 8 will be used.
- // Decoders built to this version of the standard will not be able to decode versions with bsid greater than 8.
- $ThisFileInfo['error'][] = 'Bit stream identification is version '.$thisfile_ac3_raw_bsi['bsid'].', but getID3() only understands up to version 8';
- unset($thisfile_ac3);
- return false;
+ $thisfile_ac3_raw_bsi['crc1'] = getid3_lib::Bin2Dec($this->readHeaderBSI(16));
+ $thisfile_ac3_raw_bsi['fscod'] = $this->readHeaderBSI(2); // 5.4.1.3
+ $thisfile_ac3_raw_bsi['frmsizecod'] = $this->readHeaderBSI(6); // 5.4.1.4
+ if ($thisfile_ac3_raw_bsi['frmsizecod'] > 37) { // binary: 100101 - see Table 5.18 Frame Size Code Table (1 word = 16 bits)
+ $this->warning('Unexpected ac3.bsi.frmsizecod value: '.$thisfile_ac3_raw_bsi['frmsizecod'].', bitrate not set correctly');
}
- $thisfile_ac3_raw_bsi['bsmod'] = bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 3));
- $ac3_bsi_offset += 3;
- $thisfile_ac3_raw_bsi['acmod'] = bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 3));
- $ac3_bsi_offset += 3;
+ $thisfile_ac3_raw_bsi['bsid'] = $this->readHeaderBSI(5); // we already know this from pre-parsing the version identifier, but re-read it to let the bitstream flow as intended
+ $thisfile_ac3_raw_bsi['bsmod'] = $this->readHeaderBSI(3);
+ $thisfile_ac3_raw_bsi['acmod'] = $this->readHeaderBSI(3);
- $thisfile_ac3['service_type'] = $this->AC3serviceTypeLookup($thisfile_ac3_raw_bsi['bsmod'], $thisfile_ac3_raw_bsi['acmod']);
- $ac3_coding_mode = $this->AC3audioCodingModeLookup($thisfile_ac3_raw_bsi['acmod']);
- foreach($ac3_coding_mode as $key => $value) {
- $thisfile_ac3[$key] = $value;
- }
- switch ($thisfile_ac3_raw_bsi['acmod']) {
- case 0:
- case 1:
- $ThisFileInfo['audio']['channelmode'] = 'mono';
- break;
- case 3:
- case 4:
- $ThisFileInfo['audio']['channelmode'] = 'stereo';
- break;
- default:
- $ThisFileInfo['audio']['channelmode'] = 'surround';
- break;
- }
- $ThisFileInfo['audio']['channels'] = $thisfile_ac3['num_channels'];
-
if ($thisfile_ac3_raw_bsi['acmod'] & 0x01) {
// If the lsb of acmod is a 1, center channel is in use and cmixlev follows in the bit stream.
- $thisfile_ac3_raw_bsi['cmixlev'] = bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 2));
- $ac3_bsi_offset += 2;
- $thisfile_ac3['center_mix_level'] = $this->AC3centerMixLevelLookup($thisfile_ac3_raw_bsi['cmixlev']);
+ $thisfile_ac3_raw_bsi['cmixlev'] = $this->readHeaderBSI(2);
+ $thisfile_ac3['center_mix_level'] = self::centerMixLevelLookup($thisfile_ac3_raw_bsi['cmixlev']);
}
if ($thisfile_ac3_raw_bsi['acmod'] & 0x04) {
// If the msb of acmod is a 1, surround channels are in use and surmixlev follows in the bit stream.
- $thisfile_ac3_raw_bsi['surmixlev'] = bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 2));
- $ac3_bsi_offset += 2;
- $thisfile_ac3['surround_mix_level'] = $this->AC3surroundMixLevelLookup($thisfile_ac3_raw_bsi['surmixlev']);
+ $thisfile_ac3_raw_bsi['surmixlev'] = $this->readHeaderBSI(2);
+ $thisfile_ac3['surround_mix_level'] = self::surroundMixLevelLookup($thisfile_ac3_raw_bsi['surmixlev']);
}
if ($thisfile_ac3_raw_bsi['acmod'] == 0x02) {
// When operating in the two channel mode, this 2-bit code indicates whether or not the program has been encoded in Dolby Surround.
- $thisfile_ac3_raw_bsi['dsurmod'] = bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 2));
- $ac3_bsi_offset += 2;
- $thisfile_ac3['dolby_surround_mode'] = $this->AC3dolbySurroundModeLookup($thisfile_ac3_raw_bsi['dsurmod']);
+ $thisfile_ac3_raw_bsi['dsurmod'] = $this->readHeaderBSI(2);
+ $thisfile_ac3['dolby_surround_mode'] = self::dolbySurroundModeLookup($thisfile_ac3_raw_bsi['dsurmod']);
}
- $thisfile_ac3_raw_bsi['lfeon'] = (bool) bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 1));
- $ac3_bsi_offset += 1;
- $thisfile_ac3['lfe_enabled'] = $thisfile_ac3_raw_bsi['lfeon'];
- if ($thisfile_ac3_raw_bsi['lfeon']) {
- //$ThisFileInfo['audio']['channels']++;
- $ThisFileInfo['audio']['channels'] .= '.1';
- }
+ $thisfile_ac3_raw_bsi['flags']['lfeon'] = (bool) $this->readHeaderBSI(1);
- $thisfile_ac3['channels_enabled'] = $this->AC3channelsEnabledLookup($thisfile_ac3_raw_bsi['acmod'], $thisfile_ac3_raw_bsi['lfeon']);
-
- // This indicates how far the average dialogue level is below digital 100 percent. Valid values are 1–31.
+ // This indicates how far the average dialogue level is below digital 100 percent. Valid values are 1-31.
// The value of 0 is reserved. The values of 1 to 31 are interpreted as -1 dB to -31 dB with respect to digital 100 percent.
- $thisfile_ac3_raw_bsi['dialnorm'] = bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 5));
- $ac3_bsi_offset += 5;
- $thisfile_ac3['dialogue_normalization'] = '-'.$thisfile_ac3_raw_bsi['dialnorm'].'dB';
+ $thisfile_ac3_raw_bsi['dialnorm'] = $this->readHeaderBSI(5); // 5.4.2.8 dialnorm: Dialogue Normalization, 5 Bits
- $thisfile_ac3_raw_bsi['compre_flag'] = (bool) bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 1));
- $ac3_bsi_offset += 1;
- if ($thisfile_ac3_raw_bsi['compre_flag']) {
- $thisfile_ac3_raw_bsi['compr'] = bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 8));
- $ac3_bsi_offset += 8;
- $thisfile_ac3['heavy_compression'] = $this->AC3heavyCompression($thisfile_ac3_raw_bsi['compr']);
+ $thisfile_ac3_raw_bsi['flags']['compr'] = (bool) $this->readHeaderBSI(1); // 5.4.2.9 compre: Compression Gain Word Exists, 1 Bit
+ if ($thisfile_ac3_raw_bsi['flags']['compr']) {
+ $thisfile_ac3_raw_bsi['compr'] = $this->readHeaderBSI(8); // 5.4.2.10 compr: Compression Gain Word, 8 Bits
+ $thisfile_ac3['heavy_compression'] = self::heavyCompression($thisfile_ac3_raw_bsi['compr']);
}
- $thisfile_ac3_raw_bsi['langcode_flag'] = (bool) bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 1));
- $ac3_bsi_offset += 1;
- if ($thisfile_ac3_raw_bsi['langcode_flag']) {
- $thisfile_ac3_raw_bsi['langcod'] = bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 8));
- $ac3_bsi_offset += 8;
+ $thisfile_ac3_raw_bsi['flags']['langcod'] = (bool) $this->readHeaderBSI(1); // 5.4.2.11 langcode: Language Code Exists, 1 Bit
+ if ($thisfile_ac3_raw_bsi['flags']['langcod']) {
+ $thisfile_ac3_raw_bsi['langcod'] = $this->readHeaderBSI(8); // 5.4.2.12 langcod: Language Code, 8 Bits
}
- $thisfile_ac3_raw_bsi['audprodie'] = (bool) bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 1));
- $ac3_bsi_offset += 1;
- if ($thisfile_ac3_raw_bsi['audprodie']) {
- $thisfile_ac3_raw_bsi['mixlevel'] = bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 5));
- $ac3_bsi_offset += 5;
- $thisfile_ac3_raw_bsi['roomtyp'] = bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 2));
- $ac3_bsi_offset += 2;
+ $thisfile_ac3_raw_bsi['flags']['audprodinfo'] = (bool) $this->readHeaderBSI(1); // 5.4.2.13 audprodie: Audio Production Information Exists, 1 Bit
+ if ($thisfile_ac3_raw_bsi['flags']['audprodinfo']) {
+ $thisfile_ac3_raw_bsi['mixlevel'] = $this->readHeaderBSI(5); // 5.4.2.14 mixlevel: Mixing Level, 5 Bits
+ $thisfile_ac3_raw_bsi['roomtyp'] = $this->readHeaderBSI(2); // 5.4.2.15 roomtyp: Room Type, 2 Bits
$thisfile_ac3['mixing_level'] = (80 + $thisfile_ac3_raw_bsi['mixlevel']).'dB';
- $thisfile_ac3['room_type'] = $this->AC3roomTypeLookup($thisfile_ac3_raw_bsi['roomtyp']);
+ $thisfile_ac3['room_type'] = self::roomTypeLookup($thisfile_ac3_raw_bsi['roomtyp']);
}
- if ($thisfile_ac3_raw_bsi['acmod'] == 0x00) {
- // If acmod is 0, then two completely independent program channels (dual mono)
- // are encoded into the bit stream, and are referenced as Ch1, Ch2. In this case,
- // a number of additional items are present in BSI or audblk to fully describe Ch2.
+ $thisfile_ac3_raw_bsi['dialnorm2'] = $this->readHeaderBSI(5); // 5.4.2.16 dialnorm2: Dialogue Normalization, ch2, 5 Bits
+ $thisfile_ac3['dialogue_normalization2'] = '-'.$thisfile_ac3_raw_bsi['dialnorm2'].'dB'; // This indicates how far the average dialogue level is below digital 100 percent. Valid values are 1-31. The value of 0 is reserved. The values of 1 to 31 are interpreted as -1 dB to -31 dB with respect to digital 100 percent.
- // This indicates how far the average dialogue level is below digital 100 percent. Valid values are 1–31.
- // The value of 0 is reserved. The values of 1 to 31 are interpreted as -1 dB to -31 dB with respect to digital 100 percent.
- $thisfile_ac3_raw_bsi['dialnorm2'] = bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 5));
- $ac3_bsi_offset += 5;
- $thisfile_ac3['dialogue_normalization2'] = '-'.$thisfile_ac3_raw_bsi['dialnorm2'].'dB';
+ $thisfile_ac3_raw_bsi['flags']['compr2'] = (bool) $this->readHeaderBSI(1); // 5.4.2.17 compr2e: Compression Gain Word Exists, ch2, 1 Bit
+ if ($thisfile_ac3_raw_bsi['flags']['compr2']) {
+ $thisfile_ac3_raw_bsi['compr2'] = $this->readHeaderBSI(8); // 5.4.2.18 compr2: Compression Gain Word, ch2, 8 Bits
+ $thisfile_ac3['heavy_compression2'] = self::heavyCompression($thisfile_ac3_raw_bsi['compr2']);
+ }
- $thisfile_ac3_raw_bsi['compre_flag2'] = (bool) bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 1));
- $ac3_bsi_offset += 1;
- if ($thisfile_ac3_raw_bsi['compre_flag2']) {
- $thisfile_ac3_raw_bsi['compr2'] = bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 8));
- $ac3_bsi_offset += 8;
- $thisfile_ac3['heavy_compression2'] = $this->AC3heavyCompression($thisfile_ac3_raw_bsi['compr2']);
- }
+ $thisfile_ac3_raw_bsi['flags']['langcod2'] = (bool) $this->readHeaderBSI(1); // 5.4.2.19 langcod2e: Language Code Exists, ch2, 1 Bit
+ if ($thisfile_ac3_raw_bsi['flags']['langcod2']) {
+ $thisfile_ac3_raw_bsi['langcod2'] = $this->readHeaderBSI(8); // 5.4.2.20 langcod2: Language Code, ch2, 8 Bits
+ }
- $thisfile_ac3_raw_bsi['langcode_flag2'] = (bool) bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 1));
- $ac3_bsi_offset += 1;
- if ($thisfile_ac3_raw_bsi['langcode_flag2']) {
- $thisfile_ac3_raw_bsi['langcod2'] = bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 8));
- $ac3_bsi_offset += 8;
- }
+ $thisfile_ac3_raw_bsi['flags']['audprodinfo2'] = (bool) $this->readHeaderBSI(1); // 5.4.2.21 audprodi2e: Audio Production Information Exists, ch2, 1 Bit
+ if ($thisfile_ac3_raw_bsi['flags']['audprodinfo2']) {
+ $thisfile_ac3_raw_bsi['mixlevel2'] = $this->readHeaderBSI(5); // 5.4.2.22 mixlevel2: Mixing Level, ch2, 5 Bits
+ $thisfile_ac3_raw_bsi['roomtyp2'] = $this->readHeaderBSI(2); // 5.4.2.23 roomtyp2: Room Type, ch2, 2 Bits
- $thisfile_ac3_raw_bsi['audprodie2'] = (bool) bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 1));
- $ac3_bsi_offset += 1;
- if ($thisfile_ac3_raw_bsi['audprodie2']) {
- $thisfile_ac3_raw_bsi['mixlevel2'] = bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 5));
- $ac3_bsi_offset += 5;
- $thisfile_ac3_raw_bsi['roomtyp2'] = bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 2));
- $ac3_bsi_offset += 2;
+ $thisfile_ac3['mixing_level2'] = (80 + $thisfile_ac3_raw_bsi['mixlevel2']).'dB';
+ $thisfile_ac3['room_type2'] = self::roomTypeLookup($thisfile_ac3_raw_bsi['roomtyp2']);
+ }
- $thisfile_ac3['mixing_level2'] = (80 + $thisfile_ac3_raw_bsi['mixlevel2']).'dB';
- $thisfile_ac3['room_type2'] = $this->AC3roomTypeLookup($thisfile_ac3_raw_bsi['roomtyp2']);
- }
+ $thisfile_ac3_raw_bsi['copyright'] = (bool) $this->readHeaderBSI(1); // 5.4.2.24 copyrightb: Copyright Bit, 1 Bit
+ $thisfile_ac3_raw_bsi['original'] = (bool) $this->readHeaderBSI(1); // 5.4.2.25 origbs: Original Bit Stream, 1 Bit
+
+ $thisfile_ac3_raw_bsi['flags']['timecod1'] = $this->readHeaderBSI(2); // 5.4.2.26 timecod1e, timcode2e: Time Code (first and second) Halves Exist, 2 Bits
+ if ($thisfile_ac3_raw_bsi['flags']['timecod1'] & 0x01) {
+ $thisfile_ac3_raw_bsi['timecod1'] = $this->readHeaderBSI(14); // 5.4.2.27 timecod1: Time code first half, 14 bits
+ $thisfile_ac3['timecode1'] = 0;
+ $thisfile_ac3['timecode1'] += (($thisfile_ac3_raw_bsi['timecod1'] & 0x3E00) >> 9) * 3600; // The first 5 bits of this 14-bit field represent the time in hours, with valid values of 0�23
+ $thisfile_ac3['timecode1'] += (($thisfile_ac3_raw_bsi['timecod1'] & 0x01F8) >> 3) * 60; // The next 6 bits represent the time in minutes, with valid values of 0�59
+ $thisfile_ac3['timecode1'] += (($thisfile_ac3_raw_bsi['timecod1'] & 0x0003) >> 0) * 8; // The final 3 bits represents the time in 8 second increments, with valid values of 0�7 (representing 0, 8, 16, ... 56 seconds)
}
+ if ($thisfile_ac3_raw_bsi['flags']['timecod1'] & 0x02) {
+ $thisfile_ac3_raw_bsi['timecod2'] = $this->readHeaderBSI(14); // 5.4.2.28 timecod2: Time code second half, 14 bits
+ $thisfile_ac3['timecode2'] = 0;
+ $thisfile_ac3['timecode2'] += (($thisfile_ac3_raw_bsi['timecod2'] & 0x3800) >> 11) * 1; // The first 3 bits of this 14-bit field represent the time in seconds, with valid values from 0�7 (representing 0-7 seconds)
+ $thisfile_ac3['timecode2'] += (($thisfile_ac3_raw_bsi['timecod2'] & 0x07C0) >> 6) * (1 / 30); // The next 5 bits represents the time in frames, with valid values from 0�29 (one frame = 1/30th of a second)
+ $thisfile_ac3['timecode2'] += (($thisfile_ac3_raw_bsi['timecod2'] & 0x003F) >> 0) * ((1 / 30) / 60); // The final 6 bits represents fractions of 1/64 of a frame, with valid values from 0�63
+ }
- $thisfile_ac3_raw_bsi['copyright'] = (bool) bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 1));
- $ac3_bsi_offset += 1;
+ $thisfile_ac3_raw_bsi['flags']['addbsi'] = (bool) $this->readHeaderBSI(1);
+ if ($thisfile_ac3_raw_bsi['flags']['addbsi']) {
+ $thisfile_ac3_raw_bsi['addbsi_length'] = $this->readHeaderBSI(6) + 1; // This 6-bit code, which exists only if addbside is a 1, indicates the length in bytes of additional bit stream information. The valid range of addbsil is 0�63, indicating 1�64 additional bytes, respectively.
- $thisfile_ac3_raw_bsi['original'] = (bool) bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 1));
- $ac3_bsi_offset += 1;
+ $this->AC3header['bsi'] .= getid3_lib::BigEndian2Bin($this->fread($thisfile_ac3_raw_bsi['addbsi_length']));
- $thisfile_ac3_raw_bsi['timecode1_flag'] = (bool) bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 1));
- $ac3_bsi_offset += 1;
- if ($thisfile_ac3_raw_bsi['timecode1_flag']) {
- $thisfile_ac3_raw_bsi['timecode1'] = bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 14));
- $ac3_bsi_offset += 14;
+ $thisfile_ac3_raw_bsi['addbsi_data'] = substr($this->AC3header['bsi'], $this->BSIoffset, $thisfile_ac3_raw_bsi['addbsi_length'] * 8);
+ $this->BSIoffset += $thisfile_ac3_raw_bsi['addbsi_length'] * 8;
}
- $thisfile_ac3_raw_bsi['timecode2_flag'] = (bool) bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 1));
- $ac3_bsi_offset += 1;
- if ($thisfile_ac3_raw_bsi['timecode2_flag']) {
- $thisfile_ac3_raw_bsi['timecode2'] = bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 14));
- $ac3_bsi_offset += 14;
- }
- $thisfile_ac3_raw_bsi['addbsi_flag'] = (bool) bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 1));
- $ac3_bsi_offset += 1;
- if ($thisfile_ac3_raw_bsi['addbsi_flag']) {
- $thisfile_ac3_raw_bsi['addbsi_length'] = bindec(substr($AC3header['bsi'], $ac3_bsi_offset, 6));
- $ac3_bsi_offset += 6;
+ } elseif ($thisfile_ac3_raw_bsi['bsid'] <= 16) { // E-AC3
- $AC3header['bsi'] .= getid3_lib::BigEndian2Bin(fread($fd, $thisfile_ac3_raw_bsi['addbsi_length']));
- $thisfile_ac3_raw_bsi['addbsi_data'] = substr($AC3header['bsi'], $ac3_bsi_offset, $thisfile_ac3_raw_bsi['addbsi_length'] * 8);
- $ac3_bsi_offset += $thisfile_ac3_raw_bsi['addbsi_length'] * 8;
+ $this->error('E-AC3 parsing is incomplete and experimental in this version of getID3 ('.$this->getid3->version().'). Notably the bitrate calculations are wrong -- value might (or not) be correct, but it is not calculated correctly. Email info at getid3.org if you know how to calculate EAC3 bitrate correctly.');
+ $info['audio']['dataformat'] = 'eac3';
+
+ $thisfile_ac3_raw_bsi['strmtyp'] = $this->readHeaderBSI(2);
+ $thisfile_ac3_raw_bsi['substreamid'] = $this->readHeaderBSI(3);
+ $thisfile_ac3_raw_bsi['frmsiz'] = $this->readHeaderBSI(11);
+ $thisfile_ac3_raw_bsi['fscod'] = $this->readHeaderBSI(2);
+ if ($thisfile_ac3_raw_bsi['fscod'] == 3) {
+ $thisfile_ac3_raw_bsi['fscod2'] = $this->readHeaderBSI(2);
+ $thisfile_ac3_raw_bsi['numblkscod'] = 3; // six blocks per syncframe
+ } else {
+ $thisfile_ac3_raw_bsi['numblkscod'] = $this->readHeaderBSI(2);
}
+ $thisfile_ac3['bsi']['blocks_per_sync_frame'] = self::blocksPerSyncFrame($thisfile_ac3_raw_bsi['numblkscod']);
+ $thisfile_ac3_raw_bsi['acmod'] = $this->readHeaderBSI(3);
+ $thisfile_ac3_raw_bsi['flags']['lfeon'] = (bool) $this->readHeaderBSI(1);
+ $thisfile_ac3_raw_bsi['bsid'] = $this->readHeaderBSI(5); // we already know this from pre-parsing the version identifier, but re-read it to let the bitstream flow as intended
+ $thisfile_ac3_raw_bsi['dialnorm'] = $this->readHeaderBSI(5);
+ $thisfile_ac3_raw_bsi['flags']['compr'] = (bool) $this->readHeaderBSI(1);
+ if ($thisfile_ac3_raw_bsi['flags']['compr']) {
+ $thisfile_ac3_raw_bsi['compr'] = $this->readHeaderBSI(8);
+ }
+ if ($thisfile_ac3_raw_bsi['acmod'] == 0) { // if 1+1 mode (dual mono, so some items need a second value)
+ $thisfile_ac3_raw_bsi['dialnorm2'] = $this->readHeaderBSI(5);
+ $thisfile_ac3_raw_bsi['flags']['compr2'] = (bool) $this->readHeaderBSI(1);
+ if ($thisfile_ac3_raw_bsi['flags']['compr2']) {
+ $thisfile_ac3_raw_bsi['compr2'] = $this->readHeaderBSI(8);
+ }
+ }
+ if ($thisfile_ac3_raw_bsi['strmtyp'] == 1) { // if dependent stream
+ $thisfile_ac3_raw_bsi['flags']['chanmap'] = (bool) $this->readHeaderBSI(1);
+ if ($thisfile_ac3_raw_bsi['flags']['chanmap']) {
+ $thisfile_ac3_raw_bsi['chanmap'] = $this->readHeaderBSI(8);
+ }
+ }
+ $thisfile_ac3_raw_bsi['flags']['mixmdat'] = (bool) $this->readHeaderBSI(1);
+ if ($thisfile_ac3_raw_bsi['flags']['mixmdat']) { // Mixing metadata
+ if ($thisfile_ac3_raw_bsi['acmod'] > 2) { // if more than 2 channels
+ $thisfile_ac3_raw_bsi['dmixmod'] = $this->readHeaderBSI(2);
+ }
+ if (($thisfile_ac3_raw_bsi['acmod'] & 0x01) && ($thisfile_ac3_raw_bsi['acmod'] > 2)) { // if three front channels exist
+ $thisfile_ac3_raw_bsi['ltrtcmixlev'] = $this->readHeaderBSI(3);
+ $thisfile_ac3_raw_bsi['lorocmixlev'] = $this->readHeaderBSI(3);
+ }
+ if ($thisfile_ac3_raw_bsi['acmod'] & 0x04) { // if a surround channel exists
+ $thisfile_ac3_raw_bsi['ltrtsurmixlev'] = $this->readHeaderBSI(3);
+ $thisfile_ac3_raw_bsi['lorosurmixlev'] = $this->readHeaderBSI(3);
+ }
+ if ($thisfile_ac3_raw_bsi['flags']['lfeon']) { // if the LFE channel exists
+ $thisfile_ac3_raw_bsi['flags']['lfemixlevcod'] = (bool) $this->readHeaderBSI(1);
+ if ($thisfile_ac3_raw_bsi['flags']['lfemixlevcod']) {
+ $thisfile_ac3_raw_bsi['lfemixlevcod'] = $this->readHeaderBSI(5);
+ }
+ }
+ if ($thisfile_ac3_raw_bsi['strmtyp'] == 0) { // if independent stream
+ $thisfile_ac3_raw_bsi['flags']['pgmscl'] = (bool) $this->readHeaderBSI(1);
+ if ($thisfile_ac3_raw_bsi['flags']['pgmscl']) {
+ $thisfile_ac3_raw_bsi['pgmscl'] = $this->readHeaderBSI(6);
+ }
+ if ($thisfile_ac3_raw_bsi['acmod'] == 0) { // if 1+1 mode (dual mono, so some items need a second value)
+ $thisfile_ac3_raw_bsi['flags']['pgmscl2'] = (bool) $this->readHeaderBSI(1);
+ if ($thisfile_ac3_raw_bsi['flags']['pgmscl2']) {
+ $thisfile_ac3_raw_bsi['pgmscl2'] = $this->readHeaderBSI(6);
+ }
+ }
+ $thisfile_ac3_raw_bsi['flags']['extpgmscl'] = (bool) $this->readHeaderBSI(1);
+ if ($thisfile_ac3_raw_bsi['flags']['extpgmscl']) {
+ $thisfile_ac3_raw_bsi['extpgmscl'] = $this->readHeaderBSI(6);
+ }
+ $thisfile_ac3_raw_bsi['mixdef'] = $this->readHeaderBSI(2);
+ if ($thisfile_ac3_raw_bsi['mixdef'] == 1) { // mixing option 2
+ $thisfile_ac3_raw_bsi['premixcmpsel'] = (bool) $this->readHeaderBSI(1);
+ $thisfile_ac3_raw_bsi['drcsrc'] = (bool) $this->readHeaderBSI(1);
+ $thisfile_ac3_raw_bsi['premixcmpscl'] = $this->readHeaderBSI(3);
+ } elseif ($thisfile_ac3_raw_bsi['mixdef'] == 2) { // mixing option 3
+ $thisfile_ac3_raw_bsi['mixdata'] = $this->readHeaderBSI(12);
+ } elseif ($thisfile_ac3_raw_bsi['mixdef'] == 3) { // mixing option 4
+ $mixdefbitsread = 0;
+ $thisfile_ac3_raw_bsi['mixdeflen'] = $this->readHeaderBSI(5); $mixdefbitsread += 5;
+ $thisfile_ac3_raw_bsi['flags']['mixdata2'] = (bool) $this->readHeaderBSI(1); $mixdefbitsread += 1;
+ if ($thisfile_ac3_raw_bsi['flags']['mixdata2']) {
+ $thisfile_ac3_raw_bsi['premixcmpsel'] = (bool) $this->readHeaderBSI(1); $mixdefbitsread += 1;
+ $thisfile_ac3_raw_bsi['drcsrc'] = (bool) $this->readHeaderBSI(1); $mixdefbitsread += 1;
+ $thisfile_ac3_raw_bsi['premixcmpscl'] = $this->readHeaderBSI(3); $mixdefbitsread += 3;
+ $thisfile_ac3_raw_bsi['flags']['extpgmlscl'] = (bool) $this->readHeaderBSI(1); $mixdefbitsread += 1;
+ if ($thisfile_ac3_raw_bsi['flags']['extpgmlscl']) {
+ $thisfile_ac3_raw_bsi['extpgmlscl'] = $this->readHeaderBSI(4); $mixdefbitsread += 4;
+ }
+ $thisfile_ac3_raw_bsi['flags']['extpgmcscl'] = (bool) $this->readHeaderBSI(1); $mixdefbitsread += 1;
+ if ($thisfile_ac3_raw_bsi['flags']['extpgmcscl']) {
+ $thisfile_ac3_raw_bsi['extpgmcscl'] = $this->readHeaderBSI(4); $mixdefbitsread += 4;
+ }
+ $thisfile_ac3_raw_bsi['flags']['extpgmrscl'] = (bool) $this->readHeaderBSI(1); $mixdefbitsread += 1;
+ if ($thisfile_ac3_raw_bsi['flags']['extpgmrscl']) {
+ $thisfile_ac3_raw_bsi['extpgmrscl'] = $this->readHeaderBSI(4);
+ }
+ $thisfile_ac3_raw_bsi['flags']['extpgmlsscl'] = (bool) $this->readHeaderBSI(1); $mixdefbitsread += 1;
+ if ($thisfile_ac3_raw_bsi['flags']['extpgmlsscl']) {
+ $thisfile_ac3_raw_bsi['extpgmlsscl'] = $this->readHeaderBSI(4); $mixdefbitsread += 4;
+ }
+ $thisfile_ac3_raw_bsi['flags']['extpgmrsscl'] = (bool) $this->readHeaderBSI(1); $mixdefbitsread += 1;
+ if ($thisfile_ac3_raw_bsi['flags']['extpgmrsscl']) {
+ $thisfile_ac3_raw_bsi['extpgmrsscl'] = $this->readHeaderBSI(4); $mixdefbitsread += 4;
+ }
+ $thisfile_ac3_raw_bsi['flags']['extpgmlfescl'] = (bool) $this->readHeaderBSI(1); $mixdefbitsread += 1;
+ if ($thisfile_ac3_raw_bsi['flags']['extpgmlfescl']) {
+ $thisfile_ac3_raw_bsi['extpgmlfescl'] = $this->readHeaderBSI(4); $mixdefbitsread += 4;
+ }
+ $thisfile_ac3_raw_bsi['flags']['dmixscl'] = (bool) $this->readHeaderBSI(1); $mixdefbitsread += 1;
+ if ($thisfile_ac3_raw_bsi['flags']['dmixscl']) {
+ $thisfile_ac3_raw_bsi['dmixscl'] = $this->readHeaderBSI(4); $mixdefbitsread += 4;
+ }
+ $thisfile_ac3_raw_bsi['flags']['addch'] = (bool) $this->readHeaderBSI(1); $mixdefbitsread += 1;
+ if ($thisfile_ac3_raw_bsi['flags']['addch']) {
+ $thisfile_ac3_raw_bsi['flags']['extpgmaux1scl'] = (bool) $this->readHeaderBSI(1); $mixdefbitsread += 1;
+ if ($thisfile_ac3_raw_bsi['flags']['extpgmaux1scl']) {
+ $thisfile_ac3_raw_bsi['extpgmaux1scl'] = $this->readHeaderBSI(4); $mixdefbitsread += 4;
+ }
+ $thisfile_ac3_raw_bsi['flags']['extpgmaux2scl'] = (bool) $this->readHeaderBSI(1); $mixdefbitsread += 1;
+ if ($thisfile_ac3_raw_bsi['flags']['extpgmaux2scl']) {
+ $thisfile_ac3_raw_bsi['extpgmaux2scl'] = $this->readHeaderBSI(4); $mixdefbitsread += 4;
+ }
+ }
+ }
+ $thisfile_ac3_raw_bsi['flags']['mixdata3'] = (bool) $this->readHeaderBSI(1); $mixdefbitsread += 1;
+ if ($thisfile_ac3_raw_bsi['flags']['mixdata3']) {
+ $thisfile_ac3_raw_bsi['spchdat'] = $this->readHeaderBSI(5); $mixdefbitsread += 5;
+ $thisfile_ac3_raw_bsi['flags']['addspchdat'] = (bool) $this->readHeaderBSI(1); $mixdefbitsread += 1;
+ if ($thisfile_ac3_raw_bsi['flags']['addspchdat']) {
+ $thisfile_ac3_raw_bsi['spchdat1'] = $this->readHeaderBSI(5); $mixdefbitsread += 5;
+ $thisfile_ac3_raw_bsi['spchan1att'] = $this->readHeaderBSI(2); $mixdefbitsread += 2;
+ $thisfile_ac3_raw_bsi['flags']['addspchdat1'] = (bool) $this->readHeaderBSI(1); $mixdefbitsread += 1;
+ if ($thisfile_ac3_raw_bsi['flags']['addspchdat1']) {
+ $thisfile_ac3_raw_bsi['spchdat2'] = $this->readHeaderBSI(5); $mixdefbitsread += 5;
+ $thisfile_ac3_raw_bsi['spchan2att'] = $this->readHeaderBSI(3); $mixdefbitsread += 3;
+ }
+ }
+ }
+ $mixdata_bits = (8 * ($thisfile_ac3_raw_bsi['mixdeflen'] + 2)) - $mixdefbitsread;
+ $mixdata_fill = (($mixdata_bits % 8) ? 8 - ($mixdata_bits % 8) : 0);
+ $thisfile_ac3_raw_bsi['mixdata'] = $this->readHeaderBSI($mixdata_bits);
+ $thisfile_ac3_raw_bsi['mixdatafill'] = $this->readHeaderBSI($mixdata_fill);
+ unset($mixdefbitsread, $mixdata_bits, $mixdata_fill);
+ }
+ if ($thisfile_ac3_raw_bsi['acmod'] < 2) { // if mono or dual mono source
+ $thisfile_ac3_raw_bsi['flags']['paninfo'] = (bool) $this->readHeaderBSI(1);
+ if ($thisfile_ac3_raw_bsi['flags']['paninfo']) {
+ $thisfile_ac3_raw_bsi['panmean'] = $this->readHeaderBSI(8);
+ $thisfile_ac3_raw_bsi['paninfo'] = $this->readHeaderBSI(6);
+ }
+ if ($thisfile_ac3_raw_bsi['acmod'] == 0) { // if 1+1 mode (dual mono, so some items need a second value)
+ $thisfile_ac3_raw_bsi['flags']['paninfo2'] = (bool) $this->readHeaderBSI(1);
+ if ($thisfile_ac3_raw_bsi['flags']['paninfo2']) {
+ $thisfile_ac3_raw_bsi['panmean2'] = $this->readHeaderBSI(8);
+ $thisfile_ac3_raw_bsi['paninfo2'] = $this->readHeaderBSI(6);
+ }
+ }
+ }
+ $thisfile_ac3_raw_bsi['flags']['frmmixcfginfo'] = (bool) $this->readHeaderBSI(1);
+ if ($thisfile_ac3_raw_bsi['flags']['frmmixcfginfo']) { // mixing configuration information
+ if ($thisfile_ac3_raw_bsi['numblkscod'] == 0) {
+ $thisfile_ac3_raw_bsi['blkmixcfginfo'][0] = $this->readHeaderBSI(5);
+ } else {
+ for ($blk = 0; $blk < $thisfile_ac3_raw_bsi['numblkscod']; $blk++) {
+ $thisfile_ac3_raw_bsi['flags']['blkmixcfginfo'.$blk] = (bool) $this->readHeaderBSI(1);
+ if ($thisfile_ac3_raw_bsi['flags']['blkmixcfginfo'.$blk]) { // mixing configuration information
+ $thisfile_ac3_raw_bsi['blkmixcfginfo'][$blk] = $this->readHeaderBSI(5);
+ }
+ }
+ }
+ }
+ }
+ }
+ $thisfile_ac3_raw_bsi['flags']['infomdat'] = (bool) $this->readHeaderBSI(1);
+ if ($thisfile_ac3_raw_bsi['flags']['infomdat']) { // Informational metadata
+ $thisfile_ac3_raw_bsi['bsmod'] = $this->readHeaderBSI(3);
+ $thisfile_ac3_raw_bsi['flags']['copyrightb'] = (bool) $this->readHeaderBSI(1);
+ $thisfile_ac3_raw_bsi['flags']['origbs'] = (bool) $this->readHeaderBSI(1);
+ if ($thisfile_ac3_raw_bsi['acmod'] == 2) { // if in 2/0 mode
+ $thisfile_ac3_raw_bsi['dsurmod'] = $this->readHeaderBSI(2);
+ $thisfile_ac3_raw_bsi['dheadphonmod'] = $this->readHeaderBSI(2);
+ }
+ if ($thisfile_ac3_raw_bsi['acmod'] >= 6) { // if both surround channels exist
+ $thisfile_ac3_raw_bsi['dsurexmod'] = $this->readHeaderBSI(2);
+ }
+ $thisfile_ac3_raw_bsi['flags']['audprodi'] = (bool) $this->readHeaderBSI(1);
+ if ($thisfile_ac3_raw_bsi['flags']['audprodi']) {
+ $thisfile_ac3_raw_bsi['mixlevel'] = $this->readHeaderBSI(5);
+ $thisfile_ac3_raw_bsi['roomtyp'] = $this->readHeaderBSI(2);
+ $thisfile_ac3_raw_bsi['flags']['adconvtyp'] = (bool) $this->readHeaderBSI(1);
+ }
+ if ($thisfile_ac3_raw_bsi['acmod'] == 0) { // if 1+1 mode (dual mono, so some items need a second value)
+ $thisfile_ac3_raw_bsi['flags']['audprodi2'] = (bool) $this->readHeaderBSI(1);
+ if ($thisfile_ac3_raw_bsi['flags']['audprodi2']) {
+ $thisfile_ac3_raw_bsi['mixlevel2'] = $this->readHeaderBSI(5);
+ $thisfile_ac3_raw_bsi['roomtyp2'] = $this->readHeaderBSI(2);
+ $thisfile_ac3_raw_bsi['flags']['adconvtyp2'] = (bool) $this->readHeaderBSI(1);
+ }
+ }
+ if ($thisfile_ac3_raw_bsi['fscod'] < 3) { // if not half sample rate
+ $thisfile_ac3_raw_bsi['flags']['sourcefscod'] = (bool) $this->readHeaderBSI(1);
+ }
+ }
+ if (($thisfile_ac3_raw_bsi['strmtyp'] == 0) && ($thisfile_ac3_raw_bsi['numblkscod'] != 3)) { // if both surround channels exist
+ $thisfile_ac3_raw_bsi['flags']['convsync'] = (bool) $this->readHeaderBSI(1);
+ }
+ if ($thisfile_ac3_raw_bsi['strmtyp'] == 2) { // if bit stream converted from AC-3
+ if ($thisfile_ac3_raw_bsi['numblkscod'] != 3) { // 6 blocks per syncframe
+ $thisfile_ac3_raw_bsi['flags']['blkid'] = 1;
+ } else {
+ $thisfile_ac3_raw_bsi['flags']['blkid'] = (bool) $this->readHeaderBSI(1);
+ }
+ if ($thisfile_ac3_raw_bsi['flags']['blkid']) {
+ $thisfile_ac3_raw_bsi['frmsizecod'] = $this->readHeaderBSI(6);
+ }
+ }
+ $thisfile_ac3_raw_bsi['flags']['addbsi'] = (bool) $this->readHeaderBSI(1);
+ if ($thisfile_ac3_raw_bsi['flags']['addbsi']) {
+ $thisfile_ac3_raw_bsi['addbsil'] = $this->readHeaderBSI(6);
+ $thisfile_ac3_raw_bsi['addbsi'] = $this->readHeaderBSI(($thisfile_ac3_raw_bsi['addbsil'] + 1) * 8);
+ }
+ } else {
+
+ $this->error('Bit stream identification is version '.$thisfile_ac3_raw_bsi['bsid'].', but getID3() only understands up to version 16. Please submit a support ticket with a sample file.');
+ unset($info['ac3']);
+ return false;
+
}
+ if (isset($thisfile_ac3_raw_bsi['fscod2'])) {
+ $thisfile_ac3['sample_rate'] = self::sampleRateCodeLookup2($thisfile_ac3_raw_bsi['fscod2']);
+ } else {
+ $thisfile_ac3['sample_rate'] = self::sampleRateCodeLookup($thisfile_ac3_raw_bsi['fscod']);
+ }
+ if ($thisfile_ac3_raw_bsi['fscod'] <= 3) {
+ $info['audio']['sample_rate'] = $thisfile_ac3['sample_rate'];
+ } else {
+ $this->warning('Unexpected ac3.bsi.fscod value: '.$thisfile_ac3_raw_bsi['fscod']);
+ }
+ if (isset($thisfile_ac3_raw_bsi['frmsizecod'])) {
+ $thisfile_ac3['frame_length'] = self::frameSizeLookup($thisfile_ac3_raw_bsi['frmsizecod'], $thisfile_ac3_raw_bsi['fscod']);
+ $thisfile_ac3['bitrate'] = self::bitrateLookup($thisfile_ac3_raw_bsi['frmsizecod']);
+ } elseif (!empty($thisfile_ac3_raw_bsi['frmsiz'])) {
+ // this isn't right, but it's (usually) close, roughly 5% less than it should be.
+ // but WHERE is the actual bitrate value stored in EAC3?? email info at getid3.org if you know!
+ $thisfile_ac3['bitrate'] = ($thisfile_ac3_raw_bsi['frmsiz'] + 1) * 16 * 30; // The frmsiz field shall contain a value one less than the overall size of the coded syncframe in 16-bit words. That is, this field may assume a value ranging from 0 to 2047, and these values correspond to syncframe sizes ranging from 1 to 2048.
+ // kludge-fix to make it approximately the expected value, still not "right":
+ $thisfile_ac3['bitrate'] = round(($thisfile_ac3['bitrate'] * 1.05) / 16000) * 16000;
+ }
+ $info['audio']['bitrate'] = $thisfile_ac3['bitrate'];
+
+ if (isset($thisfile_ac3_raw_bsi['bsmod']) && isset($thisfile_ac3_raw_bsi['acmod'])) {
+ $thisfile_ac3['service_type'] = self::serviceTypeLookup($thisfile_ac3_raw_bsi['bsmod'], $thisfile_ac3_raw_bsi['acmod']);
+ }
+ $ac3_coding_mode = self::audioCodingModeLookup($thisfile_ac3_raw_bsi['acmod']);
+ foreach($ac3_coding_mode as $key => $value) {
+ $thisfile_ac3[$key] = $value;
+ }
+ switch ($thisfile_ac3_raw_bsi['acmod']) {
+ case 0:
+ case 1:
+ $info['audio']['channelmode'] = 'mono';
+ break;
+ case 3:
+ case 4:
+ $info['audio']['channelmode'] = 'stereo';
+ break;
+ default:
+ $info['audio']['channelmode'] = 'surround';
+ break;
+ }
+ $info['audio']['channels'] = $thisfile_ac3['num_channels'];
+
+ $thisfile_ac3['lfe_enabled'] = $thisfile_ac3_raw_bsi['flags']['lfeon'];
+ if ($thisfile_ac3_raw_bsi['flags']['lfeon']) {
+ $info['audio']['channels'] .= '.1';
+ }
+
+ $thisfile_ac3['channels_enabled'] = self::channelsEnabledLookup($thisfile_ac3_raw_bsi['acmod'], $thisfile_ac3_raw_bsi['flags']['lfeon']);
+ $thisfile_ac3['dialogue_normalization'] = '-'.$thisfile_ac3_raw_bsi['dialnorm'].'dB';
+
return true;
}
+ /**
+ * @param int $length
+ *
+ * @return int
+ */
+ private function readHeaderBSI($length) {
+ $data = substr($this->AC3header['bsi'], $this->BSIoffset, $length);
+ $this->BSIoffset += $length;
- function AC3sampleRateCodeLookup($fscod) {
- static $AC3sampleRateCodeLookup = array(
+ return bindec($data);
+ }
+
+ /**
+ * @param int $fscod
+ *
+ * @return int|string|false
+ */
+ public static function sampleRateCodeLookup($fscod) {
+ static $sampleRateCodeLookup = array(
0 => 48000,
1 => 44100,
2 => 32000,
3 => 'reserved' // If the reserved code is indicated, the decoder should not attempt to decode audio and should mute.
);
- return (isset($AC3sampleRateCodeLookup[$fscod]) ? $AC3sampleRateCodeLookup[$fscod] : false);
+ return (isset($sampleRateCodeLookup[$fscod]) ? $sampleRateCodeLookup[$fscod] : false);
}
- function AC3serviceTypeLookup($bsmod, $acmod) {
- static $AC3serviceTypeLookup = array();
- if (empty($AC3serviceTypeLookup)) {
+ /**
+ * @param int $fscod2
+ *
+ * @return int|string|false
+ */
+ public static function sampleRateCodeLookup2($fscod2) {
+ static $sampleRateCodeLookup2 = array(
+ 0 => 24000,
+ 1 => 22050,
+ 2 => 16000,
+ 3 => 'reserved' // If the reserved code is indicated, the decoder should not attempt to decode audio and should mute.
+ );
+ return (isset($sampleRateCodeLookup2[$fscod2]) ? $sampleRateCodeLookup2[$fscod2] : false);
+ }
+
+ /**
+ * @param int $bsmod
+ * @param int $acmod
+ *
+ * @return string|false
+ */
+ public static function serviceTypeLookup($bsmod, $acmod) {
+ static $serviceTypeLookup = array();
+ if (empty($serviceTypeLookup)) {
for ($i = 0; $i <= 7; $i++) {
- $AC3serviceTypeLookup[0][$i] = 'main audio service: complete main (CM)';
- $AC3serviceTypeLookup[1][$i] = 'main audio service: music and effects (ME)';
- $AC3serviceTypeLookup[2][$i] = 'associated service: visually impaired (VI)';
- $AC3serviceTypeLookup[3][$i] = 'associated service: hearing impaired (HI)';
- $AC3serviceTypeLookup[4][$i] = 'associated service: dialogue (D)';
- $AC3serviceTypeLookup[5][$i] = 'associated service: commentary (C)';
- $AC3serviceTypeLookup[6][$i] = 'associated service: emergency (E)';
+ $serviceTypeLookup[0][$i] = 'main audio service: complete main (CM)';
+ $serviceTypeLookup[1][$i] = 'main audio service: music and effects (ME)';
+ $serviceTypeLookup[2][$i] = 'associated service: visually impaired (VI)';
+ $serviceTypeLookup[3][$i] = 'associated service: hearing impaired (HI)';
+ $serviceTypeLookup[4][$i] = 'associated service: dialogue (D)';
+ $serviceTypeLookup[5][$i] = 'associated service: commentary (C)';
+ $serviceTypeLookup[6][$i] = 'associated service: emergency (E)';
}
- $AC3serviceTypeLookup[7][1] = 'associated service: voice over (VO)';
+ $serviceTypeLookup[7][1] = 'associated service: voice over (VO)';
for ($i = 2; $i <= 7; $i++) {
- $AC3serviceTypeLookup[7][$i] = 'main audio service: karaoke';
+ $serviceTypeLookup[7][$i] = 'main audio service: karaoke';
}
}
- return (isset($AC3serviceTypeLookup[$bsmod][$acmod]) ? $AC3serviceTypeLookup[$bsmod][$acmod] : false);
+ return (isset($serviceTypeLookup[$bsmod][$acmod]) ? $serviceTypeLookup[$bsmod][$acmod] : false);
}
- function AC3audioCodingModeLookup($acmod) {
- static $AC3audioCodingModeLookup = array();
- if (empty($AC3audioCodingModeLookup)) {
- // array(channel configuration, # channels (not incl LFE), channel order)
- $AC3audioCodingModeLookup = array (
- 0 => array('channel_config'=>'1+1', 'num_channels'=>2, 'channel_order'=>'Ch1,Ch2'),
- 1 => array('channel_config'=>'1/0', 'num_channels'=>1, 'channel_order'=>'C'),
- 2 => array('channel_config'=>'2/0', 'num_channels'=>2, 'channel_order'=>'L,R'),
- 3 => array('channel_config'=>'3/0', 'num_channels'=>3, 'channel_order'=>'L,C,R'),
- 4 => array('channel_config'=>'2/1', 'num_channels'=>3, 'channel_order'=>'L,R,S'),
- 5 => array('channel_config'=>'3/1', 'num_channels'=>4, 'channel_order'=>'L,C,R,S'),
- 6 => array('channel_config'=>'2/2', 'num_channels'=>4, 'channel_order'=>'L,R,SL,SR'),
- 7 => array('channel_config'=>'3/2', 'num_channels'=>5, 'channel_order'=>'L,C,R,SL,SR')
- );
- }
- return (isset($AC3audioCodingModeLookup[$acmod]) ? $AC3audioCodingModeLookup[$acmod] : false);
+ /**
+ * @param int $acmod
+ *
+ * @return array|false
+ */
+ public static function audioCodingModeLookup($acmod) {
+ // array(channel configuration, # channels (not incl LFE), channel order)
+ static $audioCodingModeLookup = array (
+ 0 => array('channel_config'=>'1+1', 'num_channels'=>2, 'channel_order'=>'Ch1,Ch2'),
+ 1 => array('channel_config'=>'1/0', 'num_channels'=>1, 'channel_order'=>'C'),
+ 2 => array('channel_config'=>'2/0', 'num_channels'=>2, 'channel_order'=>'L,R'),
+ 3 => array('channel_config'=>'3/0', 'num_channels'=>3, 'channel_order'=>'L,C,R'),
+ 4 => array('channel_config'=>'2/1', 'num_channels'=>3, 'channel_order'=>'L,R,S'),
+ 5 => array('channel_config'=>'3/1', 'num_channels'=>4, 'channel_order'=>'L,C,R,S'),
+ 6 => array('channel_config'=>'2/2', 'num_channels'=>4, 'channel_order'=>'L,R,SL,SR'),
+ 7 => array('channel_config'=>'3/2', 'num_channels'=>5, 'channel_order'=>'L,C,R,SL,SR'),
+ );
+ return (isset($audioCodingModeLookup[$acmod]) ? $audioCodingModeLookup[$acmod] : false);
}
- function AC3centerMixLevelLookup($cmixlev) {
- static $AC3centerMixLevelLookup;
- if (empty($AC3centerMixLevelLookup)) {
- $AC3centerMixLevelLookup = array(
- 0 => pow(2, -3.0 / 6), // 0.707 (–3.0 dB)
- 1 => pow(2, -4.5 / 6), // 0.595 (–4.5 dB)
- 2 => pow(2, -6.0 / 6), // 0.500 (–6.0 dB)
+ /**
+ * @param int $cmixlev
+ *
+ * @return int|float|string|false
+ */
+ public static function centerMixLevelLookup($cmixlev) {
+ static $centerMixLevelLookup;
+ if (empty($centerMixLevelLookup)) {
+ $centerMixLevelLookup = array(
+ 0 => pow(2, -3.0 / 6), // 0.707 (-3.0 dB)
+ 1 => pow(2, -4.5 / 6), // 0.595 (-4.5 dB)
+ 2 => pow(2, -6.0 / 6), // 0.500 (-6.0 dB)
3 => 'reserved'
);
}
- return (isset($AC3centerMixLevelLookup[$cmixlev]) ? $AC3centerMixLevelLookup[$cmixlev] : false);
+ return (isset($centerMixLevelLookup[$cmixlev]) ? $centerMixLevelLookup[$cmixlev] : false);
}
- function AC3surroundMixLevelLookup($surmixlev) {
- static $AC3surroundMixLevelLookup;
- if (empty($AC3surroundMixLevelLookup)) {
- $AC3surroundMixLevelLookup = array(
+ /**
+ * @param int $surmixlev
+ *
+ * @return int|float|string|false
+ */
+ public static function surroundMixLevelLookup($surmixlev) {
+ static $surroundMixLevelLookup;
+ if (empty($surroundMixLevelLookup)) {
+ $surroundMixLevelLookup = array(
0 => pow(2, -3.0 / 6),
1 => pow(2, -6.0 / 6),
2 => 0,
@@ -331,25 +607,36 @@
3 => 'reserved'
);
}
- return (isset($AC3surroundMixLevelLookup[$surmixlev]) ? $AC3surroundMixLevelLookup[$surmixlev] : false);
+ return (isset($surroundMixLevelLookup[$surmixlev]) ? $surroundMixLevelLookup[$surmixlev] : false);
}
- function AC3dolbySurroundModeLookup($dsurmod) {
- static $AC3dolbySurroundModeLookup = array(
+ /**
+ * @param int $dsurmod
+ *
+ * @return string|false
+ */
+ public static function dolbySurroundModeLookup($dsurmod) {
+ static $dolbySurroundModeLookup = array(
0 => 'not indicated',
1 => 'Not Dolby Surround encoded',
2 => 'Dolby Surround encoded',
3 => 'reserved'
);
- return (isset($AC3dolbySurroundModeLookup[$dsurmod]) ? $AC3dolbySurroundModeLookup[$dsurmod] : false);
+ return (isset($dolbySurroundModeLookup[$dsurmod]) ? $dolbySurroundModeLookup[$dsurmod] : false);
}
- function AC3channelsEnabledLookup($acmod, $lfeon) {
- $AC3channelsEnabledLookup = array(
- 'ch1'=>(bool) ($acmod == 0),
- 'ch2'=>(bool) ($acmod == 0),
- 'left'=>(bool) ($acmod > 1),
- 'right'=>(bool) ($acmod > 1),
+ /**
+ * @param int $acmod
+ * @param bool $lfeon
+ *
+ * @return array
+ */
+ public static function channelsEnabledLookup($acmod, $lfeon) {
+ $lookup = array(
+ 'ch1'=>($acmod == 0),
+ 'ch2'=>($acmod == 0),
+ 'left'=>($acmod > 1),
+ 'right'=>($acmod > 1),
'center'=>(bool) ($acmod & 0x01),
'surround_mono'=>false,
'surround_left'=>false,
@@ -358,18 +645,23 @@
switch ($acmod) {
case 4:
case 5:
- $AC3channelsEnabledLookup['surround_mono'] = true;
+ $lookup['surround_mono'] = true;
break;
case 6:
case 7:
- $AC3channelsEnabledLookup['surround_left'] = true;
- $AC3channelsEnabledLookup['surround_right'] = true;
+ $lookup['surround_left'] = true;
+ $lookup['surround_right'] = true;
break;
}
- return $AC3channelsEnabledLookup;
+ return $lookup;
}
- function AC3heavyCompression($compre) {
+ /**
+ * @param int $compre
+ *
+ * @return float|int
+ */
+ public static function heavyCompression($compre) {
// The first four bits indicate gain changes in 6.02dB increments which can be
// implemented with an arithmetic shift operation. The following four bits
// indicate linear gain changes, and require a 5-bit multiply.
@@ -376,7 +668,7 @@
// We will represent the two 4-bit fields of compr as follows:
// X0 X1 X2 X3 . Y4 Y5 Y6 Y7
// The meaning of the X values is most simply described by considering X to represent a 4-bit
- // signed integer with values from –8 to +7. The gain indicated by X is then (X + 1) * 6.02 dB. The
+ // signed integer with values from -8 to +7. The gain indicated by X is then (X + 1) * 6.02 dB. The
// following table shows this in detail.
// Meaning of 4 msb of compr
@@ -389,16 +681,16 @@
// 1 +12.04 dB
// 0 +6.02 dB
// -1 0 dB
- // -2 –6.02 dB
- // -3 –12.04 dB
- // -4 –18.06 dB
- // -5 –24.08 dB
- // -6 –30.10 dB
- // -7 –36.12 dB
- // -8 –42.14 dB
+ // -2 -6.02 dB
+ // -3 -12.04 dB
+ // -4 -18.06 dB
+ // -5 -24.08 dB
+ // -6 -30.10 dB
+ // -7 -36.12 dB
+ // -8 -42.14 dB
$fourbit = str_pad(decbin(($compre & 0xF0) >> 4), 4, '0', STR_PAD_LEFT);
- if ($fourbit{0} == '1') {
+ if ($fourbit[0] == '1') {
$log_gain = -8 + bindec(substr($fourbit, 1));
} else {
$log_gain = bindec(substr($fourbit, 1));
@@ -405,79 +697,100 @@
}
$log_gain = ($log_gain + 1) * getid3_lib::RGADamplitude2dB(2);
- // The value of Y is a linear representation of a gain change of up to –6 dB. Y is considered to
+ // The value of Y is a linear representation of a gain change of up to -6 dB. Y is considered to
// be an unsigned fractional integer, with a leading value of 1, or: 0.1 Y4 Y5 Y6 Y7 (base 2). Y can
// represent values between 0.111112 (or 31/32) and 0.100002 (or 1/2). Thus, Y can represent gain
- // changes from –0.28 dB to –6.02 dB.
+ // changes from -0.28 dB to -6.02 dB.
$lin_gain = (16 + ($compre & 0x0F)) / 32;
// The combination of X and Y values allows compr to indicate gain changes from
- // 48.16 – 0.28 = +47.89 dB, to
- // –42.14 – 6.02 = –48.16 dB.
+ // 48.16 - 0.28 = +47.89 dB, to
+ // -42.14 - 6.02 = -48.16 dB.
return $log_gain - $lin_gain;
}
- function AC3roomTypeLookup($roomtyp) {
- static $AC3roomTypeLookup = array(
+ /**
+ * @param int $roomtyp
+ *
+ * @return string|false
+ */
+ public static function roomTypeLookup($roomtyp) {
+ static $roomTypeLookup = array(
0 => 'not indicated',
1 => 'large room, X curve monitor',
2 => 'small room, flat monitor',
3 => 'reserved'
);
- return (isset($AC3roomTypeLookup[$roomtyp]) ? $AC3roomTypeLookup[$roomtyp] : false);
+ return (isset($roomTypeLookup[$roomtyp]) ? $roomTypeLookup[$roomtyp] : false);
}
- function AC3frameSizeLookup($frmsizecod, $fscod) {
- $padding = (bool) ($frmsizecod % 2);
- $framesizeid = floor($frmsizecod / 2);
+ /**
+ * @param int $frmsizecod
+ * @param int $fscod
+ *
+ * @return int|false
+ */
+ public static function frameSizeLookup($frmsizecod, $fscod) {
+ // LSB is whether padding is used or not
+ $padding = (bool) ($frmsizecod & 0x01);
+ $framesizeid = ($frmsizecod & 0x3E) >> 1;
- static $AC3frameSizeLookup = array();
- if (empty($AC3frameSizeLookup)) {
- $AC3frameSizeLookup = array (
- 0 => array(128, 138, 192),
- 1 => array(40, 160, 174, 240),
- 2 => array(48, 192, 208, 288),
- 3 => array(56, 224, 242, 336),
- 4 => array(64, 256, 278, 384),
- 5 => array(80, 320, 348, 480),
- 6 => array(96, 384, 416, 576),
- 7 => array(112, 448, 486, 672),
- 8 => array(128, 512, 556, 768),
- 9 => array(160, 640, 696, 960),
- 10 => array(192, 768, 834, 1152),
- 11 => array(224, 896, 974, 1344),
- 12 => array(256, 1024, 1114, 1536),
- 13 => array(320, 1280, 1392, 1920),
- 14 => array(384, 1536, 1670, 2304),
- 15 => array(448, 1792, 1950, 2688),
- 16 => array(512, 2048, 2228, 3072),
- 17 => array(576, 2304, 2506, 3456),
- 18 => array(640, 2560, 2786, 3840)
+ static $frameSizeLookup = array();
+ if (empty($frameSizeLookup)) {
+ $frameSizeLookup = array (
+ 0 => array( 128, 138, 192), // 32 kbps
+ 1 => array( 160, 174, 240), // 40 kbps
+ 2 => array( 192, 208, 288), // 48 kbps
+ 3 => array( 224, 242, 336), // 56 kbps
+ 4 => array( 256, 278, 384), // 64 kbps
+ 5 => array( 320, 348, 480), // 80 kbps
+ 6 => array( 384, 416, 576), // 96 kbps
+ 7 => array( 448, 486, 672), // 112 kbps
+ 8 => array( 512, 556, 768), // 128 kbps
+ 9 => array( 640, 696, 960), // 160 kbps
+ 10 => array( 768, 834, 1152), // 192 kbps
+ 11 => array( 896, 974, 1344), // 224 kbps
+ 12 => array(1024, 1114, 1536), // 256 kbps
+ 13 => array(1280, 1392, 1920), // 320 kbps
+ 14 => array(1536, 1670, 2304), // 384 kbps
+ 15 => array(1792, 1950, 2688), // 448 kbps
+ 16 => array(2048, 2228, 3072), // 512 kbps
+ 17 => array(2304, 2506, 3456), // 576 kbps
+ 18 => array(2560, 2786, 3840) // 640 kbps
);
}
+ $paddingBytes = 0;
if (($fscod == 1) && $padding) {
// frame lengths are padded by 1 word (16 bits) at 44100
- $AC3frameSizeLookup[$frmsizecod] += 2;
+ // (fscode==1) means 44100Hz (see sampleRateCodeLookup)
+ $paddingBytes = 2;
}
- return (isset($AC3frameSizeLookup[$framesizeid][$fscod]) ? $AC3frameSizeLookup[$framesizeid][$fscod] : false);
+ return (isset($frameSizeLookup[$framesizeid][$fscod]) ? $frameSizeLookup[$framesizeid][$fscod] + $paddingBytes : false);
}
- function AC3bitrateLookup($frmsizecod) {
- $framesizeid = floor($frmsizecod / 2);
+ /**
+ * @param int $frmsizecod
+ *
+ * @return int|false
+ */
+ public static function bitrateLookup($frmsizecod) {
+ // LSB is whether padding is used or not
+ $padding = (bool) ($frmsizecod & 0x01);
+ $framesizeid = ($frmsizecod & 0x3E) >> 1;
- static $AC3bitrateLookup = array(
- 0 => 32000,
- 1 => 40000,
- 2 => 48000,
- 3 => 56000,
- 4 => 64000,
- 5 => 80000,
- 6 => 96000,
- 7 => 112000,
- 8 => 128000,
- 9 => 160000,
+ static $bitrateLookup = array(
+ 0 => 32000,
+ 1 => 40000,
+ 2 => 48000,
+ 3 => 56000,
+ 4 => 64000,
+ 5 => 80000,
+ 6 => 96000,
+ 7 => 112000,
+ 8 => 128000,
+ 9 => 160000,
10 => 192000,
11 => 224000,
12 => 256000,
@@ -486,12 +799,25 @@
15 => 448000,
16 => 512000,
17 => 576000,
- 18 => 640000
+ 18 => 640000,
);
- return (isset($AC3bitrateLookup[$framesizeid]) ? $AC3bitrateLookup[$framesizeid] : false);
+ return (isset($bitrateLookup[$framesizeid]) ? $bitrateLookup[$framesizeid] : false);
}
+ /**
+ * @param int $numblkscod
+ *
+ * @return int|false
+ */
+ public static function blocksPerSyncFrame($numblkscod) {
+ static $blocksPerSyncFrameLookup = array(
+ 0 => 1,
+ 1 => 2,
+ 2 => 3,
+ 3 => 6,
+ );
+ return (isset($blocksPerSyncFrameLookup[$numblkscod]) ? $blocksPerSyncFrameLookup[$numblkscod] : false);
+ }
+
}
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.au.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.au.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.au.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio.au.php //
// module for analyzing AU files //
@@ -13,32 +14,39 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_au
+class getid3_au extends getid3_handler
{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- function getid3_au(&$fd, &$ThisFileInfo) {
+ $this->fseek($info['avdataoffset']);
+ $AUheader = $this->fread(8);
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
- $AUheader = fread($fd, 8);
-
- if (substr($AUheader, 0, 4) != '.snd') {
- $ThisFileInfo['error'][] = 'Expecting ".snd" at offset '.$ThisFileInfo['avdataoffset'].', found "'.substr($AUheader, 0, 4).'"';
+ $magic = '.snd';
+ if (substr($AUheader, 0, 4) != $magic) {
+ $this->error('Expecting "'.getid3_lib::PrintHexBytes($magic).'" (".snd") at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes(substr($AUheader, 0, 4)).'"');
return false;
}
// shortcut
- $ThisFileInfo['au'] = array();
- $thisfile_au = &$ThisFileInfo['au'];
+ $info['au'] = array();
+ $thisfile_au = &$info['au'];
- $ThisFileInfo['fileformat'] = 'au';
- $ThisFileInfo['audio']['dataformat'] = 'au';
- $ThisFileInfo['audio']['bitrate_mode'] = 'cbr';
+ $info['fileformat'] = 'au';
+ $info['audio']['dataformat'] = 'au';
+ $info['audio']['bitrate_mode'] = 'cbr';
$thisfile_au['encoding'] = 'ISO-8859-1';
$thisfile_au['header_length'] = getid3_lib::BigEndian2Int(substr($AUheader, 4, 4));
- $AUheader .= fread($fd, $thisfile_au['header_length'] - 8);
- $ThisFileInfo['avdataoffset'] += $thisfile_au['header_length'];
+ $AUheader .= $this->fread($thisfile_au['header_length'] - 8);
+ $info['avdataoffset'] += $thisfile_au['header_length'];
$thisfile_au['data_size'] = getid3_lib::BigEndian2Int(substr($AUheader, 8, 4));
$thisfile_au['data_format_id'] = getid3_lib::BigEndian2Int(substr($AUheader, 12, 4));
@@ -49,25 +57,30 @@
$thisfile_au['data_format'] = $this->AUdataFormatNameLookup($thisfile_au['data_format_id']);
$thisfile_au['used_bits_per_sample'] = $this->AUdataFormatUsedBitsPerSampleLookup($thisfile_au['data_format_id']);
if ($thisfile_au['bits_per_sample'] = $this->AUdataFormatBitsPerSampleLookup($thisfile_au['data_format_id'])) {
- $ThisFileInfo['audio']['bits_per_sample'] = $thisfile_au['bits_per_sample'];
+ $info['audio']['bits_per_sample'] = $thisfile_au['bits_per_sample'];
} else {
unset($thisfile_au['bits_per_sample']);
}
- $ThisFileInfo['audio']['sample_rate'] = $thisfile_au['sample_rate'];
- $ThisFileInfo['audio']['channels'] = $thisfile_au['channels'];
+ $info['audio']['sample_rate'] = $thisfile_au['sample_rate'];
+ $info['audio']['channels'] = $thisfile_au['channels'];
- if (($ThisFileInfo['avdataoffset'] + $thisfile_au['data_size']) > $ThisFileInfo['avdataend']) {
- $ThisFileInfo['warning'][] = 'Possible truncated file - expecting "'.$thisfile_au['data_size'].'" bytes of audio data, only found '.($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']).' bytes"';
+ if (($info['avdataoffset'] + $thisfile_au['data_size']) > $info['avdataend']) {
+ $this->warning('Possible truncated file - expecting "'.$thisfile_au['data_size'].'" bytes of audio data, only found '.($info['avdataend'] - $info['avdataoffset']).' bytes"');
}
- $ThisFileInfo['playtime_seconds'] = $thisfile_au['data_size'] / ($thisfile_au['sample_rate'] * $thisfile_au['channels'] * ($thisfile_au['used_bits_per_sample'] / 8));
- $ThisFileInfo['audio']['bitrate'] = ($thisfile_au['data_size'] * 8) / $ThisFileInfo['playtime_seconds'];
+ $info['playtime_seconds'] = $thisfile_au['data_size'] / ($thisfile_au['sample_rate'] * $thisfile_au['channels'] * ($thisfile_au['used_bits_per_sample'] / 8));
+ $info['audio']['bitrate'] = ($thisfile_au['data_size'] * 8) / $info['playtime_seconds'];
return true;
}
- function AUdataFormatNameLookup($id) {
+ /**
+ * @param int $id
+ *
+ * @return string|false
+ */
+ public function AUdataFormatNameLookup($id) {
static $AUdataFormatNameLookup = array(
0 => 'unspecified format',
1 => '8-bit mu-law',
@@ -101,7 +114,12 @@
return (isset($AUdataFormatNameLookup[$id]) ? $AUdataFormatNameLookup[$id] : false);
}
- function AUdataFormatBitsPerSampleLookup($id) {
+ /**
+ * @param int $id
+ *
+ * @return int|false
+ */
+ public function AUdataFormatBitsPerSampleLookup($id) {
static $AUdataFormatBitsPerSampleLookup = array(
1 => 8,
2 => 8,
@@ -129,7 +147,12 @@
return (isset($AUdataFormatBitsPerSampleLookup[$id]) ? $AUdataFormatBitsPerSampleLookup[$id] : false);
}
- function AUdataFormatUsedBitsPerSampleLookup($id) {
+ /**
+ * @param int $id
+ *
+ * @return int|false
+ */
+ public function AUdataFormatUsedBitsPerSampleLookup($id) {
static $AUdataFormatUsedBitsPerSampleLookup = array(
1 => 8,
2 => 8,
@@ -158,6 +181,3 @@
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.avr.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.avr.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.avr.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio.avr.php //
// module for analyzing AVR Audio files //
@@ -13,12 +14,18 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_avr
+class getid3_avr extends getid3_handler
{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- function getid3_avr(&$fd, &$ThisFileInfo) {
-
// http://cui.unige.ch/OSG/info/AudioFormats/ap11.html
// http://www.btinternet.com/~AnthonyJ/Atari/programming/avr_format.html
// offset type length name comments
@@ -59,61 +66,62 @@
// 8-bit data between signed/unsigned just add 127 to the sample values.
// Simularly for 16-bit data you should add 32769
- $ThisFileInfo['fileformat'] = 'avr';
+ $info['fileformat'] = 'avr';
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
- $AVRheader = fread($fd, 128);
+ $this->fseek($info['avdataoffset']);
+ $AVRheader = $this->fread(128);
- $ThisFileInfo['avr']['raw']['magic'] = substr($AVRheader, 0, 4);
- if ($ThisFileInfo['avr']['raw']['magic'] != '2BIT') {
- $ThisFileInfo['error'][] = 'Expecting "2BIT" at offset '.$ThisFileInfo['avdataoffset'].', found "'.$ThisFileInfo['avr']['raw']['magic'].'"';
- unset($ThisFileInfo['fileformat']);
- unset($ThisFileInfo['avr']);
+ $info['avr']['raw']['magic'] = substr($AVRheader, 0, 4);
+ $magic = '2BIT';
+ if ($info['avr']['raw']['magic'] != $magic) {
+ $this->error('Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($info['avr']['raw']['magic']).'"');
+ unset($info['fileformat']);
+ unset($info['avr']);
return false;
}
- $ThisFileInfo['avdataoffset'] += 128;
+ $info['avdataoffset'] += 128;
- $ThisFileInfo['avr']['sample_name'] = rtrim(substr($AVRheader, 4, 8));
- $ThisFileInfo['avr']['raw']['mono'] = getid3_lib::BigEndian2Int(substr($AVRheader, 12, 2));
- $ThisFileInfo['avr']['bits_per_sample'] = getid3_lib::BigEndian2Int(substr($AVRheader, 14, 2));
- $ThisFileInfo['avr']['raw']['signed'] = getid3_lib::BigEndian2Int(substr($AVRheader, 16, 2));
- $ThisFileInfo['avr']['raw']['loop'] = getid3_lib::BigEndian2Int(substr($AVRheader, 18, 2));
- $ThisFileInfo['avr']['raw']['midi'] = getid3_lib::BigEndian2Int(substr($AVRheader, 20, 2));
- $ThisFileInfo['avr']['raw']['replay_freq'] = getid3_lib::BigEndian2Int(substr($AVRheader, 22, 1));
- $ThisFileInfo['avr']['sample_rate'] = getid3_lib::BigEndian2Int(substr($AVRheader, 23, 3));
- $ThisFileInfo['avr']['sample_length'] = getid3_lib::BigEndian2Int(substr($AVRheader, 26, 4));
- $ThisFileInfo['avr']['loop_start'] = getid3_lib::BigEndian2Int(substr($AVRheader, 30, 4));
- $ThisFileInfo['avr']['loop_end'] = getid3_lib::BigEndian2Int(substr($AVRheader, 34, 4));
- $ThisFileInfo['avr']['midi_split'] = getid3_lib::BigEndian2Int(substr($AVRheader, 38, 2));
- $ThisFileInfo['avr']['sample_compression'] = getid3_lib::BigEndian2Int(substr($AVRheader, 40, 2));
- $ThisFileInfo['avr']['reserved'] = getid3_lib::BigEndian2Int(substr($AVRheader, 42, 2));
- $ThisFileInfo['avr']['sample_name_extra'] = rtrim(substr($AVRheader, 44, 20));
- $ThisFileInfo['avr']['comment'] = rtrim(substr($AVRheader, 64, 64));
+ $info['avr']['sample_name'] = rtrim(substr($AVRheader, 4, 8));
+ $info['avr']['raw']['mono'] = getid3_lib::BigEndian2Int(substr($AVRheader, 12, 2));
+ $info['avr']['bits_per_sample'] = getid3_lib::BigEndian2Int(substr($AVRheader, 14, 2));
+ $info['avr']['raw']['signed'] = getid3_lib::BigEndian2Int(substr($AVRheader, 16, 2));
+ $info['avr']['raw']['loop'] = getid3_lib::BigEndian2Int(substr($AVRheader, 18, 2));
+ $info['avr']['raw']['midi'] = getid3_lib::BigEndian2Int(substr($AVRheader, 20, 2));
+ $info['avr']['raw']['replay_freq'] = getid3_lib::BigEndian2Int(substr($AVRheader, 22, 1));
+ $info['avr']['sample_rate'] = getid3_lib::BigEndian2Int(substr($AVRheader, 23, 3));
+ $info['avr']['sample_length'] = getid3_lib::BigEndian2Int(substr($AVRheader, 26, 4));
+ $info['avr']['loop_start'] = getid3_lib::BigEndian2Int(substr($AVRheader, 30, 4));
+ $info['avr']['loop_end'] = getid3_lib::BigEndian2Int(substr($AVRheader, 34, 4));
+ $info['avr']['midi_split'] = getid3_lib::BigEndian2Int(substr($AVRheader, 38, 2));
+ $info['avr']['sample_compression'] = getid3_lib::BigEndian2Int(substr($AVRheader, 40, 2));
+ $info['avr']['reserved'] = getid3_lib::BigEndian2Int(substr($AVRheader, 42, 2));
+ $info['avr']['sample_name_extra'] = rtrim(substr($AVRheader, 44, 20));
+ $info['avr']['comment'] = rtrim(substr($AVRheader, 64, 64));
- $ThisFileInfo['avr']['flags']['stereo'] = (($ThisFileInfo['avr']['raw']['mono'] == 0) ? false : true);
- $ThisFileInfo['avr']['flags']['signed'] = (($ThisFileInfo['avr']['raw']['signed'] == 0) ? false : true);
- $ThisFileInfo['avr']['flags']['loop'] = (($ThisFileInfo['avr']['raw']['loop'] == 0) ? false : true);
+ $info['avr']['flags']['stereo'] = (($info['avr']['raw']['mono'] == 0) ? false : true);
+ $info['avr']['flags']['signed'] = (($info['avr']['raw']['signed'] == 0) ? false : true);
+ $info['avr']['flags']['loop'] = (($info['avr']['raw']['loop'] == 0) ? false : true);
- $ThisFileInfo['avr']['midi_notes'] = array();
- if (($ThisFileInfo['avr']['raw']['midi'] & 0xFF00) != 0xFF00) {
- $ThisFileInfo['avr']['midi_notes'][] = ($ThisFileInfo['avr']['raw']['midi'] & 0xFF00) >> 8;
+ $info['avr']['midi_notes'] = array();
+ if (($info['avr']['raw']['midi'] & 0xFF00) != 0xFF00) {
+ $info['avr']['midi_notes'][] = ($info['avr']['raw']['midi'] & 0xFF00) >> 8;
}
- if (($ThisFileInfo['avr']['raw']['midi'] & 0x00FF) != 0x00FF) {
- $ThisFileInfo['avr']['midi_notes'][] = ($ThisFileInfo['avr']['raw']['midi'] & 0x00FF);
+ if (($info['avr']['raw']['midi'] & 0x00FF) != 0x00FF) {
+ $info['avr']['midi_notes'][] = ($info['avr']['raw']['midi'] & 0x00FF);
}
- if (($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) != ($ThisFileInfo['avr']['sample_length'] * (($ThisFileInfo['avr']['bits_per_sample'] == 8) ? 1 : 2))) {
- $ThisFileInfo['warning'][] = 'Probable truncated file: expecting '.($ThisFileInfo['avr']['sample_length'] * (($ThisFileInfo['avr']['bits_per_sample'] == 8) ? 1 : 2)).' bytes of audio data, found '.($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']);
+ if (($info['avdataend'] - $info['avdataoffset']) != ($info['avr']['sample_length'] * (($info['avr']['bits_per_sample'] == 8) ? 1 : 2))) {
+ $this->warning('Probable truncated file: expecting '.($info['avr']['sample_length'] * (($info['avr']['bits_per_sample'] == 8) ? 1 : 2)).' bytes of audio data, found '.($info['avdataend'] - $info['avdataoffset']));
}
- $ThisFileInfo['audio']['dataformat'] = 'avr';
- $ThisFileInfo['audio']['lossless'] = true;
- $ThisFileInfo['audio']['bitrate_mode'] = 'cbr';
- $ThisFileInfo['audio']['bits_per_sample'] = $ThisFileInfo['avr']['bits_per_sample'];
- $ThisFileInfo['audio']['sample_rate'] = $ThisFileInfo['avr']['sample_rate'];
- $ThisFileInfo['audio']['channels'] = ($ThisFileInfo['avr']['flags']['stereo'] ? 2 : 1);
- $ThisFileInfo['playtime_seconds'] = ($ThisFileInfo['avr']['sample_length'] / $ThisFileInfo['audio']['channels']) / $ThisFileInfo['avr']['sample_rate'];
- $ThisFileInfo['audio']['bitrate'] = ($ThisFileInfo['avr']['sample_length'] * (($ThisFileInfo['avr']['bits_per_sample'] == 8) ? 8 : 16)) / $ThisFileInfo['playtime_seconds'];
+ $info['audio']['dataformat'] = 'avr';
+ $info['audio']['lossless'] = true;
+ $info['audio']['bitrate_mode'] = 'cbr';
+ $info['audio']['bits_per_sample'] = $info['avr']['bits_per_sample'];
+ $info['audio']['sample_rate'] = $info['avr']['sample_rate'];
+ $info['audio']['channels'] = ($info['avr']['flags']['stereo'] ? 2 : 1);
+ $info['playtime_seconds'] = ($info['avr']['sample_length'] / $info['audio']['channels']) / $info['avr']['sample_rate'];
+ $info['audio']['bitrate'] = ($info['avr']['sample_length'] * (($info['avr']['bits_per_sample'] == 8) ? 8 : 16)) / $info['playtime_seconds'];
return true;
@@ -120,6 +128,3 @@
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.bonk.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.bonk.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.bonk.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio.la.php //
// module for analyzing BONK audio files //
@@ -13,60 +14,75 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_bonk
+class getid3_bonk extends getid3_handler
{
- function getid3_bonk(&$fd, &$ThisFileInfo) {
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
// shortcut
- $ThisFileInfo['bonk'] = array();
- $thisfile_bonk = &$ThisFileInfo['bonk'];
+ $info['bonk'] = array();
+ $thisfile_bonk = &$info['bonk'];
- $thisfile_bonk['dataoffset'] = $ThisFileInfo['avdataoffset'];
- $thisfile_bonk['dataend'] = $ThisFileInfo['avdataend'];
+ $thisfile_bonk['dataoffset'] = $info['avdataoffset'];
+ $thisfile_bonk['dataend'] = $info['avdataend'];
- // scan-from-end method, for v0.6 and higher
- fseek($fd, $thisfile_bonk['dataend'] - 8, SEEK_SET);
- $PossibleBonkTag = fread($fd, 8);
- while ($this->BonkIsValidTagName(substr($PossibleBonkTag, 4, 4), true)) {
- $BonkTagSize = getid3_lib::LittleEndian2Int(substr($PossibleBonkTag, 0, 4));
- fseek($fd, 0 - $BonkTagSize, SEEK_CUR);
- $BonkTagOffset = ftell($fd);
- $TagHeaderTest = fread($fd, 5);
- if (($TagHeaderTest{0} != "\x00") || (substr($PossibleBonkTag, 4, 4) != strtolower(substr($PossibleBonkTag, 4, 4)))) {
- $ThisFileInfo['error'][] = 'Expecting "Ø'.strtoupper(substr($PossibleBonkTag, 4, 4)).'" at offset '.$BonkTagOffset.', found "'.$TagHeaderTest.'"';
- return false;
- }
- $BonkTagName = substr($TagHeaderTest, 1, 4);
+ if (!getid3_lib::intValueSupported($thisfile_bonk['dataend'])) {
- $thisfile_bonk[$BonkTagName]['size'] = $BonkTagSize;
- $thisfile_bonk[$BonkTagName]['offset'] = $BonkTagOffset;
- $this->HandleBonkTags($fd, $BonkTagName, $ThisFileInfo);
- $NextTagEndOffset = $BonkTagOffset - 8;
- if ($NextTagEndOffset < $thisfile_bonk['dataoffset']) {
- if (empty($ThisFileInfo['audio']['encoder'])) {
- $ThisFileInfo['audio']['encoder'] = 'Extended BONK v0.9+';
+ $this->warning('Unable to parse BONK file from end (v0.6+ preferred method) because PHP filesystem functions only support up to '.round(PHP_INT_MAX / 1073741824).'GB');
+
+ } else {
+
+ // scan-from-end method, for v0.6 and higher
+ $this->fseek($thisfile_bonk['dataend'] - 8);
+ $PossibleBonkTag = $this->fread(8);
+ while ($this->BonkIsValidTagName(substr($PossibleBonkTag, 4, 4), true)) {
+ $BonkTagSize = getid3_lib::LittleEndian2Int(substr($PossibleBonkTag, 0, 4));
+ $this->fseek(0 - $BonkTagSize, SEEK_CUR);
+ $BonkTagOffset = $this->ftell();
+ $TagHeaderTest = $this->fread(5);
+ if (($TagHeaderTest[0] != "\x00") || (substr($PossibleBonkTag, 4, 4) != strtolower(substr($PossibleBonkTag, 4, 4)))) {
+ $this->error('Expecting "'.getid3_lib::PrintHexBytes("\x00".strtoupper(substr($PossibleBonkTag, 4, 4))).'" at offset '.$BonkTagOffset.', found "'.getid3_lib::PrintHexBytes($TagHeaderTest).'"');
+ return false;
}
- return true;
+ $BonkTagName = substr($TagHeaderTest, 1, 4);
+
+ $thisfile_bonk[$BonkTagName]['size'] = $BonkTagSize;
+ $thisfile_bonk[$BonkTagName]['offset'] = $BonkTagOffset;
+ $this->HandleBonkTags($BonkTagName);
+ $NextTagEndOffset = $BonkTagOffset - 8;
+ if ($NextTagEndOffset < $thisfile_bonk['dataoffset']) {
+ if (empty($info['audio']['encoder'])) {
+ $info['audio']['encoder'] = 'Extended BONK v0.9+';
+ }
+ return true;
+ }
+ $this->fseek($NextTagEndOffset);
+ $PossibleBonkTag = $this->fread(8);
}
- fseek($fd, $NextTagEndOffset, SEEK_SET);
- $PossibleBonkTag = fread($fd, 8);
+
}
// seek-from-beginning method for v0.4 and v0.5
if (empty($thisfile_bonk['BONK'])) {
- fseek($fd, $thisfile_bonk['dataoffset'], SEEK_SET);
+ $this->fseek($thisfile_bonk['dataoffset']);
do {
- $TagHeaderTest = fread($fd, 5);
+ $TagHeaderTest = $this->fread(5);
switch ($TagHeaderTest) {
case "\x00".'BONK':
- if (empty($ThisFileInfo['audio']['encoder'])) {
- $ThisFileInfo['audio']['encoder'] = 'BONK v0.4';
+ if (empty($info['audio']['encoder'])) {
+ $info['audio']['encoder'] = 'BONK v0.4';
}
break;
case "\x00".'INFO':
- $ThisFileInfo['audio']['encoder'] = 'Extended BONK v0.5';
+ $info['audio']['encoder'] = 'Extended BONK v0.5';
break;
default:
@@ -75,7 +91,7 @@
$BonkTagName = substr($TagHeaderTest, 1, 4);
$thisfile_bonk[$BonkTagName]['size'] = $thisfile_bonk['dataend'] - $thisfile_bonk['dataoffset'];
$thisfile_bonk[$BonkTagName]['offset'] = $thisfile_bonk['dataoffset'];
- $this->HandleBonkTags($fd, $BonkTagName, $ThisFileInfo);
+ $this->HandleBonkTags($BonkTagName);
} while (true);
}
@@ -82,36 +98,39 @@
// parse META block for v0.6 - v0.8
if (empty($thisfile_bonk['INFO']) && isset($thisfile_bonk['META']['tags']['info'])) {
- fseek($fd, $thisfile_bonk['META']['tags']['info'], SEEK_SET);
- $TagHeaderTest = fread($fd, 5);
+ $this->fseek($thisfile_bonk['META']['tags']['info']);
+ $TagHeaderTest = $this->fread(5);
if ($TagHeaderTest == "\x00".'INFO') {
- $ThisFileInfo['audio']['encoder'] = 'Extended BONK v0.6 - v0.8';
+ $info['audio']['encoder'] = 'Extended BONK v0.6 - v0.8';
$BonkTagName = substr($TagHeaderTest, 1, 4);
$thisfile_bonk[$BonkTagName]['size'] = $thisfile_bonk['dataend'] - $thisfile_bonk['dataoffset'];
$thisfile_bonk[$BonkTagName]['offset'] = $thisfile_bonk['dataoffset'];
- $this->HandleBonkTags($fd, $BonkTagName, $ThisFileInfo);
+ $this->HandleBonkTags($BonkTagName);
}
}
- if (empty($ThisFileInfo['audio']['encoder'])) {
- $ThisFileInfo['audio']['encoder'] = 'Extended BONK v0.9+';
+ if (empty($info['audio']['encoder'])) {
+ $info['audio']['encoder'] = 'Extended BONK v0.9+';
}
if (empty($thisfile_bonk['BONK'])) {
- unset($ThisFileInfo['bonk']);
+ unset($info['bonk']);
}
return true;
}
- function HandleBonkTags(&$fd, &$BonkTagName, &$ThisFileInfo) {
-
+ /**
+ * @param string $BonkTagName
+ */
+ public function HandleBonkTags($BonkTagName) {
+ $info = &$this->getid3->info;
switch ($BonkTagName) {
case 'BONK':
// shortcut
- $thisfile_bonk_BONK = &$ThisFileInfo['bonk']['BONK'];
+ $thisfile_bonk_BONK = &$info['bonk']['BONK'];
- $BonkData = "\x00".'BONK'.fread($fd, 17);
+ $BonkData = "\x00".'BONK'.$this->fread(17);
$thisfile_bonk_BONK['version'] = getid3_lib::LittleEndian2Int(substr($BonkData, 5, 1));
$thisfile_bonk_BONK['number_samples'] = getid3_lib::LittleEndian2Int(substr($BonkData, 6, 4));
$thisfile_bonk_BONK['sample_rate'] = getid3_lib::LittleEndian2Int(substr($BonkData, 10, 4));
@@ -123,40 +142,40 @@
$thisfile_bonk_BONK['downsampling_ratio'] = getid3_lib::LittleEndian2Int(substr($BonkData, 19, 1));
$thisfile_bonk_BONK['samples_per_packet'] = getid3_lib::LittleEndian2Int(substr($BonkData, 20, 2));
- $ThisFileInfo['avdataoffset'] = $thisfile_bonk_BONK['offset'] + 5 + 17;
- $ThisFileInfo['avdataend'] = $thisfile_bonk_BONK['offset'] + $thisfile_bonk_BONK['size'];
+ $info['avdataoffset'] = $thisfile_bonk_BONK['offset'] + 5 + 17;
+ $info['avdataend'] = $thisfile_bonk_BONK['offset'] + $thisfile_bonk_BONK['size'];
- $ThisFileInfo['fileformat'] = 'bonk';
- $ThisFileInfo['audio']['dataformat'] = 'bonk';
- $ThisFileInfo['audio']['bitrate_mode'] = 'vbr'; // assumed
- $ThisFileInfo['audio']['channels'] = $thisfile_bonk_BONK['channels'];
- $ThisFileInfo['audio']['sample_rate'] = $thisfile_bonk_BONK['sample_rate'];
- $ThisFileInfo['audio']['channelmode'] = ($thisfile_bonk_BONK['joint_stereo'] ? 'joint stereo' : 'stereo');
- $ThisFileInfo['audio']['lossless'] = $thisfile_bonk_BONK['lossless'];
- $ThisFileInfo['audio']['codec'] = 'bonk';
+ $info['fileformat'] = 'bonk';
+ $info['audio']['dataformat'] = 'bonk';
+ $info['audio']['bitrate_mode'] = 'vbr'; // assumed
+ $info['audio']['channels'] = $thisfile_bonk_BONK['channels'];
+ $info['audio']['sample_rate'] = $thisfile_bonk_BONK['sample_rate'];
+ $info['audio']['channelmode'] = ($thisfile_bonk_BONK['joint_stereo'] ? 'joint stereo' : 'stereo');
+ $info['audio']['lossless'] = $thisfile_bonk_BONK['lossless'];
+ $info['audio']['codec'] = 'bonk';
- $ThisFileInfo['playtime_seconds'] = $thisfile_bonk_BONK['number_samples'] / ($thisfile_bonk_BONK['sample_rate'] * $thisfile_bonk_BONK['channels']);
- if ($ThisFileInfo['playtime_seconds'] > 0) {
- $ThisFileInfo['audio']['bitrate'] = (($ThisFileInfo['bonk']['dataend'] - $ThisFileInfo['bonk']['dataoffset']) * 8) / $ThisFileInfo['playtime_seconds'];
+ $info['playtime_seconds'] = $thisfile_bonk_BONK['number_samples'] / ($thisfile_bonk_BONK['sample_rate'] * $thisfile_bonk_BONK['channels']);
+ if ($info['playtime_seconds'] > 0) {
+ $info['audio']['bitrate'] = (($info['bonk']['dataend'] - $info['bonk']['dataoffset']) * 8) / $info['playtime_seconds'];
}
break;
case 'INFO':
// shortcut
- $thisfile_bonk_INFO = &$ThisFileInfo['bonk']['INFO'];
+ $thisfile_bonk_INFO = &$info['bonk']['INFO'];
- $thisfile_bonk_INFO['version'] = getid3_lib::LittleEndian2Int(fread($fd, 1));
+ $thisfile_bonk_INFO['version'] = getid3_lib::LittleEndian2Int($this->fread(1));
$thisfile_bonk_INFO['entries_count'] = 0;
- $NextInfoDataPair = fread($fd, 5);
+ $NextInfoDataPair = $this->fread(5);
if (!$this->BonkIsValidTagName(substr($NextInfoDataPair, 1, 4))) {
- while (!feof($fd)) {
+ while (!feof($this->getid3->fp)) {
//$CurrentSeekInfo['offset'] = getid3_lib::LittleEndian2Int(substr($NextInfoDataPair, 0, 4));
//$CurrentSeekInfo['nextbit'] = getid3_lib::LittleEndian2Int(substr($NextInfoDataPair, 4, 1));
//$thisfile_bonk_INFO[] = $CurrentSeekInfo;
- $NextInfoDataPair = fread($fd, 5);
+ $NextInfoDataPair = $this->fread(5);
if ($this->BonkIsValidTagName(substr($NextInfoDataPair, 1, 4))) {
- fseek($fd, -5, SEEK_CUR);
+ $this->fseek(-5, SEEK_CUR);
break;
}
$thisfile_bonk_INFO['entries_count']++;
@@ -165,37 +184,51 @@
break;
case 'META':
- $BonkData = "\x00".'META'.fread($fd, $ThisFileInfo['bonk']['META']['size'] - 5);
- $ThisFileInfo['bonk']['META']['version'] = getid3_lib::LittleEndian2Int(substr($BonkData, 5, 1));
+ $BonkData = "\x00".'META'.$this->fread($info['bonk']['META']['size'] - 5);
+ $info['bonk']['META']['version'] = getid3_lib::LittleEndian2Int(substr($BonkData, 5, 1));
- $MetaTagEntries = floor(((strlen($BonkData) - 8) - 6) / 8); // BonkData - xxxxmeta - ØMETA
+ $MetaTagEntries = floor(((strlen($BonkData) - 8) - 6) / 8); // BonkData - xxxxmeta - ØMETA
$offset = 6;
for ($i = 0; $i < $MetaTagEntries; $i++) {
- $MetaEntryTagName = substr($BonkData, $offset, 4);
+ $MetaEntryTagName = substr($BonkData, $offset, 4);
$offset += 4;
$MetaEntryTagOffset = getid3_lib::LittleEndian2Int(substr($BonkData, $offset, 4));
$offset += 4;
- $ThisFileInfo['bonk']['META']['tags'][$MetaEntryTagName] = $MetaEntryTagOffset;
+ $info['bonk']['META']['tags'][$MetaEntryTagName] = $MetaEntryTagOffset;
}
break;
case ' ID3':
- $ThisFileInfo['audio']['encoder'] = 'Extended BONK v0.9+';
+ $info['audio']['encoder'] = 'Extended BONK v0.9+';
// ID3v2 checking is optional
if (class_exists('getid3_id3v2')) {
- $ThisFileInfo['bonk'][' ID3']['valid'] = new getid3_id3v2($fd, $ThisFileInfo, $ThisFileInfo['bonk'][' ID3']['offset'] + 2);
+ $getid3_temp = new getID3();
+ $getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
+ $getid3_id3v2 = new getid3_id3v2($getid3_temp);
+ $getid3_id3v2->StartingOffset = $info['bonk'][' ID3']['offset'] + 2;
+ $info['bonk'][' ID3']['valid'] = $getid3_id3v2->Analyze();
+ if ($info['bonk'][' ID3']['valid']) {
+ $info['id3v2'] = $getid3_temp->info['id3v2'];
+ }
+ unset($getid3_temp, $getid3_id3v2);
}
break;
default:
- $ThisFileInfo['warning'][] = 'Unexpected Bonk tag "'.$BonkTagName.'" at offset '.$ThisFileInfo['bonk'][$BonkTagName]['offset'];
+ $this->warning('Unexpected Bonk tag "'.$BonkTagName.'" at offset '.$info['bonk'][$BonkTagName]['offset']);
break;
}
}
- function BonkIsValidTagName($PossibleBonkTag, $ignorecase=false) {
+ /**
+ * @param string $PossibleBonkTag
+ * @param bool $ignorecase
+ *
+ * @return bool
+ */
+ public static function BonkIsValidTagName($PossibleBonkTag, $ignorecase=false) {
static $BonkIsValidTagName = array('BONK', 'INFO', ' ID3', 'META');
foreach ($BonkIsValidTagName as $validtagname) {
if ($validtagname == $PossibleBonkTag) {
@@ -208,6 +241,3 @@
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.flac.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.flac.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.flac.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio.flac.php //
// module for analyzing FLAC and OggFLAC audio files //
@@ -13,297 +14,505 @@
// ///
/////////////////////////////////////////////////////////////////
-
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.ogg.php', __FILE__, true);
-class getid3_flac
+/**
+* @tutorial http://flac.sourceforge.net/format.html
+*/
+class getid3_flac extends getid3_handler
{
+ const syncword = 'fLaC';
- function getid3_flac(&$fd, &$ThisFileInfo) {
- // http://flac.sourceforge.net/format.html
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
- $StreamMarker = fread($fd, 4);
- if ($StreamMarker != 'fLaC') {
- $ThisFileInfo['error'][] = 'Expecting "fLaC" at offset '.$ThisFileInfo['avdataoffset'].', found "'.$StreamMarker.'"';
- return false;
+ $this->fseek($info['avdataoffset']);
+ $StreamMarker = $this->fread(4);
+ if ($StreamMarker != self::syncword) {
+ return $this->error('Expecting "'.getid3_lib::PrintHexBytes(self::syncword).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($StreamMarker).'"');
}
- $ThisFileInfo['fileformat'] = 'flac';
- $ThisFileInfo['audio']['dataformat'] = 'flac';
- $ThisFileInfo['audio']['bitrate_mode'] = 'vbr';
- $ThisFileInfo['audio']['lossless'] = true;
+ $info['fileformat'] = 'flac';
+ $info['audio']['dataformat'] = 'flac';
+ $info['audio']['bitrate_mode'] = 'vbr';
+ $info['audio']['lossless'] = true;
- return getid3_flac::FLACparseMETAdata($fd, $ThisFileInfo);
+ // parse flac container
+ return $this->parseMETAdata();
}
-
- function FLACparseMETAdata(&$fd, &$ThisFileInfo) {
-
+ /**
+ * @return bool
+ */
+ public function parseMETAdata() {
+ $info = &$this->getid3->info;
do {
- $METAdataBlockOffset = ftell($fd);
- $METAdataBlockHeader = fread($fd, 4);
- $METAdataLastBlockFlag = (bool) (getid3_lib::BigEndian2Int(substr($METAdataBlockHeader, 0, 1)) & 0x80);
- $METAdataBlockType = getid3_lib::BigEndian2Int(substr($METAdataBlockHeader, 0, 1)) & 0x7F;
- $METAdataBlockLength = getid3_lib::BigEndian2Int(substr($METAdataBlockHeader, 1, 3));
- $METAdataBlockTypeText = getid3_flac::FLACmetaBlockTypeLookup($METAdataBlockType);
+ $BlockOffset = $this->ftell();
+ $BlockHeader = $this->fread(4);
+ $LBFBT = getid3_lib::BigEndian2Int(substr($BlockHeader, 0, 1)); // LBFBT = LastBlockFlag + BlockType
+ $LastBlockFlag = (bool) ($LBFBT & 0x80);
+ $BlockType = ($LBFBT & 0x7F);
+ $BlockLength = getid3_lib::BigEndian2Int(substr($BlockHeader, 1, 3));
+ $BlockTypeText = self::metaBlockTypeLookup($BlockType);
- if ($METAdataBlockLength < 0) {
- $ThisFileInfo['error'][] = 'corrupt or invalid METADATA_BLOCK_HEADER.BLOCK_TYPE ('.$METAdataBlockType.') at offset '.$METAdataBlockOffset;
+ if (($BlockOffset + 4 + $BlockLength) > $info['avdataend']) {
+ $this->warning('METADATA_BLOCK_HEADER.BLOCK_TYPE ('.$BlockTypeText.') at offset '.$BlockOffset.' extends beyond end of file');
break;
}
+ if ($BlockLength < 1) {
+ if ($BlockTypeText != 'reserved') {
+ // probably supposed to be zero-length
+ $this->warning('METADATA_BLOCK_HEADER.BLOCK_LENGTH ('.$BlockTypeText.') at offset '.$BlockOffset.' is zero bytes');
+ continue;
+ }
+ $this->error('METADATA_BLOCK_HEADER.BLOCK_LENGTH ('.$BlockLength.') at offset '.$BlockOffset.' is invalid');
+ break;
+ }
- $ThisFileInfo['flac'][$METAdataBlockTypeText]['raw'] = array();
- $ThisFileInfo_flac_METAdataBlockTypeText_raw = &$ThisFileInfo['flac'][$METAdataBlockTypeText]['raw'];
+ $info['flac'][$BlockTypeText]['raw'] = array();
+ $BlockTypeText_raw = &$info['flac'][$BlockTypeText]['raw'];
- $ThisFileInfo_flac_METAdataBlockTypeText_raw['offset'] = $METAdataBlockOffset;
- $ThisFileInfo_flac_METAdataBlockTypeText_raw['last_meta_block'] = $METAdataLastBlockFlag;
- $ThisFileInfo_flac_METAdataBlockTypeText_raw['block_type'] = $METAdataBlockType;
- $ThisFileInfo_flac_METAdataBlockTypeText_raw['block_type_text'] = $METAdataBlockTypeText;
- $ThisFileInfo_flac_METAdataBlockTypeText_raw['block_length'] = $METAdataBlockLength;
- $ThisFileInfo_flac_METAdataBlockTypeText_raw['block_data'] = @fread($fd, $METAdataBlockLength);
- $ThisFileInfo['avdataoffset'] = ftell($fd);
+ $BlockTypeText_raw['offset'] = $BlockOffset;
+ $BlockTypeText_raw['last_meta_block'] = $LastBlockFlag;
+ $BlockTypeText_raw['block_type'] = $BlockType;
+ $BlockTypeText_raw['block_type_text'] = $BlockTypeText;
+ $BlockTypeText_raw['block_length'] = $BlockLength;
+ if ($BlockTypeText_raw['block_type'] != 0x06) { // do not read attachment data automatically
+ $BlockTypeText_raw['block_data'] = $this->fread($BlockLength);
+ }
- switch ($METAdataBlockTypeText) {
-
- case 'STREAMINFO':
- if (!getid3_flac::FLACparseSTREAMINFO($ThisFileInfo_flac_METAdataBlockTypeText_raw['block_data'], $ThisFileInfo)) {
+ switch ($BlockTypeText) {
+ case 'STREAMINFO': // 0x00
+ if (!$this->parseSTREAMINFO($BlockTypeText_raw['block_data'])) {
return false;
}
break;
- case 'PADDING':
- // ignore
+ case 'PADDING': // 0x01
+ unset($info['flac']['PADDING']); // ignore
break;
- case 'APPLICATION':
- if (!getid3_flac::FLACparseAPPLICATION($ThisFileInfo_flac_METAdataBlockTypeText_raw['block_data'], $ThisFileInfo)) {
+ case 'APPLICATION': // 0x02
+ if (!$this->parseAPPLICATION($BlockTypeText_raw['block_data'])) {
return false;
}
break;
- case 'SEEKTABLE':
- if (!getid3_flac::FLACparseSEEKTABLE($ThisFileInfo_flac_METAdataBlockTypeText_raw['block_data'], $ThisFileInfo)) {
+ case 'SEEKTABLE': // 0x03
+ if (!$this->parseSEEKTABLE($BlockTypeText_raw['block_data'])) {
return false;
}
break;
- case 'VORBIS_COMMENT':
- $OldOffset = ftell($fd);
- fseek($fd, 0 - $METAdataBlockLength, SEEK_CUR);
- getid3_ogg::ParseVorbisCommentsFilepointer($fd, $ThisFileInfo);
- fseek($fd, $OldOffset, SEEK_SET);
+ case 'VORBIS_COMMENT': // 0x04
+ if (!$this->parseVORBIS_COMMENT($BlockTypeText_raw['block_data'])) {
+ return false;
+ }
break;
- case 'CUESHEET':
- if (!getid3_flac::FLACparseCUESHEET($ThisFileInfo_flac_METAdataBlockTypeText_raw['block_data'], $ThisFileInfo)) {
+ case 'CUESHEET': // 0x05
+ if (!$this->parseCUESHEET($BlockTypeText_raw['block_data'])) {
return false;
}
break;
+ case 'PICTURE': // 0x06
+ if (!$this->parsePICTURE()) {
+ return false;
+ }
+ break;
+
default:
- $ThisFileInfo['warning'][] = 'Unhandled METADATA_BLOCK_HEADER.BLOCK_TYPE ('.$METAdataBlockType.') at offset '.$METAdataBlockOffset;
- break;
+ $this->warning('Unhandled METADATA_BLOCK_HEADER.BLOCK_TYPE ('.$BlockType.') at offset '.$BlockOffset);
}
- } while ($METAdataLastBlockFlag === false);
+ unset($info['flac'][$BlockTypeText]['raw']);
+ $info['avdataoffset'] = $this->ftell();
+ }
+ while ($LastBlockFlag === false);
+ // handle tags
+ if (!empty($info['flac']['VORBIS_COMMENT']['comments'])) {
+ $info['flac']['comments'] = $info['flac']['VORBIS_COMMENT']['comments'];
+ }
+ if (!empty($info['flac']['VORBIS_COMMENT']['vendor'])) {
+ $info['audio']['encoder'] = str_replace('reference ', '', $info['flac']['VORBIS_COMMENT']['vendor']);
+ }
- if (isset($ThisFileInfo['flac']['STREAMINFO'])) {
- $ThisFileInfo['flac']['compressed_audio_bytes'] = $ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset'];
- $ThisFileInfo['flac']['uncompressed_audio_bytes'] = $ThisFileInfo['flac']['STREAMINFO']['samples_stream'] * $ThisFileInfo['flac']['STREAMINFO']['channels'] * ($ThisFileInfo['flac']['STREAMINFO']['bits_per_sample'] / 8);
- if ($ThisFileInfo['flac']['uncompressed_audio_bytes'] == 0) {
- $ThisFileInfo['error'][] = 'Corrupt FLAC file: uncompressed_audio_bytes == zero';
- return false;
+ // copy attachments to 'comments' array if nesesary
+ if (isset($info['flac']['PICTURE']) && ($this->getid3->option_save_attachments !== getID3::ATTACHMENTS_NONE)) {
+ foreach ($info['flac']['PICTURE'] as $entry) {
+ if (!empty($entry['data'])) {
+ if (!isset($info['flac']['comments']['picture'])) {
+ $info['flac']['comments']['picture'] = array();
+ }
+ $comments_picture_data = array();
+ foreach (array('data', 'image_mime', 'image_width', 'image_height', 'imagetype', 'picturetype', 'description', 'datalength') as $picture_key) {
+ if (isset($entry[$picture_key])) {
+ $comments_picture_data[$picture_key] = $entry[$picture_key];
+ }
+ }
+ $info['flac']['comments']['picture'][] = $comments_picture_data;
+ unset($comments_picture_data);
+ }
}
- $ThisFileInfo['flac']['compression_ratio'] = $ThisFileInfo['flac']['compressed_audio_bytes'] / $ThisFileInfo['flac']['uncompressed_audio_bytes'];
}
+ if (isset($info['flac']['STREAMINFO'])) {
+ if (!$this->isDependencyFor('matroska')) {
+ $info['flac']['compressed_audio_bytes'] = $info['avdataend'] - $info['avdataoffset'];
+ }
+ $info['flac']['uncompressed_audio_bytes'] = $info['flac']['STREAMINFO']['samples_stream'] * $info['flac']['STREAMINFO']['channels'] * ($info['flac']['STREAMINFO']['bits_per_sample'] / 8);
+ if ($info['flac']['uncompressed_audio_bytes'] == 0) {
+ return $this->error('Corrupt FLAC file: uncompressed_audio_bytes == zero');
+ }
+ if (!empty($info['flac']['compressed_audio_bytes'])) {
+ $info['flac']['compression_ratio'] = $info['flac']['compressed_audio_bytes'] / $info['flac']['uncompressed_audio_bytes'];
+ }
+ }
+
// set md5_data_source - built into flac 0.5+
- if (isset($ThisFileInfo['flac']['STREAMINFO']['audio_signature'])) {
+ if (isset($info['flac']['STREAMINFO']['audio_signature'])) {
- if ($ThisFileInfo['flac']['STREAMINFO']['audio_signature'] === str_repeat("\x00", 16)) {
-
- $ThisFileInfo['warning'][] = 'FLAC STREAMINFO.audio_signature is null (known issue with libOggFLAC)';
-
- } else {
-
- $ThisFileInfo['md5_data_source'] = '';
- $md5 = $ThisFileInfo['flac']['STREAMINFO']['audio_signature'];
+ if ($info['flac']['STREAMINFO']['audio_signature'] === str_repeat("\x00", 16)) {
+ $this->warning('FLAC STREAMINFO.audio_signature is null (known issue with libOggFLAC)');
+ }
+ else {
+ $info['md5_data_source'] = '';
+ $md5 = $info['flac']['STREAMINFO']['audio_signature'];
for ($i = 0; $i < strlen($md5); $i++) {
- $ThisFileInfo['md5_data_source'] .= str_pad(dechex(ord($md5{$i})), 2, '00', STR_PAD_LEFT);
+ $info['md5_data_source'] .= str_pad(dechex(ord($md5[$i])), 2, '00', STR_PAD_LEFT);
}
- if (!preg_match('/^[0-9a-f]{32}$/', $ThisFileInfo['md5_data_source'])) {
- unset($ThisFileInfo['md5_data_source']);
+ if (!preg_match('/^[0-9a-f]{32}$/', $info['md5_data_source'])) {
+ unset($info['md5_data_source']);
}
-
}
-
}
- $ThisFileInfo['audio']['bits_per_sample'] = $ThisFileInfo['flac']['STREAMINFO']['bits_per_sample'];
- if ($ThisFileInfo['audio']['bits_per_sample'] == 8) {
- // special case
- // must invert sign bit on all data bytes before MD5'ing to match FLAC's calculated value
- // MD5sum calculates on unsigned bytes, but FLAC calculated MD5 on 8-bit audio data as signed
- $ThisFileInfo['warning'][] = 'FLAC calculates MD5 data strangely on 8-bit audio, so the stored md5_data_source value will not match the decoded WAV file';
+ if (isset($info['flac']['STREAMINFO']['bits_per_sample'])) {
+ $info['audio']['bits_per_sample'] = $info['flac']['STREAMINFO']['bits_per_sample'];
+ if ($info['audio']['bits_per_sample'] == 8) {
+ // special case
+ // must invert sign bit on all data bytes before MD5'ing to match FLAC's calculated value
+ // MD5sum calculates on unsigned bytes, but FLAC calculated MD5 on 8-bit audio data as signed
+ $this->warning('FLAC calculates MD5 data strangely on 8-bit audio, so the stored md5_data_source value will not match the decoded WAV file');
+ }
}
- if (!empty($ThisFileInfo['ogg']['vendor'])) {
- $ThisFileInfo['audio']['encoder'] = $ThisFileInfo['ogg']['vendor'];
- }
return true;
}
- function FLACmetaBlockTypeLookup($blocktype) {
- static $FLACmetaBlockTypeLookup = array();
- if (empty($FLACmetaBlockTypeLookup)) {
- $FLACmetaBlockTypeLookup[0] = 'STREAMINFO';
- $FLACmetaBlockTypeLookup[1] = 'PADDING';
- $FLACmetaBlockTypeLookup[2] = 'APPLICATION';
- $FLACmetaBlockTypeLookup[3] = 'SEEKTABLE';
- $FLACmetaBlockTypeLookup[4] = 'VORBIS_COMMENT';
- $FLACmetaBlockTypeLookup[5] = 'CUESHEET';
- }
- return (isset($FLACmetaBlockTypeLookup[$blocktype]) ? $FLACmetaBlockTypeLookup[$blocktype] : 'reserved');
- }
- function FLACapplicationIDLookup($applicationid) {
- static $FLACapplicationIDLookup = array();
- if (empty($FLACapplicationIDLookup)) {
- // http://flac.sourceforge.net/id.html
- $FLACapplicationIDLookup[0x46746F6C] = 'flac-tools'; // 'Ftol'
- $FLACapplicationIDLookup[0x46746F6C] = 'Sound Font FLAC'; // 'SFFL'
- }
- return (isset($FLACapplicationIDLookup[$applicationid]) ? $FLACapplicationIDLookup[$applicationid] : 'reserved');
- }
+ /**
+ * @param string $BlockData
+ *
+ * @return array
+ */
+ public static function parseSTREAMINFOdata($BlockData) {
+ $streaminfo = array();
+ $streaminfo['min_block_size'] = getid3_lib::BigEndian2Int(substr($BlockData, 0, 2));
+ $streaminfo['max_block_size'] = getid3_lib::BigEndian2Int(substr($BlockData, 2, 2));
+ $streaminfo['min_frame_size'] = getid3_lib::BigEndian2Int(substr($BlockData, 4, 3));
+ $streaminfo['max_frame_size'] = getid3_lib::BigEndian2Int(substr($BlockData, 7, 3));
- function FLACparseSTREAMINFO($METAdataBlockData, &$ThisFileInfo) {
- $offset = 0;
- $ThisFileInfo['flac']['STREAMINFO']['min_block_size'] = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 2));
- $offset += 2;
- $ThisFileInfo['flac']['STREAMINFO']['max_block_size'] = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 2));
- $offset += 2;
- $ThisFileInfo['flac']['STREAMINFO']['min_frame_size'] = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 3));
- $offset += 3;
- $ThisFileInfo['flac']['STREAMINFO']['max_frame_size'] = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 3));
- $offset += 3;
+ $SRCSBSS = getid3_lib::BigEndian2Bin(substr($BlockData, 10, 8));
+ $streaminfo['sample_rate'] = getid3_lib::Bin2Dec(substr($SRCSBSS, 0, 20));
+ $streaminfo['channels'] = getid3_lib::Bin2Dec(substr($SRCSBSS, 20, 3)) + 1;
+ $streaminfo['bits_per_sample'] = getid3_lib::Bin2Dec(substr($SRCSBSS, 23, 5)) + 1;
+ $streaminfo['samples_stream'] = getid3_lib::Bin2Dec(substr($SRCSBSS, 28, 36));
- $SampleRateChannelsSampleBitsStreamSamples = getid3_lib::BigEndian2Bin(substr($METAdataBlockData, $offset, 8));
- $ThisFileInfo['flac']['STREAMINFO']['sample_rate'] = getid3_lib::Bin2Dec(substr($SampleRateChannelsSampleBitsStreamSamples, 0, 20));
- $ThisFileInfo['flac']['STREAMINFO']['channels'] = getid3_lib::Bin2Dec(substr($SampleRateChannelsSampleBitsStreamSamples, 20, 3)) + 1;
- $ThisFileInfo['flac']['STREAMINFO']['bits_per_sample'] = getid3_lib::Bin2Dec(substr($SampleRateChannelsSampleBitsStreamSamples, 23, 5)) + 1;
- $ThisFileInfo['flac']['STREAMINFO']['samples_stream'] = getid3_lib::Bin2Dec(substr($SampleRateChannelsSampleBitsStreamSamples, 28, 36));
- $offset += 8;
+ $streaminfo['audio_signature'] = substr($BlockData, 18, 16);
- $ThisFileInfo['flac']['STREAMINFO']['audio_signature'] = substr($METAdataBlockData, $offset, 16);
- $offset += 16;
+ return $streaminfo;
+ }
- if (!empty($ThisFileInfo['flac']['STREAMINFO']['sample_rate'])) {
+ /**
+ * @param string $BlockData
+ *
+ * @return bool
+ */
+ private function parseSTREAMINFO($BlockData) {
+ $info = &$this->getid3->info;
- $ThisFileInfo['audio']['bitrate_mode'] = 'vbr';
- $ThisFileInfo['audio']['sample_rate'] = $ThisFileInfo['flac']['STREAMINFO']['sample_rate'];
- $ThisFileInfo['audio']['channels'] = $ThisFileInfo['flac']['STREAMINFO']['channels'];
- $ThisFileInfo['audio']['bits_per_sample'] = $ThisFileInfo['flac']['STREAMINFO']['bits_per_sample'];
- $ThisFileInfo['playtime_seconds'] = $ThisFileInfo['flac']['STREAMINFO']['samples_stream'] / $ThisFileInfo['flac']['STREAMINFO']['sample_rate'];
- $ThisFileInfo['audio']['bitrate'] = (($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) * 8) / $ThisFileInfo['playtime_seconds'];
+ $info['flac']['STREAMINFO'] = self::parseSTREAMINFOdata($BlockData);
- } else {
+ if (!empty($info['flac']['STREAMINFO']['sample_rate'])) {
- $ThisFileInfo['error'][] = 'Corrupt METAdata block: STREAMINFO';
- return false;
+ $info['audio']['bitrate_mode'] = 'vbr';
+ $info['audio']['sample_rate'] = $info['flac']['STREAMINFO']['sample_rate'];
+ $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'];
+ if ($info['playtime_seconds'] > 0) {
+ if (!$this->isDependencyFor('matroska')) {
+ $info['audio']['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
+ }
+ else {
+ $this->warning('Cannot determine audio bitrate because total stream size is unknown');
+ }
+ }
+ } else {
+ return $this->error('Corrupt METAdata block: STREAMINFO');
}
+
return true;
}
+ /**
+ * @param string $BlockData
+ *
+ * @return bool
+ */
+ private function parseAPPLICATION($BlockData) {
+ $info = &$this->getid3->info;
- function FLACparseAPPLICATION($METAdataBlockData, &$ThisFileInfo) {
- $offset = 0;
- $ApplicationID = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 4));
- $offset += 4;
- $ThisFileInfo['flac']['APPLICATION'][$ApplicationID]['name'] = getid3_flac::FLACapplicationIDLookup($ApplicationID);
- $ThisFileInfo['flac']['APPLICATION'][$ApplicationID]['data'] = substr($METAdataBlockData, $offset);
- $offset = $METAdataBlockLength;
+ $ApplicationID = getid3_lib::BigEndian2Int(substr($BlockData, 0, 4));
+ $info['flac']['APPLICATION'][$ApplicationID]['name'] = self::applicationIDLookup($ApplicationID);
+ $info['flac']['APPLICATION'][$ApplicationID]['data'] = substr($BlockData, 4);
return true;
}
+ /**
+ * @param string $BlockData
+ *
+ * @return bool
+ */
+ private function parseSEEKTABLE($BlockData) {
+ $info = &$this->getid3->info;
- function FLACparseSEEKTABLE($METAdataBlockData, &$ThisFileInfo) {
$offset = 0;
- $METAdataBlockLength = strlen($METAdataBlockData);
+ $BlockLength = strlen($BlockData);
$placeholderpattern = str_repeat("\xFF", 8);
- while ($offset < $METAdataBlockLength) {
- $SampleNumberString = substr($METAdataBlockData, $offset, 8);
+ while ($offset < $BlockLength) {
+ $SampleNumberString = substr($BlockData, $offset, 8);
$offset += 8;
if ($SampleNumberString == $placeholderpattern) {
// placeholder point
- @$ThisFileInfo['flac']['SEEKTABLE']['placeholders']++;
+ getid3_lib::safe_inc($info['flac']['SEEKTABLE']['placeholders'], 1);
$offset += 10;
} else {
- $SampleNumber = getid3_lib::BigEndian2Int($SampleNumberString);
- $ThisFileInfo['flac']['SEEKTABLE'][$SampleNumber]['offset'] = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 8));
+ $SampleNumber = getid3_lib::BigEndian2Int($SampleNumberString);
+ $info['flac']['SEEKTABLE'][$SampleNumber]['offset'] = getid3_lib::BigEndian2Int(substr($BlockData, $offset, 8));
$offset += 8;
- $ThisFileInfo['flac']['SEEKTABLE'][$SampleNumber]['samples'] = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 2));
+ $info['flac']['SEEKTABLE'][$SampleNumber]['samples'] = getid3_lib::BigEndian2Int(substr($BlockData, $offset, 2));
$offset += 2;
}
}
+
return true;
}
- function FLACparseCUESHEET($METAdataBlockData, &$ThisFileInfo) {
+ /**
+ * @param string $BlockData
+ *
+ * @return bool
+ */
+ private function parseVORBIS_COMMENT($BlockData) {
+ $info = &$this->getid3->info;
+
+ $getid3_ogg = new getid3_ogg($this->getid3);
+ if ($this->isDependencyFor('matroska')) {
+ $getid3_ogg->setStringMode($this->data_string);
+ }
+ $getid3_ogg->ParseVorbisComments();
+ if (isset($info['ogg'])) {
+ unset($info['ogg']['comments_raw']);
+ $info['flac']['VORBIS_COMMENT'] = $info['ogg'];
+ unset($info['ogg']);
+ }
+
+ unset($getid3_ogg);
+
+ return true;
+ }
+
+ /**
+ * @param string $BlockData
+ *
+ * @return bool
+ */
+ private function parseCUESHEET($BlockData) {
+ $info = &$this->getid3->info;
$offset = 0;
- $ThisFileInfo['flac']['CUESHEET']['media_catalog_number'] = trim(substr($METAdataBlockData, $offset, 128), "\0");
+ $info['flac']['CUESHEET']['media_catalog_number'] = trim(substr($BlockData, $offset, 128), "\0");
$offset += 128;
- $ThisFileInfo['flac']['CUESHEET']['lead_in_samples'] = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 8));
+ $info['flac']['CUESHEET']['lead_in_samples'] = getid3_lib::BigEndian2Int(substr($BlockData, $offset, 8));
$offset += 8;
- $ThisFileInfo['flac']['CUESHEET']['flags']['is_cd'] = (bool) (getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 1)) & 0x80);
+ $info['flac']['CUESHEET']['flags']['is_cd'] = (bool) (getid3_lib::BigEndian2Int(substr($BlockData, $offset, 1)) & 0x80);
$offset += 1;
$offset += 258; // reserved
- $ThisFileInfo['flac']['CUESHEET']['number_tracks'] = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 1));
+ $info['flac']['CUESHEET']['number_tracks'] = getid3_lib::BigEndian2Int(substr($BlockData, $offset, 1));
$offset += 1;
- for ($track = 0; $track < $ThisFileInfo['flac']['CUESHEET']['number_tracks']; $track++) {
- $TrackSampleOffset = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 8));
+ for ($track = 0; $track < $info['flac']['CUESHEET']['number_tracks']; $track++) {
+ $TrackSampleOffset = getid3_lib::BigEndian2Int(substr($BlockData, $offset, 8));
$offset += 8;
- $TrackNumber = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 1));
+ $TrackNumber = getid3_lib::BigEndian2Int(substr($BlockData, $offset, 1));
$offset += 1;
- $ThisFileInfo['flac']['CUESHEET']['tracks'][$TrackNumber]['sample_offset'] = $TrackSampleOffset;
+ $info['flac']['CUESHEET']['tracks'][$TrackNumber]['sample_offset'] = $TrackSampleOffset;
- $ThisFileInfo['flac']['CUESHEET']['tracks'][$TrackNumber]['isrc'] = substr($METAdataBlockData, $offset, 12);
+ $info['flac']['CUESHEET']['tracks'][$TrackNumber]['isrc'] = substr($BlockData, $offset, 12);
$offset += 12;
- $TrackFlagsRaw = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 1));
+ $TrackFlagsRaw = getid3_lib::BigEndian2Int(substr($BlockData, $offset, 1));
$offset += 1;
- $ThisFileInfo['flac']['CUESHEET']['tracks'][$TrackNumber]['flags']['is_audio'] = (bool) ($TrackFlagsRaw & 0x80);
- $ThisFileInfo['flac']['CUESHEET']['tracks'][$TrackNumber]['flags']['pre_emphasis'] = (bool) ($TrackFlagsRaw & 0x40);
+ $info['flac']['CUESHEET']['tracks'][$TrackNumber]['flags']['is_audio'] = (bool) ($TrackFlagsRaw & 0x80);
+ $info['flac']['CUESHEET']['tracks'][$TrackNumber]['flags']['pre_emphasis'] = (bool) ($TrackFlagsRaw & 0x40);
$offset += 13; // reserved
- $ThisFileInfo['flac']['CUESHEET']['tracks'][$TrackNumber]['index_points'] = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 1));
+ $info['flac']['CUESHEET']['tracks'][$TrackNumber]['index_points'] = getid3_lib::BigEndian2Int(substr($BlockData, $offset, 1));
$offset += 1;
- for ($index = 0; $index < $ThisFileInfo['flac']['CUESHEET']['tracks'][$TrackNumber]['index_points']; $index++) {
- $IndexSampleOffset = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 8));
+ for ($index = 0; $index < $info['flac']['CUESHEET']['tracks'][$TrackNumber]['index_points']; $index++) {
+ $IndexSampleOffset = getid3_lib::BigEndian2Int(substr($BlockData, $offset, 8));
$offset += 8;
- $IndexNumber = getid3_lib::BigEndian2Int(substr($METAdataBlockData, $offset, 1));
+ $IndexNumber = getid3_lib::BigEndian2Int(substr($BlockData, $offset, 1));
$offset += 1;
$offset += 3; // reserved
- $ThisFileInfo['flac']['CUESHEET']['tracks'][$TrackNumber]['indexes'][$IndexNumber] = $IndexSampleOffset;
+ $info['flac']['CUESHEET']['tracks'][$TrackNumber]['indexes'][$IndexNumber] = $IndexSampleOffset;
}
}
+
return true;
}
+ /**
+ * Parse METADATA_BLOCK_PICTURE flac structure and extract attachment
+ * External usage: audio.ogg
+ *
+ * @return bool
+ */
+ public function parsePICTURE() {
+ $info = &$this->getid3->info;
+
+ $picture['typeid'] = getid3_lib::BigEndian2Int($this->fread(4));
+ $picture['picturetype'] = self::pictureTypeLookup($picture['typeid']);
+ $picture['image_mime'] = $this->fread(getid3_lib::BigEndian2Int($this->fread(4)));
+ $descr_length = getid3_lib::BigEndian2Int($this->fread(4));
+ if ($descr_length) {
+ $picture['description'] = $this->fread($descr_length);
+ }
+ $picture['image_width'] = getid3_lib::BigEndian2Int($this->fread(4));
+ $picture['image_height'] = getid3_lib::BigEndian2Int($this->fread(4));
+ $picture['color_depth'] = getid3_lib::BigEndian2Int($this->fread(4));
+ $picture['colors_indexed'] = getid3_lib::BigEndian2Int($this->fread(4));
+ $picture['datalength'] = getid3_lib::BigEndian2Int($this->fread(4));
+
+ if ($picture['image_mime'] == '-->') {
+ $picture['data'] = $this->fread($picture['datalength']);
+ } else {
+ $picture['data'] = $this->saveAttachment(
+ str_replace('/', '_', $picture['picturetype']).'_'.$this->ftell(),
+ $this->ftell(),
+ $picture['datalength'],
+ $picture['image_mime']);
+ }
+
+ $info['flac']['PICTURE'][] = $picture;
+
+ return true;
+ }
+
+ /**
+ * @param int $blocktype
+ *
+ * @return string
+ */
+ public static function metaBlockTypeLookup($blocktype) {
+ static $lookup = array(
+ 0 => 'STREAMINFO',
+ 1 => 'PADDING',
+ 2 => 'APPLICATION',
+ 3 => 'SEEKTABLE',
+ 4 => 'VORBIS_COMMENT',
+ 5 => 'CUESHEET',
+ 6 => 'PICTURE',
+ );
+ return (isset($lookup[$blocktype]) ? $lookup[$blocktype] : 'reserved');
+ }
+
+ /**
+ * @param int $applicationid
+ *
+ * @return string
+ */
+ public static function applicationIDLookup($applicationid) {
+ // http://flac.sourceforge.net/id.html
+ static $lookup = array(
+ 0x41544348 => 'FlacFile', // "ATCH"
+ 0x42534F4C => 'beSolo', // "BSOL"
+ 0x42554753 => 'Bugs Player', // "BUGS"
+ 0x43756573 => 'GoldWave cue points (specification)', // "Cues"
+ 0x46696361 => 'CUE Splitter', // "Fica"
+ 0x46746F6C => 'flac-tools', // "Ftol"
+ 0x4D4F5442 => 'MOTB MetaCzar', // "MOTB"
+ 0x4D505345 => 'MP3 Stream Editor', // "MPSE"
+ 0x4D754D4C => 'MusicML: Music Metadata Language', // "MuML"
+ 0x52494646 => 'Sound Devices RIFF chunk storage', // "RIFF"
+ 0x5346464C => 'Sound Font FLAC', // "SFFL"
+ 0x534F4E59 => 'Sony Creative Software', // "SONY"
+ 0x5351455A => 'flacsqueeze', // "SQEZ"
+ 0x54745776 => 'TwistedWave', // "TtWv"
+ 0x55495453 => 'UITS Embedding tools', // "UITS"
+ 0x61696666 => 'FLAC AIFF chunk storage', // "aiff"
+ 0x696D6167 => 'flac-image application for storing arbitrary files in APPLICATION metadata blocks', // "imag"
+ 0x7065656D => 'Parseable Embedded Extensible Metadata (specification)', // "peem"
+ 0x71667374 => 'QFLAC Studio', // "qfst"
+ 0x72696666 => 'FLAC RIFF chunk storage', // "riff"
+ 0x74756E65 => 'TagTuner', // "tune"
+ 0x78626174 => 'XBAT', // "xbat"
+ 0x786D6364 => 'xmcd', // "xmcd"
+ );
+ return (isset($lookup[$applicationid]) ? $lookup[$applicationid] : 'reserved');
+ }
+
+ /**
+ * @param int $type_id
+ *
+ * @return string
+ */
+ public static function pictureTypeLookup($type_id) {
+ static $lookup = array (
+ 0 => 'Other',
+ 1 => '32x32 pixels \'file icon\' (PNG only)',
+ 2 => 'Other file icon',
+ 3 => 'Cover (front)',
+ 4 => 'Cover (back)',
+ 5 => 'Leaflet page',
+ 6 => 'Media (e.g. label side of CD)',
+ 7 => 'Lead artist/lead performer/soloist',
+ 8 => 'Artist/performer',
+ 9 => 'Conductor',
+ 10 => 'Band/Orchestra',
+ 11 => 'Composer',
+ 12 => 'Lyricist/text writer',
+ 13 => 'Recording Location',
+ 14 => 'During recording',
+ 15 => 'During performance',
+ 16 => 'Movie/video screen capture',
+ 17 => 'A bright coloured fish',
+ 18 => 'Illustration',
+ 19 => 'Band/artist logotype',
+ 20 => 'Publisher/Studio logotype',
+ );
+ return (isset($lookup[$type_id]) ? $lookup[$type_id] : 'reserved');
+ }
+
}
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.la.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.la.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.la.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,72 +1,80 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio.la.php //
-// module for analyzing LA audio files //
+// module for analyzing LA (LosslessAudio) audio files //
// dependencies: module.audio.riff.php //
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, true);
-class getid3_la
+class getid3_la extends getid3_handler
{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- function getid3_la(&$fd, &$ThisFileInfo) {
$offset = 0;
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
- $rawdata = fread($fd, GETID3_FREAD_BUFFER_SIZE);
+ $this->fseek($info['avdataoffset']);
+ $rawdata = $this->fread($this->getid3->fread_buffer_size());
switch (substr($rawdata, $offset, 4)) {
case 'LA02':
case 'LA03':
case 'LA04':
- $ThisFileInfo['fileformat'] = 'la';
- $ThisFileInfo['audio']['dataformat'] = 'la';
- $ThisFileInfo['audio']['lossless'] = true;
+ $info['fileformat'] = 'la';
+ $info['audio']['dataformat'] = 'la';
+ $info['audio']['lossless'] = true;
- $ThisFileInfo['la']['version_major'] = (int) substr($rawdata, $offset + 2, 1);
- $ThisFileInfo['la']['version_minor'] = (int) substr($rawdata, $offset + 3, 1);
- $ThisFileInfo['la']['version'] = (float) $ThisFileInfo['la']['version_major'] + ($ThisFileInfo['la']['version_minor'] / 10);
+ $info['la']['version_major'] = (int) substr($rawdata, $offset + 2, 1);
+ $info['la']['version_minor'] = (int) substr($rawdata, $offset + 3, 1);
+ $info['la']['version'] = (float) $info['la']['version_major'] + ($info['la']['version_minor'] / 10);
$offset += 4;
- $ThisFileInfo['la']['uncompressed_size'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 4));
+ $info['la']['uncompressed_size'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 4));
$offset += 4;
- if ($ThisFileInfo['la']['uncompressed_size'] == 0) {
- $ThisFileInfo['error'][] = 'Corrupt LA file: uncompressed_size == zero';
+ if ($info['la']['uncompressed_size'] == 0) {
+ $this->error('Corrupt LA file: uncompressed_size == zero');
return false;
}
$WAVEchunk = substr($rawdata, $offset, 4);
if ($WAVEchunk !== 'WAVE') {
- $ThisFileInfo['error'][] = 'Expected "WAVE" ('.getid3_lib::PrintHexBytes('WAVE').') at offset '.$offset.', found "'.$WAVEchunk.'" ('.getid3_lib::PrintHexBytes($WAVEchunk).') instead.';
+ $this->error('Expected "WAVE" ('.getid3_lib::PrintHexBytes('WAVE').') at offset '.$offset.', found "'.$WAVEchunk.'" ('.getid3_lib::PrintHexBytes($WAVEchunk).') instead.');
return false;
}
$offset += 4;
- $ThisFileInfo['la']['fmt_size'] = 24;
- if ($ThisFileInfo['la']['version'] >= 0.3) {
+ $info['la']['fmt_size'] = 24;
+ if ($info['la']['version'] >= 0.3) {
- $ThisFileInfo['la']['fmt_size'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 4));
- $ThisFileInfo['la']['header_size'] = 49 + $ThisFileInfo['la']['fmt_size'] - 24;
+ $info['la']['fmt_size'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 4));
+ $info['la']['header_size'] = 49 + $info['la']['fmt_size'] - 24;
$offset += 4;
} else {
// version 0.2 didn't support additional data blocks
- $ThisFileInfo['la']['header_size'] = 41;
+ $info['la']['header_size'] = 41;
}
$fmt_chunk = substr($rawdata, $offset, 4);
if ($fmt_chunk !== 'fmt ') {
- $ThisFileInfo['error'][] = 'Expected "fmt " ('.getid3_lib::PrintHexBytes('fmt ').') at offset '.$offset.', found "'.$fmt_chunk.'" ('.getid3_lib::PrintHexBytes($fmt_chunk).') instead.';
+ $this->error('Expected "fmt " ('.getid3_lib::PrintHexBytes('fmt ').') at offset '.$offset.', found "'.$fmt_chunk.'" ('.getid3_lib::PrintHexBytes($fmt_chunk).') instead.');
return false;
}
$offset += 4;
@@ -73,155 +81,150 @@
$fmt_size = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 4));
$offset += 4;
- $ThisFileInfo['la']['raw']['format'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 2));
+ $info['la']['raw']['format'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 2));
$offset += 2;
- $ThisFileInfo['la']['channels'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 2));
+ $info['la']['channels'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 2));
$offset += 2;
- if ($ThisFileInfo['la']['channels'] == 0) {
- $ThisFileInfo['error'][] = 'Corrupt LA file: channels == zero';
+ if ($info['la']['channels'] == 0) {
+ $this->error('Corrupt LA file: channels == zero');
return false;
}
- $ThisFileInfo['la']['sample_rate'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 4));
+ $info['la']['sample_rate'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 4));
$offset += 4;
- if ($ThisFileInfo['la']['sample_rate'] == 0) {
- $ThisFileInfo['error'][] = 'Corrupt LA file: sample_rate == zero';
+ if ($info['la']['sample_rate'] == 0) {
+ $this->error('Corrupt LA file: sample_rate == zero');
return false;
}
- $ThisFileInfo['la']['bytes_per_second'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 4));
+ $info['la']['bytes_per_second'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 4));
$offset += 4;
- $ThisFileInfo['la']['bytes_per_sample'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 2));
+ $info['la']['bytes_per_sample'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 2));
$offset += 2;
- $ThisFileInfo['la']['bits_per_sample'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 2));
+ $info['la']['bits_per_sample'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 2));
$offset += 2;
- $ThisFileInfo['la']['samples'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 4));
+ $info['la']['samples'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 4));
$offset += 4;
- $ThisFileInfo['la']['raw']['flags'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 1));
+ $info['la']['raw']['flags'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 1));
$offset += 1;
- $ThisFileInfo['la']['flags']['seekable'] = (bool) ($ThisFileInfo['la']['raw']['flags'] & 0x01);
- if ($ThisFileInfo['la']['version'] >= 0.4) {
- $ThisFileInfo['la']['flags']['high_compression'] = (bool) ($ThisFileInfo['la']['raw']['flags'] & 0x02);
+ $info['la']['flags']['seekable'] = (bool) ($info['la']['raw']['flags'] & 0x01);
+ if ($info['la']['version'] >= 0.4) {
+ $info['la']['flags']['high_compression'] = (bool) ($info['la']['raw']['flags'] & 0x02);
}
- $ThisFileInfo['la']['original_crc'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 4));
+ $info['la']['original_crc'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 4));
$offset += 4;
- // mikeØbevin*de
+ // mikeØbevin*de
// Basically, the blocksize/seekevery are 61440/19 in La0.4 and 73728/16
// in earlier versions. A seekpoint is added every blocksize * seekevery
// samples, so 4 * int(totalSamples / (blockSize * seekEvery)) should
// give the number of bytes used for the seekpoints. Of course, if seeking
// is disabled, there are no seekpoints stored.
- if ($ThisFileInfo['la']['version'] >= 0.4) {
- $ThisFileInfo['la']['blocksize'] = 61440;
- $ThisFileInfo['la']['seekevery'] = 19;
+ if ($info['la']['version'] >= 0.4) {
+ $info['la']['blocksize'] = 61440;
+ $info['la']['seekevery'] = 19;
} else {
- $ThisFileInfo['la']['blocksize'] = 73728;
- $ThisFileInfo['la']['seekevery'] = 16;
+ $info['la']['blocksize'] = 73728;
+ $info['la']['seekevery'] = 16;
}
- $ThisFileInfo['la']['seekpoint_count'] = 0;
- if ($ThisFileInfo['la']['flags']['seekable']) {
- $ThisFileInfo['la']['seekpoint_count'] = floor($ThisFileInfo['la']['samples'] / ($ThisFileInfo['la']['blocksize'] * $ThisFileInfo['la']['seekevery']));
+ $info['la']['seekpoint_count'] = 0;
+ if ($info['la']['flags']['seekable']) {
+ $info['la']['seekpoint_count'] = floor($info['la']['samples'] / ($info['la']['blocksize'] * $info['la']['seekevery']));
- for ($i = 0; $i < $ThisFileInfo['la']['seekpoint_count']; $i++) {
- $ThisFileInfo['la']['seekpoints'][] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 4));
+ for ($i = 0; $i < $info['la']['seekpoint_count']; $i++) {
+ $info['la']['seekpoints'][] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 4));
$offset += 4;
}
}
- if ($ThisFileInfo['la']['version'] >= 0.3) {
+ if ($info['la']['version'] >= 0.3) {
// Following the main header information, the program outputs all of the
// seekpoints. Following these is what I called the 'footer start',
// i.e. the position immediately after the La audio data is finished.
- $ThisFileInfo['la']['footerstart'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 4));
+ $info['la']['footerstart'] = getid3_lib::LittleEndian2Int(substr($rawdata, $offset, 4));
$offset += 4;
- if ($ThisFileInfo['la']['footerstart'] > $ThisFileInfo['filesize']) {
- $ThisFileInfo['warning'][] = 'FooterStart value points to offset '.$ThisFileInfo['la']['footerstart'].' which is beyond end-of-file ('.$ThisFileInfo['filesize'].')';
- $ThisFileInfo['la']['footerstart'] = $ThisFileInfo['filesize'];
+ if ($info['la']['footerstart'] > $info['filesize']) {
+ $this->warning('FooterStart value points to offset '.$info['la']['footerstart'].' which is beyond end-of-file ('.$info['filesize'].')');
+ $info['la']['footerstart'] = $info['filesize'];
}
} else {
// La v0.2 didn't have FooterStart value
- $ThisFileInfo['la']['footerstart'] = $ThisFileInfo['avdataend'];
+ $info['la']['footerstart'] = $info['avdataend'];
}
- if ($ThisFileInfo['la']['footerstart'] < $ThisFileInfo['avdataend']) {
- if ($RIFFtempfilename = tempnam('*', 'id3')) {
+ if ($info['la']['footerstart'] < $info['avdataend']) {
+ if ($RIFFtempfilename = tempnam(GETID3_TEMP_DIR, 'id3')) {
if ($RIFF_fp = fopen($RIFFtempfilename, 'w+b')) {
$RIFFdata = 'WAVE';
- if ($ThisFileInfo['la']['version'] == 0.2) {
+ if ($info['la']['version'] == 0.2) {
$RIFFdata .= substr($rawdata, 12, 24);
} else {
$RIFFdata .= substr($rawdata, 16, 24);
}
- if ($ThisFileInfo['la']['footerstart'] < $ThisFileInfo['avdataend']) {
- fseek($fd, $ThisFileInfo['la']['footerstart'], SEEK_SET);
- $RIFFdata .= fread($fd, $ThisFileInfo['avdataend'] - $ThisFileInfo['la']['footerstart']);
+ if ($info['la']['footerstart'] < $info['avdataend']) {
+ $this->fseek($info['la']['footerstart']);
+ $RIFFdata .= $this->fread($info['avdataend'] - $info['la']['footerstart']);
}
$RIFFdata = 'RIFF'.getid3_lib::LittleEndian2String(strlen($RIFFdata), 4, false).$RIFFdata;
fwrite($RIFF_fp, $RIFFdata, strlen($RIFFdata));
- $dummy = $ThisFileInfo;
- $dummy['filesize'] = strlen($RIFFdata);
- $dummy['avdataoffset'] = 0;
- $dummy['avdataend'] = $dummy['filesize'];
+ fclose($RIFF_fp);
- $riff = new getid3_riff($RIFF_fp, $dummy);
- if (empty($dummy['error'])) {
- $ThisFileInfo['riff'] = $dummy['riff'];
+ $getid3_temp = new getID3();
+ $getid3_temp->openfile($RIFFtempfilename);
+ $getid3_riff = new getid3_riff($getid3_temp);
+ $getid3_riff->Analyze();
+
+ if (empty($getid3_temp->info['error'])) {
+ $info['riff'] = $getid3_temp->info['riff'];
} else {
- $ThisFileInfo['warning'][] = 'Error parsing RIFF portion of La file: '.implode($dummy['error']);
+ $this->warning('Error parsing RIFF portion of La file: '.implode($getid3_temp->info['error']));
}
- unset($dummy);
- fclose($RIFF_fp);
+ unset($getid3_temp, $getid3_riff);
}
unlink($RIFFtempfilename);
}
}
- // $ThisFileInfo['avdataoffset'] should be zero to begin with, but just in case it's not, include the addition anyway
- $ThisFileInfo['avdataend'] = $ThisFileInfo['avdataoffset'] + $ThisFileInfo['la']['footerstart'];
- $ThisFileInfo['avdataoffset'] = $ThisFileInfo['avdataoffset'] + $offset;
+ // $info['avdataoffset'] should be zero to begin with, but just in case it's not, include the addition anyway
+ $info['avdataend'] = $info['avdataoffset'] + $info['la']['footerstart'];
+ $info['avdataoffset'] = $info['avdataoffset'] + $offset;
- //$ThisFileInfo['la']['codec'] = RIFFwFormatTagLookup($ThisFileInfo['la']['raw']['format']);
- $ThisFileInfo['la']['compression_ratio'] = (float) (($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) / $ThisFileInfo['la']['uncompressed_size']);
- $ThisFileInfo['playtime_seconds'] = (float) ($ThisFileInfo['la']['samples'] / $ThisFileInfo['la']['sample_rate']) / $ThisFileInfo['la']['channels'];
- if ($ThisFileInfo['playtime_seconds'] == 0) {
- $ThisFileInfo['error'][] = 'Corrupt LA file: playtime_seconds == zero';
+ $info['la']['compression_ratio'] = (float) (($info['avdataend'] - $info['avdataoffset']) / $info['la']['uncompressed_size']);
+ $info['playtime_seconds'] = (float) ($info['la']['samples'] / $info['la']['sample_rate']) / $info['la']['channels'];
+ if ($info['playtime_seconds'] == 0) {
+ $this->error('Corrupt LA file: playtime_seconds == zero');
return false;
}
- $ThisFileInfo['audio']['bitrate'] = ($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) * 8 / $ThisFileInfo['playtime_seconds'];
- //$ThisFileInfo['audio']['codec'] = $ThisFileInfo['la']['codec'];
- $ThisFileInfo['audio']['bits_per_sample'] = $ThisFileInfo['la']['bits_per_sample'];
+ $info['audio']['bitrate'] = ($info['avdataend'] - $info['avdataoffset']) * 8 / $info['playtime_seconds'];
+ //$info['audio']['codec'] = $info['la']['codec'];
+ $info['audio']['bits_per_sample'] = $info['la']['bits_per_sample'];
break;
default:
if (substr($rawdata, $offset, 2) == 'LA') {
- $ThisFileInfo['error'][] = 'This version of getID3() (v'.GETID3_VERSION.') doesn\'t support LA version '.substr($rawdata, $offset + 2, 1).'.'.substr($rawdata, $offset + 3, 1).' which this appears to be - check http://getid3.sourceforge.net for updates.';
+ $this->error('This version of getID3() ['.$this->getid3->version().'] does not support LA version '.substr($rawdata, $offset + 2, 1).'.'.substr($rawdata, $offset + 3, 1).' which this appears to be - check http://getid3.sourceforge.net for updates.');
} else {
- $ThisFileInfo['error'][] = 'Not a LA (Lossless-Audio) file';
+ $this->error('Not a LA (Lossless-Audio) file');
}
return false;
- break;
}
- $ThisFileInfo['audio']['channels'] = $ThisFileInfo['la']['channels'];
- $ThisFileInfo['audio']['sample_rate'] = (int) $ThisFileInfo['la']['sample_rate'];
- $ThisFileInfo['audio']['encoder'] = 'LA v'.$ThisFileInfo['la']['version'];
+ $info['audio']['channels'] = $info['la']['channels'];
+ $info['audio']['sample_rate'] = (int) $info['la']['sample_rate'];
+ $info['audio']['encoder'] = 'LA v'.$info['la']['version'];
return true;
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.lpac.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.lpac.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.lpac.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio.lpac.php //
// module for analyzing LPAC Audio files //
@@ -13,113 +14,121 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, true);
-class getid3_lpac
+class getid3_lpac extends getid3_handler
{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- function getid3_lpac(&$fd, &$ThisFileInfo) {
-
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
- $LPACheader = fread($fd, 14);
- if (substr($LPACheader, 0, 4) != 'LPAC') {
- $ThisFileInfo['error'][] = 'Expected "LPAC" at offset '.$ThisFileInfo['avdataoffset'].', found "'.$StreamMarker.'"';
+ $this->fseek($info['avdataoffset']);
+ $LPACheader = $this->fread(14);
+ $StreamMarker = substr($LPACheader, 0, 4);
+ if ($StreamMarker != 'LPAC') {
+ $this->error('Expected "LPAC" at offset '.$info['avdataoffset'].', found "'.$StreamMarker.'"');
return false;
}
- $ThisFileInfo['avdataoffset'] += 14;
+ $info['avdataoffset'] += 14;
- $ThisFileInfo['fileformat'] = 'lpac';
- $ThisFileInfo['audio']['dataformat'] = 'lpac';
- $ThisFileInfo['audio']['lossless'] = true;
- $ThisFileInfo['audio']['bitrate_mode'] = 'vbr';
+ $info['fileformat'] = 'lpac';
+ $info['audio']['dataformat'] = 'lpac';
+ $info['audio']['lossless'] = true;
+ $info['audio']['bitrate_mode'] = 'vbr';
- $ThisFileInfo['lpac']['file_version'] = getid3_lib::BigEndian2Int(substr($LPACheader, 4, 1));
+ $info['lpac']['file_version'] = getid3_lib::BigEndian2Int(substr($LPACheader, 4, 1));
$flags['audio_type'] = getid3_lib::BigEndian2Int(substr($LPACheader, 5, 1));
- $ThisFileInfo['lpac']['total_samples']= getid3_lib::BigEndian2Int(substr($LPACheader, 6, 4));
+ $info['lpac']['total_samples']= getid3_lib::BigEndian2Int(substr($LPACheader, 6, 4));
$flags['parameters'] = getid3_lib::BigEndian2Int(substr($LPACheader, 10, 4));
- $ThisFileInfo['lpac']['flags']['is_wave'] = (bool) ($flags['audio_type'] & 0x40);
- $ThisFileInfo['lpac']['flags']['stereo'] = (bool) ($flags['audio_type'] & 0x04);
- $ThisFileInfo['lpac']['flags']['24_bit'] = (bool) ($flags['audio_type'] & 0x02);
- $ThisFileInfo['lpac']['flags']['16_bit'] = (bool) ($flags['audio_type'] & 0x01);
+ $info['lpac']['flags']['is_wave'] = (bool) ($flags['audio_type'] & 0x40);
+ $info['lpac']['flags']['stereo'] = (bool) ($flags['audio_type'] & 0x04);
+ $info['lpac']['flags']['24_bit'] = (bool) ($flags['audio_type'] & 0x02);
+ $info['lpac']['flags']['16_bit'] = (bool) ($flags['audio_type'] & 0x01);
- if ($ThisFileInfo['lpac']['flags']['24_bit'] && $ThisFileInfo['lpac']['flags']['16_bit']) {
- $ThisFileInfo['warning'][] = '24-bit and 16-bit flags cannot both be set';
+ if ($info['lpac']['flags']['24_bit'] && $info['lpac']['flags']['16_bit']) {
+ $this->warning('24-bit and 16-bit flags cannot both be set');
}
- $ThisFileInfo['lpac']['flags']['fast_compress'] = (bool) ($flags['parameters'] & 0x40000000);
- $ThisFileInfo['lpac']['flags']['random_access'] = (bool) ($flags['parameters'] & 0x08000000);
- $ThisFileInfo['lpac']['block_length'] = pow(2, (($flags['parameters'] & 0x07000000) >> 24)) * 256;
- $ThisFileInfo['lpac']['flags']['adaptive_prediction_order'] = (bool) ($flags['parameters'] & 0x00800000);
- $ThisFileInfo['lpac']['flags']['adaptive_quantization'] = (bool) ($flags['parameters'] & 0x00400000);
- $ThisFileInfo['lpac']['flags']['joint_stereo'] = (bool) ($flags['parameters'] & 0x00040000);
- $ThisFileInfo['lpac']['quantization'] = ($flags['parameters'] & 0x00001F00) >> 8;
- $ThisFileInfo['lpac']['max_prediction_order'] = ($flags['parameters'] & 0x0000003F);
+ $info['lpac']['flags']['fast_compress'] = (bool) ($flags['parameters'] & 0x40000000);
+ $info['lpac']['flags']['random_access'] = (bool) ($flags['parameters'] & 0x08000000);
+ $info['lpac']['block_length'] = pow(2, (($flags['parameters'] & 0x07000000) >> 24)) * 256;
+ $info['lpac']['flags']['adaptive_prediction_order'] = (bool) ($flags['parameters'] & 0x00800000);
+ $info['lpac']['flags']['adaptive_quantization'] = (bool) ($flags['parameters'] & 0x00400000);
+ $info['lpac']['flags']['joint_stereo'] = (bool) ($flags['parameters'] & 0x00040000);
+ $info['lpac']['quantization'] = ($flags['parameters'] & 0x00001F00) >> 8;
+ $info['lpac']['max_prediction_order'] = ($flags['parameters'] & 0x0000003F);
- if ($ThisFileInfo['lpac']['flags']['fast_compress'] && ($ThisFileInfo['lpac']['max_prediction_order'] != 3)) {
- $ThisFileInfo['warning'][] = 'max_prediction_order expected to be "3" if fast_compress is true, actual value is "'.$ThisFileInfo['lpac']['max_prediction_order'].'"';
+ if ($info['lpac']['flags']['fast_compress'] && ($info['lpac']['max_prediction_order'] != 3)) {
+ $this->warning('max_prediction_order expected to be "3" if fast_compress is true, actual value is "'.$info['lpac']['max_prediction_order'].'"');
}
- switch ($ThisFileInfo['lpac']['file_version']) {
+ switch ($info['lpac']['file_version']) {
case 6:
- if ($ThisFileInfo['lpac']['flags']['adaptive_quantization']) {
- $ThisFileInfo['warning'][] = 'adaptive_quantization expected to be false in LPAC file stucture v6, actually true';
+ if ($info['lpac']['flags']['adaptive_quantization']) {
+ $this->warning('adaptive_quantization expected to be false in LPAC file stucture v6, actually true');
}
- if ($ThisFileInfo['lpac']['quantization'] != 20) {
- $ThisFileInfo['warning'][] = 'Quantization expected to be 20 in LPAC file stucture v6, actually '.$ThisFileInfo['lpac']['flags']['Q'];
+ if ($info['lpac']['quantization'] != 20) {
+ $this->warning('Quantization expected to be 20 in LPAC file stucture v6, actually '.$info['lpac']['flags']['Q']);
}
break;
default:
- //$ThisFileInfo['warning'][] = 'This version of getID3() only supports LPAC file format version 6, this file is version '.$ThisFileInfo['lpac']['file_version'].' - please report to info at getid3.org';
+ //$this->warning('This version of getID3() ['.$this->getid3->version().'] only supports LPAC file format version 6, this file is version '.$info['lpac']['file_version'].' - please report to info at getid3.org');
break;
}
- $dummy = $ThisFileInfo;
- $riff = new getid3_riff($fd, $dummy);
- $ThisFileInfo['avdataoffset'] = $dummy['avdataoffset'];
- $ThisFileInfo['riff'] = $dummy['riff'];
- $ThisFileInfo['error'] = $dummy['error'];
- $ThisFileInfo['warning'] = $dummy['warning'];
- $ThisFileInfo['lpac']['comments']['comment'] = $dummy['comments'];
- $ThisFileInfo['audio']['sample_rate'] = $dummy['audio']['sample_rate'];
+ $getid3_temp = new getID3();
+ $getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
+ $getid3_temp->info = $info;
+ $getid3_riff = new getid3_riff($getid3_temp);
+ $getid3_riff->Analyze();
+ $info['avdataoffset'] = $getid3_temp->info['avdataoffset'];
+ $info['riff'] = $getid3_temp->info['riff'];
+ $info['error'] = $getid3_temp->info['error'];
+ $info['warning'] = $getid3_temp->info['warning'];
+ $info['lpac']['comments']['comment'] = $getid3_temp->info['comments'];
+ $info['audio']['sample_rate'] = $getid3_temp->info['audio']['sample_rate'];
+ unset($getid3_temp, $getid3_riff);
- $ThisFileInfo['audio']['channels'] = ($ThisFileInfo['lpac']['flags']['stereo'] ? 2 : 1);
+ $info['audio']['channels'] = ($info['lpac']['flags']['stereo'] ? 2 : 1);
- if ($ThisFileInfo['lpac']['flags']['24_bit']) {
- $ThisFileInfo['audio']['bits_per_sample'] = $ThisFileInfo['riff']['audio'][0]['bits_per_sample'];
- } elseif ($ThisFileInfo['lpac']['flags']['16_bit']) {
- $ThisFileInfo['audio']['bits_per_sample'] = 16;
+ if ($info['lpac']['flags']['24_bit']) {
+ $info['audio']['bits_per_sample'] = $info['riff']['audio'][0]['bits_per_sample'];
+ } elseif ($info['lpac']['flags']['16_bit']) {
+ $info['audio']['bits_per_sample'] = 16;
} else {
- $ThisFileInfo['audio']['bits_per_sample'] = 8;
+ $info['audio']['bits_per_sample'] = 8;
}
- if ($ThisFileInfo['lpac']['flags']['fast_compress']) {
+ if ($info['lpac']['flags']['fast_compress']) {
// fast
- $ThisFileInfo['audio']['encoder_options'] = '-1';
+ $info['audio']['encoder_options'] = '-1';
} else {
- switch ($ThisFileInfo['lpac']['max_prediction_order']) {
+ switch ($info['lpac']['max_prediction_order']) {
case 20: // simple
- $ThisFileInfo['audio']['encoder_options'] = '-2';
+ $info['audio']['encoder_options'] = '-2';
break;
case 30: // medium
- $ThisFileInfo['audio']['encoder_options'] = '-3';
+ $info['audio']['encoder_options'] = '-3';
break;
case 40: // high
- $ThisFileInfo['audio']['encoder_options'] = '-4';
+ $info['audio']['encoder_options'] = '-4';
break;
case 60: // extrahigh
- $ThisFileInfo['audio']['encoder_options'] = '-5';
+ $info['audio']['encoder_options'] = '-5';
break;
}
}
- $ThisFileInfo['playtime_seconds'] = $ThisFileInfo['lpac']['total_samples'] / $ThisFileInfo['audio']['sample_rate'];
- $ThisFileInfo['audio']['bitrate'] = (($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) * 8) / $ThisFileInfo['playtime_seconds'];
+ $info['playtime_seconds'] = $info['lpac']['total_samples'] / $info['audio']['sample_rate'];
+ $info['audio']['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
return true;
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.midi.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.midi.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.midi.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio.midi.php //
// module for Midi Audio files //
@@ -13,27 +14,41 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_midi
+define('GETID3_MIDI_MAGIC_MTHD', 'MThd'); // MIDI file header magic
+define('GETID3_MIDI_MAGIC_MTRK', 'MTrk'); // MIDI track header magic
+
+class getid3_midi extends getid3_handler
{
+ /**
+ * @var bool
+ */
+ public $scanwholefile = true;
- function getid3_midi(&$fd, &$ThisFileInfo, $scanwholefile=true) {
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
// shortcut
- $ThisFileInfo['midi']['raw'] = array();
- $thisfile_midi = &$ThisFileInfo['midi'];
+ $info['midi']['raw'] = array();
+ $thisfile_midi = &$info['midi'];
$thisfile_midi_raw = &$thisfile_midi['raw'];
- $ThisFileInfo['fileformat'] = 'midi';
- $ThisFileInfo['audio']['dataformat'] = 'midi';
+ $info['fileformat'] = 'midi';
+ $info['audio']['dataformat'] = 'midi';
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
- $MIDIdata = fread($fd, GETID3_FREAD_BUFFER_SIZE);
+ $this->fseek($info['avdataoffset']);
+ $MIDIdata = $this->fread($this->getid3->fread_buffer_size());
$offset = 0;
$MIDIheaderID = substr($MIDIdata, $offset, 4); // 'MThd'
- if ($MIDIheaderID != 'MThd') {
- $ThisFileInfo['error'][] = 'Expecting "MThd" at offset '.$ThisFileInfo['avdataoffset'].', found "'.$MIDIheaderID.'"';
- unset($ThisFileInfo['fileformat']);
+ if ($MIDIheaderID != GETID3_MIDI_MAGIC_MTHD) {
+ $this->error('Expecting "'.getid3_lib::PrintHexBytes(GETID3_MIDI_MAGIC_MTHD).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($MIDIheaderID).'"');
+ unset($info['fileformat']);
return false;
}
$offset += 4;
@@ -47,35 +62,43 @@
$offset += 2;
for ($i = 0; $i < $thisfile_midi_raw['tracks']; $i++) {
- if ((strlen($MIDIdata) - $offset) < 8) {
- $MIDIdata .= fread($fd, GETID3_FREAD_BUFFER_SIZE);
+ while ((strlen($MIDIdata) - $offset) < 8) {
+ if ($buffer = $this->fread($this->getid3->fread_buffer_size())) {
+ $MIDIdata .= $buffer;
+ } else {
+ $this->warning('only processed '.($i - 1).' of '.$thisfile_midi_raw['tracks'].' tracks');
+ $this->error('Unabled to read more file data at '.$this->ftell().' (trying to seek to : '.$offset.'), was expecting at least 8 more bytes');
+ return false;
+ }
}
$trackID = substr($MIDIdata, $offset, 4);
$offset += 4;
- if ($trackID == 'MTrk') {
+ if ($trackID == GETID3_MIDI_MAGIC_MTRK) {
$tracksize = getid3_lib::BigEndian2Int(substr($MIDIdata, $offset, 4));
$offset += 4;
- // $thisfile_midi['tracks'][$i]['size'] = $tracksize;
+ //$thisfile_midi['tracks'][$i]['size'] = $tracksize;
$trackdataarray[$i] = substr($MIDIdata, $offset, $tracksize);
$offset += $tracksize;
} else {
- $ThisFileInfo['error'][] = 'Expecting "MTrk" at '.$offset.', found '.$trackID.' instead';
+ $this->error('Expecting "'.getid3_lib::PrintHexBytes(GETID3_MIDI_MAGIC_MTRK).'" at '.($offset - 4).', found "'.getid3_lib::PrintHexBytes($trackID).'" instead');
return false;
}
}
if (!isset($trackdataarray) || !is_array($trackdataarray)) {
- $ThisFileInfo['error'][] = 'Cannot find MIDI track information';
+ $this->error('Cannot find MIDI track information');
unset($thisfile_midi);
- unset($ThisFileInfo['fileformat']);
+ unset($info['fileformat']);
return false;
}
- if ($scanwholefile) { // this can take quite a long time, so have the option to bypass it if speed is very important
+ if ($this->scanwholefile) { // this can take quite a long time, so have the option to bypass it if speed is very important
$thisfile_midi['totalticks'] = 0;
- $ThisFileInfo['playtime_seconds'] = 0;
+ $info['playtime_seconds'] = 0;
$CurrentMicroSecondsPerBeat = 500000; // 120 beats per minute; 60,000,000 microseconds per minute -> 500,000 microseconds per beat
$CurrentBeatsPerMinute = 120; // 120 beats per minute; 60,000,000 microseconds per minute -> 500,000 microseconds per beat
+ $MicroSecondsPerQuarterNoteAfter = array ();
+ $MIDIevents = array();
foreach ($trackdataarray as $tracknumber => $trackdata) {
@@ -214,7 +237,7 @@
case 0x51: // Tempo: microseconds / quarter note
$CurrentMicroSecondsPerBeat = getid3_lib::BigEndian2Int(substr($METAeventData, 0, $METAeventLength));
if ($CurrentMicroSecondsPerBeat == 0) {
- $ThisFileInfo['error'][] = 'Corrupt MIDI file: CurrentMicroSecondsPerBeat == zero';
+ $this->error('Corrupt MIDI file: CurrentMicroSecondsPerBeat == zero');
return false;
}
$thisfile_midi_raw['events'][$tracknumber][$CumulativeDeltaTime]['us_qnote'] = $CurrentMicroSecondsPerBeat;
@@ -224,9 +247,9 @@
break;
case 0x58: // Time signature
- $timesig_numerator = getid3_lib::BigEndian2Int($METAeventData{0});
- $timesig_denominator = pow(2, getid3_lib::BigEndian2Int($METAeventData{1})); // $02 -> x/4, $03 -> x/8, etc
- $timesig_32inqnote = getid3_lib::BigEndian2Int($METAeventData{2}); // number of 32nd notes to the quarter note
+ $timesig_numerator = getid3_lib::BigEndian2Int($METAeventData[0]);
+ $timesig_denominator = pow(2, getid3_lib::BigEndian2Int($METAeventData[1])); // $02 -> x/4, $03 -> x/8, etc
+ $timesig_32inqnote = getid3_lib::BigEndian2Int($METAeventData[2]); // number of 32nd notes to the quarter note
//$thisfile_midi_raw['events'][$tracknumber][$eventid]['timesig_32inqnote'] = $timesig_32inqnote;
//$thisfile_midi_raw['events'][$tracknumber][$eventid]['timesig_numerator'] = $timesig_numerator;
//$thisfile_midi_raw['events'][$tracknumber][$eventid]['timesig_denominator'] = $timesig_denominator;
@@ -235,13 +258,13 @@
break;
case 0x59: // Keysignature
- $keysig_sharpsflats = getid3_lib::BigEndian2Int($METAeventData{0});
+ $keysig_sharpsflats = getid3_lib::BigEndian2Int($METAeventData[0]);
if ($keysig_sharpsflats & 0x80) {
// (-7 -> 7 flats, 0 ->key of C, 7 -> 7 sharps)
$keysig_sharpsflats -= 256;
}
- $keysig_majorminor = getid3_lib::BigEndian2Int($METAeventData{1}); // 0 -> major, 1 -> minor
+ $keysig_majorminor = getid3_lib::BigEndian2Int($METAeventData[1]); // 0 -> major, 1 -> minor
$keysigs = array(-7=>'Cb', -6=>'Gb', -5=>'Db', -4=>'Ab', -3=>'Eb', -2=>'Bb', -1=>'F', 0=>'C', 1=>'G', 2=>'D', 3=>'A', 4=>'E', 5=>'B', 6=>'F#', 7=>'C#');
//$thisfile_midi_raw['events'][$tracknumber][$eventid]['keysig_sharps'] = (($keysig_sharpsflats > 0) ? abs($keysig_sharpsflats) : 0);
//$thisfile_midi_raw['events'][$tracknumber][$eventid]['keysig_flats'] = (($keysig_sharpsflats < 0) ? abs($keysig_sharpsflats) : 0);
@@ -257,13 +280,13 @@
break;
default:
- $ThisFileInfo['warning'][] = 'Unhandled META Event Command: '.$METAeventCommand;
+ $this->warning('Unhandled META Event Command: '.$METAeventCommand);
break;
}
} else {
- $ThisFileInfo['warning'][] = 'Unhandled MIDI Event ID: '.$MIDIevents[$tracknumber][$eventid]['eventid'].' + Channel ID: '.$MIDIevents[$tracknumber][$eventid]['channel'];
+ $this->warning('Unhandled MIDI Event ID: '.$MIDIevents[$tracknumber][$eventid]['eventid'].' + Channel ID: '.$MIDIevents[$tracknumber][$eventid]['channel']);
}
}
@@ -271,12 +294,10 @@
$thisfile_midi['totalticks'] = max($thisfile_midi['totalticks'], $CumulativeDeltaTime);
}
}
- $previoustickoffset = null;
+ $previoustickoffset = null;
+ $prevmicrosecondsperbeat = null;
- if ($MicroSecondsPerQuarterNoteAfter != null)
- {
- ksort($MicroSecondsPerQuarterNoteAfter);
- }
+ ksort($MicroSecondsPerQuarterNoteAfter);
foreach ($MicroSecondsPerQuarterNoteAfter as $tickoffset => $microsecondsperbeat) {
if (is_null($previoustickoffset)) {
$prevmicrosecondsperbeat = $microsecondsperbeat;
@@ -286,11 +307,11 @@
if ($thisfile_midi['totalticks'] > $tickoffset) {
if ($thisfile_midi_raw['ticksperqnote'] == 0) {
- $ThisFileInfo['error'][] = 'Corrupt MIDI file: ticksperqnote == zero';
+ $this->error('Corrupt MIDI file: ticksperqnote == zero');
return false;
}
- $ThisFileInfo['playtime_seconds'] += (($tickoffset - $previoustickoffset) / $thisfile_midi_raw['ticksperqnote']) * ($prevmicrosecondsperbeat / 1000000);
+ $info['playtime_seconds'] += (($tickoffset - $previoustickoffset) / $thisfile_midi_raw['ticksperqnote']) * ($prevmicrosecondsperbeat / 1000000);
$prevmicrosecondsperbeat = $microsecondsperbeat;
$previoustickoffset = $tickoffset;
@@ -299,17 +320,18 @@
if ($thisfile_midi['totalticks'] > $previoustickoffset) {
if ($thisfile_midi_raw['ticksperqnote'] == 0) {
- $ThisFileInfo['error'][] = 'Corrupt MIDI file: ticksperqnote == zero';
+ $this->error('Corrupt MIDI file: ticksperqnote == zero');
return false;
}
- $ThisFileInfo['playtime_seconds'] += (($thisfile_midi['totalticks'] - $previoustickoffset) / $thisfile_midi_raw['ticksperqnote']) * ($microsecondsperbeat / 1000000);
+ $info['playtime_seconds'] += (($thisfile_midi['totalticks'] - $previoustickoffset) / $thisfile_midi_raw['ticksperqnote']) * ($prevmicrosecondsperbeat / 1000000);
}
}
- if ($ThisFileInfo['playtime_seconds'] > 0) {
- $ThisFileInfo['bitrate'] = (($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) * 8) / $ThisFileInfo['playtime_seconds'];
+
+ if (!empty($info['playtime_seconds'])) {
+ $info['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
}
if (!empty($thisfile_midi['lyrics'])) {
@@ -319,7 +341,12 @@
return true;
}
- function GeneralMIDIinstrumentLookup($instrumentid) {
+ /**
+ * @param int $instrumentid
+ *
+ * @return string
+ */
+ public function GeneralMIDIinstrumentLookup($instrumentid) {
$begin = __LINE__;
@@ -459,7 +486,12 @@
return getid3_lib::EmbeddedLookup($instrumentid, $begin, __LINE__, __FILE__, 'GeneralMIDIinstrument');
}
- function GeneralMIDIpercussionLookup($instrumentid) {
+ /**
+ * @param int $instrumentid
+ *
+ * @return string
+ */
+ public function GeneralMIDIpercussionLookup($instrumentid) {
$begin = __LINE__;
@@ -518,6 +550,3 @@
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.mod.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.mod.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.mod.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio.mod.php //
// module for analyzing MOD Audio files //
@@ -13,89 +14,102 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_mod
+class getid3_mod extends getid3_handler
{
-
- // new combined constructor
- function getid3_mod(&$fd, &$ThisFileInfo, $option) {
-
- if ($option === 'mod') {
- $this->getMODheaderFilepointer($fd, $ThisFileInfo);
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
+ $this->fseek($info['avdataoffset']);
+ $fileheader = $this->fread(1088);
+ if (preg_match('#^IMPM#', $fileheader)) {
+ return $this->getITheaderFilepointer();
+ } elseif (preg_match('#^Extended Module#', $fileheader)) {
+ return $this->getXMheaderFilepointer();
+ } elseif (preg_match('#^.{44}SCRM#', $fileheader)) {
+ return $this->getS3MheaderFilepointer();
+ } elseif (preg_match('#^.{1080}(M\\.K\\.|M!K!|FLT4|FLT8|[5-9]CHN|[1-3][0-9]CH)#', $fileheader)) {
+ return $this->getMODheaderFilepointer();
}
- elseif ($option === 'xm') {
- $this->getXMheaderFilepointer($fd, $ThisFileInfo);
- }
- elseif ($option === 'it') {
- $this->getITheaderFilepointer($fd, $ThisFileInfo);
- }
- elseif ($option === 's3m') {
- $this->getS3MheaderFilepointer($fd, $ThisFileInfo);
- }
+ $this->error('This is not a known type of MOD file');
+ return false;
}
-
- function getMODheaderFilepointer(&$fd, &$ThisFileInfo) {
-
- fseek($fd, $ThisFileInfo['avdataoffset'] + 1080);
- $FormatID = fread($fd, 4);
- if (!ereg('^(M.K.|[5-9]CHN|[1-3][0-9]CH)$', $FormatID)) {
- $ThisFileInfo['error'][] = 'This is not a known type of MOD file';
+ /**
+ * @return bool
+ */
+ public function getMODheaderFilepointer() {
+ $info = &$this->getid3->info;
+ $this->fseek($info['avdataoffset'] + 1080);
+ $FormatID = $this->fread(4);
+ if (!preg_match('#^(M.K.|[5-9]CHN|[1-3][0-9]CH)$#', $FormatID)) {
+ $this->error('This is not a known type of MOD file');
return false;
}
- $ThisFileInfo['fileformat'] = 'mod';
+ $info['fileformat'] = 'mod';
- $ThisFileInfo['error'][] = 'MOD parsing not enabled in this version of getID3()';
+ $this->error('MOD parsing not enabled in this version of getID3() ['.$this->getid3->version().']');
return false;
}
- function getXMheaderFilepointer(&$fd, &$ThisFileInfo) {
-
- fseek($fd, $ThisFileInfo['avdataoffset']);
- $FormatID = fread($fd, 15);
- if (!ereg('^Extended Module$', $FormatID)) {
- $ThisFileInfo['error'][] = 'This is not a known type of XM-MOD file';
+ /**
+ * @return bool
+ */
+ public function getXMheaderFilepointer() {
+ $info = &$this->getid3->info;
+ $this->fseek($info['avdataoffset']);
+ $FormatID = $this->fread(15);
+ if (!preg_match('#^Extended Module$#', $FormatID)) {
+ $this->error('This is not a known type of XM-MOD file');
return false;
}
- $ThisFileInfo['fileformat'] = 'xm';
+ $info['fileformat'] = 'xm';
- $ThisFileInfo['error'][] = 'XM-MOD parsing not enabled in this version of getID3()';
+ $this->error('XM-MOD parsing not enabled in this version of getID3() ['.$this->getid3->version().']');
return false;
}
- function getS3MheaderFilepointer(&$fd, &$ThisFileInfo) {
-
- fseek($fd, $ThisFileInfo['avdataoffset'] + 44);
- $FormatID = fread($fd, 4);
- if (!ereg('^SCRM$', $FormatID)) {
- $ThisFileInfo['error'][] = 'This is not a ScreamTracker MOD file';
+ /**
+ * @return bool
+ */
+ public function getS3MheaderFilepointer() {
+ $info = &$this->getid3->info;
+ $this->fseek($info['avdataoffset'] + 44);
+ $FormatID = $this->fread(4);
+ if (!preg_match('#^SCRM$#', $FormatID)) {
+ $this->error('This is not a ScreamTracker MOD file');
return false;
}
- $ThisFileInfo['fileformat'] = 's3m';
+ $info['fileformat'] = 's3m';
- $ThisFileInfo['error'][] = 'ScreamTracker parsing not enabled in this version of getID3()';
+ $this->error('ScreamTracker parsing not enabled in this version of getID3() ['.$this->getid3->version().']');
return false;
}
- function getITheaderFilepointer(&$fd, &$ThisFileInfo) {
-
- fseek($fd, $ThisFileInfo['avdataoffset']);
- $FormatID = fread($fd, 4);
- if (!ereg('^IMPM$', $FormatID)) {
- $ThisFileInfo['error'][] = 'This is not an ImpulseTracker MOD file';
+ /**
+ * @return bool
+ */
+ public function getITheaderFilepointer() {
+ $info = &$this->getid3->info;
+ $this->fseek($info['avdataoffset']);
+ $FormatID = $this->fread(4);
+ if (!preg_match('#^IMPM$#', $FormatID)) {
+ $this->error('This is not an ImpulseTracker MOD file');
return false;
}
- $ThisFileInfo['fileformat'] = 'it';
+ $info['fileformat'] = 'it';
- $ThisFileInfo['error'][] = 'ImpulseTracker parsing not enabled in this version of getID3()';
+ $this->error('ImpulseTracker parsing not enabled in this version of getID3() ['.$this->getid3->version().']');
return false;
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.monkey.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.monkey.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.monkey.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio.monkey.php //
// module for analyzing Monkey's Audio files //
@@ -13,30 +14,38 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_monkey
+class getid3_monkey extends getid3_handler
{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- function getid3_monkey(&$fd, &$ThisFileInfo) {
- // based loosely on code from TMonkey by Jurgen Faul <jfaulØgmx*de>
+ // based loosely on code from TMonkey by Jurgen Faul <jfaulØgmx*de>
// http://jfaul.de/atl or http://j-faul.virtualave.net/atl/atl.html
- $ThisFileInfo['fileformat'] = 'mac';
- $ThisFileInfo['audio']['dataformat'] = 'mac';
- $ThisFileInfo['audio']['bitrate_mode'] = 'vbr';
- $ThisFileInfo['audio']['lossless'] = true;
+ $info['fileformat'] = 'mac';
+ $info['audio']['dataformat'] = 'mac';
+ $info['audio']['bitrate_mode'] = 'vbr';
+ $info['audio']['lossless'] = true;
- $ThisFileInfo['monkeys_audio']['raw'] = array();
- $thisfile_monkeysaudio = &$ThisFileInfo['monkeys_audio'];
+ $info['monkeys_audio']['raw'] = array();
+ $thisfile_monkeysaudio = &$info['monkeys_audio'];
$thisfile_monkeysaudio_raw = &$thisfile_monkeysaudio['raw'];
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
- $MACheaderData = fread($fd, 74);
+ $this->fseek($info['avdataoffset']);
+ $MACheaderData = $this->fread(74);
$thisfile_monkeysaudio_raw['magic'] = substr($MACheaderData, 0, 4);
- if ($thisfile_monkeysaudio_raw['magic'] != 'MAC ') {
- $ThisFileInfo['error'][] = 'Expecting "MAC" at offset '.$ThisFileInfo['avdataoffset'].', found "'.$thisfile_monkeysaudio_raw['magic'].'"';
- unset($ThisFileInfo['fileformat']);
+ $magic = 'MAC ';
+ if ($thisfile_monkeysaudio_raw['magic'] != $magic) {
+ $this->error('Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($thisfile_monkeysaudio_raw['magic']).'"');
+ unset($info['fileformat']);
return false;
}
$thisfile_monkeysaudio_raw['nVersion'] = getid3_lib::LittleEndian2Int(substr($MACheaderData, 4, 2)); // appears to be uint32 in 3.98+
@@ -105,13 +114,13 @@
}
$thisfile_monkeysaudio['bits_per_sample'] = ($thisfile_monkeysaudio['flags']['24-bit'] ? 24 : ($thisfile_monkeysaudio['flags']['8-bit'] ? 8 : 16));
$thisfile_monkeysaudio['channels'] = $thisfile_monkeysaudio_raw['nChannels'];
- $ThisFileInfo['audio']['channels'] = $thisfile_monkeysaudio['channels'];
+ $info['audio']['channels'] = $thisfile_monkeysaudio['channels'];
$thisfile_monkeysaudio['sample_rate'] = $thisfile_monkeysaudio_raw['nSampleRate'];
if ($thisfile_monkeysaudio['sample_rate'] == 0) {
- $ThisFileInfo['error'][] = 'Corrupt MAC file: frequency == zero';
+ $this->error('Corrupt MAC file: frequency == zero');
return false;
}
- $ThisFileInfo['audio']['sample_rate'] = $thisfile_monkeysaudio['sample_rate'];
+ $info['audio']['sample_rate'] = $thisfile_monkeysaudio['sample_rate'];
if ($thisfile_monkeysaudio['flags']['peak_level']) {
$thisfile_monkeysaudio['peak_level'] = $thisfile_monkeysaudio_raw['nPeakLevel'];
$thisfile_monkeysaudio['peak_ratio'] = $thisfile_monkeysaudio['peak_level'] / pow(2, $thisfile_monkeysaudio['bits_per_sample'] - 1);
@@ -123,43 +132,43 @@
}
$thisfile_monkeysaudio['playtime'] = $thisfile_monkeysaudio['samples'] / $thisfile_monkeysaudio['sample_rate'];
if ($thisfile_monkeysaudio['playtime'] == 0) {
- $ThisFileInfo['error'][] = 'Corrupt MAC file: playtime == zero';
+ $this->error('Corrupt MAC file: playtime == zero');
return false;
}
- $ThisFileInfo['playtime_seconds'] = $thisfile_monkeysaudio['playtime'];
- $thisfile_monkeysaudio['compressed_size'] = $ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset'];
+ $info['playtime_seconds'] = $thisfile_monkeysaudio['playtime'];
+ $thisfile_monkeysaudio['compressed_size'] = $info['avdataend'] - $info['avdataoffset'];
$thisfile_monkeysaudio['uncompressed_size'] = $thisfile_monkeysaudio['samples'] * $thisfile_monkeysaudio['channels'] * ($thisfile_monkeysaudio['bits_per_sample'] / 8);
if ($thisfile_monkeysaudio['uncompressed_size'] == 0) {
- $ThisFileInfo['error'][] = 'Corrupt MAC file: uncompressed_size == zero';
+ $this->error('Corrupt MAC file: uncompressed_size == zero');
return false;
}
$thisfile_monkeysaudio['compression_ratio'] = $thisfile_monkeysaudio['compressed_size'] / ($thisfile_monkeysaudio['uncompressed_size'] + $thisfile_monkeysaudio_raw['nHeaderDataBytes']);
$thisfile_monkeysaudio['bitrate'] = (($thisfile_monkeysaudio['samples'] * $thisfile_monkeysaudio['channels'] * $thisfile_monkeysaudio['bits_per_sample']) / $thisfile_monkeysaudio['playtime']) * $thisfile_monkeysaudio['compression_ratio'];
- $ThisFileInfo['audio']['bitrate'] = $thisfile_monkeysaudio['bitrate'];
+ $info['audio']['bitrate'] = $thisfile_monkeysaudio['bitrate'];
// add size of MAC header to avdataoffset
if ($thisfile_monkeysaudio_raw['nVersion'] >= 3980) {
- $ThisFileInfo['avdataoffset'] += $thisfile_monkeysaudio_raw['nDescriptorBytes'];
- $ThisFileInfo['avdataoffset'] += $thisfile_monkeysaudio_raw['nHeaderBytes'];
- $ThisFileInfo['avdataoffset'] += $thisfile_monkeysaudio_raw['nSeekTableBytes'];
- $ThisFileInfo['avdataoffset'] += $thisfile_monkeysaudio_raw['nHeaderDataBytes'];
+ $info['avdataoffset'] += $thisfile_monkeysaudio_raw['nDescriptorBytes'];
+ $info['avdataoffset'] += $thisfile_monkeysaudio_raw['nHeaderBytes'];
+ $info['avdataoffset'] += $thisfile_monkeysaudio_raw['nSeekTableBytes'];
+ $info['avdataoffset'] += $thisfile_monkeysaudio_raw['nHeaderDataBytes'];
- $ThisFileInfo['avdataend'] -= $thisfile_monkeysaudio_raw['nTerminatingDataBytes'];
+ $info['avdataend'] -= $thisfile_monkeysaudio_raw['nTerminatingDataBytes'];
} else {
- $ThisFileInfo['avdataoffset'] += $offset;
+ $info['avdataoffset'] += $offset;
}
if ($thisfile_monkeysaudio_raw['nVersion'] >= 3980) {
if ($thisfile_monkeysaudio_raw['cFileMD5'] === str_repeat("\x00", 16)) {
- //$ThisFileInfo['warning'][] = 'cFileMD5 is null';
+ //$this->warning('cFileMD5 is null');
} else {
- $ThisFileInfo['md5_data_source'] = '';
+ $info['md5_data_source'] = '';
$md5 = $thisfile_monkeysaudio_raw['cFileMD5'];
for ($i = 0; $i < strlen($md5); $i++) {
- $ThisFileInfo['md5_data_source'] .= str_pad(dechex(ord($md5{$i})), 2, '00', STR_PAD_LEFT);
+ $info['md5_data_source'] .= str_pad(dechex(ord($md5[$i])), 2, '00', STR_PAD_LEFT);
}
- if (!preg_match('/^[0-9a-f]{32}$/', $ThisFileInfo['md5_data_source'])) {
- unset($ThisFileInfo['md5_data_source']);
+ if (!preg_match('/^[0-9a-f]{32}$/', $info['md5_data_source'])) {
+ unset($info['md5_data_source']);
}
}
}
@@ -166,14 +175,19 @@
- $ThisFileInfo['audio']['bits_per_sample'] = $thisfile_monkeysaudio['bits_per_sample'];
- $ThisFileInfo['audio']['encoder'] = 'MAC v'.number_format($thisfile_monkeysaudio['version'], 2);
- $ThisFileInfo['audio']['encoder_options'] = ucfirst($thisfile_monkeysaudio['compression']).' compression';
+ $info['audio']['bits_per_sample'] = $thisfile_monkeysaudio['bits_per_sample'];
+ $info['audio']['encoder'] = 'MAC v'.number_format($thisfile_monkeysaudio['version'], 2);
+ $info['audio']['encoder_options'] = ucfirst($thisfile_monkeysaudio['compression']).' compression';
return true;
}
- function MonkeyCompressionLevelNameLookup($compressionlevel) {
+ /**
+ * @param int $compressionlevel
+ *
+ * @return string
+ */
+ public function MonkeyCompressionLevelNameLookup($compressionlevel) {
static $MonkeyCompressionLevelNameLookup = array(
0 => 'unknown',
1000 => 'fast',
@@ -185,7 +199,13 @@
return (isset($MonkeyCompressionLevelNameLookup[$compressionlevel]) ? $MonkeyCompressionLevelNameLookup[$compressionlevel] : 'invalid');
}
- function MonkeySamplesPerFrame($versionid, $compressionlevel) {
+ /**
+ * @param int $versionid
+ * @param int $compressionlevel
+ *
+ * @return int
+ */
+ public function MonkeySamplesPerFrame($versionid, $compressionlevel) {
if ($versionid >= 3950) {
return 73728 * 4;
} elseif ($versionid >= 3900) {
@@ -198,5 +218,3 @@
}
}
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.mp3.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.mp3.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.mp3.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio.mp3.php //
// module for analyzing MP3 files //
@@ -13,6 +14,9 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
// number of frames to scan to determine if MPEG-audio sequence is valid
// Lower this number to 5-20 for faster scanning
@@ -21,65 +25,78 @@
define('GETID3_MP3_VALID_CHECK_FRAMES', 35);
-class getid3_mp3
+class getid3_mp3 extends getid3_handler
{
+ /**
+ * Forces getID3() to scan the file byte-by-byte and log all the valid audio frame headers - extremely slow,
+ * unrecommended, but may provide data from otherwise-unusable files.
+ *
+ * @var bool
+ */
+ public $allow_bruteforce = false;
- var $allow_bruteforce = false; // forces getID3() to scan the file byte-by-byte and log all the valid audio frame headers - extremely slow, unrecommended, but may provide data from otherwise-unusuable files
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- function getid3_mp3(&$fd, &$ThisFileInfo) {
+ $initialOffset = $info['avdataoffset'];
- if (!$this->getOnlyMPEGaudioInfo($fd, $ThisFileInfo, $ThisFileInfo['avdataoffset'])) {
+ if (!$this->getOnlyMPEGaudioInfo($info['avdataoffset'])) {
if ($this->allow_bruteforce) {
- $ThisFileInfo['error'][] = 'Rescanning file in BruteForce mode';
- $this->getOnlyMPEGaudioInfoBruteForce($fd, $ThisFileInfo);
+ $this->error('Rescanning file in BruteForce mode');
+ $this->getOnlyMPEGaudioInfoBruteForce();
}
}
- if (isset($ThisFileInfo['mpeg']['audio']['bitrate_mode'])) {
- $ThisFileInfo['audio']['bitrate_mode'] = strtolower($ThisFileInfo['mpeg']['audio']['bitrate_mode']);
+ if (isset($info['mpeg']['audio']['bitrate_mode'])) {
+ $info['audio']['bitrate_mode'] = strtolower($info['mpeg']['audio']['bitrate_mode']);
}
- if (((isset($ThisFileInfo['id3v2']['headerlength']) && ($ThisFileInfo['avdataoffset'] > $ThisFileInfo['id3v2']['headerlength'])) || (!isset($ThisFileInfo['id3v2']) && ($ThisFileInfo['avdataoffset'] > 0)))) {
+ if (((isset($info['id3v2']['headerlength']) && ($info['avdataoffset'] > $info['id3v2']['headerlength'])) || (!isset($info['id3v2']) && ($info['avdataoffset'] > 0) && ($info['avdataoffset'] != $initialOffset)))) {
$synchoffsetwarning = 'Unknown data before synch ';
- if (isset($ThisFileInfo['id3v2']['headerlength'])) {
- $synchoffsetwarning .= '(ID3v2 header ends at '.$ThisFileInfo['id3v2']['headerlength'].', then '.($ThisFileInfo['avdataoffset'] - $ThisFileInfo['id3v2']['headerlength']).' bytes garbage, ';
+ if (isset($info['id3v2']['headerlength'])) {
+ $synchoffsetwarning .= '(ID3v2 header ends at '.$info['id3v2']['headerlength'].', then '.($info['avdataoffset'] - $info['id3v2']['headerlength']).' bytes garbage, ';
+ } elseif ($initialOffset > 0) {
+ $synchoffsetwarning .= '(should be at '.$initialOffset.', ';
} else {
$synchoffsetwarning .= '(should be at beginning of file, ';
}
- $synchoffsetwarning .= 'synch detected at '.$ThisFileInfo['avdataoffset'].')';
- if ($ThisFileInfo['audio']['bitrate_mode'] == 'cbr') {
+ $synchoffsetwarning .= 'synch detected at '.$info['avdataoffset'].')';
+ if (isset($info['audio']['bitrate_mode']) && ($info['audio']['bitrate_mode'] == 'cbr')) {
- if (!empty($ThisFileInfo['id3v2']['headerlength']) && (($ThisFileInfo['avdataoffset'] - $ThisFileInfo['id3v2']['headerlength']) == $ThisFileInfo['mpeg']['audio']['framelength'])) {
+ if (!empty($info['id3v2']['headerlength']) && (($info['avdataoffset'] - $info['id3v2']['headerlength']) == $info['mpeg']['audio']['framelength'])) {
$synchoffsetwarning .= '. This is a known problem with some versions of LAME (3.90-3.92) DLL in CBR mode.';
- $ThisFileInfo['audio']['codec'] = 'LAME';
+ $info['audio']['codec'] = 'LAME';
$CurrentDataLAMEversionString = 'LAME3.';
- } elseif (empty($ThisFileInfo['id3v2']['headerlength']) && ($ThisFileInfo['avdataoffset'] == $ThisFileInfo['mpeg']['audio']['framelength'])) {
+ } elseif (empty($info['id3v2']['headerlength']) && ($info['avdataoffset'] == $info['mpeg']['audio']['framelength'])) {
$synchoffsetwarning .= '. This is a known problem with some versions of LAME (3.90 - 3.92) DLL in CBR mode.';
- $ThisFileInfo['audio']['codec'] = 'LAME';
+ $info['audio']['codec'] = 'LAME';
$CurrentDataLAMEversionString = 'LAME3.';
}
}
- $ThisFileInfo['warning'][] = $synchoffsetwarning;
+ $this->warning($synchoffsetwarning);
}
- if (isset($ThisFileInfo['mpeg']['audio']['LAME'])) {
- $ThisFileInfo['audio']['codec'] = 'LAME';
- if (!empty($ThisFileInfo['mpeg']['audio']['LAME']['long_version'])) {
- $ThisFileInfo['audio']['encoder'] = rtrim($ThisFileInfo['mpeg']['audio']['LAME']['long_version'], "\x00");
- } elseif (!empty($ThisFileInfo['mpeg']['audio']['LAME']['short_version'])) {
- $ThisFileInfo['audio']['encoder'] = rtrim($ThisFileInfo['mpeg']['audio']['LAME']['short_version'], "\x00");
+ if (isset($info['mpeg']['audio']['LAME'])) {
+ $info['audio']['codec'] = 'LAME';
+ if (!empty($info['mpeg']['audio']['LAME']['long_version'])) {
+ $info['audio']['encoder'] = rtrim($info['mpeg']['audio']['LAME']['long_version'], "\x00");
+ } elseif (!empty($info['mpeg']['audio']['LAME']['short_version'])) {
+ $info['audio']['encoder'] = rtrim($info['mpeg']['audio']['LAME']['short_version'], "\x00");
}
}
- $CurrentDataLAMEversionString = (!empty($CurrentDataLAMEversionString) ? $CurrentDataLAMEversionString : @$ThisFileInfo['audio']['encoder']);
+ $CurrentDataLAMEversionString = (!empty($CurrentDataLAMEversionString) ? $CurrentDataLAMEversionString : (isset($info['audio']['encoder']) ? $info['audio']['encoder'] : ''));
if (!empty($CurrentDataLAMEversionString) && (substr($CurrentDataLAMEversionString, 0, 6) == 'LAME3.') && !preg_match('[0-9\)]', substr($CurrentDataLAMEversionString, -1))) {
// a version number of LAME that does not end with a number like "LAME3.92"
// or with a closing parenthesis like "LAME3.88 (alpha)"
@@ -89,9 +106,9 @@
$PossiblyLongerLAMEversion_FrameLength = 1441;
// Not sure what version of LAME this is - look in padding of last frame for longer version string
- $PossibleLAMEversionStringOffset = $ThisFileInfo['avdataend'] - $PossiblyLongerLAMEversion_FrameLength;
- fseek($fd, $PossibleLAMEversionStringOffset);
- $PossiblyLongerLAMEversion_Data = fread($fd, $PossiblyLongerLAMEversion_FrameLength);
+ $PossibleLAMEversionStringOffset = $info['avdataend'] - $PossiblyLongerLAMEversion_FrameLength;
+ $this->fseek($PossibleLAMEversionStringOffset);
+ $PossiblyLongerLAMEversion_Data = $this->fread($PossiblyLongerLAMEversion_FrameLength);
switch (substr($CurrentDataLAMEversionString, -1)) {
case 'a':
case 'b':
@@ -103,62 +120,71 @@
if (($PossiblyLongerLAMEversion_String = strstr($PossiblyLongerLAMEversion_Data, $CurrentDataLAMEversionString)) !== false) {
if (substr($PossiblyLongerLAMEversion_String, 0, strlen($CurrentDataLAMEversionString)) == $CurrentDataLAMEversionString) {
$PossiblyLongerLAMEversion_NewString = substr($PossiblyLongerLAMEversion_String, 0, strspn($PossiblyLongerLAMEversion_String, 'LAME0123456789., (abcdefghijklmnopqrstuvwxyzJFSOND)')); //"LAME3.90.3" "LAME3.87 (beta 1, Sep 27 2000)" "LAME3.88 (beta)"
- if (strlen($PossiblyLongerLAMEversion_NewString) > strlen(@$ThisFileInfo['audio']['encoder'])) {
- $ThisFileInfo['audio']['encoder'] = $PossiblyLongerLAMEversion_NewString;
+ if (empty($info['audio']['encoder']) || (strlen($PossiblyLongerLAMEversion_NewString) > strlen($info['audio']['encoder']))) {
+ $info['audio']['encoder'] = $PossiblyLongerLAMEversion_NewString;
}
}
}
}
- if (!empty($ThisFileInfo['audio']['encoder'])) {
- $ThisFileInfo['audio']['encoder'] = rtrim($ThisFileInfo['audio']['encoder'], "\x00 ");
+ if (!empty($info['audio']['encoder'])) {
+ $info['audio']['encoder'] = rtrim($info['audio']['encoder'], "\x00 ");
}
- switch (@$ThisFileInfo['mpeg']['audio']['layer']) {
+ switch (isset($info['mpeg']['audio']['layer']) ? $info['mpeg']['audio']['layer'] : '') {
case 1:
case 2:
- $ThisFileInfo['audio']['dataformat'] = 'mp'.$ThisFileInfo['mpeg']['audio']['layer'];
+ $info['audio']['dataformat'] = 'mp'.$info['mpeg']['audio']['layer'];
break;
}
- if ($ThisFileInfo['fileformat'] == 'mp3') {
- switch ($ThisFileInfo['audio']['dataformat']) {
+ if (isset($info['fileformat']) && ($info['fileformat'] == 'mp3')) {
+ switch ($info['audio']['dataformat']) {
case 'mp1':
case 'mp2':
case 'mp3':
- $ThisFileInfo['fileformat'] = $ThisFileInfo['audio']['dataformat'];
+ $info['fileformat'] = $info['audio']['dataformat'];
break;
default:
- $ThisFileInfo['warning'][] = 'Expecting [audio][dataformat] to be mp1/mp2/mp3 when fileformat == mp3, [audio][dataformat] actually "'.$ThisFileInfo['audio']['dataformat'].'"';
+ $this->warning('Expecting [audio][dataformat] to be mp1/mp2/mp3 when fileformat == mp3, [audio][dataformat] actually "'.$info['audio']['dataformat'].'"');
break;
}
}
- if (empty($ThisFileInfo['fileformat'])) {
- unset($ThisFileInfo['fileformat']);
- unset($ThisFileInfo['audio']['bitrate_mode']);
- unset($ThisFileInfo['avdataoffset']);
- unset($ThisFileInfo['avdataend']);
+ if (empty($info['fileformat'])) {
+ unset($info['fileformat']);
+ unset($info['audio']['bitrate_mode']);
+ unset($info['avdataoffset']);
+ unset($info['avdataend']);
return false;
}
- $ThisFileInfo['mime_type'] = 'audio/mpeg';
- $ThisFileInfo['audio']['lossless'] = false;
+ $info['mime_type'] = 'audio/mpeg';
+ $info['audio']['lossless'] = false;
// Calculate playtime
- if (!isset($ThisFileInfo['playtime_seconds']) && isset($ThisFileInfo['audio']['bitrate']) && ($ThisFileInfo['audio']['bitrate'] > 0)) {
- $ThisFileInfo['playtime_seconds'] = ($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) * 8 / $ThisFileInfo['audio']['bitrate'];
+ if (!isset($info['playtime_seconds']) && isset($info['audio']['bitrate']) && ($info['audio']['bitrate'] > 0)) {
+ // https://github.com/JamesHeinrich/getID3/issues/161
+ // VBR header frame contains ~0.026s of silent audio data, but is not actually part of the original encoding and should be ignored
+ $xingVBRheaderFrameLength = ((isset($info['mpeg']['audio']['VBR_frames']) && isset($info['mpeg']['audio']['framelength'])) ? $info['mpeg']['audio']['framelength'] : 0);
+
+ $info['playtime_seconds'] = ($info['avdataend'] - $info['avdataoffset'] - $xingVBRheaderFrameLength) * 8 / $info['audio']['bitrate'];
}
- $ThisFileInfo['audio']['encoder_options'] = $this->GuessEncoderOptions($ThisFileInfo);
+ $info['audio']['encoder_options'] = $this->GuessEncoderOptions();
return true;
}
-
- function GuessEncoderOptions(&$ThisFileInfo) {
+ /**
+ * @return string
+ */
+ public function GuessEncoderOptions() {
// shortcuts
- if (!empty($ThisFileInfo['mpeg']['audio'])) {
- $thisfile_mpeg_audio = &$ThisFileInfo['mpeg']['audio'];
+ $info = &$this->getid3->info;
+ $thisfile_mpeg_audio = array();
+ $thisfile_mpeg_audio_lame = array();
+ if (!empty($info['mpeg']['audio'])) {
+ $thisfile_mpeg_audio = &$info['mpeg']['audio'];
if (!empty($thisfile_mpeg_audio['LAME'])) {
$thisfile_mpeg_audio_lame = &$thisfile_mpeg_audio['LAME'];
}
@@ -167,11 +193,11 @@
$encoder_options = '';
static $NamedPresetBitrates = array(16, 24, 40, 56, 112, 128, 160, 192, 256);
- if ((@$thisfile_mpeg_audio['VBR_method'] == 'Fraunhofer') && !empty($thisfile_mpeg_audio['VBR_quality'])) {
+ if (isset($thisfile_mpeg_audio['VBR_method']) && ($thisfile_mpeg_audio['VBR_method'] == 'Fraunhofer') && !empty($thisfile_mpeg_audio['VBR_quality'])) {
$encoder_options = 'VBR q'.$thisfile_mpeg_audio['VBR_quality'];
- } elseif (!empty($thisfile_mpeg_audio_lame['preset_used']) && (!in_array($thisfile_mpeg_audio_lame['preset_used_id'], $NamedPresetBitrates))) {
+ } elseif (!empty($thisfile_mpeg_audio_lame['preset_used']) && isset($thisfile_mpeg_audio_lame['preset_used_id']) && (!in_array($thisfile_mpeg_audio_lame['preset_used_id'], $NamedPresetBitrates))) {
$encoder_options = $thisfile_mpeg_audio_lame['preset_used'];
@@ -242,7 +268,7 @@
$encoder_options = $KnownEncoderValues['**'][$thisfile_mpeg_audio_lame['vbr_quality']][$thisfile_mpeg_audio_lame['raw']['vbr_method']][$thisfile_mpeg_audio_lame['raw']['noise_shaping']][$thisfile_mpeg_audio_lame['raw']['stereo_mode']][$thisfile_mpeg_audio_lame['ath_type']][$thisfile_mpeg_audio_lame['lowpass_frequency']];
- } elseif ($ThisFileInfo['audio']['bitrate_mode'] == 'vbr') {
+ } elseif ($info['audio']['bitrate_mode'] == 'vbr') {
// http://gabriel.mp3-tech.org/mp3infotag.html
// int Quality = (100 - 10 * gfp->VBR_q - gfp->quality)h
@@ -252,13 +278,13 @@
$LAME_q_value = 100 - $thisfile_mpeg_audio_lame['vbr_quality'] - ($LAME_V_value * 10);
$encoder_options = '-V'.$LAME_V_value.' -q'.$LAME_q_value;
- } elseif ($ThisFileInfo['audio']['bitrate_mode'] == 'cbr') {
+ } elseif ($info['audio']['bitrate_mode'] == 'cbr') {
- $encoder_options = strtoupper($ThisFileInfo['audio']['bitrate_mode']).ceil($ThisFileInfo['audio']['bitrate'] / 1000);
+ $encoder_options = strtoupper($info['audio']['bitrate_mode']).ceil($info['audio']['bitrate'] / 1000);
} else {
- $encoder_options = strtoupper($ThisFileInfo['audio']['bitrate_mode']);
+ $encoder_options = strtoupper($info['audio']['bitrate_mode']);
}
@@ -266,12 +292,12 @@
$encoder_options = 'ABR'.$thisfile_mpeg_audio_lame['bitrate_abr'];
- } elseif (!empty($ThisFileInfo['audio']['bitrate'])) {
+ } elseif (!empty($info['audio']['bitrate'])) {
- if ($ThisFileInfo['audio']['bitrate_mode'] == 'cbr') {
- $encoder_options = strtoupper($ThisFileInfo['audio']['bitrate_mode']).ceil($ThisFileInfo['audio']['bitrate'] / 1000);
+ if ($info['audio']['bitrate_mode'] == 'cbr') {
+ $encoder_options = strtoupper($info['audio']['bitrate_mode']).ceil($info['audio']['bitrate'] / 1000);
} else {
- $encoder_options = strtoupper($ThisFileInfo['audio']['bitrate_mode']);
+ $encoder_options = strtoupper($info['audio']['bitrate_mode']);
}
}
@@ -279,7 +305,7 @@
$encoder_options .= ' -b'.$thisfile_mpeg_audio_lame['bitrate_min'];
}
- if (@$thisfile_mpeg_audio_lame['encoding_flags']['nogap_prev'] || @$thisfile_mpeg_audio_lame['encoding_flags']['nogap_next']) {
+ if (!empty($thisfile_mpeg_audio_lame['encoding_flags']['nogap_prev']) || !empty($thisfile_mpeg_audio_lame['encoding_flags']['nogap_next'])) {
$encoder_options .= ' --nogap';
}
@@ -389,17 +415,24 @@
}
}
}
- if (empty($encoder_options) && !empty($ThisFileInfo['audio']['bitrate']) && !empty($ThisFileInfo['audio']['bitrate_mode'])) {
- //$encoder_options = strtoupper($ThisFileInfo['audio']['bitrate_mode']).ceil($ThisFileInfo['audio']['bitrate'] / 1000);
- $encoder_options = strtoupper($ThisFileInfo['audio']['bitrate_mode']);
+ if (empty($encoder_options) && !empty($info['audio']['bitrate']) && !empty($info['audio']['bitrate_mode'])) {
+ //$encoder_options = strtoupper($info['audio']['bitrate_mode']).ceil($info['audio']['bitrate'] / 1000);
+ $encoder_options = strtoupper($info['audio']['bitrate_mode']);
}
return $encoder_options;
}
-
- function decodeMPEGaudioHeader($fd, $offset, &$ThisFileInfo, $recursivesearch=true, $ScanAsCBR=false, $FastMPEGheaderScan=false) {
-
+ /**
+ * @param int $offset
+ * @param array $info
+ * @param bool $recursivesearch
+ * @param bool $ScanAsCBR
+ * @param bool $FastMPEGheaderScan
+ *
+ * @return bool
+ */
+ public function decodeMPEGaudioHeader($offset, &$info, $recursivesearch=true, $ScanAsCBR=false, $FastMPEGheaderScan=false) {
static $MPEGaudioVersionLookup;
static $MPEGaudioLayerLookup;
static $MPEGaudioBitrateLookup;
@@ -408,22 +441,21 @@
static $MPEGaudioModeExtensionLookup;
static $MPEGaudioEmphasisLookup;
if (empty($MPEGaudioVersionLookup)) {
- $MPEGaudioVersionLookup = getid3_mp3::MPEGaudioVersionArray();
- $MPEGaudioLayerLookup = getid3_mp3::MPEGaudioLayerArray();
- $MPEGaudioBitrateLookup = getid3_mp3::MPEGaudioBitrateArray();
- $MPEGaudioFrequencyLookup = getid3_mp3::MPEGaudioFrequencyArray();
- $MPEGaudioChannelModeLookup = getid3_mp3::MPEGaudioChannelModeArray();
- $MPEGaudioModeExtensionLookup = getid3_mp3::MPEGaudioModeExtensionArray();
- $MPEGaudioEmphasisLookup = getid3_mp3::MPEGaudioEmphasisArray();
+ $MPEGaudioVersionLookup = self::MPEGaudioVersionArray();
+ $MPEGaudioLayerLookup = self::MPEGaudioLayerArray();
+ $MPEGaudioBitrateLookup = self::MPEGaudioBitrateArray();
+ $MPEGaudioFrequencyLookup = self::MPEGaudioFrequencyArray();
+ $MPEGaudioChannelModeLookup = self::MPEGaudioChannelModeArray();
+ $MPEGaudioModeExtensionLookup = self::MPEGaudioModeExtensionArray();
+ $MPEGaudioEmphasisLookup = self::MPEGaudioEmphasisArray();
}
- if ($offset >= $ThisFileInfo['avdataend']) {
- $ThisFileInfo['error'][] = 'end of file encounter looking for MPEG synch';
+ if ($this->fseek($offset) != 0) {
+ $this->error('decodeMPEGaudioHeader() failed to seek to next offset at '.$offset);
return false;
}
- fseek($fd, $offset, SEEK_SET);
- //$headerstring = fread($fd, 1441); // worst-case max length = 32kHz @ 320kbps layer 3 = 1441 bytes/frame
- $headerstring = fread($fd, 226); // LAME header at offset 36 + 190 bytes of Xing/LAME data
+ //$headerstring = $this->fread(1441); // worst-case max length = 32kHz @ 320kbps layer 3 = 1441 bytes/frame
+ $headerstring = $this->fread(226); // LAME header at offset 36 + 190 bytes of Xing/LAME data
// MP3 audio frame structure:
// $aa $aa $aa $aa [$bb $bb] $cc...
@@ -432,39 +464,35 @@
// and $cc... is the audio data
$head4 = substr($headerstring, 0, 4);
-
+ $head4_key = getid3_lib::PrintHexBytes($head4, true, false, false);
static $MPEGaudioHeaderDecodeCache = array();
- if (isset($MPEGaudioHeaderDecodeCache[$head4])) {
- $MPEGheaderRawArray = $MPEGaudioHeaderDecodeCache[$head4];
+ if (isset($MPEGaudioHeaderDecodeCache[$head4_key])) {
+ $MPEGheaderRawArray = $MPEGaudioHeaderDecodeCache[$head4_key];
} else {
- $MPEGheaderRawArray = getid3_mp3::MPEGaudioHeaderDecode($head4);
- $MPEGaudioHeaderDecodeCache[$head4] = $MPEGheaderRawArray;
+ $MPEGheaderRawArray = self::MPEGaudioHeaderDecode($head4);
+ $MPEGaudioHeaderDecodeCache[$head4_key] = $MPEGheaderRawArray;
}
static $MPEGaudioHeaderValidCache = array();
-
- // Not in cache
- if (!isset($MPEGaudioHeaderValidCache[$head4])) {
- //$MPEGaudioHeaderValidCache[$head4] = getid3_mp3::MPEGaudioHeaderValid($MPEGheaderRawArray, false, true); // allow badly-formatted freeformat (from LAME 3.90 - 3.93.1)
- $MPEGaudioHeaderValidCache[$head4] = getid3_mp3::MPEGaudioHeaderValid($MPEGheaderRawArray, false, false);
+ if (!isset($MPEGaudioHeaderValidCache[$head4_key])) { // Not in cache
+ //$MPEGaudioHeaderValidCache[$head4_key] = self::MPEGaudioHeaderValid($MPEGheaderRawArray, false, true); // allow badly-formatted freeformat (from LAME 3.90 - 3.93.1)
+ $MPEGaudioHeaderValidCache[$head4_key] = self::MPEGaudioHeaderValid($MPEGheaderRawArray, false, false);
}
// shortcut
- if (!isset($ThisFileInfo['mpeg']['audio'])) {
- $ThisFileInfo['mpeg']['audio'] = array();
+ if (!isset($info['mpeg']['audio'])) {
+ $info['mpeg']['audio'] = array();
}
- $thisfile_mpeg_audio = &$ThisFileInfo['mpeg']['audio'];
+ $thisfile_mpeg_audio = &$info['mpeg']['audio'];
-
- if ($MPEGaudioHeaderValidCache[$head4]) {
+ if ($MPEGaudioHeaderValidCache[$head4_key]) {
$thisfile_mpeg_audio['raw'] = $MPEGheaderRawArray;
} else {
- $ThisFileInfo['error'][] = 'Invalid MPEG audio header at offset '.$offset;
+ $this->error('Invalid MPEG audio header ('.getid3_lib::PrintHexBytes($head4).') at offset '.$offset);
return false;
}
if (!$FastMPEGheaderScan) {
-
$thisfile_mpeg_audio['version'] = $MPEGaudioVersionLookup[$thisfile_mpeg_audio['raw']['version']];
$thisfile_mpeg_audio['layer'] = $MPEGaudioLayerLookup[$thisfile_mpeg_audio['raw']['layer']];
@@ -478,24 +506,23 @@
$thisfile_mpeg_audio['original'] = (bool) $thisfile_mpeg_audio['raw']['original'];
$thisfile_mpeg_audio['emphasis'] = $MPEGaudioEmphasisLookup[$thisfile_mpeg_audio['raw']['emphasis']];
- $ThisFileInfo['audio']['channels'] = $thisfile_mpeg_audio['channels'];
- $ThisFileInfo['audio']['sample_rate'] = $thisfile_mpeg_audio['sample_rate'];
+ $info['audio']['channels'] = $thisfile_mpeg_audio['channels'];
+ $info['audio']['sample_rate'] = $thisfile_mpeg_audio['sample_rate'];
if ($thisfile_mpeg_audio['protection']) {
$thisfile_mpeg_audio['crc'] = getid3_lib::BigEndian2Int(substr($headerstring, 4, 2));
}
-
}
if ($thisfile_mpeg_audio['raw']['bitrate'] == 15) {
// http://www.hydrogenaudio.org/?act=ST&f=16&t=9682&st=0
- $ThisFileInfo['warning'][] = 'Invalid bitrate index (15), this is a known bug in free-format MP3s encoded by LAME v3.90 - 3.93.1';
+ $this->warning('Invalid bitrate index (15), this is a known bug in free-format MP3s encoded by LAME v3.90 - 3.93.1');
$thisfile_mpeg_audio['raw']['bitrate'] = 0;
}
$thisfile_mpeg_audio['padding'] = (bool) $thisfile_mpeg_audio['raw']['padding'];
$thisfile_mpeg_audio['bitrate'] = $MPEGaudioBitrateLookup[$thisfile_mpeg_audio['version']][$thisfile_mpeg_audio['layer']][$thisfile_mpeg_audio['raw']['bitrate']];
- if (($thisfile_mpeg_audio['bitrate'] == 'free') && ($offset == $ThisFileInfo['avdataoffset'])) {
+ if (($thisfile_mpeg_audio['bitrate'] == 'free') && ($offset == $info['avdataoffset'])) {
// only skip multiple frame check if free-format bitstream found at beginning of file
// otherwise is quite possibly simply corrupted data
$recursivesearch = false;
@@ -504,7 +531,7 @@
// For Layer 2 there are some combinations of bitrate and mode which are not allowed.
if (!$FastMPEGheaderScan && ($thisfile_mpeg_audio['layer'] == '2')) {
- $ThisFileInfo['audio']['dataformat'] = 'mp2';
+ $info['audio']['dataformat'] = 'mp2';
switch ($thisfile_mpeg_audio['channelmode']) {
case 'mono':
@@ -511,7 +538,7 @@
if (($thisfile_mpeg_audio['bitrate'] == 'free') || ($thisfile_mpeg_audio['bitrate'] <= 192000)) {
// these are ok
} else {
- $ThisFileInfo['error'][] = $thisfile_mpeg_audio['bitrate'].'kbps not allowed in Layer 2, '.$thisfile_mpeg_audio['channelmode'].'.';
+ $this->error($thisfile_mpeg_audio['bitrate'].'kbps not allowed in Layer 2, '.$thisfile_mpeg_audio['channelmode'].'.');
return false;
}
break;
@@ -522,7 +549,7 @@
if (($thisfile_mpeg_audio['bitrate'] == 'free') || ($thisfile_mpeg_audio['bitrate'] == 64000) || ($thisfile_mpeg_audio['bitrate'] >= 96000)) {
// these are ok
} else {
- $ThisFileInfo['error'][] = intval(round($thisfile_mpeg_audio['bitrate'] / 1000)).'kbps not allowed in Layer 2, '.$thisfile_mpeg_audio['channelmode'].'.';
+ $this->error(intval(round($thisfile_mpeg_audio['bitrate'] / 1000)).'kbps not allowed in Layer 2, '.$thisfile_mpeg_audio['channelmode'].'.');
return false;
}
break;
@@ -532,19 +559,19 @@
}
- if ($ThisFileInfo['audio']['sample_rate'] > 0) {
- $thisfile_mpeg_audio['framelength'] = getid3_mp3::MPEGaudioFrameLength($thisfile_mpeg_audio['bitrate'], $thisfile_mpeg_audio['version'], $thisfile_mpeg_audio['layer'], (int) $thisfile_mpeg_audio['padding'], $ThisFileInfo['audio']['sample_rate']);
+ if ($info['audio']['sample_rate'] > 0) {
+ $thisfile_mpeg_audio['framelength'] = self::MPEGaudioFrameLength($thisfile_mpeg_audio['bitrate'], $thisfile_mpeg_audio['version'], $thisfile_mpeg_audio['layer'], (int) $thisfile_mpeg_audio['padding'], $info['audio']['sample_rate']);
}
$nextframetestoffset = $offset + 1;
if ($thisfile_mpeg_audio['bitrate'] != 'free') {
- $ThisFileInfo['audio']['bitrate'] = $thisfile_mpeg_audio['bitrate'];
+ $info['audio']['bitrate'] = $thisfile_mpeg_audio['bitrate'];
if (isset($thisfile_mpeg_audio['framelength'])) {
$nextframetestoffset = $offset + $thisfile_mpeg_audio['framelength'];
} else {
- $ThisFileInfo['error'][] = 'Frame at offset('.$offset.') is has an invalid frame length.';
+ $this->error('Frame at offset('.$offset.') is has an invalid frame length.');
return false;
}
@@ -561,7 +588,7 @@
$thisfile_mpeg_audio['bitrate_mode'] = 'vbr';
$thisfile_mpeg_audio['VBR_method'] = 'Fraunhofer';
- $ThisFileInfo['audio']['codec'] = 'Fraunhofer';
+ $info['audio']['codec'] = 'Fraunhofer';
$SideInfoData = substr($headerstring, 4 + 2, 32);
@@ -594,7 +621,7 @@
// Xing VBR header is hardcoded 'Xing' at a offset 0x0D (13), 0x15 (21) or 0x24 (36)
// depending on MPEG layer and number of channels
- $VBRidOffset = getid3_mp3::XingVBRidOffset($thisfile_mpeg_audio['version'], $thisfile_mpeg_audio['channelmode']);
+ $VBRidOffset = self::XingVBRidOffset($thisfile_mpeg_audio['version'], $thisfile_mpeg_audio['channelmode']);
$SideInfoData = substr($headerstring, 4 + 2, $VBRidOffset - 4);
if ((substr($headerstring, $VBRidOffset, strlen('Xing')) == 'Xing') || (substr($headerstring, $VBRidOffset, strlen('Info')) == 'Info')) {
@@ -647,18 +674,29 @@
}
//if (($thisfile_mpeg_audio['bitrate'] == 'free') && !empty($thisfile_mpeg_audio['VBR_frames']) && !empty($thisfile_mpeg_audio['VBR_bytes'])) {
- if (!empty($thisfile_mpeg_audio['VBR_frames']) && !empty($thisfile_mpeg_audio['VBR_bytes'])) {
+ //if (!empty($thisfile_mpeg_audio['VBR_frames']) && !empty($thisfile_mpeg_audio['VBR_bytes'])) {
+ if (!empty($thisfile_mpeg_audio['VBR_frames'])) {
+ $used_filesize = 0;
+ if (!empty($thisfile_mpeg_audio['VBR_bytes'])) {
+ $used_filesize = $thisfile_mpeg_audio['VBR_bytes'];
+ } elseif (!empty($info['filesize'])) {
+ $used_filesize = $info['filesize'];
+ $used_filesize -= (isset($info['id3v2']['headerlength']) ? intval($info['id3v2']['headerlength']) : 0);
+ $used_filesize -= (isset($info['id3v1']) ? 128 : 0);
+ $used_filesize -= (isset($info['tag_offset_end']) ? $info['tag_offset_end'] - $info['tag_offset_start'] : 0);
+ $this->warning('MP3.Xing header missing VBR_bytes, assuming MPEG audio portion of file is '.number_format($used_filesize).' bytes');
+ }
- $framelengthfloat = $thisfile_mpeg_audio['VBR_bytes'] / $thisfile_mpeg_audio['VBR_frames'];
+ $framelengthfloat = $used_filesize / $thisfile_mpeg_audio['VBR_frames'];
if ($thisfile_mpeg_audio['layer'] == '1') {
// BitRate = (((FrameLengthInBytes / 4) - Padding) * SampleRate) / 12
- //$ThisFileInfo['audio']['bitrate'] = ((($framelengthfloat / 4) - intval($thisfile_mpeg_audio['padding'])) * $thisfile_mpeg_audio['sample_rate']) / 12;
- $ThisFileInfo['audio']['bitrate'] = ($framelengthfloat / 4) * $thisfile_mpeg_audio['sample_rate'] * (2 / $ThisFileInfo['audio']['channels']) / 12;
+ //$info['audio']['bitrate'] = ((($framelengthfloat / 4) - intval($thisfile_mpeg_audio['padding'])) * $thisfile_mpeg_audio['sample_rate']) / 12;
+ $info['audio']['bitrate'] = ($framelengthfloat / 4) * $thisfile_mpeg_audio['sample_rate'] * (2 / $info['audio']['channels']) / 12;
} else {
// Bitrate = ((FrameLengthInBytes - Padding) * SampleRate) / 144
- //$ThisFileInfo['audio']['bitrate'] = (($framelengthfloat - intval($thisfile_mpeg_audio['padding'])) * $thisfile_mpeg_audio['sample_rate']) / 144;
- $ThisFileInfo['audio']['bitrate'] = $framelengthfloat * $thisfile_mpeg_audio['sample_rate'] * (2 / $ThisFileInfo['audio']['channels']) / 144;
+ //$info['audio']['bitrate'] = (($framelengthfloat - intval($thisfile_mpeg_audio['padding'])) * $thisfile_mpeg_audio['sample_rate']) / 144;
+ $info['audio']['bitrate'] = $framelengthfloat * $thisfile_mpeg_audio['sample_rate'] * (2 / $info['audio']['channels']) / 144;
}
$thisfile_mpeg_audio['framelength'] = floor($framelengthfloat);
}
@@ -666,7 +704,7 @@
if ($thisfile_mpeg_audio['xing_flags']['toc']) {
$LAMEtocData = substr($headerstring, $VBRidOffset + 16, 100);
for ($i = 0; $i < 100; $i++) {
- $thisfile_mpeg_audio['toc'][$i] = ord($LAMEtocData{$i});
+ $thisfile_mpeg_audio['toc'][$i] = ord($LAMEtocData[$i]);
}
}
if ($thisfile_mpeg_audio['xing_flags']['vbr_scale']) {
@@ -684,8 +722,17 @@
$thisfile_mpeg_audio_lame['long_version'] = substr($headerstring, $VBRidOffset + 120, 20);
$thisfile_mpeg_audio_lame['short_version'] = substr($thisfile_mpeg_audio_lame['long_version'], 0, 9);
+ $thisfile_mpeg_audio_lame['numeric_version'] = str_replace('LAME', '', $thisfile_mpeg_audio_lame['short_version']);
+ if (preg_match('#^LAME([0-9\\.a-z]+)#', $thisfile_mpeg_audio_lame['long_version'], $matches)) {
+ $thisfile_mpeg_audio_lame['short_version'] = $matches[0];
+ $thisfile_mpeg_audio_lame['numeric_version'] = $matches[1];
+ }
+ foreach (explode('.', $thisfile_mpeg_audio_lame['numeric_version']) as $key => $number) {
+ $thisfile_mpeg_audio_lame['integer_version'][$key] = intval($number);
+ }
- if ($thisfile_mpeg_audio_lame['short_version'] >= 'LAME3.90') {
+ //if ($thisfile_mpeg_audio_lame['short_version'] >= 'LAME3.90') {
+ if ((($thisfile_mpeg_audio_lame['integer_version'][0] * 1000) + $thisfile_mpeg_audio_lame['integer_version'][1]) >= 3090) { // cannot use string version compare, may have "LAME3.90" or "LAME3.100" -- see https://github.com/JamesHeinrich/getID3/issues/207
// extra 11 chars are not part of version string when LAMEtag present
unset($thisfile_mpeg_audio_lame['long_version']);
@@ -718,10 +765,10 @@
// byte $A5 Info Tag revision + VBR method
$LAMEtagRevisionVBRmethod = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xA5, 1));
- $thisfile_mpeg_audio_lame['tag_revision'] = ($LAMEtagRevisionVBRmethod & 0xF0) >> 4;
+ $thisfile_mpeg_audio_lame['tag_revision'] = ($LAMEtagRevisionVBRmethod & 0xF0) >> 4;
$thisfile_mpeg_audio_lame_raw['vbr_method'] = $LAMEtagRevisionVBRmethod & 0x0F;
- $thisfile_mpeg_audio_lame['vbr_method'] = getid3_mp3::LAMEvbrMethodLookup($thisfile_mpeg_audio_lame_raw['vbr_method']);
- $thisfile_mpeg_audio['bitrate_mode'] = substr($thisfile_mpeg_audio_lame['vbr_method'], 0, 3); // usually either 'cbr' or 'vbr', but truncates 'vbr-old / vbr-rh' to 'vbr'
+ $thisfile_mpeg_audio_lame['vbr_method'] = self::LAMEvbrMethodLookup($thisfile_mpeg_audio_lame_raw['vbr_method']);
+ $thisfile_mpeg_audio['bitrate_mode'] = substr($thisfile_mpeg_audio_lame['vbr_method'], 0, 3); // usually either 'cbr' or 'vbr', but truncates 'vbr-old / vbr-rh' to 'vbr'
// byte $A6 Lowpass filter value
$thisfile_mpeg_audio_lame['lowpass_frequency'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xA6, 1)) * 100;
@@ -759,10 +806,10 @@
$thisfile_mpeg_audio_lame_RGAD_track['gain_db'] = getid3_lib::RGADadjustmentLookup($thisfile_mpeg_audio_lame_RGAD_track['raw']['gain_adjust'], $thisfile_mpeg_audio_lame_RGAD_track['raw']['sign_bit']);
if (!empty($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'])) {
- $ThisFileInfo['replay_gain']['track']['peak'] = $thisfile_mpeg_audio_lame_RGAD['peak_amplitude'];
+ $info['replay_gain']['track']['peak'] = $thisfile_mpeg_audio_lame_RGAD['peak_amplitude'];
}
- $ThisFileInfo['replay_gain']['track']['originator'] = $thisfile_mpeg_audio_lame_RGAD_track['originator'];
- $ThisFileInfo['replay_gain']['track']['adjustment'] = $thisfile_mpeg_audio_lame_RGAD_track['gain_db'];
+ $info['replay_gain']['track']['originator'] = $thisfile_mpeg_audio_lame_RGAD_track['originator'];
+ $info['replay_gain']['track']['adjustment'] = $thisfile_mpeg_audio_lame_RGAD_track['gain_db'];
} else {
unset($thisfile_mpeg_audio_lame_RGAD['track']);
}
@@ -777,10 +824,10 @@
$thisfile_mpeg_audio_lame_RGAD_album['gain_db'] = getid3_lib::RGADadjustmentLookup($thisfile_mpeg_audio_lame_RGAD_album['raw']['gain_adjust'], $thisfile_mpeg_audio_lame_RGAD_album['raw']['sign_bit']);
if (!empty($thisfile_mpeg_audio_lame_RGAD['peak_amplitude'])) {
- $ThisFileInfo['replay_gain']['album']['peak'] = $thisfile_mpeg_audio_lame_RGAD['peak_amplitude'];
+ $info['replay_gain']['album']['peak'] = $thisfile_mpeg_audio_lame_RGAD['peak_amplitude'];
}
- $ThisFileInfo['replay_gain']['album']['originator'] = $thisfile_mpeg_audio_lame_RGAD_album['originator'];
- $ThisFileInfo['replay_gain']['album']['adjustment'] = $thisfile_mpeg_audio_lame_RGAD_album['gain_db'];
+ $info['replay_gain']['album']['originator'] = $thisfile_mpeg_audio_lame_RGAD_album['originator'];
+ $info['replay_gain']['album']['adjustment'] = $thisfile_mpeg_audio_lame_RGAD_album['gain_db'];
} else {
unset($thisfile_mpeg_audio_lame_RGAD['album']);
}
@@ -819,9 +866,9 @@
$thisfile_mpeg_audio_lame_raw['not_optimal_quality'] = ($MiscByte & 0x20) >> 5;
$thisfile_mpeg_audio_lame_raw['source_sample_freq'] = ($MiscByte & 0xC0) >> 6;
$thisfile_mpeg_audio_lame['noise_shaping'] = $thisfile_mpeg_audio_lame_raw['noise_shaping'];
- $thisfile_mpeg_audio_lame['stereo_mode'] = getid3_mp3::LAMEmiscStereoModeLookup($thisfile_mpeg_audio_lame_raw['stereo_mode']);
+ $thisfile_mpeg_audio_lame['stereo_mode'] = self::LAMEmiscStereoModeLookup($thisfile_mpeg_audio_lame_raw['stereo_mode']);
$thisfile_mpeg_audio_lame['not_optimal_quality'] = (bool) $thisfile_mpeg_audio_lame_raw['not_optimal_quality'];
- $thisfile_mpeg_audio_lame['source_sample_freq'] = getid3_mp3::LAMEmiscSourceSampleFrequencyLookup($thisfile_mpeg_audio_lame_raw['source_sample_freq']);
+ $thisfile_mpeg_audio_lame['source_sample_freq'] = self::LAMEmiscSourceSampleFrequencyLookup($thisfile_mpeg_audio_lame_raw['source_sample_freq']);
// byte $B5 MP3 Gain
$thisfile_mpeg_audio_lame_raw['mp3_gain'] = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB5, 1), false, true);
@@ -832,11 +879,11 @@
$PresetSurroundBytes = getid3_lib::BigEndian2Int(substr($headerstring, $LAMEtagOffsetContant + 0xB6, 2));
// Reserved = ($PresetSurroundBytes & 0xC000);
$thisfile_mpeg_audio_lame_raw['surround_info'] = ($PresetSurroundBytes & 0x3800);
- $thisfile_mpeg_audio_lame['surround_info'] = getid3_mp3::LAMEsurroundInfoLookup($thisfile_mpeg_audio_lame_raw['surround_info']);
+ $thisfile_mpeg_audio_lame['surround_info'] = self::LAMEsurroundInfoLookup($thisfile_mpeg_audio_lame_raw['surround_info']);
$thisfile_mpeg_audio_lame['preset_used_id'] = ($PresetSurroundBytes & 0x07FF);
- $thisfile_mpeg_audio_lame['preset_used'] = getid3_mp3::LAMEpresetUsedLookup($thisfile_mpeg_audio_lame);
+ $thisfile_mpeg_audio_lame['preset_used'] = self::LAMEpresetUsedLookup($thisfile_mpeg_audio_lame);
if (!empty($thisfile_mpeg_audio_lame['preset_used_id']) && empty($thisfile_mpeg_audio_lame['preset_used'])) {
- $ThisFileInfo['warning'][] = 'Unknown LAME preset used ('.$thisfile_mpeg_audio_lame['preset_used_id'].') - please report to info at getid3.org';
+ $this->warning('Unknown LAME preset used ('.$thisfile_mpeg_audio_lame['preset_used_id'].') - please report to info at getid3.org');
}
if (($thisfile_mpeg_audio_lame['short_version'] == 'LAME3.90.') && !empty($thisfile_mpeg_audio_lame['preset_used_id'])) {
// this may change if 3.90.4 ever comes out
@@ -858,8 +905,8 @@
if ($thisfile_mpeg_audio_lame_raw['vbr_method'] == 1) {
$thisfile_mpeg_audio['bitrate_mode'] = 'cbr';
- $thisfile_mpeg_audio['bitrate'] = getid3_mp3::ClosestStandardMP3Bitrate($thisfile_mpeg_audio['bitrate']);
- $ThisFileInfo['audio']['bitrate'] = $thisfile_mpeg_audio['bitrate'];
+ $thisfile_mpeg_audio['bitrate'] = self::ClosestStandardMP3Bitrate($thisfile_mpeg_audio['bitrate']);
+ $info['audio']['bitrate'] = $thisfile_mpeg_audio['bitrate'];
//if (empty($thisfile_mpeg_audio['bitrate']) || (!empty($thisfile_mpeg_audio_lame['bitrate_min']) && ($thisfile_mpeg_audio_lame['bitrate_min'] != 255))) {
// $thisfile_mpeg_audio['bitrate'] = $thisfile_mpeg_audio_lame['bitrate_min'];
//}
@@ -875,12 +922,12 @@
$thisfile_mpeg_audio['bitrate_mode'] = 'cbr';
if ($recursivesearch) {
$thisfile_mpeg_audio['bitrate_mode'] = 'vbr';
- if (getid3_mp3::RecursiveFrameScanning($fd, $ThisFileInfo, $offset, $nextframetestoffset, true)) {
+ if ($this->RecursiveFrameScanning($offset, $nextframetestoffset, true)) {
$recursivesearch = false;
$thisfile_mpeg_audio['bitrate_mode'] = 'cbr';
}
if ($thisfile_mpeg_audio['bitrate_mode'] == 'vbr') {
- $ThisFileInfo['warning'][] = 'VBR file with no VBR header. Bitrate values calculated from actual frame bitrates.';
+ $this->warning('VBR file with no VBR header. Bitrate values calculated from actual frame bitrates.');
}
}
@@ -888,62 +935,66 @@
}
- if (($ExpectedNumberOfAudioBytes > 0) && ($ExpectedNumberOfAudioBytes != ($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']))) {
- if ($ExpectedNumberOfAudioBytes > ($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset'])) {
- if (($ExpectedNumberOfAudioBytes - ($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset'])) == 1) {
- $ThisFileInfo['warning'][] = 'Last byte of data truncated (this is a known bug in Meracl ID3 Tag Writer before v1.3.5)';
- } else {
- $ThisFileInfo['warning'][] = 'Probable truncated file: expecting '.$ExpectedNumberOfAudioBytes.' bytes of audio data, only found '.($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']).' (short by '.($ExpectedNumberOfAudioBytes - ($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset'])).' bytes)';
+ if (($ExpectedNumberOfAudioBytes > 0) && ($ExpectedNumberOfAudioBytes != ($info['avdataend'] - $info['avdataoffset']))) {
+ if ($ExpectedNumberOfAudioBytes > ($info['avdataend'] - $info['avdataoffset'])) {
+ if ($this->isDependencyFor('matroska') || $this->isDependencyFor('riff')) {
+ // ignore, audio data is broken into chunks so will always be data "missing"
}
+ elseif (($ExpectedNumberOfAudioBytes - ($info['avdataend'] - $info['avdataoffset'])) == 1) {
+ $this->warning('Last byte of data truncated (this is a known bug in Meracl ID3 Tag Writer before v1.3.5)');
+ }
+ else {
+ $this->warning('Probable truncated file: expecting '.$ExpectedNumberOfAudioBytes.' bytes of audio data, only found '.($info['avdataend'] - $info['avdataoffset']).' (short by '.($ExpectedNumberOfAudioBytes - ($info['avdataend'] - $info['avdataoffset'])).' bytes)');
+ }
} else {
- if ((($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) - $ExpectedNumberOfAudioBytes) == 1) {
- // $prenullbytefileoffset = ftell($fd);
- // fseek($fd, $ThisFileInfo['avdataend'], SEEK_SET);
- // $PossibleNullByte = fread($fd, 1);
- // fseek($fd, $prenullbytefileoffset, SEEK_SET);
+ if ((($info['avdataend'] - $info['avdataoffset']) - $ExpectedNumberOfAudioBytes) == 1) {
+ // $prenullbytefileoffset = $this->ftell();
+ // $this->fseek($info['avdataend']);
+ // $PossibleNullByte = $this->fread(1);
+ // $this->fseek($prenullbytefileoffset);
// if ($PossibleNullByte === "\x00") {
- $ThisFileInfo['avdataend']--;
- // $ThisFileInfo['warning'][] = 'Extra null byte at end of MP3 data assumed to be RIFF padding and therefore ignored';
+ $info['avdataend']--;
+ // $this->warning('Extra null byte at end of MP3 data assumed to be RIFF padding and therefore ignored');
// } else {
- // $ThisFileInfo['warning'][] = 'Too much data in file: expecting '.$ExpectedNumberOfAudioBytes.' bytes of audio data, found '.($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']).' ('.(($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) - $ExpectedNumberOfAudioBytes).' bytes too many)';
+ // $this->warning('Too much data in file: expecting '.$ExpectedNumberOfAudioBytes.' bytes of audio data, found '.($info['avdataend'] - $info['avdataoffset']).' ('.(($info['avdataend'] - $info['avdataoffset']) - $ExpectedNumberOfAudioBytes).' bytes too many)');
// }
} else {
- $ThisFileInfo['warning'][] = 'Too much data in file: expecting '.$ExpectedNumberOfAudioBytes.' bytes of audio data, found '.($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']).' ('.(($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) - $ExpectedNumberOfAudioBytes).' bytes too many)';
+ $this->warning('Too much data in file: expecting '.$ExpectedNumberOfAudioBytes.' bytes of audio data, found '.($info['avdataend'] - $info['avdataoffset']).' ('.(($info['avdataend'] - $info['avdataoffset']) - $ExpectedNumberOfAudioBytes).' bytes too many)');
}
}
}
- if (($thisfile_mpeg_audio['bitrate'] == 'free') && empty($ThisFileInfo['audio']['bitrate'])) {
- if (($offset == $ThisFileInfo['avdataoffset']) && empty($thisfile_mpeg_audio['VBR_frames'])) {
- $framebytelength = getid3_mp3::FreeFormatFrameLength($fd, $offset, $ThisFileInfo, true);
+ if (($thisfile_mpeg_audio['bitrate'] == 'free') && empty($info['audio']['bitrate'])) {
+ if (($offset == $info['avdataoffset']) && empty($thisfile_mpeg_audio['VBR_frames'])) {
+ $framebytelength = $this->FreeFormatFrameLength($offset, true);
if ($framebytelength > 0) {
$thisfile_mpeg_audio['framelength'] = $framebytelength;
if ($thisfile_mpeg_audio['layer'] == '1') {
// BitRate = (((FrameLengthInBytes / 4) - Padding) * SampleRate) / 12
- $ThisFileInfo['audio']['bitrate'] = ((($framebytelength / 4) - intval($thisfile_mpeg_audio['padding'])) * $thisfile_mpeg_audio['sample_rate']) / 12;
+ $info['audio']['bitrate'] = ((($framebytelength / 4) - intval($thisfile_mpeg_audio['padding'])) * $thisfile_mpeg_audio['sample_rate']) / 12;
} else {
// Bitrate = ((FrameLengthInBytes - Padding) * SampleRate) / 144
- $ThisFileInfo['audio']['bitrate'] = (($framebytelength - intval($thisfile_mpeg_audio['padding'])) * $thisfile_mpeg_audio['sample_rate']) / 144;
+ $info['audio']['bitrate'] = (($framebytelength - intval($thisfile_mpeg_audio['padding'])) * $thisfile_mpeg_audio['sample_rate']) / 144;
}
} else {
- $ThisFileInfo['error'][] = 'Error calculating frame length of free-format MP3 without Xing/LAME header';
+ $this->error('Error calculating frame length of free-format MP3 without Xing/LAME header');
}
}
}
- if (!empty($thisfile_mpeg_audio['VBR_frames'])) {
+ if (isset($thisfile_mpeg_audio['VBR_frames']) ? $thisfile_mpeg_audio['VBR_frames'] : '') {
switch ($thisfile_mpeg_audio['bitrate_mode']) {
case 'vbr':
case 'abr':
+ $bytes_per_frame = 1152;
if (($thisfile_mpeg_audio['version'] == '1') && ($thisfile_mpeg_audio['layer'] == 1)) {
- $thisfile_mpeg_audio['VBR_bitrate'] = (($thisfile_mpeg_audio['VBR_bytes'] / $thisfile_mpeg_audio['VBR_frames']) * 8) * ($ThisFileInfo['audio']['sample_rate'] / 384);
+ $bytes_per_frame = 384;
} elseif ((($thisfile_mpeg_audio['version'] == '2') || ($thisfile_mpeg_audio['version'] == '2.5')) && ($thisfile_mpeg_audio['layer'] == 3)) {
- $thisfile_mpeg_audio['VBR_bitrate'] = (($thisfile_mpeg_audio['VBR_bytes'] / $thisfile_mpeg_audio['VBR_frames']) * 8) * ($ThisFileInfo['audio']['sample_rate'] / 576);
- } else {
- $thisfile_mpeg_audio['VBR_bitrate'] = (($thisfile_mpeg_audio['VBR_bytes'] / $thisfile_mpeg_audio['VBR_frames']) * 8) * ($ThisFileInfo['audio']['sample_rate'] / 1152);
+ $bytes_per_frame = 576;
}
+ $thisfile_mpeg_audio['VBR_bitrate'] = (isset($thisfile_mpeg_audio['VBR_bytes']) ? (($thisfile_mpeg_audio['VBR_bytes'] / $thisfile_mpeg_audio['VBR_frames']) * 8) * ($info['audio']['sample_rate'] / $bytes_per_frame) : 0);
if ($thisfile_mpeg_audio['VBR_bitrate'] > 0) {
- $ThisFileInfo['audio']['bitrate'] = $thisfile_mpeg_audio['VBR_bitrate'];
+ $info['audio']['bitrate'] = $thisfile_mpeg_audio['VBR_bitrate'];
$thisfile_mpeg_audio['bitrate'] = $thisfile_mpeg_audio['VBR_bitrate']; // to avoid confusion
}
break;
@@ -955,7 +1006,7 @@
if ($recursivesearch) {
- if (!getid3_mp3::RecursiveFrameScanning($fd, $ThisFileInfo, $offset, $nextframetestoffset, $ScanAsCBR)) {
+ if (!$this->RecursiveFrameScanning($offset, $nextframetestoffset, $ScanAsCBR)) {
return false;
}
@@ -995,7 +1046,7 @@
// }
//
// if ($thisfile_mpeg_audio['version'] == '1') {
- // for ($channel = 0; $channel < $ThisFileInfo['audio']['channels']; $channel++) {
+ // for ($channel = 0; $channel < $info['audio']['channels']; $channel++) {
// for ($scfsi_band = 0; $scfsi_band < 4; $scfsi_band++) {
// $thisfile_mpeg_audio['scfsi'][$channel][$scfsi_band] = substr($SideInfoBitstream, $SideInfoOffset, 1);
// $SideInfoOffset += 2;
@@ -1003,7 +1054,7 @@
// }
// }
// for ($granule = 0; $granule < (($thisfile_mpeg_audio['version'] == '1') ? 2 : 1); $granule++) {
- // for ($channel = 0; $channel < $ThisFileInfo['audio']['channels']; $channel++) {
+ // for ($channel = 0; $channel < $info['audio']['channels']; $channel++) {
// $thisfile_mpeg_audio['part2_3_length'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 12);
// $SideInfoOffset += 12;
// $thisfile_mpeg_audio['big_values'][$granule][$channel] = substr($SideInfoBitstream, $SideInfoOffset, 9);
@@ -1067,20 +1118,30 @@
return true;
}
- function RecursiveFrameScanning(&$fd, &$ThisFileInfo, &$offset, &$nextframetestoffset, $ScanAsCBR) {
+ /**
+ * @param int $offset
+ * @param int $nextframetestoffset
+ * @param bool $ScanAsCBR
+ *
+ * @return bool
+ */
+ public function RecursiveFrameScanning(&$offset, &$nextframetestoffset, $ScanAsCBR) {
+ $info = &$this->getid3->info;
+ $firstframetestarray = array('error' => array(), 'warning'=> array(), 'avdataend' => $info['avdataend'], 'avdataoffset' => $info['avdataoffset']);
+ $this->decodeMPEGaudioHeader($offset, $firstframetestarray, false);
+
for ($i = 0; $i < GETID3_MP3_VALID_CHECK_FRAMES; $i++) {
// check next GETID3_MP3_VALID_CHECK_FRAMES frames for validity, to make sure we haven't run across a false synch
- if (($nextframetestoffset + 4) >= $ThisFileInfo['avdataend']) {
+ if (($nextframetestoffset + 4) >= $info['avdataend']) {
// end of file
return true;
}
- $nextframetestarray = array('error'=>'', 'warning'=>'', 'avdataend'=>$ThisFileInfo['avdataend'], 'avdataoffset'=>$ThisFileInfo['avdataoffset']);
- if (getid3_mp3::decodeMPEGaudioHeader($fd, $nextframetestoffset, $nextframetestarray, false)) {
+ $nextframetestarray = array('error' => array(), 'warning' => array(), 'avdataend' => $info['avdataend'], 'avdataoffset'=>$info['avdataoffset']);
+ if ($this->decodeMPEGaudioHeader($nextframetestoffset, $nextframetestarray, false)) {
if ($ScanAsCBR) {
- // force CBR mode, used for trying to pick out invalid audio streams with
- // valid(?) VBR headers, or VBR streams with no VBR header
- if (!isset($nextframetestarray['mpeg']['audio']['bitrate']) || !isset($ThisFileInfo['mpeg']['audio']['bitrate']) || ($nextframetestarray['mpeg']['audio']['bitrate'] != $ThisFileInfo['mpeg']['audio']['bitrate'])) {
+ // force CBR mode, used for trying to pick out invalid audio streams with valid(?) VBR headers, or VBR streams with no VBR header
+ if (!isset($nextframetestarray['mpeg']['audio']['bitrate']) || !isset($firstframetestarray['mpeg']['audio']['bitrate']) || ($nextframetestarray['mpeg']['audio']['bitrate'] != $firstframetestarray['mpeg']['audio']['bitrate'])) {
return false;
}
}
@@ -1090,14 +1151,19 @@
if (isset($nextframetestarray['mpeg']['audio']['framelength']) && ($nextframetestarray['mpeg']['audio']['framelength'] > 0)) {
$nextframetestoffset += $nextframetestarray['mpeg']['audio']['framelength'];
} else {
- $ThisFileInfo['error'][] = 'Frame at offset ('.$offset.') is has an invalid frame length.';
+ $this->error('Frame at offset ('.$offset.') is has an invalid frame length.');
return false;
}
+ } elseif (!empty($firstframetestarray['mpeg']['audio']['framelength']) && (($nextframetestoffset + $firstframetestarray['mpeg']['audio']['framelength']) > $info['avdataend'])) {
+
+ // it's not the end of the file, but there's not enough data left for another frame, so assume it's garbage/padding and return OK
+ return true;
+
} else {
// next frame is not valid, note the error and fail, so scanning can contiue for a valid frame sequence
- $ThisFileInfo['error'][] = 'Frame at offset ('.$offset.') is valid, but the next one at ('.$nextframetestoffset.') is not.';
+ $this->warning('Frame at offset ('.$offset.') is valid, but the next one at ('.$nextframetestoffset.') is not.');
return false;
}
@@ -1105,15 +1171,23 @@
return true;
}
- function FreeFormatFrameLength($fd, $offset, &$ThisFileInfo, $deepscan=false) {
- fseek($fd, $offset, SEEK_SET);
- $MPEGaudioData = fread($fd, 32768);
+ /**
+ * @param int $offset
+ * @param bool $deepscan
+ *
+ * @return int|false
+ */
+ public function FreeFormatFrameLength($offset, $deepscan=false) {
+ $info = &$this->getid3->info;
+ $this->fseek($offset);
+ $MPEGaudioData = $this->fread(32768);
+
$SyncPattern1 = substr($MPEGaudioData, 0, 4);
// may be different pattern due to padding
- $SyncPattern2 = $SyncPattern1{0}.$SyncPattern1{1}.chr(ord($SyncPattern1{2}) | 0x02).$SyncPattern1{3};
+ $SyncPattern2 = $SyncPattern1[0].$SyncPattern1[1].chr(ord($SyncPattern1[2]) | 0x02).$SyncPattern1[3];
if ($SyncPattern2 === $SyncPattern1) {
- $SyncPattern2 = $SyncPattern1{0}.$SyncPattern1{1}.chr(ord($SyncPattern1{2}) & 0xFD).$SyncPattern1{3};
+ $SyncPattern2 = $SyncPattern1[0].$SyncPattern1[1].chr(ord($SyncPattern1[2]) & 0xFD).$SyncPattern1[3];
}
$framelength = false;
@@ -1138,12 +1212,12 @@
$framelength = $framelength2;
}
if (!$framelength) {
- $ThisFileInfo['error'][] = 'Cannot find next free-format synch pattern ('.getid3_lib::PrintHexBytes($SyncPattern1).' or '.getid3_lib::PrintHexBytes($SyncPattern2).') after offset '.$offset;
+ $this->error('Cannot find next free-format synch pattern ('.getid3_lib::PrintHexBytes($SyncPattern1).' or '.getid3_lib::PrintHexBytes($SyncPattern2).') after offset '.$offset);
return false;
} else {
- $ThisFileInfo['warning'][] = 'ModeExtension varies between first frame and other frames (known free-format issue in LAME 3.88)';
- $ThisFileInfo['audio']['codec'] = 'LAME';
- $ThisFileInfo['audio']['encoder'] = 'LAME3.88';
+ $this->warning('ModeExtension varies between first frame and other frames (known free-format issue in LAME 3.88)');
+ $info['audio']['codec'] = 'LAME';
+ $info['audio']['encoder'] = 'LAME3.88';
$SyncPattern1 = substr($SyncPattern1, 0, 3);
$SyncPattern2 = substr($SyncPattern2, 0, 3);
}
@@ -1153,9 +1227,9 @@
$ActualFrameLengthValues = array();
$nextoffset = $offset + $framelength;
- while ($nextoffset < ($ThisFileInfo['avdataend'] - 6)) {
- fseek($fd, $nextoffset - 1, SEEK_SET);
- $NextSyncPattern = fread($fd, 6);
+ while ($nextoffset < ($info['avdataend'] - 6)) {
+ $this->fseek($nextoffset - 1);
+ $NextSyncPattern = $this->fread(6);
if ((substr($NextSyncPattern, 1, strlen($SyncPattern1)) == $SyncPattern1) || (substr($NextSyncPattern, 1, strlen($SyncPattern2)) == $SyncPattern2)) {
// good - found where expected
$ActualFrameLengthValues[] = $framelength;
@@ -1168,7 +1242,7 @@
$ActualFrameLengthValues[] = ($framelength + 1);
$nextoffset++;
} else {
- $ThisFileInfo['error'][] = 'Did not find expected free-format sync pattern at offset '.$nextoffset;
+ $this->error('Did not find expected free-format sync pattern at offset '.$nextoffset);
return false;
}
$nextoffset += $framelength;
@@ -1180,43 +1254,48 @@
return $framelength;
}
- function getOnlyMPEGaudioInfoBruteForce($fd, &$ThisFileInfo) {
+ /**
+ * @return bool
+ */
+ public function getOnlyMPEGaudioInfoBruteForce() {
+ $MPEGaudioHeaderDecodeCache = array();
+ $MPEGaudioHeaderValidCache = array();
+ $MPEGaudioHeaderLengthCache = array();
+ $MPEGaudioVersionLookup = self::MPEGaudioVersionArray();
+ $MPEGaudioLayerLookup = self::MPEGaudioLayerArray();
+ $MPEGaudioBitrateLookup = self::MPEGaudioBitrateArray();
+ $MPEGaudioFrequencyLookup = self::MPEGaudioFrequencyArray();
+ $MPEGaudioChannelModeLookup = self::MPEGaudioChannelModeArray();
+ $MPEGaudioModeExtensionLookup = self::MPEGaudioModeExtensionArray();
+ $MPEGaudioEmphasisLookup = self::MPEGaudioEmphasisArray();
+ $LongMPEGversionLookup = array();
+ $LongMPEGlayerLookup = array();
+ $LongMPEGbitrateLookup = array();
+ $LongMPEGpaddingLookup = array();
+ $LongMPEGfrequencyLookup = array();
+ $Distribution['bitrate'] = array();
+ $Distribution['frequency'] = array();
+ $Distribution['layer'] = array();
+ $Distribution['version'] = array();
+ $Distribution['padding'] = array();
- $MPEGaudioHeaderDecodeCache = array();
- $MPEGaudioHeaderValidCache = array();
- $MPEGaudioHeaderLengthCache = array();
- $MPEGaudioVersionLookup = getid3_mp3::MPEGaudioVersionArray();
- $MPEGaudioLayerLookup = getid3_mp3::MPEGaudioLayerArray();
- $MPEGaudioBitrateLookup = getid3_mp3::MPEGaudioBitrateArray();
- $MPEGaudioFrequencyLookup = getid3_mp3::MPEGaudioFrequencyArray();
- $MPEGaudioChannelModeLookup = getid3_mp3::MPEGaudioChannelModeArray();
- $MPEGaudioModeExtensionLookup = getid3_mp3::MPEGaudioModeExtensionArray();
- $MPEGaudioEmphasisLookup = getid3_mp3::MPEGaudioEmphasisArray();
- $LongMPEGversionLookup = array();
- $LongMPEGlayerLookup = array();
- $LongMPEGbitrateLookup = array();
- $LongMPEGpaddingLookup = array();
- $LongMPEGfrequencyLookup = array();
+ $info = &$this->getid3->info;
+ $this->fseek($info['avdataoffset']);
- $Distribution['bitrate'] = array();
- $Distribution['frequency'] = array();
- $Distribution['layer'] = array();
- $Distribution['version'] = array();
- $Distribution['padding'] = array();
+ $max_frames_scan = 5000;
+ $frames_scanned = 0;
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
-
- $previousvalidframe = $ThisFileInfo['avdataoffset'];
- while (ftell($fd) < $ThisFileInfo['avdataend']) {
+ $previousvalidframe = $info['avdataoffset'];
+ while ($this->ftell() < $info['avdataend']) {
set_time_limit(30);
- $head4 = fread($fd, 4);
+ $head4 = $this->fread(4);
if (strlen($head4) < 4) {
break;
}
- if ($head4{0} != "\xFF") {
+ if ($head4[0] != "\xFF") {
for ($i = 1; $i < 4; $i++) {
- if ($head4{$i} == "\xFF") {
- fseek($fd, $i - 4, SEEK_CUR);
+ if ($head4[$i] == "\xFF") {
+ $this->fseek($i - 4, SEEK_CUR);
continue 2;
}
}
@@ -1223,10 +1302,10 @@
continue;
}
if (!isset($MPEGaudioHeaderDecodeCache[$head4])) {
- $MPEGaudioHeaderDecodeCache[$head4] = getid3_mp3::MPEGaudioHeaderDecode($head4);
+ $MPEGaudioHeaderDecodeCache[$head4] = self::MPEGaudioHeaderDecode($head4);
}
if (!isset($MPEGaudioHeaderValidCache[$head4])) {
- $MPEGaudioHeaderValidCache[$head4] = getid3_mp3::MPEGaudioHeaderValid($MPEGaudioHeaderDecodeCache[$head4], false, false);
+ $MPEGaudioHeaderValidCache[$head4] = self::MPEGaudioHeaderValid($MPEGaudioHeaderDecodeCache[$head4], false, false);
}
if ($MPEGaudioHeaderValidCache[$head4]) {
@@ -1236,7 +1315,7 @@
$LongMPEGbitrateLookup[$head4] = $MPEGaudioBitrateLookup[$LongMPEGversionLookup[$head4]][$LongMPEGlayerLookup[$head4]][$MPEGaudioHeaderDecodeCache[$head4]['bitrate']];
$LongMPEGpaddingLookup[$head4] = (bool) $MPEGaudioHeaderDecodeCache[$head4]['padding'];
$LongMPEGfrequencyLookup[$head4] = $MPEGaudioFrequencyLookup[$LongMPEGversionLookup[$head4]][$MPEGaudioHeaderDecodeCache[$head4]['sample_rate']];
- $MPEGaudioHeaderLengthCache[$head4] = getid3_mp3::MPEGaudioFrameLength(
+ $MPEGaudioHeaderLengthCache[$head4] = self::MPEGaudioFrameLength(
$LongMPEGbitrateLookup[$head4],
$LongMPEGversionLookup[$head4],
$LongMPEGlayerLookup[$head4],
@@ -1244,29 +1323,39 @@
$LongMPEGfrequencyLookup[$head4]);
}
if ($MPEGaudioHeaderLengthCache[$head4] > 4) {
- $WhereWeWere = ftell($fd);
- fseek($fd, $MPEGaudioHeaderLengthCache[$head4] - 4, SEEK_CUR);
- $next4 = fread($fd, 4);
- if ($next4{0} == "\xFF") {
+ $WhereWeWere = $this->ftell();
+ $this->fseek($MPEGaudioHeaderLengthCache[$head4] - 4, SEEK_CUR);
+ $next4 = $this->fread(4);
+ if ($next4[0] == "\xFF") {
if (!isset($MPEGaudioHeaderDecodeCache[$next4])) {
- $MPEGaudioHeaderDecodeCache[$next4] = getid3_mp3::MPEGaudioHeaderDecode($next4);
+ $MPEGaudioHeaderDecodeCache[$next4] = self::MPEGaudioHeaderDecode($next4);
}
if (!isset($MPEGaudioHeaderValidCache[$next4])) {
- $MPEGaudioHeaderValidCache[$next4] = getid3_mp3::MPEGaudioHeaderValid($MPEGaudioHeaderDecodeCache[$next4], false, false);
+ $MPEGaudioHeaderValidCache[$next4] = self::MPEGaudioHeaderValid($MPEGaudioHeaderDecodeCache[$next4], false, false);
}
if ($MPEGaudioHeaderValidCache[$next4]) {
- fseek($fd, -4, SEEK_CUR);
+ $this->fseek(-4, SEEK_CUR);
- @$Distribution['bitrate'][$LongMPEGbitrateLookup[$head4]]++;
- @$Distribution['layer'][$LongMPEGlayerLookup[$head4]]++;
- @$Distribution['version'][$LongMPEGversionLookup[$head4]]++;
- @$Distribution['padding'][intval($LongMPEGpaddingLookup[$head4])]++;
- @$Distribution['frequency'][$LongMPEGfrequencyLookup[$head4]]++;
+ $Distribution['bitrate'][$LongMPEGbitrateLookup[$head4]] = isset($Distribution['bitrate'][$LongMPEGbitrateLookup[$head4]]) ? ++$Distribution['bitrate'][$LongMPEGbitrateLookup[$head4]] : 1;
+ $Distribution['layer'][$LongMPEGlayerLookup[$head4]] = isset($Distribution['layer'][$LongMPEGlayerLookup[$head4]]) ? ++$Distribution['layer'][$LongMPEGlayerLookup[$head4]] : 1;
+ $Distribution['version'][$LongMPEGversionLookup[$head4]] = isset($Distribution['version'][$LongMPEGversionLookup[$head4]]) ? ++$Distribution['version'][$LongMPEGversionLookup[$head4]] : 1;
+ $Distribution['padding'][intval($LongMPEGpaddingLookup[$head4])] = isset($Distribution['padding'][intval($LongMPEGpaddingLookup[$head4])]) ? ++$Distribution['padding'][intval($LongMPEGpaddingLookup[$head4])] : 1;
+ $Distribution['frequency'][$LongMPEGfrequencyLookup[$head4]] = isset($Distribution['frequency'][$LongMPEGfrequencyLookup[$head4]]) ? ++$Distribution['frequency'][$LongMPEGfrequencyLookup[$head4]] : 1;
+ if (++$frames_scanned >= $max_frames_scan) {
+ $pct_data_scanned = ($this->ftell() - $info['avdataoffset']) / ($info['avdataend'] - $info['avdataoffset']);
+ $this->warning('too many MPEG audio frames to scan, only scanned first '.$max_frames_scan.' frames ('.number_format($pct_data_scanned * 100, 1).'% of file) and extrapolated distribution, playtime and bitrate may be incorrect.');
+ foreach ($Distribution as $key1 => $value1) {
+ foreach ($value1 as $key2 => $value2) {
+ $Distribution[$key1][$key2] = round($value2 / $pct_data_scanned);
+ }
+ }
+ break;
+ }
continue;
}
}
unset($next4);
- fseek($fd, $WhereWeWere - 3, SEEK_SET);
+ $this->fseek($WhereWeWere - 3);
}
}
@@ -1275,19 +1364,19 @@
ksort($Distribution[$key], SORT_NUMERIC);
}
ksort($Distribution['version'], SORT_STRING);
- $ThisFileInfo['mpeg']['audio']['bitrate_distribution'] = $Distribution['bitrate'];
- $ThisFileInfo['mpeg']['audio']['frequency_distribution'] = $Distribution['frequency'];
- $ThisFileInfo['mpeg']['audio']['layer_distribution'] = $Distribution['layer'];
- $ThisFileInfo['mpeg']['audio']['version_distribution'] = $Distribution['version'];
- $ThisFileInfo['mpeg']['audio']['padding_distribution'] = $Distribution['padding'];
+ $info['mpeg']['audio']['bitrate_distribution'] = $Distribution['bitrate'];
+ $info['mpeg']['audio']['frequency_distribution'] = $Distribution['frequency'];
+ $info['mpeg']['audio']['layer_distribution'] = $Distribution['layer'];
+ $info['mpeg']['audio']['version_distribution'] = $Distribution['version'];
+ $info['mpeg']['audio']['padding_distribution'] = $Distribution['padding'];
if (count($Distribution['version']) > 1) {
- $ThisFileInfo['error'][] = 'Corrupt file - more than one MPEG version detected';
+ $this->error('Corrupt file - more than one MPEG version detected');
}
if (count($Distribution['layer']) > 1) {
- $ThisFileInfo['error'][] = 'Corrupt file - more than one MPEG layer detected';
+ $this->error('Corrupt file - more than one MPEG layer detected');
}
if (count($Distribution['frequency']) > 1) {
- $ThisFileInfo['error'][] = 'Corrupt file - more than one MPEG sample rate detected';
+ $this->error('Corrupt file - more than one MPEG sample rate detected');
}
@@ -1297,94 +1386,97 @@
$bittotal += ($bitratevalue * $bitratecount);
}
}
- $ThisFileInfo['mpeg']['audio']['frame_count'] = array_sum($Distribution['bitrate']);
- if ($ThisFileInfo['mpeg']['audio']['frame_count'] == 0) {
- $ThisFileInfo['error'][] = 'no MPEG audio frames found';
+ $info['mpeg']['audio']['frame_count'] = array_sum($Distribution['bitrate']);
+ if ($info['mpeg']['audio']['frame_count'] == 0) {
+ $this->error('no MPEG audio frames found');
return false;
}
- $ThisFileInfo['mpeg']['audio']['bitrate'] = ($bittotal / $ThisFileInfo['mpeg']['audio']['frame_count']);
- $ThisFileInfo['mpeg']['audio']['bitrate_mode'] = ((count($Distribution['bitrate']) > 0) ? 'vbr' : 'cbr');
- $ThisFileInfo['mpeg']['audio']['sample_rate'] = getid3_lib::array_max($Distribution['frequency'], true);
+ $info['mpeg']['audio']['bitrate'] = ($bittotal / $info['mpeg']['audio']['frame_count']);
+ $info['mpeg']['audio']['bitrate_mode'] = ((count($Distribution['bitrate']) > 0) ? 'vbr' : 'cbr');
+ $info['mpeg']['audio']['sample_rate'] = getid3_lib::array_max($Distribution['frequency'], true);
- $ThisFileInfo['audio']['bitrate'] = $ThisFileInfo['mpeg']['audio']['bitrate'];
- $ThisFileInfo['audio']['bitrate_mode'] = $ThisFileInfo['mpeg']['audio']['bitrate_mode'];
- $ThisFileInfo['audio']['sample_rate'] = $ThisFileInfo['mpeg']['audio']['sample_rate'];
- $ThisFileInfo['audio']['dataformat'] = 'mp'.getid3_lib::array_max($Distribution['layer'], true);
- $ThisFileInfo['fileformat'] = $ThisFileInfo['audio']['dataformat'];
+ $info['audio']['bitrate'] = $info['mpeg']['audio']['bitrate'];
+ $info['audio']['bitrate_mode'] = $info['mpeg']['audio']['bitrate_mode'];
+ $info['audio']['sample_rate'] = $info['mpeg']['audio']['sample_rate'];
+ $info['audio']['dataformat'] = 'mp'.getid3_lib::array_max($Distribution['layer'], true);
+ $info['fileformat'] = $info['audio']['dataformat'];
return true;
}
-
- function getOnlyMPEGaudioInfo($fd, &$ThisFileInfo, $avdataoffset, $BitrateHistogram=false) {
+ /**
+ * @param int $avdataoffset
+ * @param bool $BitrateHistogram
+ *
+ * @return bool
+ */
+ public function getOnlyMPEGaudioInfo($avdataoffset, $BitrateHistogram=false) {
// looks for synch, decodes MPEG audio header
- fseek($fd, $avdataoffset, SEEK_SET);
- $header = '';
- $SynchSeekOffset = 0;
+ $info = &$this->getid3->info;
static $MPEGaudioVersionLookup;
static $MPEGaudioLayerLookup;
static $MPEGaudioBitrateLookup;
if (empty($MPEGaudioVersionLookup)) {
- $MPEGaudioVersionLookup = getid3_mp3::MPEGaudioVersionArray();
- $MPEGaudioLayerLookup = getid3_mp3::MPEGaudioLayerArray();
- $MPEGaudioBitrateLookup = getid3_mp3::MPEGaudioBitrateArray();
+ $MPEGaudioVersionLookup = self::MPEGaudioVersionArray();
+ $MPEGaudioLayerLookup = self::MPEGaudioLayerArray();
+ $MPEGaudioBitrateLookup = self::MPEGaudioBitrateArray();
+ }
+ $this->fseek($avdataoffset);
+ $sync_seek_buffer_size = min(128 * 1024, $info['avdataend'] - $avdataoffset);
+ if ($sync_seek_buffer_size <= 0) {
+ $this->error('Invalid $sync_seek_buffer_size at offset '.$avdataoffset);
+ return false;
}
+ $header = $this->fread($sync_seek_buffer_size);
+ $sync_seek_buffer_size = strlen($header);
+ $SynchSeekOffset = 0;
+ while ($SynchSeekOffset < $sync_seek_buffer_size) {
+ if ((($avdataoffset + $SynchSeekOffset) < $info['avdataend']) && !feof($this->getid3->fp)) {
- $header_len = strlen($header) - intval(round(GETID3_FREAD_BUFFER_SIZE / 2));
- while (true) {
-
- if (($SynchSeekOffset > $header_len) && (($avdataoffset + $SynchSeekOffset) < $ThisFileInfo['avdataend']) && !feof($fd)) {
-
- if ($SynchSeekOffset > 131072) {
+ if ($SynchSeekOffset > $sync_seek_buffer_size) {
// if a synch's not found within the first 128k bytes, then give up
- $ThisFileInfo['error'][] = 'could not find valid MPEG audio synch within the first 128k bytes';
- if (isset($ThisFileInfo['audio']['bitrate'])) {
- unset($ThisFileInfo['audio']['bitrate']);
+ $this->error('Could not find valid MPEG audio synch within the first '.round($sync_seek_buffer_size / 1024).'kB');
+ if (isset($info['audio']['bitrate'])) {
+ unset($info['audio']['bitrate']);
}
- if (isset($ThisFileInfo['mpeg']['audio'])) {
- unset($ThisFileInfo['mpeg']['audio']);
+ if (isset($info['mpeg']['audio'])) {
+ unset($info['mpeg']['audio']);
}
- if (empty($ThisFileInfo['mpeg'])) {
- unset($ThisFileInfo['mpeg']);
+ if (empty($info['mpeg'])) {
+ unset($info['mpeg']);
}
return false;
- } elseif ($header .= fread($fd, GETID3_FREAD_BUFFER_SIZE)) {
+ } elseif (feof($this->getid3->fp)) {
- // great
- $header_len = strlen($header) - intval(round(GETID3_FREAD_BUFFER_SIZE / 2));
-
- } else {
-
- $ThisFileInfo['error'][] = 'could not find valid MPEG audio synch before end of file';
- if (isset($ThisFileInfo['audio']['bitrate'])) {
- unset($ThisFileInfo['audio']['bitrate']);
+ $this->error('Could not find valid MPEG audio synch before end of file');
+ if (isset($info['audio']['bitrate'])) {
+ unset($info['audio']['bitrate']);
}
- if (isset($ThisFileInfo['mpeg']['audio'])) {
- unset($ThisFileInfo['mpeg']['audio']);
+ if (isset($info['mpeg']['audio'])) {
+ unset($info['mpeg']['audio']);
}
- if (isset($ThisFileInfo['mpeg']) && (!is_array($ThisFileInfo['mpeg']) || (count($ThisFileInfo['mpeg']) == 0))) {
- unset($ThisFileInfo['mpeg']);
+ if (isset($info['mpeg']) && (!is_array($info['mpeg']) || (count($info['mpeg']) == 0))) {
+ unset($info['mpeg']);
}
return false;
-
}
}
if (($SynchSeekOffset + 1) >= strlen($header)) {
- $ThisFileInfo['error'][] = 'could not find valid MPEG synch before end of file';
+ $this->error('Could not find valid MPEG synch before end of file');
return false;
}
- if (($header{$SynchSeekOffset} == "\xFF") && ($header{($SynchSeekOffset + 1)} > "\xE0")) { // synch detected
-
- if (!isset($FirstFrameThisfileInfo) && !isset($ThisFileInfo['mpeg']['audio'])) {
- $FirstFrameThisfileInfo = $ThisFileInfo;
+ if (($header[$SynchSeekOffset] == "\xFF") && ($header[($SynchSeekOffset + 1)] > "\xE0")) { // synch detected
+ $FirstFrameAVDataOffset = null;
+ if (!isset($FirstFrameThisfileInfo) && !isset($info['mpeg']['audio'])) {
+ $FirstFrameThisfileInfo = $info;
$FirstFrameAVDataOffset = $avdataoffset + $SynchSeekOffset;
- if (!getid3_mp3::decodeMPEGaudioHeader($fd, $avdataoffset + $SynchSeekOffset, $FirstFrameThisfileInfo, false)) {
+ if (!$this->decodeMPEGaudioHeader($FirstFrameAVDataOffset, $FirstFrameThisfileInfo, false)) {
// if this is the first valid MPEG-audio frame, save it in case it's a VBR header frame and there's
// garbage between this frame and a valid sequence of MPEG-audio frames, to be restored below
unset($FirstFrameThisfileInfo);
@@ -1391,45 +1483,41 @@
}
}
- $dummy = $ThisFileInfo; // only overwrite real data if valid header found
- if (getid3_mp3::decodeMPEGaudioHeader($fd, $avdataoffset + $SynchSeekOffset, $dummy, true)) {
- $ThisFileInfo = $dummy;
- $ThisFileInfo['avdataoffset'] = $avdataoffset + $SynchSeekOffset;
- switch ($ThisFileInfo['fileformat']) {
+ $dummy = $info; // only overwrite real data if valid header found
+ if ($this->decodeMPEGaudioHeader($avdataoffset + $SynchSeekOffset, $dummy, true)) {
+ $info = $dummy;
+ $info['avdataoffset'] = $avdataoffset + $SynchSeekOffset;
+ switch (isset($info['fileformat']) ? $info['fileformat'] : '') {
case '':
case 'id3':
case 'ape':
case 'mp3':
- $ThisFileInfo['fileformat'] = 'mp3';
- $ThisFileInfo['audio']['dataformat'] = 'mp3';
+ $info['fileformat'] = 'mp3';
+ $info['audio']['dataformat'] = 'mp3';
break;
}
- if (isset($FirstFrameThisfileInfo['mpeg']['audio']['bitrate_mode']) && ($FirstFrameThisfileInfo['mpeg']['audio']['bitrate_mode'] == 'vbr')) {
- if (!(abs($ThisFileInfo['audio']['bitrate'] - $FirstFrameThisfileInfo['audio']['bitrate']) <= 1)) {
+ if (isset($FirstFrameThisfileInfo) && isset($FirstFrameThisfileInfo['mpeg']['audio']['bitrate_mode']) && ($FirstFrameThisfileInfo['mpeg']['audio']['bitrate_mode'] == 'vbr')) {
+ if (!(abs($info['audio']['bitrate'] - $FirstFrameThisfileInfo['audio']['bitrate']) <= 1)) {
// If there is garbage data between a valid VBR header frame and a sequence
// of valid MPEG-audio frames the VBR data is no longer discarded.
- $ThisFileInfo = $FirstFrameThisfileInfo;
- $ThisFileInfo['avdataoffset'] = $FirstFrameAVDataOffset;
- $ThisFileInfo['fileformat'] = 'mp3';
- $ThisFileInfo['audio']['dataformat'] = 'mp3';
- $dummy = $ThisFileInfo;
+ $info = $FirstFrameThisfileInfo;
+ $info['avdataoffset'] = $FirstFrameAVDataOffset;
+ $info['fileformat'] = 'mp3';
+ $info['audio']['dataformat'] = 'mp3';
+ $dummy = $info;
unset($dummy['mpeg']['audio']);
$GarbageOffsetStart = $FirstFrameAVDataOffset + $FirstFrameThisfileInfo['mpeg']['audio']['framelength'];
$GarbageOffsetEnd = $avdataoffset + $SynchSeekOffset;
- if (getid3_mp3::decodeMPEGaudioHeader($fd, $GarbageOffsetEnd, $dummy, true, true)) {
-
- $ThisFileInfo = $dummy;
- $ThisFileInfo['avdataoffset'] = $GarbageOffsetEnd;
- $ThisFileInfo['warning'][] = 'apparently-valid VBR header not used because could not find '.GETID3_MP3_VALID_CHECK_FRAMES.' consecutive MPEG-audio frames immediately after VBR header (garbage data for '.($GarbageOffsetEnd - $GarbageOffsetStart).' bytes between '.$GarbageOffsetStart.' and '.$GarbageOffsetEnd.'), but did find valid CBR stream starting at '.$GarbageOffsetEnd;
-
+ if ($this->decodeMPEGaudioHeader($GarbageOffsetEnd, $dummy, true, true)) {
+ $info = $dummy;
+ $info['avdataoffset'] = $GarbageOffsetEnd;
+ $this->warning('apparently-valid VBR header not used because could not find '.GETID3_MP3_VALID_CHECK_FRAMES.' consecutive MPEG-audio frames immediately after VBR header (garbage data for '.($GarbageOffsetEnd - $GarbageOffsetStart).' bytes between '.$GarbageOffsetStart.' and '.$GarbageOffsetEnd.'), but did find valid CBR stream starting at '.$GarbageOffsetEnd);
} else {
-
- $ThisFileInfo['warning'][] = 'using data from VBR header even though could not find '.GETID3_MP3_VALID_CHECK_FRAMES.' consecutive MPEG-audio frames immediately after VBR header (garbage data for '.($GarbageOffsetEnd - $GarbageOffsetStart).' bytes between '.$GarbageOffsetStart.' and '.$GarbageOffsetEnd.')';
-
+ $this->warning('using data from VBR header even though could not find '.GETID3_MP3_VALID_CHECK_FRAMES.' consecutive MPEG-audio frames immediately after VBR header (garbage data for '.($GarbageOffsetEnd - $GarbageOffsetStart).' bytes between '.$GarbageOffsetStart.' and '.$GarbageOffsetEnd.')');
}
}
}
- if (isset($ThisFileInfo['mpeg']['audio']['bitrate_mode']) && ($ThisFileInfo['mpeg']['audio']['bitrate_mode'] == 'vbr') && !isset($ThisFileInfo['mpeg']['audio']['VBR_method'])) {
+ if (isset($info['mpeg']['audio']['bitrate_mode']) && ($info['mpeg']['audio']['bitrate_mode'] == 'vbr') && !isset($info['mpeg']['audio']['VBR_method'])) {
// VBR file with no VBR header
$BitrateHistogram = true;
}
@@ -1436,50 +1524,107 @@
if ($BitrateHistogram) {
- $ThisFileInfo['mpeg']['audio']['stereo_distribution'] = array('stereo'=>0, 'joint stereo'=>0, 'dual channel'=>0, 'mono'=>0);
- $ThisFileInfo['mpeg']['audio']['version_distribution'] = array('1'=>0, '2'=>0, '2.5'=>0);
+ $info['mpeg']['audio']['stereo_distribution'] = array('stereo'=>0, 'joint stereo'=>0, 'dual channel'=>0, 'mono'=>0);
+ $info['mpeg']['audio']['version_distribution'] = array('1'=>0, '2'=>0, '2.5'=>0);
- if ($ThisFileInfo['mpeg']['audio']['version'] == '1') {
- if ($ThisFileInfo['mpeg']['audio']['layer'] == 3) {
- $ThisFileInfo['mpeg']['audio']['bitrate_distribution'] = array('free'=>0, 32000=>0, 40000=>0, 48000=>0, 56000=>0, 64000=>0, 80000=>0, 96000=>0, 112000=>0, 128000=>0, 160000=>0, 192000=>0, 224000=>0, 256000=>0, 320000=>0);
- } elseif ($ThisFileInfo['mpeg']['audio']['layer'] == 2) {
- $ThisFileInfo['mpeg']['audio']['bitrate_distribution'] = array('free'=>0, 32000=>0, 48000=>0, 56000=>0, 64000=>0, 80000=>0, 96000=>0, 112000=>0, 128000=>0, 160000=>0, 192000=>0, 224000=>0, 256000=>0, 320000=>0, 384000=>0);
- } elseif ($ThisFileInfo['mpeg']['audio']['layer'] == 1) {
- $ThisFileInfo['mpeg']['audio']['bitrate_distribution'] = array('free'=>0, 32000=>0, 64000=>0, 96000=>0, 128000=>0, 160000=>0, 192000=>0, 224000=>0, 256000=>0, 288000=>0, 320000=>0, 352000=>0, 384000=>0, 416000=>0, 448000=>0);
+ if ($info['mpeg']['audio']['version'] == '1') {
+ if ($info['mpeg']['audio']['layer'] == 3) {
+ $info['mpeg']['audio']['bitrate_distribution'] = array('free'=>0, 32000=>0, 40000=>0, 48000=>0, 56000=>0, 64000=>0, 80000=>0, 96000=>0, 112000=>0, 128000=>0, 160000=>0, 192000=>0, 224000=>0, 256000=>0, 320000=>0);
+ } elseif ($info['mpeg']['audio']['layer'] == 2) {
+ $info['mpeg']['audio']['bitrate_distribution'] = array('free'=>0, 32000=>0, 48000=>0, 56000=>0, 64000=>0, 80000=>0, 96000=>0, 112000=>0, 128000=>0, 160000=>0, 192000=>0, 224000=>0, 256000=>0, 320000=>0, 384000=>0);
+ } elseif ($info['mpeg']['audio']['layer'] == 1) {
+ $info['mpeg']['audio']['bitrate_distribution'] = array('free'=>0, 32000=>0, 64000=>0, 96000=>0, 128000=>0, 160000=>0, 192000=>0, 224000=>0, 256000=>0, 288000=>0, 320000=>0, 352000=>0, 384000=>0, 416000=>0, 448000=>0);
}
- } elseif ($ThisFileInfo['mpeg']['audio']['layer'] == 1) {
- $ThisFileInfo['mpeg']['audio']['bitrate_distribution'] = array('free'=>0, 32000=>0, 48000=>0, 56000=>0, 64000=>0, 80000=>0, 96000=>0, 112000=>0, 128000=>0, 144000=>0, 160000=>0, 176000=>0, 192000=>0, 224000=>0, 256000=>0);
+ } elseif ($info['mpeg']['audio']['layer'] == 1) {
+ $info['mpeg']['audio']['bitrate_distribution'] = array('free'=>0, 32000=>0, 48000=>0, 56000=>0, 64000=>0, 80000=>0, 96000=>0, 112000=>0, 128000=>0, 144000=>0, 160000=>0, 176000=>0, 192000=>0, 224000=>0, 256000=>0);
} else {
- $ThisFileInfo['mpeg']['audio']['bitrate_distribution'] = array('free'=>0, 8000=>0, 16000=>0, 24000=>0, 32000=>0, 40000=>0, 48000=>0, 56000=>0, 64000=>0, 80000=>0, 96000=>0, 112000=>0, 128000=>0, 144000=>0, 160000=>0);
+ $info['mpeg']['audio']['bitrate_distribution'] = array('free'=>0, 8000=>0, 16000=>0, 24000=>0, 32000=>0, 40000=>0, 48000=>0, 56000=>0, 64000=>0, 80000=>0, 96000=>0, 112000=>0, 128000=>0, 144000=>0, 160000=>0);
}
- $dummy = array('error'=>$ThisFileInfo['error'], 'warning'=>$ThisFileInfo['warning'], 'avdataend'=>$ThisFileInfo['avdataend'], 'avdataoffset'=>$ThisFileInfo['avdataoffset']);
- $synchstartoffset = $ThisFileInfo['avdataoffset'];
+ $dummy = array('error'=>$info['error'], 'warning'=>$info['warning'], 'avdataend'=>$info['avdataend'], 'avdataoffset'=>$info['avdataoffset']);
+ $synchstartoffset = $info['avdataoffset'];
+ $this->fseek($info['avdataoffset']);
+ // you can play with these numbers:
+ $max_frames_scan = 50000;
+ $max_scan_segments = 10;
+
+ // don't play with these numbers:
$FastMode = false;
$SynchErrorsFound = 0;
- while (getid3_mp3::decodeMPEGaudioHeader($fd, $synchstartoffset, $dummy, false, false, $FastMode)) {
- $FastMode = true;
- $thisframebitrate = $MPEGaudioBitrateLookup[$MPEGaudioVersionLookup[$dummy['mpeg']['audio']['raw']['version']]][$MPEGaudioLayerLookup[$dummy['mpeg']['audio']['raw']['layer']]][$dummy['mpeg']['audio']['raw']['bitrate']];
+ $frames_scanned = 0;
+ $this_scan_segment = 0;
+ $frames_scan_per_segment = ceil($max_frames_scan / $max_scan_segments);
+ $pct_data_scanned = 0;
+ for ($current_segment = 0; $current_segment < $max_scan_segments; $current_segment++) {
+ $frames_scanned_this_segment = 0;
+ if ($this->ftell() >= $info['avdataend']) {
+ break;
+ }
+ $scan_start_offset[$current_segment] = max($this->ftell(), $info['avdataoffset'] + round($current_segment * (($info['avdataend'] - $info['avdataoffset']) / $max_scan_segments)));
+ if ($current_segment > 0) {
+ $this->fseek($scan_start_offset[$current_segment]);
+ $buffer_4k = $this->fread(4096);
+ for ($j = 0; $j < (strlen($buffer_4k) - 4); $j++) {
+ if (($buffer_4k[$j] == "\xFF") && ($buffer_4k[($j + 1)] > "\xE0")) { // synch detected
+ if ($this->decodeMPEGaudioHeader($scan_start_offset[$current_segment] + $j, $dummy, false, false, $FastMode)) {
+ $calculated_next_offset = $scan_start_offset[$current_segment] + $j + $dummy['mpeg']['audio']['framelength'];
+ if ($this->decodeMPEGaudioHeader($calculated_next_offset, $dummy, false, false, $FastMode)) {
+ $scan_start_offset[$current_segment] += $j;
+ break;
+ }
+ }
+ }
+ }
+ }
+ $synchstartoffset = $scan_start_offset[$current_segment];
+ while (($synchstartoffset < $info['avdataend']) && $this->decodeMPEGaudioHeader($synchstartoffset, $dummy, false, false, $FastMode)) {
+ $FastMode = true;
+ $thisframebitrate = $MPEGaudioBitrateLookup[$MPEGaudioVersionLookup[$dummy['mpeg']['audio']['raw']['version']]][$MPEGaudioLayerLookup[$dummy['mpeg']['audio']['raw']['layer']]][$dummy['mpeg']['audio']['raw']['bitrate']];
- if (empty($dummy['mpeg']['audio']['framelength'])) {
- $SynchErrorsFound++;
- } else {
- $ThisFileInfo['mpeg']['audio']['bitrate_distribution'][$thisframebitrate]++;
- $ThisFileInfo['mpeg']['audio']['stereo_distribution'][$dummy['mpeg']['audio']['channelmode']]++;
- $ThisFileInfo['mpeg']['audio']['version_distribution'][$dummy['mpeg']['audio']['version']]++;
-
- $synchstartoffset += $dummy['mpeg']['audio']['framelength'];
+ if (empty($dummy['mpeg']['audio']['framelength'])) {
+ $SynchErrorsFound++;
+ $synchstartoffset++;
+ } else {
+ getid3_lib::safe_inc($info['mpeg']['audio']['bitrate_distribution'][$thisframebitrate]);
+ getid3_lib::safe_inc($info['mpeg']['audio']['stereo_distribution'][$dummy['mpeg']['audio']['channelmode']]);
+ getid3_lib::safe_inc($info['mpeg']['audio']['version_distribution'][$dummy['mpeg']['audio']['version']]);
+ $synchstartoffset += $dummy['mpeg']['audio']['framelength'];
+ }
+ $frames_scanned++;
+ if ($frames_scan_per_segment && (++$frames_scanned_this_segment >= $frames_scan_per_segment)) {
+ $this_pct_scanned = ($this->ftell() - $scan_start_offset[$current_segment]) / ($info['avdataend'] - $info['avdataoffset']);
+ if (($current_segment == 0) && (($this_pct_scanned * $max_scan_segments) >= 1)) {
+ // file likely contains < $max_frames_scan, just scan as one segment
+ $max_scan_segments = 1;
+ $frames_scan_per_segment = $max_frames_scan;
+ } else {
+ $pct_data_scanned += $this_pct_scanned;
+ break;
+ }
+ }
}
}
+ if ($pct_data_scanned > 0) {
+ $this->warning('too many MPEG audio frames to scan, only scanned '.$frames_scanned.' frames in '.$max_scan_segments.' segments ('.number_format($pct_data_scanned * 100, 1).'% of file) and extrapolated distribution, playtime and bitrate may be incorrect.');
+ foreach ($info['mpeg']['audio'] as $key1 => $value1) {
+ if (!preg_match('#_distribution$#i', $key1)) {
+ continue;
+ }
+ foreach ($value1 as $key2 => $value2) {
+ $info['mpeg']['audio'][$key1][$key2] = round($value2 / $pct_data_scanned);
+ }
+ }
+ }
+
if ($SynchErrorsFound > 0) {
- $ThisFileInfo['warning'][] = 'Found '.$SynchErrorsFound.' synch errors in histogram analysis';
+ $this->warning('Found '.$SynchErrorsFound.' synch errors in histogram analysis');
//return false;
}
$bittotal = 0;
$framecounter = 0;
- foreach ($ThisFileInfo['mpeg']['audio']['bitrate_distribution'] as $bitratevalue => $bitratecount) {
+ foreach ($info['mpeg']['audio']['bitrate_distribution'] as $bitratevalue => $bitratecount) {
$framecounter += $bitratecount;
if ($bitratevalue != 'free') {
$bittotal += ($bitratevalue * $bitratecount);
@@ -1486,28 +1631,28 @@
}
}
if ($framecounter == 0) {
- $ThisFileInfo['error'][] = 'Corrupt MP3 file: framecounter == zero';
+ $this->error('Corrupt MP3 file: framecounter == zero');
return false;
}
- $ThisFileInfo['mpeg']['audio']['frame_count'] = $framecounter;
- $ThisFileInfo['mpeg']['audio']['bitrate'] = ($bittotal / $framecounter);
+ $info['mpeg']['audio']['frame_count'] = getid3_lib::CastAsInt($framecounter);
+ $info['mpeg']['audio']['bitrate'] = ($bittotal / $framecounter);
- $ThisFileInfo['audio']['bitrate'] = $ThisFileInfo['mpeg']['audio']['bitrate'];
+ $info['audio']['bitrate'] = $info['mpeg']['audio']['bitrate'];
// Definitively set VBR vs CBR, even if the Xing/LAME/VBRI header says differently
$distinct_bitrates = 0;
- foreach ($ThisFileInfo['mpeg']['audio']['bitrate_distribution'] as $bitrate_value => $bitrate_count) {
+ foreach ($info['mpeg']['audio']['bitrate_distribution'] as $bitrate_value => $bitrate_count) {
if ($bitrate_count > 0) {
$distinct_bitrates++;
}
}
if ($distinct_bitrates > 1) {
- $ThisFileInfo['mpeg']['audio']['bitrate_mode'] = 'vbr';
+ $info['mpeg']['audio']['bitrate_mode'] = 'vbr';
} else {
- $ThisFileInfo['mpeg']['audio']['bitrate_mode'] = 'cbr';
+ $info['mpeg']['audio']['bitrate_mode'] = 'cbr';
}
- $ThisFileInfo['audio']['bitrate_mode'] = $ThisFileInfo['mpeg']['audio']['bitrate_mode'];
+ $info['audio']['bitrate_mode'] = $info['mpeg']['audio']['bitrate_mode'];
}
@@ -1516,20 +1661,20 @@
}
$SynchSeekOffset++;
- if (($avdataoffset + $SynchSeekOffset) >= $ThisFileInfo['avdataend']) {
+ if (($avdataoffset + $SynchSeekOffset) >= $info['avdataend']) {
// end of file/data
- if (empty($ThisFileInfo['mpeg']['audio'])) {
+ if (empty($info['mpeg']['audio'])) {
- $ThisFileInfo['error'][] = 'could not find valid MPEG synch before end of file';
- if (isset($ThisFileInfo['audio']['bitrate'])) {
- unset($ThisFileInfo['audio']['bitrate']);
+ $this->error('could not find valid MPEG synch before end of file');
+ if (isset($info['audio']['bitrate'])) {
+ unset($info['audio']['bitrate']);
}
- if (isset($ThisFileInfo['mpeg']['audio'])) {
- unset($ThisFileInfo['mpeg']['audio']);
+ if (isset($info['mpeg']['audio'])) {
+ unset($info['mpeg']['audio']);
}
- if (isset($ThisFileInfo['mpeg']) && (!is_array($ThisFileInfo['mpeg']) || empty($ThisFileInfo['mpeg']))) {
- unset($ThisFileInfo['mpeg']);
+ if (isset($info['mpeg']) && (!is_array($info['mpeg']) || empty($info['mpeg']))) {
+ unset($info['mpeg']);
}
return false;
@@ -1538,35 +1683,43 @@
}
}
- $ThisFileInfo['audio']['channels'] = $ThisFileInfo['mpeg']['audio']['channels'];
- $ThisFileInfo['audio']['channelmode'] = $ThisFileInfo['mpeg']['audio']['channelmode'];
- $ThisFileInfo['audio']['sample_rate'] = $ThisFileInfo['mpeg']['audio']['sample_rate'];
+ $info['audio']['channels'] = $info['mpeg']['audio']['channels'];
+ $info['audio']['channelmode'] = $info['mpeg']['audio']['channelmode'];
+ $info['audio']['sample_rate'] = $info['mpeg']['audio']['sample_rate'];
return true;
}
-
- function MPEGaudioVersionArray() {
+ /**
+ * @return array
+ */
+ public static function MPEGaudioVersionArray() {
static $MPEGaudioVersion = array('2.5', false, '2', '1');
return $MPEGaudioVersion;
}
- function MPEGaudioLayerArray() {
+ /**
+ * @return array
+ */
+ public static function MPEGaudioLayerArray() {
static $MPEGaudioLayer = array(false, 3, 2, 1);
return $MPEGaudioLayer;
}
- function MPEGaudioBitrateArray() {
+ /**
+ * @return array
+ */
+ public static function MPEGaudioBitrateArray() {
static $MPEGaudioBitrate;
if (empty($MPEGaudioBitrate)) {
- $MPEGaudioBitrate = array (
- '1' => array (1 => array('free', 32000, 64000, 96000, 128000, 160000, 192000, 224000, 256000, 288000, 320000, 352000, 384000, 416000, 448000),
- 2 => array('free', 32000, 48000, 56000, 64000, 80000, 96000, 112000, 128000, 160000, 192000, 224000, 256000, 320000, 384000),
- 3 => array('free', 32000, 40000, 48000, 56000, 64000, 80000, 96000, 112000, 128000, 160000, 192000, 224000, 256000, 320000)
- ),
+ $MPEGaudioBitrate = array (
+ '1' => array (1 => array('free', 32000, 64000, 96000, 128000, 160000, 192000, 224000, 256000, 288000, 320000, 352000, 384000, 416000, 448000),
+ 2 => array('free', 32000, 48000, 56000, 64000, 80000, 96000, 112000, 128000, 160000, 192000, 224000, 256000, 320000, 384000),
+ 3 => array('free', 32000, 40000, 48000, 56000, 64000, 80000, 96000, 112000, 128000, 160000, 192000, 224000, 256000, 320000)
+ ),
- '2' => array (1 => array('free', 32000, 48000, 56000, 64000, 80000, 96000, 112000, 128000, 144000, 160000, 176000, 192000, 224000, 256000),
- 2 => array('free', 8000, 16000, 24000, 32000, 40000, 48000, 56000, 64000, 80000, 96000, 112000, 128000, 144000, 160000),
- )
+ '2' => array (1 => array('free', 32000, 48000, 56000, 64000, 80000, 96000, 112000, 128000, 144000, 160000, 176000, 192000, 224000, 256000),
+ 2 => array('free', 8000, 16000, 24000, 32000, 40000, 48000, 56000, 64000, 80000, 96000, 112000, 128000, 144000, 160000),
+ )
);
$MPEGaudioBitrate['2'][3] = $MPEGaudioBitrate['2'][2];
$MPEGaudioBitrate['2.5'] = $MPEGaudioBitrate['2'];
@@ -1574,46 +1727,71 @@
return $MPEGaudioBitrate;
}
- function MPEGaudioFrequencyArray() {
+ /**
+ * @return array
+ */
+ public static function MPEGaudioFrequencyArray() {
static $MPEGaudioFrequency;
if (empty($MPEGaudioFrequency)) {
- $MPEGaudioFrequency = array (
- '1' => array(44100, 48000, 32000),
- '2' => array(22050, 24000, 16000),
- '2.5' => array(11025, 12000, 8000)
+ $MPEGaudioFrequency = array (
+ '1' => array(44100, 48000, 32000),
+ '2' => array(22050, 24000, 16000),
+ '2.5' => array(11025, 12000, 8000)
);
}
return $MPEGaudioFrequency;
}
- function MPEGaudioChannelModeArray() {
+ /**
+ * @return array
+ */
+ public static function MPEGaudioChannelModeArray() {
static $MPEGaudioChannelMode = array('stereo', 'joint stereo', 'dual channel', 'mono');
return $MPEGaudioChannelMode;
}
- function MPEGaudioModeExtensionArray() {
+ /**
+ * @return array
+ */
+ public static function MPEGaudioModeExtensionArray() {
static $MPEGaudioModeExtension;
if (empty($MPEGaudioModeExtension)) {
- $MPEGaudioModeExtension = array (
- 1 => array('4-31', '8-31', '12-31', '16-31'),
- 2 => array('4-31', '8-31', '12-31', '16-31'),
- 3 => array('', 'IS', 'MS', 'IS+MS')
+ $MPEGaudioModeExtension = array (
+ 1 => array('4-31', '8-31', '12-31', '16-31'),
+ 2 => array('4-31', '8-31', '12-31', '16-31'),
+ 3 => array('', 'IS', 'MS', 'IS+MS')
);
}
return $MPEGaudioModeExtension;
}
- function MPEGaudioEmphasisArray() {
+ /**
+ * @return array
+ */
+ public static function MPEGaudioEmphasisArray() {
static $MPEGaudioEmphasis = array('none', '50/15ms', false, 'CCIT J.17');
return $MPEGaudioEmphasis;
}
- function MPEGaudioHeaderBytesValid($head4, $allowBitrate15=false) {
- return getid3_mp3::MPEGaudioHeaderValid(getid3_mp3::MPEGaudioHeaderDecode($head4), false, $allowBitrate15);
+ /**
+ * @param string $head4
+ * @param bool $allowBitrate15
+ *
+ * @return bool
+ */
+ public static function MPEGaudioHeaderBytesValid($head4, $allowBitrate15=false) {
+ return self::MPEGaudioHeaderValid(self::MPEGaudioHeaderDecode($head4), false, $allowBitrate15);
}
- function MPEGaudioHeaderValid($rawarray, $echoerrors=false, $allowBitrate15=false) {
- if (($rawarray['synch'] & 0x0FFE) != 0x0FFE) {
+ /**
+ * @param array $rawarray
+ * @param bool $echoerrors
+ * @param bool $allowBitrate15
+ *
+ * @return bool
+ */
+ public static function MPEGaudioHeaderValid($rawarray, $echoerrors=false, $allowBitrate15=false) {
+ if (!isset($rawarray['synch']) || ($rawarray['synch'] & 0x0FFE) != 0x0FFE) {
return false;
}
@@ -1625,13 +1803,13 @@
static $MPEGaudioModeExtensionLookup;
static $MPEGaudioEmphasisLookup;
if (empty($MPEGaudioVersionLookup)) {
- $MPEGaudioVersionLookup = getid3_mp3::MPEGaudioVersionArray();
- $MPEGaudioLayerLookup = getid3_mp3::MPEGaudioLayerArray();
- $MPEGaudioBitrateLookup = getid3_mp3::MPEGaudioBitrateArray();
- $MPEGaudioFrequencyLookup = getid3_mp3::MPEGaudioFrequencyArray();
- $MPEGaudioChannelModeLookup = getid3_mp3::MPEGaudioChannelModeArray();
- $MPEGaudioModeExtensionLookup = getid3_mp3::MPEGaudioModeExtensionArray();
- $MPEGaudioEmphasisLookup = getid3_mp3::MPEGaudioEmphasisArray();
+ $MPEGaudioVersionLookup = self::MPEGaudioVersionArray();
+ $MPEGaudioLayerLookup = self::MPEGaudioLayerArray();
+ $MPEGaudioBitrateLookup = self::MPEGaudioBitrateArray();
+ $MPEGaudioFrequencyLookup = self::MPEGaudioFrequencyArray();
+ $MPEGaudioChannelModeLookup = self::MPEGaudioChannelModeArray();
+ $MPEGaudioModeExtensionLookup = self::MPEGaudioModeExtensionArray();
+ $MPEGaudioEmphasisLookup = self::MPEGaudioEmphasisArray();
}
if (isset($MPEGaudioVersionLookup[$rawarray['version']])) {
@@ -1684,7 +1862,12 @@
return true;
}
- function MPEGaudioHeaderDecode($Header4Bytes) {
+ /**
+ * @param string $Header4Bytes
+ *
+ * @return array|false
+ */
+ public static function MPEGaudioHeaderDecode($Header4Bytes) {
// AAAA AAAA AAAB BCCD EEEE FFGH IIJJ KLMM
// A - Frame sync (all bits set)
// B - MPEG Audio version ID
@@ -1705,23 +1888,32 @@
}
$MPEGrawHeader['synch'] = (getid3_lib::BigEndian2Int(substr($Header4Bytes, 0, 2)) & 0xFFE0) >> 4;
- $MPEGrawHeader['version'] = (ord($Header4Bytes{1}) & 0x18) >> 3; // BB
- $MPEGrawHeader['layer'] = (ord($Header4Bytes{1}) & 0x06) >> 1; // CC
- $MPEGrawHeader['protection'] = (ord($Header4Bytes{1}) & 0x01); // D
- $MPEGrawHeader['bitrate'] = (ord($Header4Bytes{2}) & 0xF0) >> 4; // EEEE
- $MPEGrawHeader['sample_rate'] = (ord($Header4Bytes{2}) & 0x0C) >> 2; // FF
- $MPEGrawHeader['padding'] = (ord($Header4Bytes{2}) & 0x02) >> 1; // G
- $MPEGrawHeader['private'] = (ord($Header4Bytes{2}) & 0x01); // H
- $MPEGrawHeader['channelmode'] = (ord($Header4Bytes{3}) & 0xC0) >> 6; // II
- $MPEGrawHeader['modeextension'] = (ord($Header4Bytes{3}) & 0x30) >> 4; // JJ
- $MPEGrawHeader['copyright'] = (ord($Header4Bytes{3}) & 0x08) >> 3; // K
- $MPEGrawHeader['original'] = (ord($Header4Bytes{3}) & 0x04) >> 2; // L
- $MPEGrawHeader['emphasis'] = (ord($Header4Bytes{3}) & 0x03); // MM
+ $MPEGrawHeader['version'] = (ord($Header4Bytes[1]) & 0x18) >> 3; // BB
+ $MPEGrawHeader['layer'] = (ord($Header4Bytes[1]) & 0x06) >> 1; // CC
+ $MPEGrawHeader['protection'] = (ord($Header4Bytes[1]) & 0x01); // D
+ $MPEGrawHeader['bitrate'] = (ord($Header4Bytes[2]) & 0xF0) >> 4; // EEEE
+ $MPEGrawHeader['sample_rate'] = (ord($Header4Bytes[2]) & 0x0C) >> 2; // FF
+ $MPEGrawHeader['padding'] = (ord($Header4Bytes[2]) & 0x02) >> 1; // G
+ $MPEGrawHeader['private'] = (ord($Header4Bytes[2]) & 0x01); // H
+ $MPEGrawHeader['channelmode'] = (ord($Header4Bytes[3]) & 0xC0) >> 6; // II
+ $MPEGrawHeader['modeextension'] = (ord($Header4Bytes[3]) & 0x30) >> 4; // JJ
+ $MPEGrawHeader['copyright'] = (ord($Header4Bytes[3]) & 0x08) >> 3; // K
+ $MPEGrawHeader['original'] = (ord($Header4Bytes[3]) & 0x04) >> 2; // L
+ $MPEGrawHeader['emphasis'] = (ord($Header4Bytes[3]) & 0x03); // MM
return $MPEGrawHeader;
}
- function MPEGaudioFrameLength(&$bitrate, &$version, &$layer, $padding, &$samplerate) {
+ /**
+ * @param int|string $bitrate
+ * @param string $version
+ * @param string $layer
+ * @param bool $padding
+ * @param int $samplerate
+ *
+ * @return int|false
+ */
+ public static function MPEGaudioFrameLength(&$bitrate, &$version, &$layer, $padding, &$samplerate) {
static $AudioFrameLengthCache = array();
if (!isset($AudioFrameLengthCache[$bitrate][$version][$layer][$padding][$samplerate])) {
@@ -1782,54 +1974,69 @@
return $AudioFrameLengthCache[$bitrate][$version][$layer][$padding][$samplerate];
}
- function ClosestStandardMP3Bitrate($bitrate) {
- static $StandardBitrates = array(320000, 256000, 224000, 192000, 160000, 128000, 112000, 96000, 80000, 64000, 56000, 48000, 40000, 32000, 24000, 16000, 8000);
- static $BitrateTable = array(0=>'-');
- $roundbitrate = intval(round($bitrate, -3));
- if (!isset($BitrateTable[$roundbitrate])) {
- if ($roundbitrate > 320000) {
- $BitrateTable[$roundbitrate] = round($bitrate, -4);
+ /**
+ * @param float|int $bit_rate
+ *
+ * @return int|float|string
+ */
+ public static function ClosestStandardMP3Bitrate($bit_rate) {
+ static $standard_bit_rates = array (320000, 256000, 224000, 192000, 160000, 128000, 112000, 96000, 80000, 64000, 56000, 48000, 40000, 32000, 24000, 16000, 8000);
+ static $bit_rate_table = array (0=>'-');
+ $round_bit_rate = intval(round($bit_rate, -3));
+ if (!isset($bit_rate_table[$round_bit_rate])) {
+ if ($round_bit_rate > max($standard_bit_rates)) {
+ $bit_rate_table[$round_bit_rate] = round($bit_rate, 2 - strlen($bit_rate));
} else {
- $LastBitrate = 320000;
- foreach ($StandardBitrates as $StandardBitrate) {
- $BitrateTable[$roundbitrate] = $StandardBitrate;
- if ($roundbitrate >= $StandardBitrate - (($LastBitrate - $StandardBitrate) / 2)) {
+ $bit_rate_table[$round_bit_rate] = max($standard_bit_rates);
+ foreach ($standard_bit_rates as $standard_bit_rate) {
+ if ($round_bit_rate >= $standard_bit_rate + (($bit_rate_table[$round_bit_rate] - $standard_bit_rate) / 2)) {
break;
}
- $LastBitrate = $StandardBitrate;
+ $bit_rate_table[$round_bit_rate] = $standard_bit_rate;
}
}
}
- return $BitrateTable[$roundbitrate];
+ return $bit_rate_table[$round_bit_rate];
}
- function XingVBRidOffset($version, $channelmode) {
+ /**
+ * @param string $version
+ * @param string $channelmode
+ *
+ * @return int
+ */
+ public static function XingVBRidOffset($version, $channelmode) {
static $XingVBRidOffsetCache = array();
- if (empty($XingVBRidOffset)) {
- $XingVBRidOffset = array (
- '1' => array ('mono' => 0x15, // 4 + 17 = 21
- 'stereo' => 0x24, // 4 + 32 = 36
- 'joint stereo' => 0x24,
- 'dual channel' => 0x24
- ),
+ if (empty($XingVBRidOffsetCache)) {
+ $XingVBRidOffsetCache = array (
+ '1' => array ('mono' => 0x15, // 4 + 17 = 21
+ 'stereo' => 0x24, // 4 + 32 = 36
+ 'joint stereo' => 0x24,
+ 'dual channel' => 0x24
+ ),
- '2' => array ('mono' => 0x0D, // 4 + 9 = 13
- 'stereo' => 0x15, // 4 + 17 = 21
- 'joint stereo' => 0x15,
- 'dual channel' => 0x15
- ),
+ '2' => array ('mono' => 0x0D, // 4 + 9 = 13
+ 'stereo' => 0x15, // 4 + 17 = 21
+ 'joint stereo' => 0x15,
+ 'dual channel' => 0x15
+ ),
- '2.5' => array ('mono' => 0x15,
- 'stereo' => 0x15,
- 'joint stereo' => 0x15,
- 'dual channel' => 0x15
- )
- );
+ '2.5' => array ('mono' => 0x15,
+ 'stereo' => 0x15,
+ 'joint stereo' => 0x15,
+ 'dual channel' => 0x15
+ )
+ );
}
- return $XingVBRidOffset[$version][$channelmode];
+ return $XingVBRidOffsetCache[$version][$channelmode];
}
- function LAMEvbrMethodLookup($VBRmethodID) {
+ /**
+ * @param int $VBRmethodID
+ *
+ * @return string
+ */
+ public static function LAMEvbrMethodLookup($VBRmethodID) {
static $LAMEvbrMethodLookup = array(
0x00 => 'unknown',
0x01 => 'cbr',
@@ -1837,15 +2044,20 @@
0x03 => 'vbr-old / vbr-rh',
0x04 => 'vbr-new / vbr-mtrh',
0x05 => 'vbr-mt',
- 0x06 => 'Full VBR Method 4',
- 0x08 => 'constant bitrate 2 pass',
- 0x09 => 'abr 2 pass',
+ 0x06 => 'vbr (full vbr method 4)',
+ 0x08 => 'cbr (constant bitrate 2 pass)',
+ 0x09 => 'abr (2 pass)',
0x0F => 'reserved'
);
return (isset($LAMEvbrMethodLookup[$VBRmethodID]) ? $LAMEvbrMethodLookup[$VBRmethodID] : '');
}
- function LAMEmiscStereoModeLookup($StereoModeID) {
+ /**
+ * @param int $StereoModeID
+ *
+ * @return string
+ */
+ public static function LAMEmiscStereoModeLookup($StereoModeID) {
static $LAMEmiscStereoModeLookup = array(
0 => 'mono',
1 => 'stereo',
@@ -1859,7 +2071,12 @@
return (isset($LAMEmiscStereoModeLookup[$StereoModeID]) ? $LAMEmiscStereoModeLookup[$StereoModeID] : '');
}
- function LAMEmiscSourceSampleFrequencyLookup($SourceSampleFrequencyID) {
+ /**
+ * @param int $SourceSampleFrequencyID
+ *
+ * @return string
+ */
+ public static function LAMEmiscSourceSampleFrequencyLookup($SourceSampleFrequencyID) {
static $LAMEmiscSourceSampleFrequencyLookup = array(
0 => '<= 32 kHz',
1 => '44.1 kHz',
@@ -1869,7 +2086,12 @@
return (isset($LAMEmiscSourceSampleFrequencyLookup[$SourceSampleFrequencyID]) ? $LAMEmiscSourceSampleFrequencyLookup[$SourceSampleFrequencyID] : '');
}
- function LAMEsurroundInfoLookup($SurroundInfoID) {
+ /**
+ * @param int $SurroundInfoID
+ *
+ * @return string
+ */
+ public static function LAMEsurroundInfoLookup($SurroundInfoID) {
static $LAMEsurroundInfoLookup = array(
0 => 'no surround info',
1 => 'DPL encoding',
@@ -1879,59 +2101,62 @@
return (isset($LAMEsurroundInfoLookup[$SurroundInfoID]) ? $LAMEsurroundInfoLookup[$SurroundInfoID] : 'reserved');
}
- function LAMEpresetUsedLookup($LAMEtag) {
+ /**
+ * @param array $LAMEtag
+ *
+ * @return string
+ */
+ public static function LAMEpresetUsedLookup($LAMEtag) {
- if ($LAMEtag['preset_used_id'] == 0) {
- // no preset used (LAME >=3.93)
- // no preset recorded (LAME <3.93)
- return '';
- }
- $LAMEpresetUsedLookup = array();
+ if ($LAMEtag['preset_used_id'] == 0) {
+ // no preset used (LAME >=3.93)
+ // no preset recorded (LAME <3.93)
+ return '';
+ }
+ $LAMEpresetUsedLookup = array();
- ///// THIS PART CANNOT BE STATIC .
- for ($i = 8; $i <= 320; $i++) {
- switch ($LAMEtag['vbr_method']) {
- case 'cbr':
- $LAMEpresetUsedLookup[$i] = '--alt-preset '.$LAMEtag['vbr_method'].' '.$i;
- break;
- case 'abr':
- default: // other VBR modes shouldn't be here(?)
- $LAMEpresetUsedLookup[$i] = '--alt-preset '.$i;
- break;
- }
- }
+ ///// THIS PART CANNOT BE STATIC .
+ for ($i = 8; $i <= 320; $i++) {
+ switch ($LAMEtag['vbr_method']) {
+ case 'cbr':
+ $LAMEpresetUsedLookup[$i] = '--alt-preset '.$LAMEtag['vbr_method'].' '.$i;
+ break;
+ case 'abr':
+ default: // other VBR modes shouldn't be here(?)
+ $LAMEpresetUsedLookup[$i] = '--alt-preset '.$i;
+ break;
+ }
+ }
- // named old-style presets (studio, phone, voice, etc) are handled in GuessEncoderOptions()
+ // named old-style presets (studio, phone, voice, etc) are handled in GuessEncoderOptions()
- // named alt-presets
- $LAMEpresetUsedLookup[1000] = '--r3mix';
- $LAMEpresetUsedLookup[1001] = '--alt-preset standard';
- $LAMEpresetUsedLookup[1002] = '--alt-preset extreme';
- $LAMEpresetUsedLookup[1003] = '--alt-preset insane';
- $LAMEpresetUsedLookup[1004] = '--alt-preset fast standard';
- $LAMEpresetUsedLookup[1005] = '--alt-preset fast extreme';
- $LAMEpresetUsedLookup[1006] = '--alt-preset medium';
- $LAMEpresetUsedLookup[1007] = '--alt-preset fast medium';
+ // named alt-presets
+ $LAMEpresetUsedLookup[1000] = '--r3mix';
+ $LAMEpresetUsedLookup[1001] = '--alt-preset standard';
+ $LAMEpresetUsedLookup[1002] = '--alt-preset extreme';
+ $LAMEpresetUsedLookup[1003] = '--alt-preset insane';
+ $LAMEpresetUsedLookup[1004] = '--alt-preset fast standard';
+ $LAMEpresetUsedLookup[1005] = '--alt-preset fast extreme';
+ $LAMEpresetUsedLookup[1006] = '--alt-preset medium';
+ $LAMEpresetUsedLookup[1007] = '--alt-preset fast medium';
- // LAME 3.94 additions/changes
- $LAMEpresetUsedLookup[1010] = '--preset portable'; // 3.94a15 Oct 21 2003
- $LAMEpresetUsedLookup[1015] = '--preset radio'; // 3.94a15 Oct 21 2003
+ // LAME 3.94 additions/changes
+ $LAMEpresetUsedLookup[1010] = '--preset portable'; // 3.94a15 Oct 21 2003
+ $LAMEpresetUsedLookup[1015] = '--preset radio'; // 3.94a15 Oct 21 2003
- $LAMEpresetUsedLookup[320] = '--preset insane'; // 3.94a15 Nov 12 2003
- $LAMEpresetUsedLookup[410] = '-V9';
- $LAMEpresetUsedLookup[420] = '-V8';
- $LAMEpresetUsedLookup[440] = '-V6';
- $LAMEpresetUsedLookup[430] = '--preset radio'; // 3.94a15 Nov 12 2003
- $LAMEpresetUsedLookup[450] = '--preset '.(($LAMEtag['raw']['vbr_method'] == 4) ? 'fast ' : '').'portable'; // 3.94a15 Nov 12 2003
- $LAMEpresetUsedLookup[460] = '--preset '.(($LAMEtag['raw']['vbr_method'] == 4) ? 'fast ' : '').'medium'; // 3.94a15 Nov 12 2003
- $LAMEpresetUsedLookup[470] = '--r3mix'; // 3.94b1 Dec 18 2003
- $LAMEpresetUsedLookup[480] = '--preset '.(($LAMEtag['raw']['vbr_method'] == 4) ? 'fast ' : '').'standard'; // 3.94a15 Nov 12 2003
- $LAMEpresetUsedLookup[490] = '-V1';
- $LAMEpresetUsedLookup[500] = '--preset '.(($LAMEtag['raw']['vbr_method'] == 4) ? 'fast ' : '').'extreme'; // 3.94a15 Nov 12 2003
-
- return (isset($LAMEpresetUsedLookup[$LAMEtag['preset_used_id']]) ? $LAMEpresetUsedLookup[$LAMEtag['preset_used_id']] : 'new/unknown preset: '.$LAMEtag['preset_used_id'].' - report to info at getid3.org');
- }
+ $LAMEpresetUsedLookup[320] = '--preset insane'; // 3.94a15 Nov 12 2003
+ $LAMEpresetUsedLookup[410] = '-V9';
+ $LAMEpresetUsedLookup[420] = '-V8';
+ $LAMEpresetUsedLookup[440] = '-V6';
+ $LAMEpresetUsedLookup[430] = '--preset radio'; // 3.94a15 Nov 12 2003
+ $LAMEpresetUsedLookup[450] = '--preset '.(($LAMEtag['raw']['vbr_method'] == 4) ? 'fast ' : '').'portable'; // 3.94a15 Nov 12 2003
+ $LAMEpresetUsedLookup[460] = '--preset '.(($LAMEtag['raw']['vbr_method'] == 4) ? 'fast ' : '').'medium'; // 3.94a15 Nov 12 2003
+ $LAMEpresetUsedLookup[470] = '--r3mix'; // 3.94b1 Dec 18 2003
+ $LAMEpresetUsedLookup[480] = '--preset '.(($LAMEtag['raw']['vbr_method'] == 4) ? 'fast ' : '').'standard'; // 3.94a15 Nov 12 2003
+ $LAMEpresetUsedLookup[490] = '-V1';
+ $LAMEpresetUsedLookup[500] = '--preset '.(($LAMEtag['raw']['vbr_method'] == 4) ? 'fast ' : '').'extreme'; // 3.94a15 Nov 12 2003
+ return (isset($LAMEpresetUsedLookup[$LAMEtag['preset_used_id']]) ? $LAMEpresetUsedLookup[$LAMEtag['preset_used_id']] : 'new/unknown preset: '.$LAMEtag['preset_used_id'].' - report to info at getid3.org');
+ }
+
}
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.mpc.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.mpc.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.mpc.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio.mpc.php //
// module for analyzing Musepack/MPEG+ Audio files //
@@ -13,127 +14,231 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_mpc
+class getid3_mpc extends getid3_handler
{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- function getid3_mpc(&$fd, &$ThisFileInfo) {
- // http://www.uni-jena.de/~pfk/mpp/sv8/header.html
+ $info['mpc']['header'] = array();
+ $thisfile_mpc_header = &$info['mpc']['header'];
- $ThisFileInfo['mpc']['header'] = array();
- $thisfile_mpc_header = &$ThisFileInfo['mpc']['header'];
+ $info['fileformat'] = 'mpc';
+ $info['audio']['dataformat'] = 'mpc';
+ $info['audio']['bitrate_mode'] = 'vbr';
+ $info['audio']['channels'] = 2; // up to SV7 the format appears to have been hardcoded for stereo only
+ $info['audio']['lossless'] = false;
- $ThisFileInfo['fileformat'] = 'mpc';
- $ThisFileInfo['audio']['dataformat'] = 'mpc';
- $ThisFileInfo['audio']['bitrate_mode'] = 'vbr';
- $ThisFileInfo['audio']['channels'] = 2; // the format appears to be hardcoded for stereo only
- $ThisFileInfo['audio']['lossless'] = false;
+ $this->fseek($info['avdataoffset']);
+ $MPCheaderData = $this->fread(4);
+ $info['mpc']['header']['preamble'] = substr($MPCheaderData, 0, 4); // should be 'MPCK' (SV8) or 'MP+' (SV7), otherwise possible stream data (SV4-SV6)
+ if (preg_match('#^MPCK#', $info['mpc']['header']['preamble'])) {
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
+ // this is SV8
+ return $this->ParseMPCsv8();
- $thisfile_mpc_header['size'] = 28;
- $MPCheaderData = fread($fd, $thisfile_mpc_header['size']);
- $offset = 0;
+ } elseif (preg_match('#^MP\+#', $info['mpc']['header']['preamble'])) {
- if (substr($MPCheaderData, $offset, 3) == 'MP+') {
+ // this is SV7
+ return $this->ParseMPCsv7();
- // great, this is SV7+
- $thisfile_mpc_header['raw']['preamble'] = substr($MPCheaderData, $offset, 3); // should be 'MP+'
- $offset += 3;
+ } elseif (preg_match('/^[\x00\x01\x10\x11\x40\x41\x50\x51\x80\x81\x90\x91\xC0\xC1\xD0\xD1][\x20-37][\x00\x20\x40\x60\x80\xA0\xC0\xE0]/s', $MPCheaderData)) {
- } elseif (preg_match('/^[\x00\x01\x10\x11\x40\x41\x50\x51\x80\x81\x90\x91\xC0\xC1\xD0\xD1][\x20-37][\x00\x20\x40\x60\x80\xA0\xC0\xE0]/s', substr($MPCheaderData, 0, 4))) {
-
// this is SV4 - SV6, handle seperately
- $thisfile_mpc_header['size'] = 8;
+ return $this->ParseMPCsv6();
- // add size of file header to avdataoffset - calc bitrate correctly + MD5 data
- $ThisFileInfo['avdataoffset'] += $thisfile_mpc_header['size'];
+ } else {
- // Most of this code adapted from Jurgen Faul's MPEGplus source code - thanks Jurgen! :)
- $HeaderDWORD[0] = getid3_lib::LittleEndian2Int(substr($MPCheaderData, 0, 4));
- $HeaderDWORD[1] = getid3_lib::LittleEndian2Int(substr($MPCheaderData, 4, 4));
+ $this->error('Expecting "MP+" or "MPCK" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes(substr($MPCheaderData, 0, 4)).'"');
+ unset($info['fileformat']);
+ unset($info['mpc']);
+ return false;
+ }
+ }
- // DDDD DDDD CCCC CCCC BBBB BBBB AAAA AAAA
- // aaaa aaaa abcd dddd dddd deee eeff ffff
- //
- // a = bitrate = anything
- // b = IS = anything
- // c = MS = anything
- // d = streamversion = 0000000004 or 0000000005 or 0000000006
- // e = maxband = anything
- // f = blocksize = 000001 for SV5+, anything(?) for SV4
+ /**
+ * @return bool
+ */
+ public function ParseMPCsv8() {
+ // this is SV8
+ // http://trac.musepack.net/trac/wiki/SV8Specification
- $thisfile_mpc_header['target_bitrate'] = (($HeaderDWORD[0] & 0xFF800000) >> 23);
- $thisfile_mpc_header['intensity_stereo'] = (bool) (($HeaderDWORD[0] & 0x00400000) >> 22);
- $thisfile_mpc_header['mid-side_stereo'] = (bool) (($HeaderDWORD[0] & 0x00200000) >> 21);
- $thisfile_mpc_header['stream_major_version'] = ($HeaderDWORD[0] & 0x001FF800) >> 11;
- $thisfile_mpc_header['stream_minor_version'] = 0; // no sub-version numbers before SV7
- $thisfile_mpc_header['max_band'] = ($HeaderDWORD[0] & 0x000007C0) >> 6; // related to lowpass frequency, not sure how it translates exactly
- $thisfile_mpc_header['block_size'] = ($HeaderDWORD[0] & 0x0000003F);
+ $info = &$this->getid3->info;
+ $thisfile_mpc_header = &$info['mpc']['header'];
- switch ($thisfile_mpc_header['stream_major_version']) {
- case 4:
- $thisfile_mpc_header['frame_count'] = ($HeaderDWORD[1] >> 16);
+ $keyNameSize = 2;
+ $maxHandledPacketLength = 9; // specs say: "n*8; 0 < n < 10"
+
+ $offset = $this->ftell();
+ while ($offset < $info['avdataend']) {
+ $thisPacket = array();
+ $thisPacket['offset'] = $offset;
+ $packet_offset = 0;
+
+ // Size is a variable-size field, could be 1-4 bytes (possibly more?)
+ // read enough data in and figure out the exact size later
+ $MPCheaderData = $this->fread($keyNameSize + $maxHandledPacketLength);
+ $packet_offset += $keyNameSize;
+ $thisPacket['key'] = substr($MPCheaderData, 0, $keyNameSize);
+ $thisPacket['key_name'] = $this->MPCsv8PacketName($thisPacket['key']);
+ if ($thisPacket['key'] == $thisPacket['key_name']) {
+ $this->error('Found unexpected key value "'.$thisPacket['key'].'" at offset '.$thisPacket['offset']);
+ return false;
+ }
+ $packetLength = 0;
+ $thisPacket['packet_size'] = $this->SV8variableLengthInteger(substr($MPCheaderData, $keyNameSize), $packetLength); // includes keyname and packet_size field
+ if ($thisPacket['packet_size'] === false) {
+ $this->error('Did not find expected packet length within '.$maxHandledPacketLength.' bytes at offset '.($thisPacket['offset'] + $keyNameSize));
+ return false;
+ }
+ $packet_offset += $packetLength;
+ $offset += $thisPacket['packet_size'];
+
+ switch ($thisPacket['key']) {
+ case 'SH': // Stream Header
+ $moreBytesToRead = $thisPacket['packet_size'] - $keyNameSize - $maxHandledPacketLength;
+ if ($moreBytesToRead > 0) {
+ $MPCheaderData .= $this->fread($moreBytesToRead);
+ }
+ $thisPacket['crc'] = getid3_lib::BigEndian2Int(substr($MPCheaderData, $packet_offset, 4));
+ $packet_offset += 4;
+ $thisPacket['stream_version'] = getid3_lib::BigEndian2Int(substr($MPCheaderData, $packet_offset, 1));
+ $packet_offset += 1;
+
+ $packetLength = 0;
+ $thisPacket['sample_count'] = $this->SV8variableLengthInteger(substr($MPCheaderData, $packet_offset, $maxHandledPacketLength), $packetLength);
+ $packet_offset += $packetLength;
+
+ $packetLength = 0;
+ $thisPacket['beginning_silence'] = $this->SV8variableLengthInteger(substr($MPCheaderData, $packet_offset, $maxHandledPacketLength), $packetLength);
+ $packet_offset += $packetLength;
+
+ $otherUsefulData = getid3_lib::BigEndian2Int(substr($MPCheaderData, $packet_offset, 2));
+ $packet_offset += 2;
+ $thisPacket['sample_frequency_raw'] = (($otherUsefulData & 0xE000) >> 13);
+ $thisPacket['max_bands_used'] = (($otherUsefulData & 0x1F00) >> 8);
+ $thisPacket['channels'] = (($otherUsefulData & 0x00F0) >> 4) + 1;
+ $thisPacket['ms_used'] = (bool) (($otherUsefulData & 0x0008) >> 3);
+ $thisPacket['audio_block_frames'] = (($otherUsefulData & 0x0007) >> 0);
+ $thisPacket['sample_frequency'] = $this->MPCfrequencyLookup($thisPacket['sample_frequency_raw']);
+
+ $thisfile_mpc_header['mid_side_stereo'] = $thisPacket['ms_used'];
+ $thisfile_mpc_header['sample_rate'] = $thisPacket['sample_frequency'];
+ $thisfile_mpc_header['samples'] = $thisPacket['sample_count'];
+ $thisfile_mpc_header['stream_version_major'] = $thisPacket['stream_version'];
+
+ $info['audio']['channels'] = $thisPacket['channels'];
+ $info['audio']['sample_rate'] = $thisPacket['sample_frequency'];
+ $info['playtime_seconds'] = $thisPacket['sample_count'] / $thisPacket['sample_frequency'];
+ $info['audio']['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
break;
- case 5:
- case 6:
- $thisfile_mpc_header['frame_count'] = $HeaderDWORD[1];
+ case 'RG': // Replay Gain
+ $moreBytesToRead = $thisPacket['packet_size'] - $keyNameSize - $maxHandledPacketLength;
+ if ($moreBytesToRead > 0) {
+ $MPCheaderData .= $this->fread($moreBytesToRead);
+ }
+ $thisPacket['replaygain_version'] = getid3_lib::BigEndian2Int(substr($MPCheaderData, $packet_offset, 1));
+ $packet_offset += 1;
+ $thisPacket['replaygain_title_gain'] = getid3_lib::BigEndian2Int(substr($MPCheaderData, $packet_offset, 2));
+ $packet_offset += 2;
+ $thisPacket['replaygain_title_peak'] = getid3_lib::BigEndian2Int(substr($MPCheaderData, $packet_offset, 2));
+ $packet_offset += 2;
+ $thisPacket['replaygain_album_gain'] = getid3_lib::BigEndian2Int(substr($MPCheaderData, $packet_offset, 2));
+ $packet_offset += 2;
+ $thisPacket['replaygain_album_peak'] = getid3_lib::BigEndian2Int(substr($MPCheaderData, $packet_offset, 2));
+ $packet_offset += 2;
+
+ if ($thisPacket['replaygain_title_gain']) { $info['replay_gain']['title']['gain'] = $thisPacket['replaygain_title_gain']; }
+ if ($thisPacket['replaygain_title_peak']) { $info['replay_gain']['title']['peak'] = $thisPacket['replaygain_title_peak']; }
+ if ($thisPacket['replaygain_album_gain']) { $info['replay_gain']['album']['gain'] = $thisPacket['replaygain_album_gain']; }
+ if ($thisPacket['replaygain_album_peak']) { $info['replay_gain']['album']['peak'] = $thisPacket['replaygain_album_peak']; }
break;
- default:
- $ThisFileInfo['error'] = 'Expecting 4, 5 or 6 in version field, found '.$thisfile_mpc_header['stream_major_version'].' instead';
- unset($ThisFileInfo['mpc']);
- return false;
+ case 'EI': // Encoder Info
+ $moreBytesToRead = $thisPacket['packet_size'] - $keyNameSize - $maxHandledPacketLength;
+ if ($moreBytesToRead > 0) {
+ $MPCheaderData .= $this->fread($moreBytesToRead);
+ }
+ $profile_pns = getid3_lib::BigEndian2Int(substr($MPCheaderData, $packet_offset, 1));
+ $packet_offset += 1;
+ $quality_int = (($profile_pns & 0xF0) >> 4);
+ $quality_dec = (($profile_pns & 0x0E) >> 3);
+ $thisPacket['quality'] = (float) $quality_int + ($quality_dec / 8);
+ $thisPacket['pns_tool'] = (bool) (($profile_pns & 0x01) >> 0);
+ $thisPacket['version_major'] = getid3_lib::BigEndian2Int(substr($MPCheaderData, $packet_offset, 1));
+ $packet_offset += 1;
+ $thisPacket['version_minor'] = getid3_lib::BigEndian2Int(substr($MPCheaderData, $packet_offset, 1));
+ $packet_offset += 1;
+ $thisPacket['version_build'] = getid3_lib::BigEndian2Int(substr($MPCheaderData, $packet_offset, 1));
+ $packet_offset += 1;
+ $thisPacket['version'] = $thisPacket['version_major'].'.'.$thisPacket['version_minor'].'.'.$thisPacket['version_build'];
+
+ $info['audio']['encoder'] = 'MPC v'.$thisPacket['version'].' ('.(($thisPacket['version_minor'] % 2) ? 'unstable' : 'stable').')';
+ $thisfile_mpc_header['encoder_version'] = $info['audio']['encoder'];
+ //$thisfile_mpc_header['quality'] = (float) ($thisPacket['quality'] / 1.5875); // values can range from 0.000 to 15.875, mapped to qualities of 0.0 to 10.0
+ $thisfile_mpc_header['quality'] = (float) ($thisPacket['quality'] - 5); // values can range from 0.000 to 15.875, of which 0..4 are "reserved/experimental", and 5..15 are mapped to qualities of 0.0 to 10.0
break;
- }
- if (($thisfile_mpc_header['stream_major_version'] > 4) && ($thisfile_mpc_header['block_size'] != 1)) {
- $ThisFileInfo['warning'][] = 'Block size expected to be 1, actual value found: '.$thisfile_mpc_header['block_size'];
- }
+ case 'SO': // Seek Table Offset
+ $packetLength = 0;
+ $thisPacket['seek_table_offset'] = $thisPacket['offset'] + $this->SV8variableLengthInteger(substr($MPCheaderData, $packet_offset, $maxHandledPacketLength), $packetLength);
+ $packet_offset += $packetLength;
+ break;
- $thisfile_mpc_header['sample_rate'] = 44100; // AB: used by all files up to SV7
- $ThisFileInfo['audio']['sample_rate'] = $thisfile_mpc_header['sample_rate'];
- $thisfile_mpc_header['samples'] = $thisfile_mpc_header['frame_count'] * 1152 * $ThisFileInfo['audio']['channels'];
+ case 'ST': // Seek Table
+ case 'SE': // Stream End
+ case 'AP': // Audio Data
+ // nothing useful here, just skip this packet
+ $thisPacket = array();
+ break;
- if ($thisfile_mpc_header['target_bitrate'] == 0) {
- $ThisFileInfo['audio']['bitrate_mode'] = 'vbr';
- } else {
- $ThisFileInfo['audio']['bitrate_mode'] = 'cbr';
+ default:
+ $this->error('Found unhandled key type "'.$thisPacket['key'].'" at offset '.$thisPacket['offset']);
+ return false;
}
+ if (!empty($thisPacket)) {
+ $info['mpc']['packets'][] = $thisPacket;
+ }
+ $this->fseek($offset);
+ }
+ $thisfile_mpc_header['size'] = $offset;
+ return true;
+ }
- $ThisFileInfo['mpc']['bitrate'] = ($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) * 8 * 44100 / $thisfile_mpc_header['frame_count'] / 1152;
- $ThisFileInfo['audio']['bitrate'] = $ThisFileInfo['mpc']['bitrate'];
- $ThisFileInfo['audio']['encoder'] = 'SV'.$thisfile_mpc_header['stream_major_version'];
+ /**
+ * @return bool
+ */
+ public function ParseMPCsv7() {
+ // this is SV7
+ // http://www.uni-jena.de/~pfk/mpp/sv8/header.html
- return true;
+ $info = &$this->getid3->info;
+ $thisfile_mpc_header = &$info['mpc']['header'];
+ $offset = 0;
- } else {
+ $thisfile_mpc_header['size'] = 28;
+ $MPCheaderData = $info['mpc']['header']['preamble'];
+ $MPCheaderData .= $this->fread($thisfile_mpc_header['size'] - strlen($info['mpc']['header']['preamble']));
+ $offset = strlen('MP+');
- $ThisFileInfo['error'][] = 'Expecting "MP+" at offset '.$ThisFileInfo['avdataoffset'].', found "'.substr($MPCheaderData, $offset, 3).'"';
- unset($ThisFileInfo['fileformat']);
- unset($ThisFileInfo['mpc']);
- return false;
-
- }
-
- // Continue with SV7+ handling
$StreamVersionByte = getid3_lib::LittleEndian2Int(substr($MPCheaderData, $offset, 1));
$offset += 1;
- $thisfile_mpc_header['stream_major_version'] = ($StreamVersionByte & 0x0F);
- $thisfile_mpc_header['stream_minor_version'] = ($StreamVersionByte & 0xF0) >> 4;
+ $thisfile_mpc_header['stream_version_major'] = ($StreamVersionByte & 0x0F) >> 0;
+ $thisfile_mpc_header['stream_version_minor'] = ($StreamVersionByte & 0xF0) >> 4; // should always be 0, subversions no longer exist in SV8
$thisfile_mpc_header['frame_count'] = getid3_lib::LittleEndian2Int(substr($MPCheaderData, $offset, 4));
$offset += 4;
- switch ($thisfile_mpc_header['stream_major_version']) {
- case 7:
- //$ThisFileInfo['fileformat'] = 'SV7';
- break;
-
- default:
- $ThisFileInfo['error'][] = 'Only Musepack SV7 supported';
- return false;
+ if ($thisfile_mpc_header['stream_version_major'] != 7) {
+ $this->error('Only Musepack SV7 supported (this file claims to be v'.$thisfile_mpc_header['stream_version_major'].')');
+ return false;
}
$FlagsDWORD1 = getid3_lib::LittleEndian2Int(substr($MPCheaderData, $offset, 4));
@@ -171,22 +276,22 @@
$thisfile_mpc_header['profile'] = $this->MPCprofileNameLookup($thisfile_mpc_header['raw']['profile']);
$thisfile_mpc_header['sample_rate'] = $this->MPCfrequencyLookup($thisfile_mpc_header['raw']['sample_rate']);
if ($thisfile_mpc_header['sample_rate'] == 0) {
- $ThisFileInfo['error'][] = 'Corrupt MPC file: frequency == zero';
+ $this->error('Corrupt MPC file: frequency == zero');
return false;
}
- $ThisFileInfo['audio']['sample_rate'] = $thisfile_mpc_header['sample_rate'];
- $thisfile_mpc_header['samples'] = ((($thisfile_mpc_header['frame_count'] - 1) * 1152) + $thisfile_mpc_header['last_frame_length']) * $ThisFileInfo['audio']['channels'];
+ $info['audio']['sample_rate'] = $thisfile_mpc_header['sample_rate'];
+ $thisfile_mpc_header['samples'] = ((($thisfile_mpc_header['frame_count'] - 1) * 1152) + $thisfile_mpc_header['last_frame_length']) * $info['audio']['channels'];
- $ThisFileInfo['playtime_seconds'] = ($thisfile_mpc_header['samples'] / $ThisFileInfo['audio']['channels']) / $ThisFileInfo['audio']['sample_rate'];
- if ($ThisFileInfo['playtime_seconds'] == 0) {
- $ThisFileInfo['error'][] = 'Corrupt MPC file: playtime_seconds == zero';
+ $info['playtime_seconds'] = ($thisfile_mpc_header['samples'] / $info['audio']['channels']) / $info['audio']['sample_rate'];
+ if ($info['playtime_seconds'] == 0) {
+ $this->error('Corrupt MPC file: playtime_seconds == zero');
return false;
}
// add size of file header to avdataoffset - calc bitrate correctly + MD5 data
- $ThisFileInfo['avdataoffset'] += $thisfile_mpc_header['size'];
+ $info['avdataoffset'] += $thisfile_mpc_header['size'];
- $ThisFileInfo['audio']['bitrate'] = (($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) * 8) / $ThisFileInfo['playtime_seconds'];
+ $info['audio']['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
$thisfile_mpc_header['title_peak'] = $thisfile_mpc_header['raw']['title_peak'];
$thisfile_mpc_header['title_peak_db'] = $this->MPCpeakDBLookup($thisfile_mpc_header['title_peak']);
@@ -205,26 +310,109 @@
}
$thisfile_mpc_header['encoder_version'] = $this->MPCencoderVersionLookup($thisfile_mpc_header['raw']['encoder_version']);
- $ThisFileInfo['replay_gain']['track']['adjustment'] = $thisfile_mpc_header['title_gain_db'];
- $ThisFileInfo['replay_gain']['album']['adjustment'] = $thisfile_mpc_header['album_gain_db'];
+ $info['replay_gain']['track']['adjustment'] = $thisfile_mpc_header['title_gain_db'];
+ $info['replay_gain']['album']['adjustment'] = $thisfile_mpc_header['album_gain_db'];
if ($thisfile_mpc_header['title_peak'] > 0) {
- $ThisFileInfo['replay_gain']['track']['peak'] = $thisfile_mpc_header['title_peak'];
+ $info['replay_gain']['track']['peak'] = $thisfile_mpc_header['title_peak'];
} elseif (round($thisfile_mpc_header['max_level'] * 1.18) > 0) {
- $ThisFileInfo['replay_gain']['track']['peak'] = getid3_lib::CastAsInt(round($thisfile_mpc_header['max_level'] * 1.18)); // why? I don't know - see mppdec.c
+ $info['replay_gain']['track']['peak'] = getid3_lib::CastAsInt(round($thisfile_mpc_header['max_level'] * 1.18)); // why? I don't know - see mppdec.c
}
if ($thisfile_mpc_header['album_peak'] > 0) {
- $ThisFileInfo['replay_gain']['album']['peak'] = $thisfile_mpc_header['album_peak'];
+ $info['replay_gain']['album']['peak'] = $thisfile_mpc_header['album_peak'];
}
- //$ThisFileInfo['audio']['encoder'] = 'SV'.$thisfile_mpc_header['stream_major_version'].'.'.$thisfile_mpc_header['stream_minor_version'].', '.$thisfile_mpc_header['encoder_version'];
- $ThisFileInfo['audio']['encoder'] = $thisfile_mpc_header['encoder_version'];
- $ThisFileInfo['audio']['encoder_options'] = $thisfile_mpc_header['profile'];
+ //$info['audio']['encoder'] = 'SV'.$thisfile_mpc_header['stream_version_major'].'.'.$thisfile_mpc_header['stream_version_minor'].', '.$thisfile_mpc_header['encoder_version'];
+ $info['audio']['encoder'] = $thisfile_mpc_header['encoder_version'];
+ $info['audio']['encoder_options'] = $thisfile_mpc_header['profile'];
+ $thisfile_mpc_header['quality'] = (float) ($thisfile_mpc_header['raw']['profile'] - 5); // values can range from 0 to 15, of which 0..4 are "reserved/experimental", and 5..15 are mapped to qualities of 0.0 to 10.0
return true;
}
- function MPCprofileNameLookup($profileid) {
+ /**
+ * @return bool
+ */
+ public function ParseMPCsv6() {
+ // this is SV4 - SV6
+
+ $info = &$this->getid3->info;
+ $thisfile_mpc_header = &$info['mpc']['header'];
+ $offset = 0;
+
+ $thisfile_mpc_header['size'] = 8;
+ $this->fseek($info['avdataoffset']);
+ $MPCheaderData = $this->fread($thisfile_mpc_header['size']);
+
+ // add size of file header to avdataoffset - calc bitrate correctly + MD5 data
+ $info['avdataoffset'] += $thisfile_mpc_header['size'];
+
+ // Most of this code adapted from Jurgen Faul's MPEGplus source code - thanks Jurgen! :)
+ $HeaderDWORD[0] = getid3_lib::LittleEndian2Int(substr($MPCheaderData, 0, 4));
+ $HeaderDWORD[1] = getid3_lib::LittleEndian2Int(substr($MPCheaderData, 4, 4));
+
+
+ // DDDD DDDD CCCC CCCC BBBB BBBB AAAA AAAA
+ // aaaa aaaa abcd dddd dddd deee eeff ffff
+ //
+ // a = bitrate = anything
+ // b = IS = anything
+ // c = MS = anything
+ // d = streamversion = 0000000004 or 0000000005 or 0000000006
+ // e = maxband = anything
+ // f = blocksize = 000001 for SV5+, anything(?) for SV4
+
+ $thisfile_mpc_header['target_bitrate'] = (($HeaderDWORD[0] & 0xFF800000) >> 23);
+ $thisfile_mpc_header['intensity_stereo'] = (bool) (($HeaderDWORD[0] & 0x00400000) >> 22);
+ $thisfile_mpc_header['mid_side_stereo'] = (bool) (($HeaderDWORD[0] & 0x00200000) >> 21);
+ $thisfile_mpc_header['stream_version_major'] = ($HeaderDWORD[0] & 0x001FF800) >> 11;
+ $thisfile_mpc_header['stream_version_minor'] = 0; // no sub-version numbers before SV7
+ $thisfile_mpc_header['max_band'] = ($HeaderDWORD[0] & 0x000007C0) >> 6; // related to lowpass frequency, not sure how it translates exactly
+ $thisfile_mpc_header['block_size'] = ($HeaderDWORD[0] & 0x0000003F);
+
+ switch ($thisfile_mpc_header['stream_version_major']) {
+ case 4:
+ $thisfile_mpc_header['frame_count'] = ($HeaderDWORD[1] >> 16);
+ break;
+
+ case 5:
+ case 6:
+ $thisfile_mpc_header['frame_count'] = $HeaderDWORD[1];
+ break;
+
+ default:
+ $info['error'] = 'Expecting 4, 5 or 6 in version field, found '.$thisfile_mpc_header['stream_version_major'].' instead';
+ unset($info['mpc']);
+ return false;
+ }
+
+ if (($thisfile_mpc_header['stream_version_major'] > 4) && ($thisfile_mpc_header['block_size'] != 1)) {
+ $this->warning('Block size expected to be 1, actual value found: '.$thisfile_mpc_header['block_size']);
+ }
+
+ $thisfile_mpc_header['sample_rate'] = 44100; // AB: used by all files up to SV7
+ $info['audio']['sample_rate'] = $thisfile_mpc_header['sample_rate'];
+ $thisfile_mpc_header['samples'] = $thisfile_mpc_header['frame_count'] * 1152 * $info['audio']['channels'];
+
+ if ($thisfile_mpc_header['target_bitrate'] == 0) {
+ $info['audio']['bitrate_mode'] = 'vbr';
+ } else {
+ $info['audio']['bitrate_mode'] = 'cbr';
+ }
+
+ $info['mpc']['bitrate'] = ($info['avdataend'] - $info['avdataoffset']) * 8 * 44100 / $thisfile_mpc_header['frame_count'] / 1152;
+ $info['audio']['bitrate'] = $info['mpc']['bitrate'];
+ $info['audio']['encoder'] = 'SV'.$thisfile_mpc_header['stream_version_major'];
+
+ return true;
+ }
+
+ /**
+ * @param int $profileid
+ *
+ * @return string
+ */
+ public function MPCprofileNameLookup($profileid) {
static $MPCprofileNameLookup = array(
0 => 'no profile',
1 => 'Experimental',
@@ -246,7 +434,12 @@
return (isset($MPCprofileNameLookup[$profileid]) ? $MPCprofileNameLookup[$profileid] : 'invalid');
}
- function MPCfrequencyLookup($frequencyid) {
+ /**
+ * @param int $frequencyid
+ *
+ * @return int|string
+ */
+ public function MPCfrequencyLookup($frequencyid) {
static $MPCfrequencyLookup = array(
0 => 44100,
1 => 48000,
@@ -256,7 +449,12 @@
return (isset($MPCfrequencyLookup[$frequencyid]) ? $MPCfrequencyLookup[$frequencyid] : 'invalid');
}
- function MPCpeakDBLookup($intvalue) {
+ /**
+ * @param int $intvalue
+ *
+ * @return float|false
+ */
+ public function MPCpeakDBLookup($intvalue) {
if ($intvalue > 0) {
return ((log10($intvalue) / log10(2)) - 15) * 6;
}
@@ -263,7 +461,12 @@
return false;
}
- function MPCencoderVersionLookup($encoderversion) {
+ /**
+ * @param int $encoderversion
+ *
+ * @return string
+ */
+ public function MPCencoderVersionLookup($encoderversion) {
//Encoder version * 100 (106 = 1.06)
//EncoderVersion % 10 == 0 Release (1.0)
//EncoderVersion % 2 == 0 Beta (1.06)
@@ -290,7 +493,56 @@
return number_format($encoderversion / 100, 2).' alpha';
}
+ /**
+ * @param string $data
+ * @param int $packetLength
+ * @param int $maxHandledPacketLength
+ *
+ * @return int|false
+ */
+ public function SV8variableLengthInteger($data, &$packetLength, $maxHandledPacketLength=9) {
+ $packet_size = 0;
+ for ($packetLength = 1; $packetLength <= $maxHandledPacketLength; $packetLength++) {
+ // variable-length size field:
+ // bits, big-endian
+ // 0xxx xxxx - value 0 to 2^7-1
+ // 1xxx xxxx 0xxx xxxx - value 0 to 2^14-1
+ // 1xxx xxxx 1xxx xxxx 0xxx xxxx - value 0 to 2^21-1
+ // 1xxx xxxx 1xxx xxxx 1xxx xxxx 0xxx xxxx - value 0 to 2^28-1
+ // ...
+ $thisbyte = ord(substr($data, ($packetLength - 1), 1));
+ // look through bytes until find a byte with MSB==0
+ $packet_size = ($packet_size << 7);
+ $packet_size = ($packet_size | ($thisbyte & 0x7F));
+ if (($thisbyte & 0x80) === 0) {
+ break;
+ }
+ if ($packetLength >= $maxHandledPacketLength) {
+ return false;
+ }
+ }
+ return $packet_size;
+ }
+
+ /**
+ * @param string $packetKey
+ *
+ * @return string
+ */
+ public function MPCsv8PacketName($packetKey) {
+ static $MPCsv8PacketName = array();
+ if (empty($MPCsv8PacketName)) {
+ $MPCsv8PacketName = array(
+ 'AP' => 'Audio Packet',
+ 'CT' => 'Chapter Tag',
+ 'EI' => 'Encoder Info',
+ 'RG' => 'Replay Gain',
+ 'SE' => 'Stream End',
+ 'SH' => 'Stream Header',
+ 'SO' => 'Seek Table Offset',
+ 'ST' => 'Seek Table',
+ );
+ }
+ return (isset($MPCsv8PacketName[$packetKey]) ? $MPCsv8PacketName[$packetKey] : $packetKey);
+ }
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.ogg.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.ogg.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.ogg.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio.ogg.php //
// module for analyzing Ogg Vorbis, OggFLAC and Speex files //
@@ -13,243 +14,395 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.flac.php', __FILE__, true);
-class getid3_ogg
+class getid3_ogg extends getid3_handler
{
+ /**
+ * @link http://xiph.org/vorbis/doc/Vorbis_I_spec.html
+ *
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- function getid3_ogg(&$fd, &$ThisFileInfo) {
+ $info['fileformat'] = 'ogg';
- $ThisFileInfo['fileformat'] = 'ogg';
-
// Warn about illegal tags - only vorbiscomments are allowed
- if (isset($ThisFileInfo['id3v2'])) {
- $ThisFileInfo['warning'][] = 'Illegal ID3v2 tag present.';
+ if (isset($info['id3v2'])) {
+ $this->warning('Illegal ID3v2 tag present.');
}
- if (isset($ThisFileInfo['id3v1'])) {
- $ThisFileInfo['warning'][] = 'Illegal ID3v1 tag present.';
+ if (isset($info['id3v1'])) {
+ $this->warning('Illegal ID3v1 tag present.');
}
- if (isset($ThisFileInfo['ape'])) {
- $ThisFileInfo['warning'][] = 'Illegal APE tag present.';
+ if (isset($info['ape'])) {
+ $this->warning('Illegal APE tag present.');
}
// Page 1 - Stream Header
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
+ $this->fseek($info['avdataoffset']);
- $oggpageinfo = getid3_ogg::ParseOggPageHeader($fd);
- $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']] = $oggpageinfo;
+ $oggpageinfo = $this->ParseOggPageHeader();
+ $info['ogg']['pageheader'][$oggpageinfo['page_seqno']] = $oggpageinfo;
- if (ftell($fd) >= GETID3_FREAD_BUFFER_SIZE) {
- $ThisFileInfo['error'][] = 'Could not find start of Ogg page in the first '.GETID3_FREAD_BUFFER_SIZE.' bytes (this might not be an Ogg-Vorbis file?)';
- unset($ThisFileInfo['fileformat']);
- unset($ThisFileInfo['ogg']);
+ if ($this->ftell() >= $this->getid3->fread_buffer_size()) {
+ $this->error('Could not find start of Ogg page in the first '.$this->getid3->fread_buffer_size().' bytes (this might not be an Ogg-Vorbis file?)');
+ unset($info['fileformat']);
+ unset($info['ogg']);
return false;
}
- $filedata = fread($fd, $oggpageinfo['page_length']);
+ $filedata = $this->fread($oggpageinfo['page_length']);
$filedataoffset = 0;
if (substr($filedata, 0, 4) == 'fLaC') {
- $ThisFileInfo['audio']['dataformat'] = 'flac';
- $ThisFileInfo['audio']['bitrate_mode'] = 'vbr';
- $ThisFileInfo['audio']['lossless'] = true;
+ $info['audio']['dataformat'] = 'flac';
+ $info['audio']['bitrate_mode'] = 'vbr';
+ $info['audio']['lossless'] = true;
} elseif (substr($filedata, 1, 6) == 'vorbis') {
- $ThisFileInfo['audio']['dataformat'] = 'vorbis';
- $ThisFileInfo['audio']['lossless'] = false;
+ $this->ParseVorbisPageHeader($filedata, $filedataoffset, $oggpageinfo);
- $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['packet_type'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1));
- $filedataoffset += 1;
- $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['stream_type'] = substr($filedata, $filedataoffset, 6); // hard-coded to 'vorbis'
- $filedataoffset += 6;
- $ThisFileInfo['ogg']['bitstreamversion'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
- $filedataoffset += 4;
- $ThisFileInfo['ogg']['numberofchannels'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1));
- $filedataoffset += 1;
- $ThisFileInfo['audio']['channels'] = $ThisFileInfo['ogg']['numberofchannels'];
- $ThisFileInfo['ogg']['samplerate'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
- $filedataoffset += 4;
- if ($ThisFileInfo['ogg']['samplerate'] == 0) {
- $ThisFileInfo['error'][] = 'Corrupt Ogg file: sample rate == zero';
+ } elseif (substr($filedata, 0, 8) == 'OpusHead') {
+
+ if ($this->ParseOpusPageHeader($filedata, $filedataoffset, $oggpageinfo) === false) {
return false;
}
- $ThisFileInfo['audio']['sample_rate'] = $ThisFileInfo['ogg']['samplerate'];
- $ThisFileInfo['ogg']['samples'] = 0; // filled in later
- $ThisFileInfo['ogg']['bitrate_average'] = 0; // filled in later
- $ThisFileInfo['ogg']['bitrate_max'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
- $filedataoffset += 4;
- $ThisFileInfo['ogg']['bitrate_nominal'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
- $filedataoffset += 4;
- $ThisFileInfo['ogg']['bitrate_min'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
- $filedataoffset += 4;
- $ThisFileInfo['ogg']['blocksize_small'] = pow(2, getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1)) & 0x0F);
- $ThisFileInfo['ogg']['blocksize_large'] = pow(2, (getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1)) & 0xF0) >> 4);
- $ThisFileInfo['ogg']['stop_bit'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1)); // must be 1, marks end of packet
- $ThisFileInfo['audio']['bitrate_mode'] = 'vbr'; // overridden if actually abr
- if ($ThisFileInfo['ogg']['bitrate_max'] == 0xFFFFFFFF) {
- unset($ThisFileInfo['ogg']['bitrate_max']);
- $ThisFileInfo['audio']['bitrate_mode'] = 'abr';
- }
- if ($ThisFileInfo['ogg']['bitrate_nominal'] == 0xFFFFFFFF) {
- unset($ThisFileInfo['ogg']['bitrate_nominal']);
- }
- if ($ThisFileInfo['ogg']['bitrate_min'] == 0xFFFFFFFF) {
- unset($ThisFileInfo['ogg']['bitrate_min']);
- $ThisFileInfo['audio']['bitrate_mode'] = 'abr';
- }
-
} elseif (substr($filedata, 0, 8) == 'Speex ') {
// http://www.speex.org/manual/node10.html
- $ThisFileInfo['audio']['dataformat'] = 'speex';
- $ThisFileInfo['mime_type'] = 'audio/speex';
- $ThisFileInfo['audio']['bitrate_mode'] = 'abr';
- $ThisFileInfo['audio']['lossless'] = false;
+ $info['audio']['dataformat'] = 'speex';
+ $info['mime_type'] = 'audio/speex';
+ $info['audio']['bitrate_mode'] = 'abr';
+ $info['audio']['lossless'] = false;
- $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['speex_string'] = substr($filedata, $filedataoffset, 8); // hard-coded to 'Speex '
+ $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['speex_string'] = substr($filedata, $filedataoffset, 8); // hard-coded to 'Speex '
$filedataoffset += 8;
- $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['speex_version'] = substr($filedata, $filedataoffset, 20);
+ $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['speex_version'] = substr($filedata, $filedataoffset, 20);
$filedataoffset += 20;
- $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['speex_version_id'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
+ $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['speex_version_id'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
$filedataoffset += 4;
- $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['header_size'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
+ $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['header_size'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
$filedataoffset += 4;
- $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['rate'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
+ $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['rate'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
$filedataoffset += 4;
- $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['mode'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
+ $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['mode'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
$filedataoffset += 4;
- $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['mode_bitstream_version'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
+ $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['mode_bitstream_version'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
$filedataoffset += 4;
- $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['nb_channels'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
+ $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['nb_channels'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
$filedataoffset += 4;
- $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['bitrate'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
+ $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['bitrate'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
$filedataoffset += 4;
- $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['framesize'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
+ $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['framesize'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
$filedataoffset += 4;
- $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['vbr'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
+ $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['vbr'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
$filedataoffset += 4;
- $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['frames_per_packet'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
+ $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['frames_per_packet'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
$filedataoffset += 4;
- $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['extra_headers'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
+ $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['extra_headers'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
$filedataoffset += 4;
- $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['reserved1'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
+ $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['reserved1'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
$filedataoffset += 4;
- $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['reserved2'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
+ $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['reserved2'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
$filedataoffset += 4;
- $ThisFileInfo['speex']['speex_version'] = trim($ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['speex_version']);
- $ThisFileInfo['speex']['sample_rate'] = $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['rate'];
- $ThisFileInfo['speex']['channels'] = $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['nb_channels'];
- $ThisFileInfo['speex']['vbr'] = (bool) $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['vbr'];
- $ThisFileInfo['speex']['band_type'] = getid3_ogg::SpeexBandModeLookup($ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['mode']);
+ $info['speex']['speex_version'] = trim($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['speex_version']);
+ $info['speex']['sample_rate'] = $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['rate'];
+ $info['speex']['channels'] = $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['nb_channels'];
+ $info['speex']['vbr'] = (bool) $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['vbr'];
+ $info['speex']['band_type'] = $this->SpeexBandModeLookup($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['mode']);
- $ThisFileInfo['audio']['sample_rate'] = $ThisFileInfo['speex']['sample_rate'];
- $ThisFileInfo['audio']['channels'] = $ThisFileInfo['speex']['channels'];
- if ($ThisFileInfo['speex']['vbr']) {
- $ThisFileInfo['audio']['bitrate_mode'] = 'vbr';
+ $info['audio']['sample_rate'] = $info['speex']['sample_rate'];
+ $info['audio']['channels'] = $info['speex']['channels'];
+ if ($info['speex']['vbr']) {
+ $info['audio']['bitrate_mode'] = 'vbr';
}
+ } elseif (substr($filedata, 0, 7) == "\x80".'theora') {
+
+ // http://www.theora.org/doc/Theora.pdf (section 6.2)
+
+ $info['ogg']['pageheader']['theora']['theora_magic'] = substr($filedata, $filedataoffset, 7); // hard-coded to "\x80.'theora'
+ $filedataoffset += 7;
+ $info['ogg']['pageheader']['theora']['version_major'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 1));
+ $filedataoffset += 1;
+ $info['ogg']['pageheader']['theora']['version_minor'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 1));
+ $filedataoffset += 1;
+ $info['ogg']['pageheader']['theora']['version_revision'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 1));
+ $filedataoffset += 1;
+ $info['ogg']['pageheader']['theora']['frame_width_macroblocks'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 2));
+ $filedataoffset += 2;
+ $info['ogg']['pageheader']['theora']['frame_height_macroblocks'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 2));
+ $filedataoffset += 2;
+ $info['ogg']['pageheader']['theora']['resolution_x'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 3));
+ $filedataoffset += 3;
+ $info['ogg']['pageheader']['theora']['resolution_y'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 3));
+ $filedataoffset += 3;
+ $info['ogg']['pageheader']['theora']['picture_offset_x'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 1));
+ $filedataoffset += 1;
+ $info['ogg']['pageheader']['theora']['picture_offset_y'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 1));
+ $filedataoffset += 1;
+ $info['ogg']['pageheader']['theora']['frame_rate_numerator'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 4));
+ $filedataoffset += 4;
+ $info['ogg']['pageheader']['theora']['frame_rate_denominator'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 4));
+ $filedataoffset += 4;
+ $info['ogg']['pageheader']['theora']['pixel_aspect_numerator'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 3));
+ $filedataoffset += 3;
+ $info['ogg']['pageheader']['theora']['pixel_aspect_denominator'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 3));
+ $filedataoffset += 3;
+ $info['ogg']['pageheader']['theora']['color_space_id'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 1));
+ $filedataoffset += 1;
+ $info['ogg']['pageheader']['theora']['nominal_bitrate'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 3));
+ $filedataoffset += 3;
+ $info['ogg']['pageheader']['theora']['flags'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 2));
+ $filedataoffset += 2;
+
+ $info['ogg']['pageheader']['theora']['quality'] = ($info['ogg']['pageheader']['theora']['flags'] & 0xFC00) >> 10;
+ $info['ogg']['pageheader']['theora']['kfg_shift'] = ($info['ogg']['pageheader']['theora']['flags'] & 0x03E0) >> 5;
+ $info['ogg']['pageheader']['theora']['pixel_format_id'] = ($info['ogg']['pageheader']['theora']['flags'] & 0x0018) >> 3;
+ $info['ogg']['pageheader']['theora']['reserved'] = ($info['ogg']['pageheader']['theora']['flags'] & 0x0007) >> 0; // should be 0
+ $info['ogg']['pageheader']['theora']['color_space'] = self::TheoraColorSpace($info['ogg']['pageheader']['theora']['color_space_id']);
+ $info['ogg']['pageheader']['theora']['pixel_format'] = self::TheoraPixelFormat($info['ogg']['pageheader']['theora']['pixel_format_id']);
+
+ $info['video']['dataformat'] = 'theora';
+ $info['mime_type'] = 'video/ogg';
+ //$info['audio']['bitrate_mode'] = 'abr';
+ //$info['audio']['lossless'] = false;
+ $info['video']['resolution_x'] = $info['ogg']['pageheader']['theora']['resolution_x'];
+ $info['video']['resolution_y'] = $info['ogg']['pageheader']['theora']['resolution_y'];
+ if ($info['ogg']['pageheader']['theora']['frame_rate_denominator'] > 0) {
+ $info['video']['frame_rate'] = (float) $info['ogg']['pageheader']['theora']['frame_rate_numerator'] / $info['ogg']['pageheader']['theora']['frame_rate_denominator'];
+ }
+ if ($info['ogg']['pageheader']['theora']['pixel_aspect_denominator'] > 0) {
+ $info['video']['pixel_aspect_ratio'] = (float) $info['ogg']['pageheader']['theora']['pixel_aspect_numerator'] / $info['ogg']['pageheader']['theora']['pixel_aspect_denominator'];
+ }
+ $this->warning('Ogg Theora (v3) not fully supported in this version of getID3 ['.$this->getid3->version().'] -- bitrate, playtime and all audio data are currently unavailable');
+
+
+ } elseif (substr($filedata, 0, 8) == "fishead\x00") {
+
+ // Ogg Skeleton version 3.0 Format Specification
+ // http://xiph.org/ogg/doc/skeleton.html
+ $filedataoffset += 8;
+ $info['ogg']['skeleton']['fishead']['raw']['version_major'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 2));
+ $filedataoffset += 2;
+ $info['ogg']['skeleton']['fishead']['raw']['version_minor'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 2));
+ $filedataoffset += 2;
+ $info['ogg']['skeleton']['fishead']['raw']['presentationtime_numerator'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 8));
+ $filedataoffset += 8;
+ $info['ogg']['skeleton']['fishead']['raw']['presentationtime_denominator'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 8));
+ $filedataoffset += 8;
+ $info['ogg']['skeleton']['fishead']['raw']['basetime_numerator'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 8));
+ $filedataoffset += 8;
+ $info['ogg']['skeleton']['fishead']['raw']['basetime_denominator'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 8));
+ $filedataoffset += 8;
+ $info['ogg']['skeleton']['fishead']['raw']['utc'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 20));
+ $filedataoffset += 20;
+
+ $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']['utc'] = $info['ogg']['skeleton']['fishead']['raw']['utc'];
+
+
+ $counter = 0;
+ do {
+ $oggpageinfo = $this->ParseOggPageHeader();
+ $info['ogg']['pageheader'][$oggpageinfo['page_seqno'].'.'.$counter++] = $oggpageinfo;
+ $filedata = $this->fread($oggpageinfo['page_length']);
+ $this->fseek($oggpageinfo['page_end_offset']);
+
+ if (substr($filedata, 0, 8) == "fisbone\x00") {
+
+ $filedataoffset = 8;
+ $info['ogg']['skeleton']['fisbone']['raw']['message_header_offset'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
+ $filedataoffset += 4;
+ $info['ogg']['skeleton']['fisbone']['raw']['serial_number'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
+ $filedataoffset += 4;
+ $info['ogg']['skeleton']['fisbone']['raw']['number_header_packets'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
+ $filedataoffset += 4;
+ $info['ogg']['skeleton']['fisbone']['raw']['granulerate_numerator'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 8));
+ $filedataoffset += 8;
+ $info['ogg']['skeleton']['fisbone']['raw']['granulerate_denominator'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 8));
+ $filedataoffset += 8;
+ $info['ogg']['skeleton']['fisbone']['raw']['basegranule'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 8));
+ $filedataoffset += 8;
+ $info['ogg']['skeleton']['fisbone']['raw']['preroll'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
+ $filedataoffset += 4;
+ $info['ogg']['skeleton']['fisbone']['raw']['granuleshift'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1));
+ $filedataoffset += 1;
+ $info['ogg']['skeleton']['fisbone']['raw']['padding'] = substr($filedata, $filedataoffset, 3);
+ $filedataoffset += 3;
+
+ } elseif (substr($filedata, 1, 6) == 'theora') {
+
+ $info['video']['dataformat'] = 'theora1';
+ $this->error('Ogg Theora (v1) not correctly handled in this version of getID3 ['.$this->getid3->version().']');
+ //break;
+
+ } elseif (substr($filedata, 1, 6) == 'vorbis') {
+
+ $this->ParseVorbisPageHeader($filedata, $filedataoffset, $oggpageinfo);
+
+ } else {
+ $this->error('unexpected');
+ //break;
+ }
+ //} while ($oggpageinfo['page_seqno'] == 0);
+ } while (($oggpageinfo['page_seqno'] == 0) && (substr($filedata, 0, 8) != "fisbone\x00"));
+
+ $this->fseek($oggpageinfo['page_start_offset']);
+
+ $this->error('Ogg Skeleton not correctly handled in this version of getID3 ['.$this->getid3->version().']');
+ //return false;
+
+ } elseif (substr($filedata, 0, 5) == "\x7F".'FLAC') {
+ // https://xiph.org/flac/ogg_mapping.html
+
+ $info['audio']['dataformat'] = 'flac';
+ $info['audio']['bitrate_mode'] = 'vbr';
+ $info['audio']['lossless'] = true;
+
+ $info['ogg']['flac']['header']['version_major'] = ord(substr($filedata, 5, 1));
+ $info['ogg']['flac']['header']['version_minor'] = ord(substr($filedata, 6, 1));
+ $info['ogg']['flac']['header']['header_packets'] = getid3_lib::BigEndian2Int(substr($filedata, 7, 2)) + 1; // "A two-byte, big-endian binary number signifying the number of header (non-audio) packets, not including this one. This number may be zero (0x0000) to signify 'unknown' but be aware that some decoders may not be able to handle such streams."
+ $info['ogg']['flac']['header']['magic'] = substr($filedata, 9, 4);
+ if ($info['ogg']['flac']['header']['magic'] != 'fLaC') {
+ $this->error('Ogg-FLAC expecting "fLaC", found "'.$info['ogg']['flac']['header']['magic'].'" ('.trim(getid3_lib::PrintHexBytes($info['ogg']['flac']['header']['magic'])).')');
+ return false;
+ }
+ $info['ogg']['flac']['header']['STREAMINFO_bytes'] = getid3_lib::BigEndian2Int(substr($filedata, 13, 4));
+ $info['flac']['STREAMINFO'] = getid3_flac::parseSTREAMINFOdata(substr($filedata, 17, 34));
+ if (!empty($info['flac']['STREAMINFO']['sample_rate'])) {
+ $info['audio']['bitrate_mode'] = 'vbr';
+ $info['audio']['sample_rate'] = $info['flac']['STREAMINFO']['sample_rate'];
+ $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'];
+ }
+
} else {
- $ThisFileInfo['error'][] = 'Expecting either "Speex " or "vorbis" identifier strings, found neither';
- unset($ThisFileInfo['ogg']);
- unset($ThisFileInfo['mime_type']);
+ $this->error('Expecting one of "vorbis", "Speex", "OpusHead", "vorbis", "fishhead", "theora", "fLaC" identifier strings, found "'.substr($filedata, 0, 8).'"');
+ unset($info['ogg']);
+ unset($info['mime_type']);
return false;
}
-
// Page 2 - Comment Header
+ $oggpageinfo = $this->ParseOggPageHeader();
+ $info['ogg']['pageheader'][$oggpageinfo['page_seqno']] = $oggpageinfo;
- $oggpageinfo = getid3_ogg::ParseOggPageHeader($fd);
- $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']] = $oggpageinfo;
-
- switch ($ThisFileInfo['audio']['dataformat']) {
-
+ switch ($info['audio']['dataformat']) {
case 'vorbis':
- $filedata = fread($fd, $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
- $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['packet_type'] = getid3_lib::LittleEndian2Int(substr($filedata, 0, 1));
- $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['stream_type'] = substr($filedata, 1, 6); // hard-coded to 'vorbis'
+ $filedata = $this->fread($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
+ $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['packet_type'] = getid3_lib::LittleEndian2Int(substr($filedata, 0, 1));
+ $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['stream_type'] = substr($filedata, 1, 6); // hard-coded to 'vorbis'
- getid3_ogg::ParseVorbisCommentsFilepointer($fd, $ThisFileInfo);
+ $this->ParseVorbisComments();
break;
case 'flac':
- if (!getid3_flac::FLACparseMETAdata($fd, $ThisFileInfo)) {
- $ThisFileInfo['error'][] = 'Failed to parse FLAC headers';
+ $flac = new getid3_flac($this->getid3);
+ if (!$flac->parseMETAdata()) {
+ $this->error('Failed to parse FLAC headers');
return false;
}
+ unset($flac);
break;
case 'speex':
- fseek($fd, $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length'], SEEK_CUR);
- getid3_ogg::ParseVorbisCommentsFilepointer($fd, $ThisFileInfo);
+ $this->fseek($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length'], SEEK_CUR);
+ $this->ParseVorbisComments();
break;
- }
+ case 'opus':
+ $filedata = $this->fread($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
+ $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['stream_type'] = substr($filedata, 0, 8); // hard-coded to 'OpusTags'
+ if(substr($filedata, 0, 8) != 'OpusTags') {
+ $this->error('Expected "OpusTags" as header but got "'.substr($filedata, 0, 8).'"');
+ return false;
+ }
+ $this->ParseVorbisComments();
+ break;
+ }
// Last Page - Number of Samples
+ if (!getid3_lib::intValueSupported($info['avdataend'])) {
- fseek($fd, max($ThisFileInfo['avdataend'] - GETID3_FREAD_BUFFER_SIZE, 0), SEEK_SET);
- $LastChunkOfOgg = strrev(fread($fd, GETID3_FREAD_BUFFER_SIZE));
- if ($LastOggSpostion = strpos($LastChunkOfOgg, 'SggO')) {
- fseek($fd, $ThisFileInfo['avdataend'] - ($LastOggSpostion + strlen('SggO')), SEEK_SET);
- $ThisFileInfo['avdataend'] = ftell($fd);
- $ThisFileInfo['ogg']['pageheader']['eos'] = getid3_ogg::ParseOggPageHeader($fd);
- $ThisFileInfo['ogg']['samples'] = $ThisFileInfo['ogg']['pageheader']['eos']['pcm_abs_position'];
- if ($ThisFileInfo['ogg']['samples'] == 0) {
- $ThisFileInfo['error'][] = 'Corrupt Ogg file: eos.number of samples == zero';
- return false;
+ $this->warning('Unable to parse Ogg end chunk file (PHP does not support file operations beyond '.round(PHP_INT_MAX / 1073741824).'GB)');
+
+ } else {
+
+ $this->fseek(max($info['avdataend'] - $this->getid3->fread_buffer_size(), 0));
+ $LastChunkOfOgg = strrev($this->fread($this->getid3->fread_buffer_size()));
+ if ($LastOggSpostion = strpos($LastChunkOfOgg, 'SggO')) {
+ $this->fseek($info['avdataend'] - ($LastOggSpostion + strlen('SggO')));
+ $info['avdataend'] = $this->ftell();
+ $info['ogg']['pageheader']['eos'] = $this->ParseOggPageHeader();
+ $info['ogg']['samples'] = $info['ogg']['pageheader']['eos']['pcm_abs_position'];
+ if ($info['ogg']['samples'] == 0) {
+ $this->error('Corrupt Ogg file: eos.number of samples == zero');
+ return false;
+ }
+ if (!empty($info['audio']['sample_rate'])) {
+ $info['ogg']['bitrate_average'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / ($info['ogg']['samples'] / $info['audio']['sample_rate']);
+ }
}
- $ThisFileInfo['ogg']['bitrate_average'] = (($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) * 8) / ($ThisFileInfo['ogg']['samples'] / $ThisFileInfo['audio']['sample_rate']);
+
}
- if (!empty($ThisFileInfo['ogg']['bitrate_average'])) {
- $ThisFileInfo['audio']['bitrate'] = $ThisFileInfo['ogg']['bitrate_average'];
- } elseif (!empty($ThisFileInfo['ogg']['bitrate_nominal'])) {
- $ThisFileInfo['audio']['bitrate'] = $ThisFileInfo['ogg']['bitrate_nominal'];
- } elseif (!empty($ThisFileInfo['ogg']['bitrate_min']) && !empty($ThisFileInfo['ogg']['bitrate_max'])) {
- $ThisFileInfo['audio']['bitrate'] = ($ThisFileInfo['ogg']['bitrate_min'] + $ThisFileInfo['ogg']['bitrate_max']) / 2;
+ if (!empty($info['ogg']['bitrate_average'])) {
+ $info['audio']['bitrate'] = $info['ogg']['bitrate_average'];
+ } elseif (!empty($info['ogg']['bitrate_nominal'])) {
+ $info['audio']['bitrate'] = $info['ogg']['bitrate_nominal'];
+ } elseif (!empty($info['ogg']['bitrate_min']) && !empty($info['ogg']['bitrate_max'])) {
+ $info['audio']['bitrate'] = ($info['ogg']['bitrate_min'] + $info['ogg']['bitrate_max']) / 2;
}
- if (isset($ThisFileInfo['audio']['bitrate']) && !isset($ThisFileInfo['playtime_seconds'])) {
- if ($ThisFileInfo['audio']['bitrate'] == 0) {
- $ThisFileInfo['error'][] = 'Corrupt Ogg file: bitrate_audio == zero';
+ if (isset($info['audio']['bitrate']) && !isset($info['playtime_seconds'])) {
+ if ($info['audio']['bitrate'] == 0) {
+ $this->error('Corrupt Ogg file: bitrate_audio == zero');
return false;
}
- $ThisFileInfo['playtime_seconds'] = (float) ((($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) * 8) / $ThisFileInfo['audio']['bitrate']);
+ $info['playtime_seconds'] = (float) ((($info['avdataend'] - $info['avdataoffset']) * 8) / $info['audio']['bitrate']);
}
- if (isset($ThisFileInfo['ogg']['vendor'])) {
- $ThisFileInfo['audio']['encoder'] = preg_replace('/^Encoded with /', '', $ThisFileInfo['ogg']['vendor']);
+ if (isset($info['ogg']['vendor'])) {
+ $info['audio']['encoder'] = preg_replace('/^Encoded with /', '', $info['ogg']['vendor']);
// Vorbis only
- if ($ThisFileInfo['audio']['dataformat'] == 'vorbis') {
+ if ($info['audio']['dataformat'] == 'vorbis') {
// Vorbis 1.0 starts with Xiph.Org
- if (preg_match('/^Xiph.Org/', $ThisFileInfo['audio']['encoder'])) {
+ if (preg_match('/^Xiph.Org/', $info['audio']['encoder'])) {
- if ($ThisFileInfo['audio']['bitrate_mode'] == 'abr') {
+ if ($info['audio']['bitrate_mode'] == 'abr') {
// Set -b 128 on abr files
- $ThisFileInfo['audio']['encoder_options'] = '-b '.round($ThisFileInfo['ogg']['bitrate_nominal'] / 1000);
+ $info['audio']['encoder_options'] = '-b '.round($info['ogg']['bitrate_nominal'] / 1000);
- } elseif (($ThisFileInfo['audio']['bitrate_mode'] == 'vbr') && ($ThisFileInfo['audio']['channels'] == 2) && ($ThisFileInfo['audio']['sample_rate'] >= 44100) && ($ThisFileInfo['audio']['sample_rate'] <= 48000)) {
+ } elseif (($info['audio']['bitrate_mode'] == 'vbr') && ($info['audio']['channels'] == 2) && ($info['audio']['sample_rate'] >= 44100) && ($info['audio']['sample_rate'] <= 48000)) {
// Set -q N on vbr files
- $ThisFileInfo['audio']['encoder_options'] = '-q '.$this->get_quality_from_nominal_bitrate($ThisFileInfo['ogg']['bitrate_nominal']);
+ $info['audio']['encoder_options'] = '-q '.$this->get_quality_from_nominal_bitrate($info['ogg']['bitrate_nominal']);
}
}
- if (empty($ThisFileInfo['audio']['encoder_options']) && !empty($ThisFileInfo['ogg']['bitrate_nominal'])) {
- $ThisFileInfo['audio']['encoder_options'] = 'Nominal bitrate: '.intval(round($ThisFileInfo['ogg']['bitrate_nominal'] / 1000)).'kbps';
+ if (empty($info['audio']['encoder_options']) && !empty($info['ogg']['bitrate_nominal'])) {
+ $info['audio']['encoder_options'] = 'Nominal bitrate: '.intval(round($info['ogg']['bitrate_nominal'] / 1000)).'kbps';
}
}
}
@@ -257,20 +410,136 @@
return true;
}
+ /**
+ * @param string $filedata
+ * @param int $filedataoffset
+ * @param array $oggpageinfo
+ *
+ * @return bool
+ */
+ public function ParseVorbisPageHeader(&$filedata, &$filedataoffset, &$oggpageinfo) {
+ $info = &$this->getid3->info;
+ $info['audio']['dataformat'] = 'vorbis';
+ $info['audio']['lossless'] = false;
- function ParseOggPageHeader(&$fd) {
+ $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['packet_type'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1));
+ $filedataoffset += 1;
+ $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['stream_type'] = substr($filedata, $filedataoffset, 6); // hard-coded to 'vorbis'
+ $filedataoffset += 6;
+ $info['ogg']['bitstreamversion'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
+ $filedataoffset += 4;
+ $info['ogg']['numberofchannels'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1));
+ $filedataoffset += 1;
+ $info['audio']['channels'] = $info['ogg']['numberofchannels'];
+ $info['ogg']['samplerate'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
+ $filedataoffset += 4;
+ if ($info['ogg']['samplerate'] == 0) {
+ $this->error('Corrupt Ogg file: sample rate == zero');
+ return false;
+ }
+ $info['audio']['sample_rate'] = $info['ogg']['samplerate'];
+ $info['ogg']['samples'] = 0; // filled in later
+ $info['ogg']['bitrate_average'] = 0; // filled in later
+ $info['ogg']['bitrate_max'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
+ $filedataoffset += 4;
+ $info['ogg']['bitrate_nominal'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
+ $filedataoffset += 4;
+ $info['ogg']['bitrate_min'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
+ $filedataoffset += 4;
+ $info['ogg']['blocksize_small'] = pow(2, getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1)) & 0x0F);
+ $info['ogg']['blocksize_large'] = pow(2, (getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1)) & 0xF0) >> 4);
+ $info['ogg']['stop_bit'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1)); // must be 1, marks end of packet
+
+ $info['audio']['bitrate_mode'] = 'vbr'; // overridden if actually abr
+ if ($info['ogg']['bitrate_max'] == 0xFFFFFFFF) {
+ unset($info['ogg']['bitrate_max']);
+ $info['audio']['bitrate_mode'] = 'abr';
+ }
+ if ($info['ogg']['bitrate_nominal'] == 0xFFFFFFFF) {
+ unset($info['ogg']['bitrate_nominal']);
+ }
+ if ($info['ogg']['bitrate_min'] == 0xFFFFFFFF) {
+ unset($info['ogg']['bitrate_min']);
+ $info['audio']['bitrate_mode'] = 'abr';
+ }
+ return true;
+ }
+
+ /**
+ * @link http://tools.ietf.org/html/draft-ietf-codec-oggopus-03
+ *
+ * @param string $filedata
+ * @param int $filedataoffset
+ * @param array $oggpageinfo
+ *
+ * @return bool
+ */
+ public function ParseOpusPageHeader(&$filedata, &$filedataoffset, &$oggpageinfo) {
+ $info = &$this->getid3->info;
+ $info['audio']['dataformat'] = 'opus';
+ $info['mime_type'] = 'audio/ogg; codecs=opus';
+
+ /** @todo find a usable way to detect abr (vbr that is padded to be abr) */
+ $info['audio']['bitrate_mode'] = 'vbr';
+
+ $info['audio']['lossless'] = false;
+
+ $info['ogg']['pageheader']['opus']['opus_magic'] = substr($filedata, $filedataoffset, 8); // hard-coded to 'OpusHead'
+ $filedataoffset += 8;
+ $info['ogg']['pageheader']['opus']['version'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1));
+ $filedataoffset += 1;
+
+ if ($info['ogg']['pageheader']['opus']['version'] < 1 || $info['ogg']['pageheader']['opus']['version'] > 15) {
+ $this->error('Unknown opus version number (only accepting 1-15)');
+ return false;
+ }
+
+ $info['ogg']['pageheader']['opus']['out_channel_count'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1));
+ $filedataoffset += 1;
+
+ if ($info['ogg']['pageheader']['opus']['out_channel_count'] == 0) {
+ $this->error('Invalid channel count in opus header (must not be zero)');
+ return false;
+ }
+
+ $info['ogg']['pageheader']['opus']['pre_skip'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 2));
+ $filedataoffset += 2;
+
+ $info['ogg']['pageheader']['opus']['input_sample_rate'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
+ $filedataoffset += 4;
+
+ //$info['ogg']['pageheader']['opus']['output_gain'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 2));
+ //$filedataoffset += 2;
+
+ //$info['ogg']['pageheader']['opus']['channel_mapping_family'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1));
+ //$filedataoffset += 1;
+
+ $info['opus']['opus_version'] = $info['ogg']['pageheader']['opus']['version'];
+ $info['opus']['sample_rate_input'] = $info['ogg']['pageheader']['opus']['input_sample_rate'];
+ $info['opus']['out_channel_count'] = $info['ogg']['pageheader']['opus']['out_channel_count'];
+
+ $info['audio']['channels'] = $info['opus']['out_channel_count'];
+ $info['audio']['sample_rate_input'] = $info['opus']['sample_rate_input'];
+ $info['audio']['sample_rate'] = 48000; // "All Opus audio is coded at 48 kHz, and should also be decoded at 48 kHz for playback (unless the target hardware does not support this sampling rate). However, this field may be used to resample the audio back to the original sampling rate, for example, when saving the output to a file." -- https://mf4.xiph.org/jenkins/view/opus/job/opusfile-unix/ws/doc/html/structOpusHead.html
+ return true;
+ }
+
+ /**
+ * @return array|false
+ */
+ public function ParseOggPageHeader() {
// http://xiph.org/ogg/vorbis/doc/framing.html
- $oggheader['page_start_offset'] = ftell($fd); // where we started from in the file
+ $oggheader['page_start_offset'] = $this->ftell(); // where we started from in the file
- $filedata = fread($fd, GETID3_FREAD_BUFFER_SIZE);
+ $filedata = $this->fread($this->getid3->fread_buffer_size());
$filedataoffset = 0;
while ((substr($filedata, $filedataoffset++, 4) != 'OggS')) {
- if ((ftell($fd) - $oggheader['page_start_offset']) >= GETID3_FREAD_BUFFER_SIZE) {
+ 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 (feof($fd) || (($filedata .= fread($fd, GETID3_FREAD_BUFFER_SIZE)) === false)) {
+ if ($this->feof() || (($filedata .= $this->fread($this->getid3->fread_buffer_size())) === '')) {
// get some more data, unless eof, in which case fail
return false;
}
@@ -304,100 +573,115 @@
}
$oggheader['header_end_offset'] = $oggheader['page_start_offset'] + $filedataoffset;
$oggheader['page_end_offset'] = $oggheader['header_end_offset'] + $oggheader['page_length'];
- fseek($fd, $oggheader['header_end_offset'], SEEK_SET);
+ $this->fseek($oggheader['header_end_offset']);
return $oggheader;
}
+ /**
+ * @link http://xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-810005
+ *
+ * @return bool
+ */
+ public function ParseVorbisComments() {
+ $info = &$this->getid3->info;
- function ParseVorbisCommentsFilepointer(&$fd, &$ThisFileInfo) {
-
- $OriginalOffset = ftell($fd);
- $CommentStartOffset = $OriginalOffset;
+ $OriginalOffset = $this->ftell();
+ $commentdata = null;
$commentdataoffset = 0;
$VorbisCommentPage = 1;
+ $CommentStartOffset = 0;
- switch ($ThisFileInfo['audio']['dataformat']) {
+ switch ($info['audio']['dataformat']) {
case 'vorbis':
- $CommentStartOffset = $ThisFileInfo['ogg']['pageheader'][$VorbisCommentPage]['page_start_offset']; // Second Ogg page, after header block
- fseek($fd, $CommentStartOffset, SEEK_SET);
- $commentdataoffset = 27 + $ThisFileInfo['ogg']['pageheader'][$VorbisCommentPage]['page_segments'];
- $commentdata = fread($fd, getid3_ogg::OggPageSegmentLength($ThisFileInfo['ogg']['pageheader'][$VorbisCommentPage], 1) + $commentdataoffset);
+ case 'speex':
+ case 'opus':
+ $CommentStartOffset = $info['ogg']['pageheader'][$VorbisCommentPage]['page_start_offset']; // Second Ogg page, after header block
+ $this->fseek($CommentStartOffset);
+ $commentdataoffset = 27 + $info['ogg']['pageheader'][$VorbisCommentPage]['page_segments'];
+ $commentdata = $this->fread(self::OggPageSegmentLength($info['ogg']['pageheader'][$VorbisCommentPage], 1) + $commentdataoffset);
- $commentdataoffset += (strlen('vorbis') + 1);
+ if ($info['audio']['dataformat'] == 'vorbis') {
+ $commentdataoffset += (strlen('vorbis') + 1);
+ }
+ else if ($info['audio']['dataformat'] == 'opus') {
+ $commentdataoffset += strlen('OpusTags');
+ }
+
break;
case 'flac':
- fseek($fd, $ThisFileInfo['flac']['VORBIS_COMMENT']['raw']['offset'] + 4, SEEK_SET);
- $commentdata = fread($fd, $ThisFileInfo['flac']['VORBIS_COMMENT']['raw']['block_length']);
+ $CommentStartOffset = $info['flac']['VORBIS_COMMENT']['raw']['offset'] + 4;
+ $this->fseek($CommentStartOffset);
+ $commentdata = $this->fread($info['flac']['VORBIS_COMMENT']['raw']['block_length']);
break;
- case 'speex':
- $CommentStartOffset = $ThisFileInfo['ogg']['pageheader'][$VorbisCommentPage]['page_start_offset']; // Second Ogg page, after header block
- fseek($fd, $CommentStartOffset, SEEK_SET);
- $commentdataoffset = 27 + $ThisFileInfo['ogg']['pageheader'][$VorbisCommentPage]['page_segments'];
- $commentdata = fread($fd, getid3_ogg::OggPageSegmentLength($ThisFileInfo['ogg']['pageheader'][$VorbisCommentPage], 1) + $commentdataoffset);
- break;
-
default:
return false;
- break;
}
$VendorSize = getid3_lib::LittleEndian2Int(substr($commentdata, $commentdataoffset, 4));
$commentdataoffset += 4;
- $ThisFileInfo['ogg']['vendor'] = substr($commentdata, $commentdataoffset, $VendorSize);
+ $info['ogg']['vendor'] = substr($commentdata, $commentdataoffset, $VendorSize);
$commentdataoffset += $VendorSize;
$CommentsCount = getid3_lib::LittleEndian2Int(substr($commentdata, $commentdataoffset, 4));
$commentdataoffset += 4;
- $ThisFileInfo['avdataoffset'] = $CommentStartOffset + $commentdataoffset;
+ $info['avdataoffset'] = $CommentStartOffset + $commentdataoffset;
$basicfields = array('TITLE', 'ARTIST', 'ALBUM', 'TRACKNUMBER', 'GENRE', 'DATE', 'DESCRIPTION', 'COMMENT');
+ $ThisFileInfo_ogg_comments_raw = &$info['ogg']['comments_raw'];
for ($i = 0; $i < $CommentsCount; $i++) {
- $ThisFileInfo['ogg']['comments_raw'][$i]['dataoffset'] = $CommentStartOffset + $commentdataoffset;
+ if ($i >= 10000) {
+ // https://github.com/owncloud/music/issues/212#issuecomment-43082336
+ $this->warning('Unexpectedly large number ('.$CommentsCount.') of Ogg comments - breaking after reading '.$i.' comments');
+ break;
+ }
- if (ftell($fd) < ($ThisFileInfo['ogg']['comments_raw'][$i]['dataoffset'] + 4)) {
- $VorbisCommentPage++;
+ $ThisFileInfo_ogg_comments_raw[$i]['dataoffset'] = $CommentStartOffset + $commentdataoffset;
- $oggpageinfo = getid3_ogg::ParseOggPageHeader($fd);
- $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']] = $oggpageinfo;
+ if ($this->ftell() < ($ThisFileInfo_ogg_comments_raw[$i]['dataoffset'] + 4)) {
+ if ($oggpageinfo = $this->ParseOggPageHeader()) {
+ $info['ogg']['pageheader'][$oggpageinfo['page_seqno']] = $oggpageinfo;
- // First, save what we haven't read yet
- $AsYetUnusedData = substr($commentdata, $commentdataoffset);
+ $VorbisCommentPage++;
- // Then take that data off the end
- $commentdata = substr($commentdata, 0, $commentdataoffset);
+ // First, save what we haven't read yet
+ $AsYetUnusedData = substr($commentdata, $commentdataoffset);
- // Add [headerlength] bytes of dummy data for the Ogg Page Header, just to keep absolute offsets correct
- $commentdata .= str_repeat("\x00", 27 + $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']);
- $commentdataoffset += (27 + $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']);
+ // Then take that data off the end
+ $commentdata = substr($commentdata, 0, $commentdataoffset);
- // Finally, stick the unused data back on the end
- $commentdata .= $AsYetUnusedData;
+ // Add [headerlength] bytes of dummy data for the Ogg Page Header, just to keep absolute offsets correct
+ $commentdata .= str_repeat("\x00", 27 + $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']);
+ $commentdataoffset += (27 + $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']);
- //$commentdata .= fread($fd, $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
- $commentdata .= fread($fd, getid3_ogg::OggPageSegmentLength($ThisFileInfo['ogg']['pageheader'][$VorbisCommentPage], 1));
+ // Finally, stick the unused data back on the end
+ $commentdata .= $AsYetUnusedData;
+ //$commentdata .= $this->fread($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
+ $commentdata .= $this->fread($this->OggPageSegmentLength($info['ogg']['pageheader'][$VorbisCommentPage], 1));
+ }
+
}
- $ThisFileInfo['ogg']['comments_raw'][$i]['size'] = getid3_lib::LittleEndian2Int(substr($commentdata, $commentdataoffset, 4));
+ $ThisFileInfo_ogg_comments_raw[$i]['size'] = getid3_lib::LittleEndian2Int(substr($commentdata, $commentdataoffset, 4));
// replace avdataoffset with position just after the last vorbiscomment
- $ThisFileInfo['avdataoffset'] = $ThisFileInfo['ogg']['comments_raw'][$i]['dataoffset'] + $ThisFileInfo['ogg']['comments_raw'][$i]['size'] + 4;
+ $info['avdataoffset'] = $ThisFileInfo_ogg_comments_raw[$i]['dataoffset'] + $ThisFileInfo_ogg_comments_raw[$i]['size'] + 4;
$commentdataoffset += 4;
- while ((strlen($commentdata) - $commentdataoffset) < $ThisFileInfo['ogg']['comments_raw'][$i]['size']) {
- if (($ThisFileInfo['ogg']['comments_raw'][$i]['size'] > $ThisFileInfo['avdataend']) || ($ThisFileInfo['ogg']['comments_raw'][$i]['size'] < 0)) {
- $ThisFileInfo['error'][] = 'Invalid Ogg comment size (comment #'.$i.', claims to be '.number_format($ThisFileInfo['ogg']['comments_raw'][$i]['size']).' bytes) - aborting reading comments';
+ while ((strlen($commentdata) - $commentdataoffset) < $ThisFileInfo_ogg_comments_raw[$i]['size']) {
+ if (($ThisFileInfo_ogg_comments_raw[$i]['size'] > $info['avdataend']) || ($ThisFileInfo_ogg_comments_raw[$i]['size'] < 0)) {
+ $this->warning('Invalid Ogg comment size (comment #'.$i.', claims to be '.number_format($ThisFileInfo_ogg_comments_raw[$i]['size']).' bytes) - aborting reading comments');
break 2;
}
$VorbisCommentPage++;
- $oggpageinfo = getid3_ogg::ParseOggPageHeader($fd);
- $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']] = $oggpageinfo;
+ $oggpageinfo = $this->ParseOggPageHeader();
+ $info['ogg']['pageheader'][$oggpageinfo['page_seqno']] = $oggpageinfo;
// First, save what we haven't read yet
$AsYetUnusedData = substr($commentdata, $commentdataoffset);
@@ -406,77 +690,123 @@
$commentdata = substr($commentdata, 0, $commentdataoffset);
// Add [headerlength] bytes of dummy data for the Ogg Page Header, just to keep absolute offsets correct
- $commentdata .= str_repeat("\x00", 27 + $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']);
- $commentdataoffset += (27 + $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']);
+ $commentdata .= str_repeat("\x00", 27 + $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']);
+ $commentdataoffset += (27 + $info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_segments']);
// Finally, stick the unused data back on the end
$commentdata .= $AsYetUnusedData;
- //$commentdata .= fread($fd, $ThisFileInfo['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
- $commentdata .= fread($fd, getid3_ogg::OggPageSegmentLength($ThisFileInfo['ogg']['pageheader'][$VorbisCommentPage], 1));
+ //$commentdata .= $this->fread($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
+ if (!isset($info['ogg']['pageheader'][$VorbisCommentPage])) {
+ $this->warning('undefined Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.$this->ftell());
+ break;
+ }
+ $readlength = self::OggPageSegmentLength($info['ogg']['pageheader'][$VorbisCommentPage], 1);
+ if ($readlength <= 0) {
+ $this->warning('invalid length Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.$this->ftell());
+ break;
+ }
+ $commentdata .= $this->fread($readlength);
//$filebaseoffset += $oggpageinfo['header_end_offset'] - $oggpageinfo['page_start_offset'];
}
- $commentstring = substr($commentdata, $commentdataoffset, $ThisFileInfo['ogg']['comments_raw'][$i]['size']);
- $commentdataoffset += $ThisFileInfo['ogg']['comments_raw'][$i]['size'];
+ $ThisFileInfo_ogg_comments_raw[$i]['offset'] = $commentdataoffset;
+ $commentstring = substr($commentdata, $commentdataoffset, $ThisFileInfo_ogg_comments_raw[$i]['size']);
+ $commentdataoffset += $ThisFileInfo_ogg_comments_raw[$i]['size'];
if (!$commentstring) {
// no comment?
- $ThisFileInfo['warning'][] = 'Blank Ogg comment ['.$i.']';
+ $this->warning('Blank Ogg comment ['.$i.']');
} elseif (strstr($commentstring, '=')) {
$commentexploded = explode('=', $commentstring, 2);
- $ThisFileInfo['ogg']['comments_raw'][$i]['key'] = strtoupper($commentexploded[0]);
- $ThisFileInfo['ogg']['comments_raw'][$i]['value'] = @$commentexploded[1];
- $ThisFileInfo['ogg']['comments_raw'][$i]['data'] = base64_decode($ThisFileInfo['ogg']['comments_raw'][$i]['value']);
+ $ThisFileInfo_ogg_comments_raw[$i]['key'] = strtoupper($commentexploded[0]);
+ $ThisFileInfo_ogg_comments_raw[$i]['value'] = (isset($commentexploded[1]) ? $commentexploded[1] : '');
- $ThisFileInfo['ogg']['comments'][strtolower($ThisFileInfo['ogg']['comments_raw'][$i]['key'])][] = $ThisFileInfo['ogg']['comments_raw'][$i]['value'];
+ if ($ThisFileInfo_ogg_comments_raw[$i]['key'] == 'METADATA_BLOCK_PICTURE') {
- $imagechunkcheck = getid3_lib::GetDataImageSize($ThisFileInfo['ogg']['comments_raw'][$i]['data']);
- $ThisFileInfo['ogg']['comments_raw'][$i]['image_mime'] = getid3_lib::image_type_to_mime_type($imagechunkcheck[2]);
- if (!$ThisFileInfo['ogg']['comments_raw'][$i]['image_mime'] || ($ThisFileInfo['ogg']['comments_raw'][$i]['image_mime'] == 'application/octet-stream')) {
- unset($ThisFileInfo['ogg']['comments_raw'][$i]['image_mime']);
- unset($ThisFileInfo['ogg']['comments_raw'][$i]['data']);
+ // http://wiki.xiph.org/VorbisComment#METADATA_BLOCK_PICTURE
+ // The unencoded format is that of the FLAC picture block. The fields are stored in big endian order as in FLAC, picture data is stored according to the relevant standard.
+ // http://flac.sourceforge.net/format.html#metadata_block_picture
+ $flac = new getid3_flac($this->getid3);
+ $flac->setStringMode(base64_decode($ThisFileInfo_ogg_comments_raw[$i]['value']));
+ $flac->parsePICTURE();
+ $info['ogg']['comments']['picture'][] = $flac->getid3->info['flac']['PICTURE'][0];
+ unset($flac);
+
+ } elseif ($ThisFileInfo_ogg_comments_raw[$i]['key'] == 'COVERART') {
+
+ $data = base64_decode($ThisFileInfo_ogg_comments_raw[$i]['value']);
+ $this->notice('Found deprecated COVERART tag, it should be replaced in honor of METADATA_BLOCK_PICTURE structure');
+ /** @todo use 'coverartmime' where available */
+ $imageinfo = getid3_lib::GetDataImageSize($data);
+ if ($imageinfo === false || !isset($imageinfo['mime'])) {
+ $this->warning('COVERART vorbiscomment tag contains invalid image');
+ continue;
+ }
+
+ $ogg = new self($this->getid3);
+ $ogg->setStringMode($data);
+ $info['ogg']['comments']['picture'][] = array(
+ 'image_mime' => $imageinfo['mime'],
+ 'datalength' => strlen($data),
+ 'picturetype' => 'cover art',
+ 'image_height' => $imageinfo['height'],
+ 'image_width' => $imageinfo['width'],
+ 'data' => $ogg->saveAttachment('coverart', 0, strlen($data), $imageinfo['mime']),
+ );
+ unset($ogg);
+
+ } else {
+
+ $info['ogg']['comments'][strtolower($ThisFileInfo_ogg_comments_raw[$i]['key'])][] = $ThisFileInfo_ogg_comments_raw[$i]['value'];
+
}
} else {
- $ThisFileInfo['warning'][] = '[known problem with CDex >= v1.40, < v1.50b7] Invalid Ogg comment name/value pair ['.$i.']: '.$commentstring;
+ $this->warning('[known problem with CDex >= v1.40, < v1.50b7] Invalid Ogg comment name/value pair ['.$i.']: '.$commentstring);
}
+ unset($ThisFileInfo_ogg_comments_raw[$i]);
}
+ unset($ThisFileInfo_ogg_comments_raw);
// Replay Gain Adjustment
// http://privatewww.essex.ac.uk/~djmrob/replaygain/
- if (isset($ThisFileInfo['ogg']['comments']) && is_array($ThisFileInfo['ogg']['comments'])) {
- foreach ($ThisFileInfo['ogg']['comments'] as $index => $commentvalue) {
+ if (isset($info['ogg']['comments']) && is_array($info['ogg']['comments'])) {
+ foreach ($info['ogg']['comments'] as $index => $commentvalue) {
switch ($index) {
case 'rg_audiophile':
case 'replaygain_album_gain':
- $ThisFileInfo['replay_gain']['album']['adjustment'] = (double) $commentvalue[0];
- unset($ThisFileInfo['ogg']['comments'][$index]);
+ $info['replay_gain']['album']['adjustment'] = (double) $commentvalue[0];
+ unset($info['ogg']['comments'][$index]);
break;
case 'rg_radio':
case 'replaygain_track_gain':
- $ThisFileInfo['replay_gain']['track']['adjustment'] = (double) $commentvalue[0];
- unset($ThisFileInfo['ogg']['comments'][$index]);
+ $info['replay_gain']['track']['adjustment'] = (double) $commentvalue[0];
+ unset($info['ogg']['comments'][$index]);
break;
case 'replaygain_album_peak':
- $ThisFileInfo['replay_gain']['album']['peak'] = (double) $commentvalue[0];
- unset($ThisFileInfo['ogg']['comments'][$index]);
+ $info['replay_gain']['album']['peak'] = (double) $commentvalue[0];
+ unset($info['ogg']['comments'][$index]);
break;
case 'rg_peak':
case 'replaygain_track_peak':
- $ThisFileInfo['replay_gain']['track']['peak'] = (double) $commentvalue[0];
- unset($ThisFileInfo['ogg']['comments'][$index]);
+ $info['replay_gain']['track']['peak'] = (double) $commentvalue[0];
+ unset($info['ogg']['comments'][$index]);
break;
+ case 'replaygain_reference_loudness':
+ $info['replay_gain']['reference_volume'] = (double) $commentvalue[0];
+ unset($info['ogg']['comments'][$index]);
+ break;
default:
// do nothing
@@ -485,12 +815,17 @@
}
}
- fseek($fd, $OriginalOffset, SEEK_SET);
+ $this->fseek($OriginalOffset);
return true;
}
- function SpeexBandModeLookup($mode) {
+ /**
+ * @param int $mode
+ *
+ * @return string|null
+ */
+ public static function SpeexBandModeLookup($mode) {
static $SpeexBandModeLookup = array();
if (empty($SpeexBandModeLookup)) {
$SpeexBandModeLookup[0] = 'narrow';
@@ -500,8 +835,14 @@
return (isset($SpeexBandModeLookup[$mode]) ? $SpeexBandModeLookup[$mode] : null);
}
-
- function OggPageSegmentLength($OggInfoArray, $SegmentNumber=1) {
+ /**
+ * @param array $OggInfoArray
+ * @param int $SegmentNumber
+ *
+ * @return int
+ */
+ public static function OggPageSegmentLength($OggInfoArray, $SegmentNumber=1) {
+ $segmentlength = 0;
for ($i = 0; $i < $SegmentNumber; $i++) {
$segmentlength = 0;
foreach ($OggInfoArray['segment_table'] as $key => $value) {
@@ -514,9 +855,13 @@
return $segmentlength;
}
+ /**
+ * @param int $nominal_bitrate
+ *
+ * @return float
+ */
+ public static function get_quality_from_nominal_bitrate($nominal_bitrate) {
- function get_quality_from_nominal_bitrate($nominal_bitrate) {
-
// decrease precision
$nominal_bitrate = $nominal_bitrate / 1000;
@@ -538,6 +883,38 @@
return round($qval, 1); // 5 or 4.9
}
+ /**
+ * @param int $colorspace_id
+ *
+ * @return string|null
+ */
+ public static function TheoraColorSpace($colorspace_id) {
+ // http://www.theora.org/doc/Theora.pdf (table 6.3)
+ static $TheoraColorSpaceLookup = array();
+ if (empty($TheoraColorSpaceLookup)) {
+ $TheoraColorSpaceLookup[0] = 'Undefined';
+ $TheoraColorSpaceLookup[1] = 'Rec. 470M';
+ $TheoraColorSpaceLookup[2] = 'Rec. 470BG';
+ $TheoraColorSpaceLookup[3] = 'Reserved';
+ }
+ return (isset($TheoraColorSpaceLookup[$colorspace_id]) ? $TheoraColorSpaceLookup[$colorspace_id] : null);
+ }
+
+ /**
+ * @param int $pixelformat_id
+ *
+ * @return string|null
+ */
+ public static function TheoraPixelFormat($pixelformat_id) {
+ // http://www.theora.org/doc/Theora.pdf (table 6.4)
+ static $TheoraPixelFormatLookup = array();
+ if (empty($TheoraPixelFormatLookup)) {
+ $TheoraPixelFormatLookup[0] = '4:2:0';
+ $TheoraPixelFormatLookup[1] = 'Reserved';
+ $TheoraPixelFormatLookup[2] = '4:2:2';
+ $TheoraPixelFormatLookup[3] = '4:4:4';
+ }
+ return (isset($TheoraPixelFormatLookup[$pixelformat_id]) ? $TheoraPixelFormatLookup[$pixelformat_id] : null);
+ }
+
}
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.optimfrog.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.optimfrog.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.optimfrog.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio.optimfrog.php //
// module for analyzing OptimFROG audio files //
@@ -13,41 +14,51 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, true);
-class getid3_optimfrog
+class getid3_optimfrog extends getid3_handler
{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- function getid3_optimfrog(&$fd, &$ThisFileInfo) {
- $ThisFileInfo['fileformat'] = 'ofr';
- $ThisFileInfo['audio']['dataformat'] = 'ofr';
- $ThisFileInfo['audio']['bitrate_mode'] = 'vbr';
- $ThisFileInfo['audio']['lossless'] = true;
+ $info['fileformat'] = 'ofr';
+ $info['audio']['dataformat'] = 'ofr';
+ $info['audio']['bitrate_mode'] = 'vbr';
+ $info['audio']['lossless'] = true;
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
- $OFRheader = fread($fd, 8);
+ $this->fseek($info['avdataoffset']);
+ $OFRheader = $this->fread(8);
if (substr($OFRheader, 0, 5) == '*RIFF') {
- return $this->ParseOptimFROGheader42($fd, $ThisFileInfo);
+ return $this->ParseOptimFROGheader42();
} elseif (substr($OFRheader, 0, 3) == 'OFR') {
- return $this->ParseOptimFROGheader45($fd, $ThisFileInfo);
+ return $this->ParseOptimFROGheader45();
}
- $ThisFileInfo['error'][] = 'Expecting "*RIFF" or "OFR " at offset '.$ThisFileInfo['avdataoffset'].', found "'.$OFRheader.'"';
- unset($ThisFileInfo['fileformat']);
+ $this->error('Expecting "*RIFF" or "OFR " at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($OFRheader).'"');
+ unset($info['fileformat']);
return false;
}
-
- function ParseOptimFROGheader42(&$fd, &$ThisFileInfo) {
+ /**
+ * @return bool
+ */
+ public function ParseOptimFROGheader42() {
// for fileformat of v4.21 and older
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
- $OptimFROGheaderData = fread($fd, 45);
- $ThisFileInfo['avdataoffset'] = 45;
+ $info = &$this->getid3->info;
+ $this->fseek($info['avdataoffset']);
+ $OptimFROGheaderData = $this->fread(45);
+ $info['avdataoffset'] = 45;
$OptimFROGencoderVersion_raw = getid3_lib::LittleEndian2Int(substr($OptimFROGheaderData, 0, 1));
$OptimFROGencoderVersion_major = floor($OptimFROGencoderVersion_raw / 10);
@@ -57,9 +68,9 @@
$OrignalRIFFdataSize = getid3_lib::LittleEndian2Int(substr($RIFFdata, 40, 4)) + 44;
if ($OrignalRIFFheaderSize > $OrignalRIFFdataSize) {
- $ThisFileInfo['avdataend'] -= ($OrignalRIFFheaderSize - $OrignalRIFFdataSize);
- fseek($fd, $ThisFileInfo['avdataend'], SEEK_SET);
- $RIFFdata .= fread($fd, $OrignalRIFFheaderSize - $OrignalRIFFdataSize);
+ $info['avdataend'] -= ($OrignalRIFFheaderSize - $OrignalRIFFdataSize);
+ $this->fseek($info['avdataend']);
+ $RIFFdata .= $this->fread($OrignalRIFFheaderSize - $OrignalRIFFdataSize);
}
// move the data chunk after all other chunks (if any)
@@ -66,27 +77,39 @@
// so that the RIFF parser doesn't see EOF when trying
// to skip over the data chunk
$RIFFdata = substr($RIFFdata, 0, 36).substr($RIFFdata, 44).substr($RIFFdata, 36, 8);
- getid3_riff::ParseRIFFdata($RIFFdata, $ThisFileInfo);
- $ThisFileInfo['audio']['encoder'] = 'OptimFROG '.$OptimFROGencoderVersion_major.'.'.$OptimFROGencoderVersion_minor;
- $ThisFileInfo['audio']['channels'] = $ThisFileInfo['riff']['audio'][0]['channels'];
- $ThisFileInfo['audio']['sample_rate'] = $ThisFileInfo['riff']['audio'][0]['sample_rate'];
- $ThisFileInfo['audio']['bits_per_sample'] = $ThisFileInfo['riff']['audio'][0]['bits_per_sample'];
- $ThisFileInfo['playtime_seconds'] = $OrignalRIFFdataSize / ($ThisFileInfo['audio']['channels'] * $ThisFileInfo['audio']['sample_rate'] * ($ThisFileInfo['audio']['bits_per_sample'] / 8));
- $ThisFileInfo['audio']['bitrate'] = (($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) * 8) / $ThisFileInfo['playtime_seconds'];
+ $getid3_temp = new getID3();
+ $getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
+ $getid3_temp->info['avdataoffset'] = $info['avdataoffset'];
+ $getid3_temp->info['avdataend'] = $info['avdataend'];
+ $getid3_riff = new getid3_riff($getid3_temp);
+ $getid3_riff->ParseRIFFdata($RIFFdata);
+ $info['riff'] = $getid3_temp->info['riff'];
+ $info['audio']['encoder'] = 'OptimFROG '.$OptimFROGencoderVersion_major.'.'.$OptimFROGencoderVersion_minor;
+ $info['audio']['channels'] = $info['riff']['audio'][0]['channels'];
+ $info['audio']['sample_rate'] = $info['riff']['audio'][0]['sample_rate'];
+ $info['audio']['bits_per_sample'] = $info['riff']['audio'][0]['bits_per_sample'];
+ $info['playtime_seconds'] = $OrignalRIFFdataSize / ($info['audio']['channels'] * $info['audio']['sample_rate'] * ($info['audio']['bits_per_sample'] / 8));
+ $info['audio']['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
+
+ unset($getid3_riff, $getid3_temp, $RIFFdata);
+
return true;
}
-
- function ParseOptimFROGheader45(&$fd, &$ThisFileInfo) {
+ /**
+ * @return bool
+ */
+ public function ParseOptimFROGheader45() {
// for fileformat of v4.50a and higher
+ $info = &$this->getid3->info;
$RIFFdata = '';
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
- while (!feof($fd) && (ftell($fd) < $ThisFileInfo['avdataend'])) {
- $BlockOffset = ftell($fd);
- $BlockData = fread($fd, 8);
+ $this->fseek($info['avdataoffset']);
+ while (!feof($this->getid3->fp) && ($this->ftell() < $info['avdataend'])) {
+ $BlockOffset = $this->ftell();
+ $BlockData = $this->fread(8);
$offset = 8;
$BlockName = substr($BlockData, 0, 4);
$BlockSize = getid3_lib::LittleEndian2Int(substr($BlockData, 4, 4));
@@ -94,10 +117,10 @@
if ($BlockName == 'OFRX') {
$BlockName = 'OFR ';
}
- if (!isset($ThisFileInfo['ofr'][$BlockName])) {
- $ThisFileInfo['ofr'][$BlockName] = array();
+ if (!isset($info['ofr'][$BlockName])) {
+ $info['ofr'][$BlockName] = array();
}
- $thisfile_ofr_thisblock = &$ThisFileInfo['ofr'][$BlockName];
+ $thisfile_ofr_thisblock = &$info['ofr'][$BlockName];
switch ($BlockName) {
case 'OFR ':
@@ -106,7 +129,7 @@
$thisfile_ofr_thisblock['offset'] = $BlockOffset;
$thisfile_ofr_thisblock['size'] = $BlockSize;
- $ThisFileInfo['audio']['encoder'] = 'OptimFROG 4.50 alpha';
+ $info['audio']['encoder'] = 'OptimFROG 4.50 alpha';
switch ($BlockSize) {
case 12:
case 15:
@@ -114,10 +137,10 @@
break;
default:
- $ThisFileInfo['warning'][] = '"'.$BlockName.'" contains more data than expected (expected 12 or 15 bytes, found '.$BlockSize.' bytes)';
+ $this->warning('"'.$BlockName.'" contains more data than expected (expected 12 or 15 bytes, found '.$BlockSize.' bytes)');
break;
}
- $BlockData .= fread($fd, $BlockSize);
+ $BlockData .= $this->fread($BlockSize);
$thisfile_ofr_thisblock['total_samples'] = getid3_lib::LittleEndian2Int(substr($BlockData, $offset, 6));
$offset += 6;
@@ -142,23 +165,23 @@
$thisfile_ofr_thisblock['speedup'] = $this->OptimFROGspeedupLookup($thisfile_ofr_thisblock['raw']['compression']);
$offset += 1;
- $ThisFileInfo['audio']['encoder'] = 'OptimFROG '.$thisfile_ofr_thisblock['encoder'];
- $ThisFileInfo['audio']['encoder_options'] = '--mode '.$thisfile_ofr_thisblock['compression'];
+ $info['audio']['encoder'] = 'OptimFROG '.$thisfile_ofr_thisblock['encoder'];
+ $info['audio']['encoder_options'] = '--mode '.$thisfile_ofr_thisblock['compression'];
if ((($thisfile_ofr_thisblock['raw']['encoder_id'] & 0xF0) >> 4) == 7) { // v4.507
- if (strtolower(getid3_lib::fileextension($ThisFileInfo['filename'])) == 'ofs') {
+ if (strtolower(getid3_lib::fileextension($info['filename'])) == 'ofs') {
// OptimFROG DualStream format is lossy, but as of v4.507 there is no way to tell the difference
// between lossless and lossy other than the file extension.
- $ThisFileInfo['audio']['dataformat'] = 'ofs';
- $ThisFileInfo['audio']['lossless'] = true;
+ $info['audio']['dataformat'] = 'ofs';
+ $info['audio']['lossless'] = true;
}
}
}
- $ThisFileInfo['audio']['channels'] = $thisfile_ofr_thisblock['channels'];
- $ThisFileInfo['audio']['sample_rate'] = $thisfile_ofr_thisblock['sample_rate'];
- $ThisFileInfo['audio']['bits_per_sample'] = $this->OptimFROGbitsPerSampleTypeLookup($thisfile_ofr_thisblock['raw']['sample_type']);
+ $info['audio']['channels'] = $thisfile_ofr_thisblock['channels'];
+ $info['audio']['sample_rate'] = $thisfile_ofr_thisblock['sample_rate'];
+ $info['audio']['bits_per_sample'] = $this->OptimFROGbitsPerSampleTypeLookup($thisfile_ofr_thisblock['raw']['sample_type']);
break;
@@ -168,13 +191,13 @@
$COMPdata['offset'] = $BlockOffset;
$COMPdata['size'] = $BlockSize;
- if ($ThisFileInfo['avdataoffset'] == 0) {
- $ThisFileInfo['avdataoffset'] = $BlockOffset;
+ if ($info['avdataoffset'] == 0) {
+ $info['avdataoffset'] = $BlockOffset;
}
// Only interested in first 14 bytes (only first 12 needed for v4.50 alpha), not actual audio data
- $BlockData .= fread($fd, 14);
- fseek($fd, $BlockSize - 14, SEEK_CUR);
+ $BlockData .= $this->fread(14);
+ $this->fseek($BlockSize - 14, SEEK_CUR);
$COMPdata['crc_32'] = getid3_lib::LittleEndian2Int(substr($BlockData, $offset, 4));
$offset += 4;
@@ -190,7 +213,7 @@
//$COMPdata['algorithm'] = OptimFROGalgorithmNameLookup($COMPdata['raw']['algorithm_id']);
$offset += 2;
- if ($ThisFileInfo['ofr']['OFR ']['size'] > 12) {
+ if ($info['ofr']['OFR ']['size'] > 12) {
// OFR 4.504b or higher
$COMPdata['raw']['encoder_id'] = getid3_lib::LittleEndian2Int(substr($BlockData, $offset, 2));
@@ -211,7 +234,7 @@
$thisfile_ofr_thisblock['offset'] = $BlockOffset;
$thisfile_ofr_thisblock['size'] = $BlockSize;
- $RIFFdata .= fread($fd, $BlockSize);
+ $RIFFdata .= $this->fread($BlockSize);
break;
case 'TAIL':
@@ -219,7 +242,7 @@
$thisfile_ofr_thisblock['size'] = $BlockSize;
if ($BlockSize > 0) {
- $RIFFdata .= fread($fd, $BlockSize);
+ $RIFFdata .= $this->fread($BlockSize);
}
break;
@@ -229,7 +252,7 @@
$thisfile_ofr_thisblock['offset'] = $BlockOffset;
$thisfile_ofr_thisblock['size'] = $BlockSize;
- fseek($fd, $BlockSize, SEEK_CUR);
+ $this->fseek($BlockSize, SEEK_CUR);
break;
@@ -238,9 +261,9 @@
$thisfile_ofr_thisblock['offset'] = $BlockOffset;
$thisfile_ofr_thisblock['size'] = $BlockSize;
- $ThisFileInfo['warning'][] = 'APEtag processing inside OptimFROG not supported in this version ('.GETID3_VERSION.') of getID3()';
+ $this->warning('APEtag processing inside OptimFROG not supported in this version ('.$this->getid3->version().') of getID3()');
- fseek($fd, $BlockSize, SEEK_CUR);
+ $this->fseek($BlockSize, SEEK_CUR);
break;
@@ -252,14 +275,14 @@
if ($BlockSize == 16) {
- $thisfile_ofr_thisblock['md5_binary'] = fread($fd, $BlockSize);
+ $thisfile_ofr_thisblock['md5_binary'] = $this->fread($BlockSize);
$thisfile_ofr_thisblock['md5_string'] = getid3_lib::PrintHexBytes($thisfile_ofr_thisblock['md5_binary'], true, false, false);
- $ThisFileInfo['md5_data_source'] = $thisfile_ofr_thisblock['md5_string'];
+ $info['md5_data_source'] = $thisfile_ofr_thisblock['md5_string'];
} else {
- $ThisFileInfo['warning'][] = 'Expecting block size of 16 in "MD5 " chunk, found '.$BlockSize.' instead';
- fseek($fd, $BlockSize, SEEK_CUR);
+ $this->warning('Expecting block size of 16 in "MD5 " chunk, found '.$BlockSize.' instead');
+ $this->fseek($BlockSize, SEEK_CUR);
}
break;
@@ -269,29 +292,42 @@
$thisfile_ofr_thisblock['offset'] = $BlockOffset;
$thisfile_ofr_thisblock['size'] = $BlockSize;
- $ThisFileInfo['warning'][] = 'Unhandled OptimFROG block type "'.$BlockName.'" at offset '.$thisfile_ofr_thisblock['offset'];
- fseek($fd, $BlockSize, SEEK_CUR);
+ $this->warning('Unhandled OptimFROG block type "'.$BlockName.'" at offset '.$thisfile_ofr_thisblock['offset']);
+ $this->fseek($BlockSize, SEEK_CUR);
break;
}
}
- if (isset($ThisFileInfo['ofr']['TAIL']['offset'])) {
- $ThisFileInfo['avdataend'] = $ThisFileInfo['ofr']['TAIL']['offset'];
+ if (isset($info['ofr']['TAIL']['offset'])) {
+ $info['avdataend'] = $info['ofr']['TAIL']['offset'];
}
- $ThisFileInfo['playtime_seconds'] = (float) $ThisFileInfo['ofr']['OFR ']['total_samples'] / ($ThisFileInfo['audio']['channels'] * $ThisFileInfo['audio']['sample_rate']);
- $ThisFileInfo['audio']['bitrate'] = (($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) * 8) / $ThisFileInfo['playtime_seconds'];
+ $info['playtime_seconds'] = (float) $info['ofr']['OFR ']['total_samples'] / ($info['audio']['channels'] * $info['audio']['sample_rate']);
+ $info['audio']['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
// move the data chunk after all other chunks (if any)
// so that the RIFF parser doesn't see EOF when trying
// to skip over the data chunk
$RIFFdata = substr($RIFFdata, 0, 36).substr($RIFFdata, 44).substr($RIFFdata, 36, 8);
- getid3_riff::ParseRIFFdata($RIFFdata, $ThisFileInfo);
+ $getid3_temp = new getID3();
+ $getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
+ $getid3_temp->info['avdataoffset'] = $info['avdataoffset'];
+ $getid3_temp->info['avdataend'] = $info['avdataend'];
+ $getid3_riff = new getid3_riff($getid3_temp);
+ $getid3_riff->ParseRIFFdata($RIFFdata);
+ $info['riff'] = $getid3_temp->info['riff'];
+
+ unset($getid3_riff, $getid3_temp, $RIFFdata);
+
return true;
}
-
- function OptimFROGsampleTypeLookup($SampleType) {
+ /**
+ * @param int $SampleType
+ *
+ * @return string|false
+ */
+ public static function OptimFROGsampleTypeLookup($SampleType) {
static $OptimFROGsampleTypeLookup = array(
0 => 'unsigned int (8-bit)',
1 => 'signed int (8-bit)',
@@ -308,7 +344,12 @@
return (isset($OptimFROGsampleTypeLookup[$SampleType]) ? $OptimFROGsampleTypeLookup[$SampleType] : false);
}
- function OptimFROGbitsPerSampleTypeLookup($SampleType) {
+ /**
+ * @param int $SampleType
+ *
+ * @return int|false
+ */
+ public static function OptimFROGbitsPerSampleTypeLookup($SampleType) {
static $OptimFROGbitsPerSampleTypeLookup = array(
0 => 8,
1 => 8,
@@ -325,7 +366,12 @@
return (isset($OptimFROGbitsPerSampleTypeLookup[$SampleType]) ? $OptimFROGbitsPerSampleTypeLookup[$SampleType] : false);
}
- function OptimFROGchannelConfigurationLookup($ChannelConfiguration) {
+ /**
+ * @param int $ChannelConfiguration
+ *
+ * @return string|false
+ */
+ public static function OptimFROGchannelConfigurationLookup($ChannelConfiguration) {
static $OptimFROGchannelConfigurationLookup = array(
0 => 'mono',
1 => 'stereo'
@@ -333,7 +379,12 @@
return (isset($OptimFROGchannelConfigurationLookup[$ChannelConfiguration]) ? $OptimFROGchannelConfigurationLookup[$ChannelConfiguration] : false);
}
- function OptimFROGchannelConfigNumChannelsLookup($ChannelConfiguration) {
+ /**
+ * @param int $ChannelConfiguration
+ *
+ * @return int|false
+ */
+ public static function OptimFROGchannelConfigNumChannelsLookup($ChannelConfiguration) {
static $OptimFROGchannelConfigNumChannelsLookup = array(
0 => 1,
1 => 2
@@ -342,14 +393,18 @@
}
-
- // function OptimFROGalgorithmNameLookup($AlgorithID) {
+ // static function OptimFROGalgorithmNameLookup($AlgorithID) {
// static $OptimFROGalgorithmNameLookup = array();
// return (isset($OptimFROGalgorithmNameLookup[$AlgorithID]) ? $OptimFROGalgorithmNameLookup[$AlgorithID] : false);
// }
- function OptimFROGencoderNameLookup($EncoderID) {
+ /**
+ * @param int $EncoderID
+ *
+ * @return string
+ */
+ public static function OptimFROGencoderNameLookup($EncoderID) {
// version = (encoderID >> 4) + 4500
// system = encoderID & 0xF
@@ -364,7 +419,12 @@
return $EncoderVersion.' ('.(isset($OptimFROGencoderSystemLookup[$EncoderSystemID]) ? $OptimFROGencoderSystemLookup[$EncoderSystemID] : 'undefined encoder type (0x'.dechex($EncoderSystemID).')').')';
}
- function OptimFROGcompressionLookup($CompressionID) {
+ /**
+ * @param int $CompressionID
+ *
+ * @return string
+ */
+ public static function OptimFROGcompressionLookup($CompressionID) {
// mode = compression >> 3
// speedup = compression & 0x07
@@ -386,7 +446,12 @@
return (isset($OptimFROGencoderModeLookup[$CompressionModeID]) ? $OptimFROGencoderModeLookup[$CompressionModeID] : 'undefined mode (0x'.str_pad(dechex($CompressionModeID), 2, '0', STR_PAD_LEFT).')');
}
- function OptimFROGspeedupLookup($CompressionID) {
+ /**
+ * @param int $CompressionID
+ *
+ * @return string
+ */
+ public static function OptimFROGspeedupLookup($CompressionID) {
// mode = compression >> 3
// speedup = compression & 0x07
@@ -398,11 +463,7 @@
0x01 => '2x',
0x02 => '4x'
);
-
return (isset($OptimFROGencoderSpeedupLookup[$CompressionSpeedupID]) ? $OptimFROGencoderSpeedupLookup[$CompressionSpeedupID] : 'undefined mode (0x'.dechex($CompressionSpeedupID));
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.rkau.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.rkau.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.rkau.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio.shorten.php //
// module for analyzing Shorten Audio files //
@@ -13,68 +14,79 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_rkau
+class getid3_rkau extends getid3_handler
{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- function getid3_rkau(&$fd, &$ThisFileInfo) {
-
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
- $RKAUHeader = fread($fd, 20);
- if (substr($RKAUHeader, 0, 3) != 'RKA') {
- $ThisFileInfo['error'][] = 'Expecting "RKA" at offset '.$ThisFileInfo['avdataoffset'].', found "'.substr($RKAUHeader, 0, 3).'"';
+ $this->fseek($info['avdataoffset']);
+ $RKAUHeader = $this->fread(20);
+ $magic = 'RKA';
+ if (substr($RKAUHeader, 0, 3) != $magic) {
+ $this->error('Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes(substr($RKAUHeader, 0, 3)).'"');
return false;
}
- $ThisFileInfo['fileformat'] = 'rkau';
- $ThisFileInfo['audio']['dataformat'] = 'rkau';
- $ThisFileInfo['audio']['bitrate_mode'] = 'vbr';
+ $info['fileformat'] = 'rkau';
+ $info['audio']['dataformat'] = 'rkau';
+ $info['audio']['bitrate_mode'] = 'vbr';
- $ThisFileInfo['rkau']['raw']['version'] = getid3_lib::LittleEndian2Int(substr($RKAUHeader, 3, 1));
- $ThisFileInfo['rkau']['version'] = '1.'.str_pad($ThisFileInfo['rkau']['raw']['version'] & 0x0F, 2, '0', STR_PAD_LEFT);
- if (($ThisFileInfo['rkau']['version'] > 1.07) || ($ThisFileInfo['rkau']['version'] < 1.06)) {
- $ThisFileInfo['error'][] = 'This version of getID3() can only parse RKAU files v1.06 and 1.07 (this file is v'.$ThisFileInfo['rkau']['version'].')';
- unset($ThisFileInfo['rkau']);
+ $info['rkau']['raw']['version'] = getid3_lib::LittleEndian2Int(substr($RKAUHeader, 3, 1));
+ $info['rkau']['version'] = '1.'.str_pad($info['rkau']['raw']['version'] & 0x0F, 2, '0', STR_PAD_LEFT);
+ if (($info['rkau']['version'] > 1.07) || ($info['rkau']['version'] < 1.06)) {
+ $this->error('This version of getID3() ['.$this->getid3->version().'] can only parse RKAU files v1.06 and 1.07 (this file is v'.$info['rkau']['version'].')');
+ unset($info['rkau']);
return false;
}
- $ThisFileInfo['rkau']['source_bytes'] = getid3_lib::LittleEndian2Int(substr($RKAUHeader, 4, 4));
- $ThisFileInfo['rkau']['sample_rate'] = getid3_lib::LittleEndian2Int(substr($RKAUHeader, 8, 4));
- $ThisFileInfo['rkau']['channels'] = getid3_lib::LittleEndian2Int(substr($RKAUHeader, 12, 1));
- $ThisFileInfo['rkau']['bits_per_sample'] = getid3_lib::LittleEndian2Int(substr($RKAUHeader, 13, 1));
+ $info['rkau']['source_bytes'] = getid3_lib::LittleEndian2Int(substr($RKAUHeader, 4, 4));
+ $info['rkau']['sample_rate'] = getid3_lib::LittleEndian2Int(substr($RKAUHeader, 8, 4));
+ $info['rkau']['channels'] = getid3_lib::LittleEndian2Int(substr($RKAUHeader, 12, 1));
+ $info['rkau']['bits_per_sample'] = getid3_lib::LittleEndian2Int(substr($RKAUHeader, 13, 1));
- $ThisFileInfo['rkau']['raw']['quality'] = getid3_lib::LittleEndian2Int(substr($RKAUHeader, 14, 1));
- $this->RKAUqualityLookup($ThisFileInfo['rkau']);
+ $info['rkau']['raw']['quality'] = getid3_lib::LittleEndian2Int(substr($RKAUHeader, 14, 1));
+ $this->RKAUqualityLookup($info['rkau']);
- $ThisFileInfo['rkau']['raw']['flags'] = getid3_lib::LittleEndian2Int(substr($RKAUHeader, 15, 1));
- $ThisFileInfo['rkau']['flags']['joint_stereo'] = (bool) (!($ThisFileInfo['rkau']['raw']['flags'] & 0x01));
- $ThisFileInfo['rkau']['flags']['streaming'] = (bool) ($ThisFileInfo['rkau']['raw']['flags'] & 0x02);
- $ThisFileInfo['rkau']['flags']['vrq_lossy_mode'] = (bool) ($ThisFileInfo['rkau']['raw']['flags'] & 0x04);
+ $info['rkau']['raw']['flags'] = getid3_lib::LittleEndian2Int(substr($RKAUHeader, 15, 1));
+ $info['rkau']['flags']['joint_stereo'] = !($info['rkau']['raw']['flags'] & 0x01);
+ $info['rkau']['flags']['streaming'] = (bool) ($info['rkau']['raw']['flags'] & 0x02);
+ $info['rkau']['flags']['vrq_lossy_mode'] = (bool) ($info['rkau']['raw']['flags'] & 0x04);
- if ($ThisFileInfo['rkau']['flags']['streaming']) {
- $ThisFileInfo['avdataoffset'] += 20;
- $ThisFileInfo['rkau']['compressed_bytes'] = getid3_lib::LittleEndian2Int(substr($RKAUHeader, 16, 4));
+ if ($info['rkau']['flags']['streaming']) {
+ $info['avdataoffset'] += 20;
+ $info['rkau']['compressed_bytes'] = getid3_lib::LittleEndian2Int(substr($RKAUHeader, 16, 4));
} else {
- $ThisFileInfo['avdataoffset'] += 16;
- $ThisFileInfo['rkau']['compressed_bytes'] = $ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset'] - 1;
+ $info['avdataoffset'] += 16;
+ $info['rkau']['compressed_bytes'] = $info['avdataend'] - $info['avdataoffset'] - 1;
}
// Note: compressed_bytes does not always equal what appears to be the actual number of compressed bytes,
// sometimes it's more, sometimes less. No idea why(?)
- $ThisFileInfo['audio']['lossless'] = $ThisFileInfo['rkau']['lossless'];
- $ThisFileInfo['audio']['channels'] = $ThisFileInfo['rkau']['channels'];
- $ThisFileInfo['audio']['bits_per_sample'] = $ThisFileInfo['rkau']['bits_per_sample'];
- $ThisFileInfo['audio']['sample_rate'] = $ThisFileInfo['rkau']['sample_rate'];
+ $info['audio']['lossless'] = $info['rkau']['lossless'];
+ $info['audio']['channels'] = $info['rkau']['channels'];
+ $info['audio']['bits_per_sample'] = $info['rkau']['bits_per_sample'];
+ $info['audio']['sample_rate'] = $info['rkau']['sample_rate'];
- $ThisFileInfo['playtime_seconds'] = $ThisFileInfo['rkau']['source_bytes'] / ($ThisFileInfo['rkau']['sample_rate'] * $ThisFileInfo['rkau']['channels'] * ($ThisFileInfo['rkau']['bits_per_sample'] / 8));
- $ThisFileInfo['audio']['bitrate'] = ($ThisFileInfo['rkau']['compressed_bytes'] * 8) / $ThisFileInfo['playtime_seconds'];
+ $info['playtime_seconds'] = $info['rkau']['source_bytes'] / ($info['rkau']['sample_rate'] * $info['rkau']['channels'] * ($info['rkau']['bits_per_sample'] / 8));
+ $info['audio']['bitrate'] = ($info['rkau']['compressed_bytes'] * 8) / $info['playtime_seconds'];
return true;
}
-
- function RKAUqualityLookup(&$RKAUdata) {
+ /**
+ * @param array $RKAUdata
+ *
+ * @return bool
+ */
+ public function RKAUqualityLookup(&$RKAUdata) {
$level = ($RKAUdata['raw']['quality'] & 0xF0) >> 4;
$quality = $RKAUdata['raw']['quality'] & 0x0F;
@@ -88,5 +100,3 @@
}
}
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.shorten.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.shorten.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.shorten.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio.shorten.php //
// module for analyzing Shorten Audio files //
@@ -13,37 +14,44 @@
// ///
/////////////////////////////////////////////////////////////////
-
-class getid3_shorten
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
+class getid3_shorten extends getid3_handler
{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- function getid3_shorten(&$fd, &$ThisFileInfo) {
+ $this->fseek($info['avdataoffset']);
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
-
- $ShortenHeader = fread($fd, 8);
- if (substr($ShortenHeader, 0, 4) != 'ajkg') {
- $ThisFileInfo['error'][] = 'Expecting "ajkg" at offset '.$ThisFileInfo['avdataoffset'].', found "'.substr($ShortenHeader, 0, 4).'"';
+ $ShortenHeader = $this->fread(8);
+ $magic = 'ajkg';
+ if (substr($ShortenHeader, 0, 4) != $magic) {
+ $this->error('Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes(substr($ShortenHeader, 0, 4)).'"');
return false;
}
- $ThisFileInfo['fileformat'] = 'shn';
- $ThisFileInfo['audio']['dataformat'] = 'shn';
- $ThisFileInfo['audio']['lossless'] = true;
- $ThisFileInfo['audio']['bitrate_mode'] = 'vbr';
+ $info['fileformat'] = 'shn';
+ $info['audio']['dataformat'] = 'shn';
+ $info['audio']['lossless'] = true;
+ $info['audio']['bitrate_mode'] = 'vbr';
- $ThisFileInfo['shn']['version'] = getid3_lib::LittleEndian2Int(substr($ShortenHeader, 4, 1));
+ $info['shn']['version'] = getid3_lib::LittleEndian2Int(substr($ShortenHeader, 4, 1));
- fseek($fd, $ThisFileInfo['avdataend'] - 12, SEEK_SET);
- $SeekTableSignatureTest = fread($fd, 12);
- $ThisFileInfo['shn']['seektable']['present'] = (bool) (substr($SeekTableSignatureTest, 4, 8) == 'SHNAMPSK');
- if ($ThisFileInfo['shn']['seektable']['present']) {
- $ThisFileInfo['shn']['seektable']['length'] = getid3_lib::LittleEndian2Int(substr($SeekTableSignatureTest, 0, 4));
- $ThisFileInfo['shn']['seektable']['offset'] = $ThisFileInfo['avdataend'] - $ThisFileInfo['shn']['seektable']['length'];
- fseek($fd, $ThisFileInfo['shn']['seektable']['offset'], SEEK_SET);
- $SeekTableMagic = fread($fd, 4);
- if ($SeekTableMagic != 'SEEK') {
+ $this->fseek($info['avdataend'] - 12);
+ $SeekTableSignatureTest = $this->fread(12);
+ $info['shn']['seektable']['present'] = substr($SeekTableSignatureTest, 4, 8) == 'SHNAMPSK';
+ if ($info['shn']['seektable']['present']) {
+ $info['shn']['seektable']['length'] = getid3_lib::LittleEndian2Int(substr($SeekTableSignatureTest, 0, 4));
+ $info['shn']['seektable']['offset'] = $info['avdataend'] - $info['shn']['seektable']['length'];
+ $this->fseek($info['shn']['seektable']['offset']);
+ $SeekTableMagic = $this->fread(4);
+ $magic = 'SEEK';
+ if ($SeekTableMagic != $magic) {
- $ThisFileInfo['error'][] = 'Expecting "SEEK" at offset '.$ThisFileInfo['shn']['seektable']['offset'].', found "'.$SeekTableMagic.'"';
+ $this->error('Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['shn']['seektable']['offset'].', found "'.getid3_lib::PrintHexBytes($SeekTableMagic).'"');
return false;
} else {
@@ -64,11 +72,11 @@
// long Offset1[4];
// }TSeekEntry;
- $SeekTableData = fread($fd, $ThisFileInfo['shn']['seektable']['length'] - 16);
- $ThisFileInfo['shn']['seektable']['entry_count'] = floor(strlen($SeekTableData) / 80);
- //$ThisFileInfo['shn']['seektable']['entries'] = array();
+ $SeekTableData = $this->fread($info['shn']['seektable']['length'] - 16);
+ $info['shn']['seektable']['entry_count'] = floor(strlen($SeekTableData) / 80);
+ //$info['shn']['seektable']['entries'] = array();
//$SeekTableOffset = 0;
- //for ($i = 0; $i < $ThisFileInfo['shn']['seektable']['entry_count']; $i++) {
+ //for ($i = 0; $i < $info['shn']['seektable']['entry_count']; $i++) {
// $SeekTableEntry['sample_number'] = getid3_lib::LittleEndian2Int(substr($SeekTableData, $SeekTableOffset, 4));
// $SeekTableOffset += 4;
// $SeekTableEntry['shn_file_byte_offset'] = getid3_lib::LittleEndian2Int(substr($SeekTableData, $SeekTableOffset, 4));
@@ -101,8 +109,8 @@
// $SeekTableEntry['offset1'][$j] = getid3_lib::LittleEndian2Int(substr($SeekTableData, $SeekTableOffset, 4));
// $SeekTableOffset += 4;
// }
- //
- // $ThisFileInfo['shn']['seektable']['entries'][] = $SeekTableEntry;
+ //
+ // $info['shn']['seektable']['entries'][] = $SeekTableEntry;
//}
}
@@ -109,8 +117,8 @@
}
- if ((bool) ini_get('safe_mode')) {
- $ThisFileInfo['error'][] = 'PHP running in Safe Mode - backtick operator not available, cannot run shntool to analyze Shorten files';
+ if (preg_match('#(1|ON)#i', ini_get('safe_mode'))) {
+ $this->error('PHP running in Safe Mode - backtick operator not available, cannot run shntool to analyze Shorten files');
return false;
}
@@ -119,24 +127,24 @@
$RequiredFiles = array('shorten.exe', 'cygwin1.dll', 'head.exe');
foreach ($RequiredFiles as $required_file) {
if (!is_readable(GETID3_HELPERAPPSDIR.$required_file)) {
- $ThisFileInfo['error'][] = GETID3_HELPERAPPSDIR.$required_file.' does not exist';
+ $this->error(GETID3_HELPERAPPSDIR.$required_file.' does not exist');
return false;
}
}
- $commandline = GETID3_HELPERAPPSDIR.'shorten.exe -x "'.$ThisFileInfo['filenamepath'].'" - | '.GETID3_HELPERAPPSDIR.'head.exe -c 44';
+ $commandline = GETID3_HELPERAPPSDIR.'shorten.exe -x "'.$info['filenamepath'].'" - | '.GETID3_HELPERAPPSDIR.'head.exe -c 64';
$commandline = str_replace('/', '\\', $commandline);
} else {
- static $shorten_present;
- if (!isset($shorten_present)) {
- $shorten_present = file_exists('/usr/local/bin/shorten') || `which shorten`;
- }
- if (!$shorten_present) {
- $ThisFileInfo['error'][] = 'shorten binary was not found in path or /usr/local/bin';
- return false;
- }
- $commandline = (file_exists('/usr/local/bin/shorten') ? '/usr/local/bin/' : '' ) . 'shorten -x '.escapeshellarg($ThisFileInfo['filenamepath']).' - | head -c 44';
+ static $shorten_present;
+ if (!isset($shorten_present)) {
+ $shorten_present = file_exists('/usr/local/bin/shorten') || `which shorten`;
+ }
+ if (!$shorten_present) {
+ $this->error('shorten binary was not found in path or /usr/local/bin');
+ return false;
+ }
+ $commandline = (file_exists('/usr/local/bin/shorten') ? '/usr/local/bin/' : '' ) . 'shorten -x '.escapeshellarg($info['filenamepath']).' - | head -c 64';
}
@@ -144,29 +152,33 @@
if (!empty($output) && (substr($output, 12, 4) == 'fmt ')) {
+ if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+ }
getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, true);
- $DecodedWAVFORMATEX = getid3_riff::RIFFparseWAVEFORMATex(substr($output, 20, 16));
- $ThisFileInfo['audio']['channels'] = $DecodedWAVFORMATEX['channels'];
- $ThisFileInfo['audio']['bits_per_sample'] = $DecodedWAVFORMATEX['bits_per_sample'];
- $ThisFileInfo['audio']['sample_rate'] = $DecodedWAVFORMATEX['sample_rate'];
+ $fmt_size = getid3_lib::LittleEndian2Int(substr($output, 16, 4));
+ $DecodedWAVFORMATEX = getid3_riff::parseWAVEFORMATex(substr($output, 20, $fmt_size));
+ $info['audio']['channels'] = $DecodedWAVFORMATEX['channels'];
+ $info['audio']['bits_per_sample'] = $DecodedWAVFORMATEX['bits_per_sample'];
+ $info['audio']['sample_rate'] = $DecodedWAVFORMATEX['sample_rate'];
- if (substr($output, 36, 4) == 'data') {
+ if (substr($output, 20 + $fmt_size, 4) == 'data') {
- $ThisFileInfo['playtime_seconds'] = getid3_lib::LittleEndian2Int(substr($output, 40, 4)) / $DecodedWAVFORMATEX['raw']['nAvgBytesPerSec'];
+ $info['playtime_seconds'] = getid3_lib::LittleEndian2Int(substr($output, 20 + 4 + $fmt_size, 4)) / $DecodedWAVFORMATEX['raw']['nAvgBytesPerSec'];
} else {
- $ThisFileInfo['error'][] = 'shorten failed to decode DATA chunk to expected location, cannot determine playtime';
+ $this->error('shorten failed to decode DATA chunk to expected location, cannot determine playtime');
return false;
}
- $ThisFileInfo['audio']['bitrate'] = (($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) / $ThisFileInfo['playtime_seconds']) * 8;
+ $info['audio']['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) / $info['playtime_seconds']) * 8;
} else {
- $ThisFileInfo['error'][] = 'shorten failed to decode file to WAV for parsing';
+ $this->error('shorten failed to decode file to WAV for parsing');
return false;
}
@@ -175,5 +187,3 @@
}
}
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.tta.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.tta.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.tta.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio.tta.php //
// module for analyzing TTA Audio files //
@@ -13,95 +14,98 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_tta
+class getid3_tta extends getid3_handler
{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- function getid3_tta(&$fd, &$ThisFileInfo) {
+ $info['fileformat'] = 'tta';
+ $info['audio']['dataformat'] = 'tta';
+ $info['audio']['lossless'] = true;
+ $info['audio']['bitrate_mode'] = 'vbr';
- $ThisFileInfo['fileformat'] = 'tta';
- $ThisFileInfo['audio']['dataformat'] = 'tta';
- $ThisFileInfo['audio']['lossless'] = true;
- $ThisFileInfo['audio']['bitrate_mode'] = 'vbr';
+ $this->fseek($info['avdataoffset']);
+ $ttaheader = $this->fread(26);
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
- $ttaheader = fread($fd, 26);
-
- $ThisFileInfo['tta']['magic'] = substr($ttaheader, 0, 3);
- if ($ThisFileInfo['tta']['magic'] != 'TTA') {
- $ThisFileInfo['error'][] = 'Expecting "TTA" at offset '.$ThisFileInfo['avdataoffset'].', found "'.$ThisFileInfo['tta']['magic'].'"';
- unset($ThisFileInfo['fileformat']);
- unset($ThisFileInfo['audio']);
- unset($ThisFileInfo['tta']);
+ $info['tta']['magic'] = substr($ttaheader, 0, 3);
+ $magic = 'TTA';
+ if ($info['tta']['magic'] != $magic) {
+ $this->error('Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($info['tta']['magic']).'"');
+ unset($info['fileformat']);
+ unset($info['audio']);
+ unset($info['tta']);
return false;
}
- switch ($ttaheader{3}) {
+ switch ($ttaheader[3]) {
case "\x01": // TTA v1.x
case "\x02": // TTA v1.x
case "\x03": // TTA v1.x
// "It was the demo-version of the TTA encoder. There is no released format with such header. TTA encoder v1 is not supported about a year."
- $ThisFileInfo['tta']['major_version'] = 1;
- $ThisFileInfo['avdataoffset'] += 16;
+ $info['tta']['major_version'] = 1;
+ $info['avdataoffset'] += 16;
- $ThisFileInfo['tta']['compression_level'] = ord($ttaheader{3});
- $ThisFileInfo['tta']['channels'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 4, 2));
- $ThisFileInfo['tta']['bits_per_sample'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 6, 2));
- $ThisFileInfo['tta']['sample_rate'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 8, 4));
- $ThisFileInfo['tta']['samples_per_channel'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 12, 4));
+ $info['tta']['compression_level'] = ord($ttaheader[3]);
+ $info['tta']['channels'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 4, 2));
+ $info['tta']['bits_per_sample'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 6, 2));
+ $info['tta']['sample_rate'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 8, 4));
+ $info['tta']['samples_per_channel'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 12, 4));
- $ThisFileInfo['audio']['encoder_options'] = '-e'.$ThisFileInfo['tta']['compression_level'];
- $ThisFileInfo['playtime_seconds'] = $ThisFileInfo['tta']['samples_per_channel'] / $ThisFileInfo['tta']['sample_rate'];
+ $info['audio']['encoder_options'] = '-e'.$info['tta']['compression_level'];
+ $info['playtime_seconds'] = $info['tta']['samples_per_channel'] / $info['tta']['sample_rate'];
break;
case '2': // TTA v2.x
// "I have hurried to release the TTA 2.0 encoder. Format documentation is removed from our site. This format still in development. Please wait the TTA2 format, encoder v4."
- $ThisFileInfo['tta']['major_version'] = 2;
- $ThisFileInfo['avdataoffset'] += 20;
+ $info['tta']['major_version'] = 2;
+ $info['avdataoffset'] += 20;
- $ThisFileInfo['tta']['compression_level'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 4, 2));
- $ThisFileInfo['tta']['audio_format'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 6, 2));
- $ThisFileInfo['tta']['channels'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 8, 2));
- $ThisFileInfo['tta']['bits_per_sample'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 10, 2));
- $ThisFileInfo['tta']['sample_rate'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 12, 4));
- $ThisFileInfo['tta']['data_length'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 16, 4));
+ $info['tta']['compression_level'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 4, 2));
+ $info['tta']['audio_format'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 6, 2));
+ $info['tta']['channels'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 8, 2));
+ $info['tta']['bits_per_sample'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 10, 2));
+ $info['tta']['sample_rate'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 12, 4));
+ $info['tta']['data_length'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 16, 4));
- $ThisFileInfo['audio']['encoder_options'] = '-e'.$ThisFileInfo['tta']['compression_level'];
- $ThisFileInfo['playtime_seconds'] = $ThisFileInfo['tta']['data_length'] / $ThisFileInfo['tta']['sample_rate'];
+ $info['audio']['encoder_options'] = '-e'.$info['tta']['compression_level'];
+ $info['playtime_seconds'] = $info['tta']['data_length'] / $info['tta']['sample_rate'];
break;
case '1': // TTA v3.x
// "This is a first stable release of the TTA format. It will be supported by the encoders v3 or higher."
- $ThisFileInfo['tta']['major_version'] = 3;
- $ThisFileInfo['avdataoffset'] += 26;
+ $info['tta']['major_version'] = 3;
+ $info['avdataoffset'] += 26;
- $ThisFileInfo['tta']['audio_format'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 4, 2)); // getid3_riff::RIFFwFormatTagLookup()
- $ThisFileInfo['tta']['channels'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 6, 2));
- $ThisFileInfo['tta']['bits_per_sample'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 8, 2));
- $ThisFileInfo['tta']['sample_rate'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 10, 4));
- $ThisFileInfo['tta']['data_length'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 14, 4));
- $ThisFileInfo['tta']['crc32_footer'] = substr($ttaheader, 18, 4);
- $ThisFileInfo['tta']['seek_point'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 22, 4));
+ $info['tta']['audio_format'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 4, 2)); // getid3_riff::wFormatTagLookup()
+ $info['tta']['channels'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 6, 2));
+ $info['tta']['bits_per_sample'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 8, 2));
+ $info['tta']['sample_rate'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 10, 4));
+ $info['tta']['data_length'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 14, 4));
+ $info['tta']['crc32_footer'] = substr($ttaheader, 18, 4);
+ $info['tta']['seek_point'] = getid3_lib::LittleEndian2Int(substr($ttaheader, 22, 4));
- $ThisFileInfo['playtime_seconds'] = $ThisFileInfo['tta']['data_length'] / $ThisFileInfo['tta']['sample_rate'];
+ $info['playtime_seconds'] = $info['tta']['data_length'] / $info['tta']['sample_rate'];
break;
default:
- $ThisFileInfo['error'][] = 'This version of getID3() only knows how to handle TTA v1 and v2 - it may not work correctly with this file which appears to be TTA v'.$ttaheader{3};
+ $this->error('This version of getID3() ['.$this->getid3->version().'] only knows how to handle TTA v1 and v2 - it may not work correctly with this file which appears to be TTA v'.$ttaheader[3]);
return false;
- break;
}
- $ThisFileInfo['audio']['encoder'] = 'TTA v'.$ThisFileInfo['tta']['major_version'];
- $ThisFileInfo['audio']['bits_per_sample'] = $ThisFileInfo['tta']['bits_per_sample'];
- $ThisFileInfo['audio']['sample_rate'] = $ThisFileInfo['tta']['sample_rate'];
- $ThisFileInfo['audio']['channels'] = $ThisFileInfo['tta']['channels'];
- $ThisFileInfo['audio']['bitrate'] = (($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) * 8) / $ThisFileInfo['playtime_seconds'];
+ $info['audio']['encoder'] = 'TTA v'.$info['tta']['major_version'];
+ $info['audio']['bits_per_sample'] = $info['tta']['bits_per_sample'];
+ $info['audio']['sample_rate'] = $info['tta']['sample_rate'];
+ $info['audio']['channels'] = $info['tta']['channels'];
+ $info['audio']['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
return true;
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.voc.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.voc.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.voc.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio.voc.php //
// module for analyzing Creative VOC Audio files //
@@ -13,27 +14,34 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_voc
+class getid3_voc extends getid3_handler
{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- function getid3_voc(&$fd, &$ThisFileInfo) {
+ $OriginalAVdataOffset = $info['avdataoffset'];
+ $this->fseek($info['avdataoffset']);
+ $VOCheader = $this->fread(26);
- $OriginalAVdataOffset = $ThisFileInfo['avdataoffset'];
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
- $VOCheader = fread($fd, 26);
-
- if (substr($VOCheader, 0, 19) != 'Creative Voice File') {
- $ThisFileInfo['error'][] = 'Expecting "Creative Voice File" at offset '.$ThisFileInfo['avdataoffset'].', found "'.substr($VOCheader, 0, 19).'"';
+ $magic = 'Creative Voice File';
+ if (substr($VOCheader, 0, 19) != $magic) {
+ $this->error('Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes(substr($VOCheader, 0, 19)).'"');
return false;
}
// shortcuts
- $thisfile_audio = &$ThisFileInfo['audio'];
- $ThisFileInfo['voc'] = array();
- $thisfile_voc = &$ThisFileInfo['voc'];
+ $thisfile_audio = &$info['audio'];
+ $info['voc'] = array();
+ $thisfile_voc = &$info['voc'];
- $ThisFileInfo['fileformat'] = 'voc';
+ $info['fileformat'] = 'voc';
$thisfile_audio['dataformat'] = 'voc';
$thisfile_audio['bitrate_mode'] = 'cbr';
$thisfile_audio['lossless'] = true;
@@ -54,13 +62,13 @@
do {
- $BlockOffset = ftell($fd);
- $BlockData = fread($fd, 4);
- $BlockType = ord($BlockData{0});
+ $BlockOffset = $this->ftell();
+ $BlockData = $this->fread(4);
+ $BlockType = ord($BlockData[0]);
$BlockSize = getid3_lib::LittleEndian2Int(substr($BlockData, 1, 3));
$ThisBlock = array();
- @$thisfile_voc['blocktypes'][$BlockType]++;
+ getid3_lib::safe_inc($thisfile_voc['blocktypes'][$BlockType], 1);
switch ($BlockType) {
case 0: // Terminator
// do nothing, we'll break out of the loop down below
@@ -67,11 +75,11 @@
break;
case 1: // Sound data
- $BlockData .= fread($fd, 2);
- if ($ThisFileInfo['avdataoffset'] <= $OriginalAVdataOffset) {
- $ThisFileInfo['avdataoffset'] = ftell($fd);
+ $BlockData .= $this->fread(2);
+ if ($info['avdataoffset'] <= $OriginalAVdataOffset) {
+ $info['avdataoffset'] = $this->ftell();
}
- fseek($fd, $BlockSize - 2, SEEK_CUR);
+ $this->fseek($BlockSize - 2, SEEK_CUR);
$ThisBlock['sample_rate_id'] = getid3_lib::LittleEndian2Int(substr($BlockData, 4, 1));
$ThisBlock['compression_type'] = getid3_lib::LittleEndian2Int(substr($BlockData, 5, 1));
@@ -94,11 +102,11 @@
case 6: // Repeat
case 7: // End repeat
// nothing useful, just skip
- fseek($fd, $BlockSize, SEEK_CUR);
+ $this->fseek($BlockSize, SEEK_CUR);
break;
case 8: // Extended
- $BlockData .= fread($fd, 4);
+ $BlockData .= $this->fread(4);
//00-01 Time Constant:
// Mono: 65536 - (256000000 / sample_rate)
@@ -112,11 +120,11 @@
break;
case 9: // data block that supersedes blocks 1 and 8. Used for stereo, 16 bit
- $BlockData .= fread($fd, 12);
- if ($ThisFileInfo['avdataoffset'] <= $OriginalAVdataOffset) {
- $ThisFileInfo['avdataoffset'] = ftell($fd);
+ $BlockData .= $this->fread(12);
+ if ($info['avdataoffset'] <= $OriginalAVdataOffset) {
+ $info['avdataoffset'] = $this->ftell();
}
- fseek($fd, $BlockSize - 12, SEEK_CUR);
+ $this->fseek($BlockSize - 12, SEEK_CUR);
$ThisBlock['sample_rate'] = getid3_lib::LittleEndian2Int(substr($BlockData, 4, 4));
$ThisBlock['bits_per_sample'] = getid3_lib::LittleEndian2Int(substr($BlockData, 8, 1));
@@ -134,8 +142,8 @@
break;
default:
- $ThisFileInfo['warning'][] = 'Unhandled block type "'.$BlockType.'" at offset '.$BlockOffset;
- fseek($fd, $BlockSize, SEEK_CUR);
+ $this->warning('Unhandled block type "'.$BlockType.'" at offset '.$BlockOffset);
+ $this->fseek($BlockSize, SEEK_CUR);
break;
}
@@ -146,22 +154,27 @@
$thisfile_voc['blocks'][] = $ThisBlock;
}
- } while (!feof($fd) && ($BlockType != 0));
+ } while (!feof($this->getid3->fp) && ($BlockType != 0));
// Terminator block doesn't have size field, so seek back 3 spaces
- fseek($fd, -3, SEEK_CUR);
+ $this->fseek(-3, SEEK_CUR);
ksort($thisfile_voc['blocktypes']);
if (!empty($thisfile_voc['compressed_bits_per_sample'])) {
- $ThisFileInfo['playtime_seconds'] = (($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) * 8) / ($thisfile_voc['compressed_bits_per_sample'] * $thisfile_audio['channels'] * $thisfile_audio['sample_rate']);
- $thisfile_audio['bitrate'] = (($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) * 8) / $ThisFileInfo['playtime_seconds'];
+ $info['playtime_seconds'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / ($thisfile_voc['compressed_bits_per_sample'] * $thisfile_audio['channels'] * $thisfile_audio['sample_rate']);
+ $thisfile_audio['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
}
return true;
}
- function VOCcompressionTypeLookup($index) {
+ /**
+ * @param int $index
+ *
+ * @return string
+ */
+ public function VOCcompressionTypeLookup($index) {
static $VOCcompressionTypeLookup = array(
0 => '8-bit',
1 => '4-bit',
@@ -171,7 +184,12 @@
return (isset($VOCcompressionTypeLookup[$index]) ? $VOCcompressionTypeLookup[$index] : 'Multi DAC ('.($index - 3).') channels');
}
- function VOCwFormatLookup($index) {
+ /**
+ * @param int $index
+ *
+ * @return string|false
+ */
+ public function VOCwFormatLookup($index) {
static $VOCwFormatLookup = array(
0x0000 => '8-bit unsigned PCM',
0x0001 => 'Creative 8-bit to 4-bit ADPCM',
@@ -185,21 +203,23 @@
return (isset($VOCwFormatLookup[$index]) ? $VOCwFormatLookup[$index] : false);
}
- function VOCwFormatActualBitsPerSampleLookup($index) {
+ /**
+ * @param int $index
+ *
+ * @return int|false
+ */
+ public function VOCwFormatActualBitsPerSampleLookup($index) {
static $VOCwFormatLookup = array(
- 0x0000 => 8,
- 0x0001 => 4,
- 0x0002 => 3,
- 0x0003 => 2,
+ 0x0000 => 8,
+ 0x0001 => 4,
+ 0x0002 => 3,
+ 0x0003 => 2,
0x0004 => 16,
- 0x0006 => 8,
- 0x0007 => 8,
- 0x2000 => 4
+ 0x0006 => 8,
+ 0x0007 => 8,
+ 0x2000 => 4
);
return (isset($VOCwFormatLookup[$index]) ? $VOCwFormatLookup[$index] : false);
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.vqf.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.vqf.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.vqf.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio.vqf.php //
// module for analyzing VQF audio files //
@@ -13,59 +14,68 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_vqf
+class getid3_vqf extends getid3_handler
{
- function getid3_vqf(&$fd, &$ThisFileInfo) {
- // based loosely on code from TTwinVQ by Jurgen Faul <jfaulØgmx*de>
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
+
+ // based loosely on code from TTwinVQ by Jurgen Faul <jfaulØgmx*de>
// http://jfaul.de/atl or http://j-faul.virtualave.net/atl/atl.html
- $ThisFileInfo['fileformat'] = 'vqf';
- $ThisFileInfo['audio']['dataformat'] = 'vqf';
- $ThisFileInfo['audio']['bitrate_mode'] = 'cbr';
- $ThisFileInfo['audio']['lossless'] = false;
+ $info['fileformat'] = 'vqf';
+ $info['audio']['dataformat'] = 'vqf';
+ $info['audio']['bitrate_mode'] = 'cbr';
+ $info['audio']['lossless'] = false;
// shortcut
- $ThisFileInfo['vqf']['raw'] = array();
- $thisfile_vqf = &$ThisFileInfo['vqf'];
+ $info['vqf']['raw'] = array();
+ $thisfile_vqf = &$info['vqf'];
$thisfile_vqf_raw = &$thisfile_vqf['raw'];
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
- $VQFheaderData = fread($fd, 16);
+ $this->fseek($info['avdataoffset']);
+ $VQFheaderData = $this->fread(16);
$offset = 0;
- $thisfile_vqf_raw['header_tag'] = substr($VQFheaderData, $offset, 4);
- if ($thisfile_vqf_raw['header_tag'] != 'TWIN') {
- $ThisFileInfo['error'][] = 'Expecting "TWIN" at offset '.$ThisFileInfo['avdataoffset'].', found "'.$thisfile_vqf_raw['header_tag'].'"';
- unset($ThisFileInfo['vqf']);
- unset($ThisFileInfo['fileformat']);
+ $thisfile_vqf_raw['header_tag'] = substr($VQFheaderData, $offset, 4);
+ $magic = 'TWIN';
+ if ($thisfile_vqf_raw['header_tag'] != $magic) {
+ $this->error('Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($thisfile_vqf_raw['header_tag']).'"');
+ unset($info['vqf']);
+ unset($info['fileformat']);
return false;
}
$offset += 4;
- $thisfile_vqf_raw['version'] = substr($VQFheaderData, $offset, 8);
+ $thisfile_vqf_raw['version'] = substr($VQFheaderData, $offset, 8);
$offset += 8;
- $thisfile_vqf_raw['size'] = getid3_lib::BigEndian2Int(substr($VQFheaderData, $offset, 4));
+ $thisfile_vqf_raw['size'] = getid3_lib::BigEndian2Int(substr($VQFheaderData, $offset, 4));
$offset += 4;
- while (ftell($fd) < $ThisFileInfo['avdataend']) {
+ while ($this->ftell() < $info['avdataend']) {
- $ChunkBaseOffset = ftell($fd);
+ $ChunkBaseOffset = $this->ftell();
$chunkoffset = 0;
- $ChunkData = fread($fd, 8);
+ $ChunkData = $this->fread(8);
$ChunkName = substr($ChunkData, $chunkoffset, 4);
if ($ChunkName == 'DATA') {
- $ThisFileInfo['avdataoffset'] = $ChunkBaseOffset;
+ $info['avdataoffset'] = $ChunkBaseOffset;
break;
}
$chunkoffset += 4;
$ChunkSize = getid3_lib::BigEndian2Int(substr($ChunkData, $chunkoffset, 4));
$chunkoffset += 4;
- if ($ChunkSize > ($ThisFileInfo['avdataend'] - ftell($fd))) {
- $ThisFileInfo['error'][] = 'Invalid chunk size ('.$ChunkSize.') for chunk "'.$ChunkName.'" at offset '.$ChunkBaseOffset;
+ if ($ChunkSize > ($info['avdataend'] - $this->ftell())) {
+ $this->error('Invalid chunk size ('.$ChunkSize.') for chunk "'.$ChunkName.'" at offset '.$ChunkBaseOffset);
break;
}
if ($ChunkSize > 0) {
- $ChunkData .= fread($fd, $ChunkSize);
+ $ChunkData .= $this->fread($ChunkSize);
}
switch ($ChunkName) {
@@ -83,13 +93,13 @@
$thisfile_vqf_COMM['security_level'] = getid3_lib::BigEndian2Int(substr($ChunkData, $chunkoffset, 4));
$chunkoffset += 4;
- $ThisFileInfo['audio']['channels'] = $thisfile_vqf_COMM['channel_mode'] + 1;
- $ThisFileInfo['audio']['sample_rate'] = $this->VQFchannelFrequencyLookup($thisfile_vqf_COMM['sample_rate']);
- $ThisFileInfo['audio']['bitrate'] = $thisfile_vqf_COMM['bitrate'] * 1000;
- $ThisFileInfo['audio']['encoder_options'] = 'CBR' . ceil($ThisFileInfo['audio']['bitrate']/1000);
+ $info['audio']['channels'] = $thisfile_vqf_COMM['channel_mode'] + 1;
+ $info['audio']['sample_rate'] = $this->VQFchannelFrequencyLookup($thisfile_vqf_COMM['sample_rate']);
+ $info['audio']['bitrate'] = $thisfile_vqf_COMM['bitrate'] * 1000;
+ $info['audio']['encoder_options'] = 'CBR' . ceil($info['audio']['bitrate']/1000);
- if ($ThisFileInfo['audio']['bitrate'] == 0) {
- $ThisFileInfo['error'][] = 'Corrupt VQF file: bitrate_audio == zero';
+ if ($info['audio']['bitrate'] == 0) {
+ $this->error('Corrupt VQF file: bitrate_audio == zero');
return false;
}
break;
@@ -108,23 +118,23 @@
break;
default:
- $ThisFileInfo['warning'][] = 'Unhandled chunk type "'.$ChunkName.'" at offset '.$ChunkBaseOffset;
+ $this->warning('Unhandled chunk type "'.$ChunkName.'" at offset '.$ChunkBaseOffset);
break;
}
}
- $ThisFileInfo['playtime_seconds'] = (($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) * 8) / $ThisFileInfo['audio']['bitrate'];
+ $info['playtime_seconds'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['audio']['bitrate'];
- if (isset($thisfile_vqf['DSIZ']) && (($thisfile_vqf['DSIZ'] != ($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset'] - strlen('DATA'))))) {
+ if (isset($thisfile_vqf['DSIZ']) && (($thisfile_vqf['DSIZ'] != ($info['avdataend'] - $info['avdataoffset'] - strlen('DATA'))))) {
switch ($thisfile_vqf['DSIZ']) {
case 0:
case 1:
- $ThisFileInfo['warning'][] = 'Invalid DSIZ value "'.$thisfile_vqf['DSIZ'].'". This is known to happen with VQF files encoded by Ahead Nero, and seems to be its way of saying this is TwinVQF v'.($thisfile_vqf['DSIZ'] + 1).'.0';
- $ThisFileInfo['audio']['encoder'] = 'Ahead Nero';
+ $this->warning('Invalid DSIZ value "'.$thisfile_vqf['DSIZ'].'". This is known to happen with VQF files encoded by Ahead Nero, and seems to be its way of saying this is TwinVQF v'.($thisfile_vqf['DSIZ'] + 1).'.0');
+ $info['audio']['encoder'] = 'Ahead Nero';
break;
default:
- $ThisFileInfo['warning'][] = 'Probable corrupted file - should be '.$thisfile_vqf['DSIZ'].' bytes, actually '.($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset'] - strlen('DATA'));
+ $this->warning('Probable corrupted file - should be '.$thisfile_vqf['DSIZ'].' bytes, actually '.($info['avdataend'] - $info['avdataoffset'] - strlen('DATA')));
break;
}
}
@@ -132,7 +142,12 @@
return true;
}
- function VQFchannelFrequencyLookup($frequencyid) {
+ /**
+ * @param int $frequencyid
+ *
+ * @return int
+ */
+ public function VQFchannelFrequencyLookup($frequencyid) {
static $VQFchannelFrequencyLookup = array(
11 => 11025,
22 => 22050,
@@ -141,7 +156,12 @@
return (isset($VQFchannelFrequencyLookup[$frequencyid]) ? $VQFchannelFrequencyLookup[$frequencyid] : $frequencyid * 1000);
}
- function VQFcommentNiceNameLookup($shortname) {
+ /**
+ * @param string $shortname
+ *
+ * @return string
+ */
+ public function VQFcommentNiceNameLookup($shortname) {
static $VQFcommentNiceNameLookup = array(
'NAME' => 'title',
'AUTH' => 'artist',
@@ -154,6 +174,3 @@
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.wavpack.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.wavpack.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.wavpack.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.audio.wavpack.php //
// module for analyzing WavPack v4.0+ Audio files //
@@ -13,124 +14,148 @@
// ///
/////////////////////////////////////////////////////////////////
-
-class getid3_wavpack
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
+class getid3_wavpack extends getid3_handler
{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- function getid3_wavpack(&$fd, &$ThisFileInfo) {
+ $this->fseek($info['avdataoffset']);
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
-
while (true) {
- $wavpackheader = fread($fd, 32);
+ $wavpackheader = $this->fread(32);
- if (ftell($fd) >= $ThisFileInfo['avdataend']) {
+ if ($this->ftell() >= $info['avdataend']) {
break;
- } elseif (feof($fd)) {
+ } elseif (feof($this->getid3->fp)) {
break;
} elseif (
- (@$ThisFileInfo['wavpack']['blockheader']['total_samples'] > 0) &&
- (@$ThisFileInfo['wavpack']['blockheader']['block_samples'] > 0) &&
- (!isset($ThisFileInfo['wavpack']['riff_trailer_size']) || ($ThisFileInfo['wavpack']['riff_trailer_size'] <= 0)) &&
- ((@$ThisFileInfo['wavpack']['config_flags']['md5_checksum'] === false) || !empty($ThisFileInfo['md5_data_source']))) {
+ isset($info['wavpack']['blockheader']['total_samples']) &&
+ isset($info['wavpack']['blockheader']['block_samples']) &&
+ ($info['wavpack']['blockheader']['total_samples'] > 0) &&
+ ($info['wavpack']['blockheader']['block_samples'] > 0) &&
+ (!isset($info['wavpack']['riff_trailer_size']) || ($info['wavpack']['riff_trailer_size'] <= 0)) &&
+ ((isset($info['wavpack']['config_flags']['md5_checksum']) && ($info['wavpack']['config_flags']['md5_checksum'] === false)) || !empty($info['md5_data_source']))) {
break;
}
- $blockheader_offset = ftell($fd) - 32;
+ $blockheader_offset = $this->ftell() - 32;
$blockheader_magic = substr($wavpackheader, 0, 4);
$blockheader_size = getid3_lib::LittleEndian2Int(substr($wavpackheader, 4, 4));
- if ($blockheader_magic != 'wvpk') {
- $ThisFileInfo['error'][] = 'Expecting "wvpk" at offset '.$blockheader_offset.', found "'.$blockheader_magic.'"';
- if ((@$ThisFileInfo['audio']['dataformat'] != 'wavpack') && (@$ThisFileInfo['audio']['dataformat'] != 'wvc')) {
- unset($ThisFileInfo['fileformat']);
- unset($ThisFileInfo['audio']);
- unset($ThisFileInfo['wavpack']);
+ $magic = 'wvpk';
+ if ($blockheader_magic != $magic) {
+ $this->error('Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$blockheader_offset.', found "'.getid3_lib::PrintHexBytes($blockheader_magic).'"');
+ switch (isset($info['audio']['dataformat']) ? $info['audio']['dataformat'] : '') {
+ case 'wavpack':
+ case 'wvc':
+ break;
+ default:
+ unset($info['fileformat']);
+ unset($info['audio']);
+ unset($info['wavpack']);
+ break;
}
return false;
}
-
- if ((@$ThisFileInfo['wavpack']['blockheader']['block_samples'] <= 0) ||
- (@$ThisFileInfo['wavpack']['blockheader']['total_samples'] <= 0)) {
+ if (empty($info['wavpack']['blockheader']['block_samples']) ||
+ empty($info['wavpack']['blockheader']['total_samples']) ||
+ ($info['wavpack']['blockheader']['block_samples'] <= 0) ||
+ ($info['wavpack']['blockheader']['total_samples'] <= 0)) {
// Also, it is possible that the first block might not have
// any samples (block_samples == 0) and in this case you should skip blocks
// until you find one with samples because the other information (like
// total_samples) are not guaranteed to be correct until (block_samples > 0)
- // Finally, I have defined a format for files in which the length is not known
- // (for example when raw files are created using pipes). In these cases
- // total_samples will be -1 and you must seek to the final block to determine
- // the total number of samples.
+ // Finally, I have defined a format for files in which the length is not known
+ // (for example when raw files are created using pipes). In these cases
+ // total_samples will be -1 and you must seek to the final block to determine
+ // the total number of samples.
- $ThisFileInfo['audio']['dataformat'] = 'wavpack';
- $ThisFileInfo['fileformat'] = 'wavpack';
- $ThisFileInfo['audio']['lossless'] = true;
- $ThisFileInfo['audio']['bitrate_mode'] = 'vbr';
+ $info['audio']['dataformat'] = 'wavpack';
+ $info['fileformat'] = 'wavpack';
+ $info['audio']['lossless'] = true;
+ $info['audio']['bitrate_mode'] = 'vbr';
- $ThisFileInfo['wavpack']['blockheader']['offset'] = $blockheader_offset;
- $ThisFileInfo['wavpack']['blockheader']['magic'] = $blockheader_magic;
- $ThisFileInfo['wavpack']['blockheader']['size'] = $blockheader_size;
+ $info['wavpack']['blockheader']['offset'] = $blockheader_offset;
+ $info['wavpack']['blockheader']['magic'] = $blockheader_magic;
+ $info['wavpack']['blockheader']['size'] = $blockheader_size;
- if ($ThisFileInfo['wavpack']['blockheader']['size'] >= 0x100000) {
- $ThisFileInfo['error'][] = 'Expecting WavPack block size less than "0x100000", found "'.$ThisFileInfo['wavpack']['blockheader']['size'].'" at offset '.$ThisFileInfo['wavpack']['blockheader']['offset'];
- if ((@$ThisFileInfo['audio']['dataformat'] != 'wavpack') && (@$ThisFileInfo['audio']['dataformat'] != 'wvc')) {
- unset($ThisFileInfo['fileformat']);
- unset($ThisFileInfo['audio']);
- unset($ThisFileInfo['wavpack']);
+ if ($info['wavpack']['blockheader']['size'] >= 0x100000) {
+ $this->error('Expecting WavPack block size less than "0x100000", found "'.$info['wavpack']['blockheader']['size'].'" at offset '.$info['wavpack']['blockheader']['offset']);
+ switch (isset($info['audio']['dataformat']) ? $info['audio']['dataformat'] : '') {
+ case 'wavpack':
+ case 'wvc':
+ break;
+ default:
+ unset($info['fileformat']);
+ unset($info['audio']);
+ unset($info['wavpack']);
+ break;
}
return false;
}
- $ThisFileInfo['wavpack']['blockheader']['minor_version'] = ord($wavpackheader{8});
- $ThisFileInfo['wavpack']['blockheader']['major_version'] = ord($wavpackheader{9});
+ $info['wavpack']['blockheader']['minor_version'] = ord($wavpackheader[8]);
+ $info['wavpack']['blockheader']['major_version'] = ord($wavpackheader[9]);
- if (($ThisFileInfo['wavpack']['blockheader']['major_version'] != 4) ||
- (($ThisFileInfo['wavpack']['blockheader']['minor_version'] < 4) &&
- ($ThisFileInfo['wavpack']['blockheader']['minor_version'] > 16))) {
- $ThisFileInfo['error'][] = 'Expecting WavPack version between "4.2" and "4.16", found version "'.$ThisFileInfo['wavpack']['blockheader']['major_version'].'.'.$ThisFileInfo['wavpack']['blockheader']['minor_version'].'" at offset '.$ThisFileInfo['wavpack']['blockheader']['offset'];
- if ((@$ThisFileInfo['audio']['dataformat'] != 'wavpack') && (@$ThisFileInfo['audio']['dataformat'] != 'wvc')) {
- unset($ThisFileInfo['fileformat']);
- unset($ThisFileInfo['audio']);
- unset($ThisFileInfo['wavpack']);
+ if (($info['wavpack']['blockheader']['major_version'] != 4) ||
+ (($info['wavpack']['blockheader']['minor_version'] < 4) &&
+ ($info['wavpack']['blockheader']['minor_version'] > 16))) {
+ $this->error('Expecting WavPack version between "4.2" and "4.16", found version "'.$info['wavpack']['blockheader']['major_version'].'.'.$info['wavpack']['blockheader']['minor_version'].'" at offset '.$info['wavpack']['blockheader']['offset']);
+ switch (isset($info['audio']['dataformat']) ? $info['audio']['dataformat'] : '') {
+ case 'wavpack':
+ case 'wvc':
+ break;
+ default:
+ unset($info['fileformat']);
+ unset($info['audio']);
+ unset($info['wavpack']);
+ break;
}
return false;
}
- $ThisFileInfo['wavpack']['blockheader']['track_number'] = ord($wavpackheader{10}); // unused
- $ThisFileInfo['wavpack']['blockheader']['index_number'] = ord($wavpackheader{11}); // unused
- $ThisFileInfo['wavpack']['blockheader']['total_samples'] = getid3_lib::LittleEndian2Int(substr($wavpackheader, 12, 4));
- $ThisFileInfo['wavpack']['blockheader']['block_index'] = getid3_lib::LittleEndian2Int(substr($wavpackheader, 16, 4));
- $ThisFileInfo['wavpack']['blockheader']['block_samples'] = getid3_lib::LittleEndian2Int(substr($wavpackheader, 20, 4));
- $ThisFileInfo['wavpack']['blockheader']['flags_raw'] = getid3_lib::LittleEndian2Int(substr($wavpackheader, 24, 4));
- $ThisFileInfo['wavpack']['blockheader']['crc'] = getid3_lib::LittleEndian2Int(substr($wavpackheader, 28, 4));
+ $info['wavpack']['blockheader']['track_number'] = ord($wavpackheader[10]); // unused
+ $info['wavpack']['blockheader']['index_number'] = ord($wavpackheader[11]); // unused
+ $info['wavpack']['blockheader']['total_samples'] = getid3_lib::LittleEndian2Int(substr($wavpackheader, 12, 4));
+ $info['wavpack']['blockheader']['block_index'] = getid3_lib::LittleEndian2Int(substr($wavpackheader, 16, 4));
+ $info['wavpack']['blockheader']['block_samples'] = getid3_lib::LittleEndian2Int(substr($wavpackheader, 20, 4));
+ $info['wavpack']['blockheader']['flags_raw'] = getid3_lib::LittleEndian2Int(substr($wavpackheader, 24, 4));
+ $info['wavpack']['blockheader']['crc'] = getid3_lib::LittleEndian2Int(substr($wavpackheader, 28, 4));
- $ThisFileInfo['wavpack']['blockheader']['flags']['bytes_per_sample'] = 1 + ($ThisFileInfo['wavpack']['blockheader']['flags_raw'] & 0x00000003);
- $ThisFileInfo['wavpack']['blockheader']['flags']['mono'] = (bool) ($ThisFileInfo['wavpack']['blockheader']['flags_raw'] & 0x00000004);
- $ThisFileInfo['wavpack']['blockheader']['flags']['hybrid'] = (bool) ($ThisFileInfo['wavpack']['blockheader']['flags_raw'] & 0x00000008);
- $ThisFileInfo['wavpack']['blockheader']['flags']['joint_stereo'] = (bool) ($ThisFileInfo['wavpack']['blockheader']['flags_raw'] & 0x00000010);
- $ThisFileInfo['wavpack']['blockheader']['flags']['cross_decorrelation'] = (bool) ($ThisFileInfo['wavpack']['blockheader']['flags_raw'] & 0x00000020);
- $ThisFileInfo['wavpack']['blockheader']['flags']['hybrid_noiseshape'] = (bool) ($ThisFileInfo['wavpack']['blockheader']['flags_raw'] & 0x00000040);
- $ThisFileInfo['wavpack']['blockheader']['flags']['ieee_32bit_float'] = (bool) ($ThisFileInfo['wavpack']['blockheader']['flags_raw'] & 0x00000080);
- $ThisFileInfo['wavpack']['blockheader']['flags']['int_32bit'] = (bool) ($ThisFileInfo['wavpack']['blockheader']['flags_raw'] & 0x00000100);
- $ThisFileInfo['wavpack']['blockheader']['flags']['hybrid_bitrate_noise'] = (bool) ($ThisFileInfo['wavpack']['blockheader']['flags_raw'] & 0x00000200);
- $ThisFileInfo['wavpack']['blockheader']['flags']['hybrid_balance_noise'] = (bool) ($ThisFileInfo['wavpack']['blockheader']['flags_raw'] & 0x00000400);
- $ThisFileInfo['wavpack']['blockheader']['flags']['multichannel_initial'] = (bool) ($ThisFileInfo['wavpack']['blockheader']['flags_raw'] & 0x00000800);
- $ThisFileInfo['wavpack']['blockheader']['flags']['multichannel_final'] = (bool) ($ThisFileInfo['wavpack']['blockheader']['flags_raw'] & 0x00001000);
+ $info['wavpack']['blockheader']['flags']['bytes_per_sample'] = 1 + ($info['wavpack']['blockheader']['flags_raw'] & 0x00000003);
+ $info['wavpack']['blockheader']['flags']['mono'] = (bool) ($info['wavpack']['blockheader']['flags_raw'] & 0x00000004);
+ $info['wavpack']['blockheader']['flags']['hybrid'] = (bool) ($info['wavpack']['blockheader']['flags_raw'] & 0x00000008);
+ $info['wavpack']['blockheader']['flags']['joint_stereo'] = (bool) ($info['wavpack']['blockheader']['flags_raw'] & 0x00000010);
+ $info['wavpack']['blockheader']['flags']['cross_decorrelation'] = (bool) ($info['wavpack']['blockheader']['flags_raw'] & 0x00000020);
+ $info['wavpack']['blockheader']['flags']['hybrid_noiseshape'] = (bool) ($info['wavpack']['blockheader']['flags_raw'] & 0x00000040);
+ $info['wavpack']['blockheader']['flags']['ieee_32bit_float'] = (bool) ($info['wavpack']['blockheader']['flags_raw'] & 0x00000080);
+ $info['wavpack']['blockheader']['flags']['int_32bit'] = (bool) ($info['wavpack']['blockheader']['flags_raw'] & 0x00000100);
+ $info['wavpack']['blockheader']['flags']['hybrid_bitrate_noise'] = (bool) ($info['wavpack']['blockheader']['flags_raw'] & 0x00000200);
+ $info['wavpack']['blockheader']['flags']['hybrid_balance_noise'] = (bool) ($info['wavpack']['blockheader']['flags_raw'] & 0x00000400);
+ $info['wavpack']['blockheader']['flags']['multichannel_initial'] = (bool) ($info['wavpack']['blockheader']['flags_raw'] & 0x00000800);
+ $info['wavpack']['blockheader']['flags']['multichannel_final'] = (bool) ($info['wavpack']['blockheader']['flags_raw'] & 0x00001000);
- $ThisFileInfo['audio']['lossless'] = !$ThisFileInfo['wavpack']['blockheader']['flags']['hybrid'];
+ $info['audio']['lossless'] = !$info['wavpack']['blockheader']['flags']['hybrid'];
}
- while (!feof($fd) && (ftell($fd) < ($blockheader_offset + $blockheader_size + 8))) {
+ while (!feof($this->getid3->fp) && ($this->ftell() < ($blockheader_offset + $blockheader_size + 8))) {
- $metablock = array('offset'=>ftell($fd));
- $metablockheader = fread($fd, 2);
- if (feof($fd)) {
+ $metablock = array('offset'=>$this->ftell());
+ $metablockheader = $this->fread(2);
+ if (feof($this->getid3->fp)) {
break;
}
- $metablock['id'] = ord($metablockheader{0});
+ $metablock['id'] = ord($metablockheader[0]);
$metablock['function_id'] = ($metablock['id'] & 0x3F);
$metablock['function_name'] = $this->WavPackMetablockNameLookup($metablock['function_id']);
@@ -146,10 +171,11 @@
$metablock['padded_data'] = (bool) ($metablock['id'] & 0x40);
$metablock['large_block'] = (bool) ($metablock['id'] & 0x80);
if ($metablock['large_block']) {
- $metablockheader .= fread($fd, 2);
+ $metablockheader .= $this->fread(2);
}
$metablock['size'] = getid3_lib::LittleEndian2Int(substr($metablockheader, 1)) * 2; // size is stored in words
$metablock['data'] = null;
+ $metablock['comments'] = array();
if ($metablock['size'] > 0) {
@@ -160,7 +186,7 @@
case 0x24: // ID_CUESHEET
case 0x25: // ID_CONFIG_BLOCK
case 0x26: // ID_MD5_CHECKSUM
- $metablock['data'] = fread($fd, $metablock['size']);
+ $metablock['data'] = $this->fread($metablock['size']);
if ($metablock['padded_data']) {
// padded to the nearest even byte
@@ -183,12 +209,12 @@
case 0x0B: // ID_WVC_BITSTREAM
case 0x0C: // ID_WVX_BITSTREAM
case 0x0D: // ID_CHANNEL_INFO
- fseek($fd, $metablock['offset'] + ($metablock['large_block'] ? 4 : 2) + $metablock['size'], SEEK_SET);
+ $this->fseek($metablock['offset'] + ($metablock['large_block'] ? 4 : 2) + $metablock['size']);
break;
default:
- $ThisFileInfo['warning'][] = 'Unexpected metablock type "0x'.str_pad(dechex($metablock['function_id']), 2, '0', STR_PAD_LEFT).'" at offset '.$metablock['offset'];
- fseek($fd, $metablock['offset'] + ($metablock['large_block'] ? 4 : 2) + $metablock['size'], SEEK_SET);
+ $this->warning('Unexpected metablock type "0x'.str_pad(dechex($metablock['function_id']), 2, '0', STR_PAD_LEFT).'" at offset '.$metablock['offset']);
+ $this->fseek($metablock['offset'] + ($metablock['large_block'] ? 4 : 2) + $metablock['size']);
break;
}
@@ -196,14 +222,19 @@
case 0x21: // ID_RIFF_HEADER
getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, true);
$original_wav_filesize = getid3_lib::LittleEndian2Int(substr($metablock['data'], 4, 4));
- getid3_riff::ParseRIFFdata($metablock['data'], $ParsedRIFFheader);
- $metablock['riff'] = $ParsedRIFFheader['riff'];
+
+ $getid3_temp = new getID3();
+ $getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
+ $getid3_riff = new getid3_riff($getid3_temp);
+ $getid3_riff->ParseRIFFdata($metablock['data']);
+ $metablock['riff'] = $getid3_temp->info['riff'];
+ $info['audio']['sample_rate'] = $getid3_temp->info['riff']['raw']['fmt ']['nSamplesPerSec'];
+ unset($getid3_riff, $getid3_temp);
+
$metablock['riff']['original_filesize'] = $original_wav_filesize;
- $ThisFileInfo['wavpack']['riff_trailer_size'] = $original_wav_filesize - $metablock['riff']['WAVE']['data'][0]['size'] - $metablock['riff']['header_size'];
+ $info['wavpack']['riff_trailer_size'] = $original_wav_filesize - $metablock['riff']['WAVE']['data'][0]['size'] - $metablock['riff']['header_size'];
+ $info['playtime_seconds'] = $info['wavpack']['blockheader']['total_samples'] / $info['audio']['sample_rate'];
- $ThisFileInfo['audio']['sample_rate'] = $ParsedRIFFheader['riff']['raw']['fmt ']['nSamplesPerSec'];
- $ThisFileInfo['playtime_seconds'] = $ThisFileInfo['wavpack']['blockheader']['total_samples'] / $ThisFileInfo['audio']['sample_rate'];
-
// Safe RIFF header in case there's a RIFF footer later
$metablockRIFFheader = $metablock['data'];
break;
@@ -210,29 +241,32 @@
case 0x22: // ID_RIFF_TRAILER
- $metablockRIFFfooter = $metablockRIFFheader.$metablock['data'];
+ $metablockRIFFfooter = isset($metablockRIFFheader) ? $metablockRIFFheader : ''.$metablock['data'];
getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.riff.php', __FILE__, true);
- $ftell_old = ftell($fd);
$startoffset = $metablock['offset'] + ($metablock['large_block'] ? 4 : 2);
- $ParsedRIFFfooter = array('avdataend'=>$ThisFileInfo['avdataend'], 'fileformat'=>'riff', 'error'=>array(), 'warning'=>array());
- $metablock['riff'] = getid3_riff::ParseRIFF($fd, $startoffset, $startoffset + $metablock['size'], $ParsedRIFFfooter);
- fseek($fd, $ftell_old, SEEK_SET);
+ $getid3_temp = new getID3();
+ $getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
+ $getid3_temp->info['avdataend'] = $info['avdataend'];
+ //$getid3_temp->info['fileformat'] = 'riff';
+ $getid3_riff = new getid3_riff($getid3_temp);
+ $metablock['riff'] = $getid3_riff->ParseRIFF($startoffset, $startoffset + $metablock['size']);
if (!empty($metablock['riff']['INFO'])) {
- getid3_riff::RIFFcommentsParse($metablock['riff']['INFO'], $metablock['comments']);
- $ThisFileInfo['tags']['riff'] = $metablock['comments'];
+ getid3_riff::parseComments($metablock['riff']['INFO'], $metablock['comments']);
+ $info['tags']['riff'] = $metablock['comments'];
}
+ unset($getid3_temp, $getid3_riff);
break;
case 0x23: // ID_REPLAY_GAIN
- $ThisFileInfo['warning'][] = 'WavPack "Replay Gain" contents not yet handled by getID3() in metablock at offset '.$metablock['offset'];
+ $this->warning('WavPack "Replay Gain" contents not yet handled by getID3() in metablock at offset '.$metablock['offset']);
break;
case 0x24: // ID_CUESHEET
- $ThisFileInfo['warning'][] = 'WavPack "Cuesheet" contents not yet handled by getID3() in metablock at offset '.$metablock['offset'];
+ $this->warning('WavPack "Cuesheet" contents not yet handled by getID3() in metablock at offset '.$metablock['offset']);
break;
@@ -261,36 +295,36 @@
$metablock['flags']['md5_checksum'] = (bool) ($metablock['flags_raw'] & 0x080000); // compute & store MD5 signature
$metablock['flags']['quiet_mode'] = (bool) ($metablock['flags_raw'] & 0x100000); // don't report progress %
- $ThisFileInfo['wavpack']['config_flags'] = $metablock['flags'];
+ $info['wavpack']['config_flags'] = $metablock['flags'];
- if ($ThisFileInfo['wavpack']['blockheader']['flags']['hybrid']) {
- @$ThisFileInfo['audio']['encoder_options'] .= ' -b???';
+ $info['audio']['encoder_options'] = '';
+ if ($info['wavpack']['blockheader']['flags']['hybrid']) {
+ $info['audio']['encoder_options'] .= ' -b???';
}
- @$ThisFileInfo['audio']['encoder_options'] .= ($metablock['flags']['adobe_mode'] ? ' -a' : '');
- @$ThisFileInfo['audio']['encoder_options'] .= ($metablock['flags']['optimize_wvc'] ? ' -cc' : '');
- @$ThisFileInfo['audio']['encoder_options'] .= ($metablock['flags']['create_exe'] ? ' -e' : '');
- @$ThisFileInfo['audio']['encoder_options'] .= ($metablock['flags']['fast_flag'] ? ' -f' : '');
- @$ThisFileInfo['audio']['encoder_options'] .= ($metablock['flags']['joint_override'] ? ' -j?' : '');
- @$ThisFileInfo['audio']['encoder_options'] .= ($metablock['flags']['high_flag'] ? ' -h' : '');
- @$ThisFileInfo['audio']['encoder_options'] .= ($metablock['flags']['md5_checksum'] ? ' -m' : '');
- @$ThisFileInfo['audio']['encoder_options'] .= ($metablock['flags']['calc_noise'] ? ' -n' : '');
- @$ThisFileInfo['audio']['encoder_options'] .= ($metablock['flags']['shape_override'] ? ' -s?' : '');
- @$ThisFileInfo['audio']['encoder_options'] .= ($metablock['flags']['extra_mode'] ? ' -x?' : '');
- if (@$ThisFileInfo['audio']['encoder_options']) {
- $ThisFileInfo['audio']['encoder_options'] = trim(@$ThisFileInfo['audio']['encoder_options']);
+ $info['audio']['encoder_options'] .= ($metablock['flags']['adobe_mode'] ? ' -a' : '');
+ $info['audio']['encoder_options'] .= ($metablock['flags']['optimize_wvc'] ? ' -cc' : '');
+ $info['audio']['encoder_options'] .= ($metablock['flags']['create_exe'] ? ' -e' : '');
+ $info['audio']['encoder_options'] .= ($metablock['flags']['fast_flag'] ? ' -f' : '');
+ $info['audio']['encoder_options'] .= ($metablock['flags']['joint_override'] ? ' -j?' : '');
+ $info['audio']['encoder_options'] .= ($metablock['flags']['high_flag'] ? ' -h' : '');
+ $info['audio']['encoder_options'] .= ($metablock['flags']['md5_checksum'] ? ' -m' : '');
+ $info['audio']['encoder_options'] .= ($metablock['flags']['calc_noise'] ? ' -n' : '');
+ $info['audio']['encoder_options'] .= ($metablock['flags']['shape_override'] ? ' -s?' : '');
+ $info['audio']['encoder_options'] .= ($metablock['flags']['extra_mode'] ? ' -x?' : '');
+ if (!empty($info['audio']['encoder_options'])) {
+ $info['audio']['encoder_options'] = trim($info['audio']['encoder_options']);
+ } elseif (isset($info['audio']['encoder_options'])) {
+ unset($info['audio']['encoder_options']);
}
- elseif (isset($ThisFileInfo['audio']['encoder_options'])) {
- unset($ThisFileInfo['audio']['encoder_options']);
- }
break;
case 0x26: // ID_MD5_CHECKSUM
if (strlen($metablock['data']) == 16) {
- $ThisFileInfo['md5_data_source'] = strtolower(getid3_lib::PrintHexBytes($metablock['data'], true, false, false));
+ $info['md5_data_source'] = strtolower(getid3_lib::PrintHexBytes($metablock['data'], true, false, false));
} else {
- $ThisFileInfo['warning'][] = 'Expecting 16 bytes of WavPack "MD5 Checksum" in metablock at offset '.$metablock['offset'].', but found '.strlen($metablock['data']).' bytes';
+ $this->warning('Expecting 16 bytes of WavPack "MD5 Checksum" in metablock at offset '.$metablock['offset'].', but found '.strlen($metablock['data']).' bytes');
}
break;
@@ -315,7 +349,7 @@
}
if (!empty($metablock)) {
- $ThisFileInfo['wavpack']['metablocks'][] = $metablock;
+ $info['wavpack']['metablocks'][] = $metablock;
}
}
@@ -322,17 +356,17 @@
}
- $ThisFileInfo['audio']['encoder'] = 'WavPack v'.$ThisFileInfo['wavpack']['blockheader']['major_version'].'.'.str_pad($ThisFileInfo['wavpack']['blockheader']['minor_version'], 2, '0', STR_PAD_LEFT);
- $ThisFileInfo['audio']['bits_per_sample'] = $ThisFileInfo['wavpack']['blockheader']['flags']['bytes_per_sample'] * 8;
- $ThisFileInfo['audio']['channels'] = ($ThisFileInfo['wavpack']['blockheader']['flags']['mono'] ? 1 : 2);
+ $info['audio']['encoder'] = 'WavPack v'.$info['wavpack']['blockheader']['major_version'].'.'.str_pad($info['wavpack']['blockheader']['minor_version'], 2, '0', STR_PAD_LEFT);
+ $info['audio']['bits_per_sample'] = $info['wavpack']['blockheader']['flags']['bytes_per_sample'] * 8;
+ $info['audio']['channels'] = ($info['wavpack']['blockheader']['flags']['mono'] ? 1 : 2);
- if (@$ThisFileInfo['playtime_seconds']) {
+ if (!empty($info['playtime_seconds'])) {
- $ThisFileInfo['audio']['bitrate'] = (($ThisFileInfo['avdataend'] - $ThisFileInfo['avdataoffset']) * 8) / $ThisFileInfo['playtime_seconds'];
+ $info['audio']['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
} else {
- $ThisFileInfo['audio']['dataformat'] = 'wvc';
+ $info['audio']['dataformat'] = 'wvc';
}
@@ -339,8 +373,12 @@
return true;
}
-
- function WavPackMetablockNameLookup(&$id) {
+ /**
+ * @param int $id
+ *
+ * @return string
+ */
+ public function WavPackMetablockNameLookup(&$id) {
static $WavPackMetablockNameLookup = array(
0x00 => 'Dummy',
0x01 => 'Encoder Info',
@@ -363,10 +401,7 @@
0x25 => 'Config Block',
0x26 => 'MD5 Checksum',
);
- return (@$WavPackMetablockNameLookup[$id]);
+ return (isset($WavPackMetablockNameLookup[$id]) ? $WavPackMetablockNameLookup[$id] : '');
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.bmp.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.bmp.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.bmp.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.graphic.bmp.php //
// module for analyzing BMP Image files //
@@ -13,17 +14,26 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_bmp
+class getid3_bmp extends getid3_handler
{
+ public $ExtractPalette = false;
+ public $ExtractData = false;
- function getid3_bmp(&$fd, &$ThisFileInfo, $ExtractPalette=false, $ExtractData=false) {
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- // shortcuts
- $ThisFileInfo['bmp']['header']['raw'] = array();
- $thisfile_bmp = &$ThisFileInfo['bmp'];
- $thisfile_bmp_header = &$thisfile_bmp['header'];
- $thisfile_bmp_header_raw = &$thisfile_bmp_header['raw'];
+ // shortcuts
+ $info['bmp']['header']['raw'] = array();
+ $thisfile_bmp = &$info['bmp'];
+ $thisfile_bmp_header = &$thisfile_bmp['header'];
+ $thisfile_bmp_header_raw = &$thisfile_bmp_header['raw'];
// BITMAPFILEHEADER [14 bytes] - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_62uq.asp
// all versions
@@ -33,17 +43,18 @@
// WORD bfReserved2;
// DWORD bfOffBits;
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
+ $this->fseek($info['avdataoffset']);
$offset = 0;
- $BMPheader = fread($fd, 14 + 40);
+ $BMPheader = $this->fread(14 + 40);
$thisfile_bmp_header_raw['identifier'] = substr($BMPheader, $offset, 2);
$offset += 2;
- if ($thisfile_bmp_header_raw['identifier'] != 'BM') {
- $ThisFileInfo['error'][] = 'Expecting "BM" at offset '.$ThisFileInfo['avdataoffset'].', found "'.$thisfile_bmp_header_raw['identifier'].'"';
- unset($ThisFileInfo['fileformat']);
- unset($ThisFileInfo['bmp']);
+ $magic = 'BM';
+ if ($thisfile_bmp_header_raw['identifier'] != $magic) {
+ $this->error('Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($thisfile_bmp_header_raw['identifier']).'"');
+ unset($info['fileformat']);
+ unset($info['bmp']);
return false;
}
@@ -81,16 +92,16 @@
$thisfile_bmp['type_os'] = 'Windows';
$thisfile_bmp['type_version'] = 5;
} else {
- $ThisFileInfo['error'][] = 'Unknown BMP subtype (or not a BMP file)';
- unset($ThisFileInfo['fileformat']);
- unset($ThisFileInfo['bmp']);
+ $this->error('Unknown BMP subtype (or not a BMP file)');
+ unset($info['fileformat']);
+ unset($info['bmp']);
return false;
}
- $ThisFileInfo['fileformat'] = 'bmp';
- $ThisFileInfo['video']['dataformat'] = 'bmp';
- $ThisFileInfo['video']['lossless'] = true;
- $ThisFileInfo['video']['pixel_aspect_ratio'] = (float) 1;
+ $info['fileformat'] = 'bmp';
+ $info['video']['dataformat'] = 'bmp';
+ $info['video']['lossless'] = true;
+ $info['video']['pixel_aspect_ratio'] = (float) 1;
if ($thisfile_bmp['type_os'] == 'OS/2') {
@@ -112,10 +123,10 @@
$thisfile_bmp_header_raw['bits_per_pixel'] = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 2));
$offset += 2;
- $ThisFileInfo['video']['resolution_x'] = $thisfile_bmp_header_raw['width'];
- $ThisFileInfo['video']['resolution_y'] = $thisfile_bmp_header_raw['height'];
- $ThisFileInfo['video']['codec'] = 'BI_RGB '.$thisfile_bmp_header_raw['bits_per_pixel'].'-bit';
- $ThisFileInfo['video']['bits_per_sample'] = $thisfile_bmp_header_raw['bits_per_pixel'];
+ $info['video']['resolution_x'] = $thisfile_bmp_header_raw['width'];
+ $info['video']['resolution_y'] = $thisfile_bmp_header_raw['height'];
+ $info['video']['codec'] = 'BI_RGB '.$thisfile_bmp_header_raw['bits_per_pixel'].'-bit';
+ $info['video']['bits_per_sample'] = $thisfile_bmp_header_raw['bits_per_pixel'];
if ($thisfile_bmp['type_version'] >= 2) {
// DWORD Compression; /* Bitmap compression scheme */
@@ -162,9 +173,9 @@
$thisfile_bmp_header_raw['identifier'] = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4));
$offset += 4;
- $thisfile_bmp_header['compression'] = $this->BMPcompressionOS2Lookup($thisfile_bmp_header_raw['compression']);
+ $thisfile_bmp_header['compression'] = $this->BMPcompressionOS2Lookup($thisfile_bmp_header_raw['compression']);
- $ThisFileInfo['video']['codec'] = $thisfile_bmp_header['compression'].' '.$thisfile_bmp_header_raw['bits_per_pixel'].'-bit';
+ $info['video']['codec'] = $thisfile_bmp_header['compression'].' '.$thisfile_bmp_header_raw['bits_per_pixel'].'-bit';
}
} elseif ($thisfile_bmp['type_os'] == 'Windows') {
@@ -185,6 +196,8 @@
// DWORD biClrUsed;
// DWORD biClrImportant;
+ // possibly integrate this section and module.audio-video.riff.php::ParseBITMAPINFOHEADER() ?
+
$thisfile_bmp_header_raw['width'] = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4), true);
$offset += 4;
$thisfile_bmp_header_raw['height'] = getid3_lib::LittleEndian2Int(substr($BMPheader, $offset, 4), true);
@@ -207,14 +220,14 @@
$offset += 4;
$thisfile_bmp_header['compression'] = $this->BMPcompressionWindowsLookup($thisfile_bmp_header_raw['compression']);
- $ThisFileInfo['video']['resolution_x'] = $thisfile_bmp_header_raw['width'];
- $ThisFileInfo['video']['resolution_y'] = $thisfile_bmp_header_raw['height'];
- $ThisFileInfo['video']['codec'] = $thisfile_bmp_header['compression'].' '.$thisfile_bmp_header_raw['bits_per_pixel'].'-bit';
- $ThisFileInfo['video']['bits_per_sample'] = $thisfile_bmp_header_raw['bits_per_pixel'];
+ $info['video']['resolution_x'] = $thisfile_bmp_header_raw['width'];
+ $info['video']['resolution_y'] = $thisfile_bmp_header_raw['height'];
+ $info['video']['codec'] = $thisfile_bmp_header['compression'].' '.$thisfile_bmp_header_raw['bits_per_pixel'].'-bit';
+ $info['video']['bits_per_sample'] = $thisfile_bmp_header_raw['bits_per_pixel'];
if (($thisfile_bmp['type_version'] >= 4) || ($thisfile_bmp_header_raw['compression'] == 3)) {
// should only be v4+, but BMPs with type_version==1 and BI_BITFIELDS compression have been seen
- $BMPheader .= fread($fd, 44);
+ $BMPheader .= $this->fread(44);
// BITMAPV4HEADER - [44 bytes] - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_2k1e.asp
// Win95+, WinNT4.0+
@@ -256,7 +269,7 @@
}
if ($thisfile_bmp['type_version'] >= 5) {
- $BMPheader .= fread($fd, 16);
+ $BMPheader .= $this->fread(16);
// BITMAPV5HEADER - [16 bytes] - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_7c36.asp
// Win98+, Win2000+
@@ -276,13 +289,13 @@
} else {
- $ThisFileInfo['error'][] = 'Unknown BMP format in header.';
+ $this->error('Unknown BMP format in header.');
return false;
}
- if ($ExtractPalette || $ExtractData) {
+ if ($this->ExtractPalette || $this->ExtractData) {
$PaletteEntries = 0;
if ($thisfile_bmp_header_raw['bits_per_pixel'] < 16) {
$PaletteEntries = pow(2, $thisfile_bmp_header_raw['bits_per_pixel']);
@@ -290,7 +303,7 @@
$PaletteEntries = $thisfile_bmp_header_raw['colors_used'];
}
if ($PaletteEntries > 0) {
- $BMPpalette = fread($fd, 4 * $PaletteEntries);
+ $BMPpalette = $this->fread(4 * $PaletteEntries);
$paletteoffset = 0;
for ($i = 0; $i < $PaletteEntries; $i++) {
// RGBQUAD - http://msdn.microsoft.com/library/en-us/gdi/bitmaps_5f8y.asp
@@ -311,12 +324,13 @@
}
}
- if ($ExtractData) {
- fseek($fd, $thisfile_bmp_header_raw['data_offset'], SEEK_SET);
+ if ($this->ExtractData) {
+ $this->fseek($thisfile_bmp_header_raw['data_offset']);
$RowByteLength = ceil(($thisfile_bmp_header_raw['width'] * ($thisfile_bmp_header_raw['bits_per_pixel'] / 8)) / 4) * 4; // round up to nearest DWORD boundry
- $BMPpixelData = fread($fd, $thisfile_bmp_header_raw['height'] * $RowByteLength);
+ $BMPpixelData = $this->fread($thisfile_bmp_header_raw['height'] * $RowByteLength);
$pixeldataoffset = 0;
- switch (@$thisfile_bmp_header_raw['compression']) {
+ $thisfile_bmp_header_raw['compression'] = (isset($thisfile_bmp_header_raw['compression']) ? $thisfile_bmp_header_raw['compression'] : '');
+ switch ($thisfile_bmp_header_raw['compression']) {
case 0: // BI_RGB
switch ($thisfile_bmp_header_raw['bits_per_pixel']) {
@@ -323,7 +337,7 @@
case 1:
for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col = $col) {
- $paletteindexbyte = ord($BMPpixelData{$pixeldataoffset++});
+ $paletteindexbyte = ord($BMPpixelData[$pixeldataoffset++]);
for ($i = 7; $i >= 0; $i--) {
$paletteindex = ($paletteindexbyte & (0x01 << $i)) >> $i;
$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
@@ -340,7 +354,7 @@
case 4:
for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col = $col) {
- $paletteindexbyte = ord($BMPpixelData{$pixeldataoffset++});
+ $paletteindexbyte = ord($BMPpixelData[$pixeldataoffset++]);
for ($i = 1; $i >= 0; $i--) {
$paletteindex = ($paletteindexbyte & (0x0F << (4 * $i))) >> (4 * $i);
$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
@@ -357,7 +371,7 @@
case 8:
for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col++) {
- $paletteindex = ord($BMPpixelData{$pixeldataoffset++});
+ $paletteindex = ord($BMPpixelData[$pixeldataoffset++]);
$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
}
while (($pixeldataoffset % 4) != 0) {
@@ -370,8 +384,8 @@
case 24:
for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col++) {
- $thisfile_bmp['data'][$row][$col] = (ord($BMPpixelData{$pixeldataoffset+2}) << 16) | (ord($BMPpixelData{$pixeldataoffset+1}) << 8) | ord($BMPpixelData{$pixeldataoffset});
- $pixeldataoffset += 3;
+ $thisfile_bmp['data'][$row][$col] = (ord($BMPpixelData[$pixeldataoffset+2]) << 16) | (ord($BMPpixelData[$pixeldataoffset+1]) << 8) | ord($BMPpixelData[$pixeldataoffset]);
+ $pixeldataoffset += 3;
}
while (($pixeldataoffset % 4) != 0) {
// lines are padded to nearest DWORD
@@ -383,8 +397,8 @@
case 32:
for ($row = ($thisfile_bmp_header_raw['height'] - 1); $row >= 0; $row--) {
for ($col = 0; $col < $thisfile_bmp_header_raw['width']; $col++) {
- $thisfile_bmp['data'][$row][$col] = (ord($BMPpixelData{$pixeldataoffset+3}) << 24) | (ord($BMPpixelData{$pixeldataoffset+2}) << 16) | (ord($BMPpixelData{$pixeldataoffset+1}) << 8) | ord($BMPpixelData{$pixeldataoffset});
- $pixeldataoffset += 4;
+ $thisfile_bmp['data'][$row][$col] = (ord($BMPpixelData[$pixeldataoffset+3]) << 24) | (ord($BMPpixelData[$pixeldataoffset+2]) << 16) | (ord($BMPpixelData[$pixeldataoffset+1]) << 8) | ord($BMPpixelData[$pixeldataoffset]);
+ $pixeldataoffset += 4;
}
while (($pixeldataoffset % 4) != 0) {
// lines are padded to nearest DWORD
@@ -398,7 +412,7 @@
break;
default:
- $ThisFileInfo['error'][] = 'Unknown bits-per-pixel value ('.$thisfile_bmp_header_raw['bits_per_pixel'].') - cannot read pixel data';
+ $this->error('Unknown bits-per-pixel value ('.$thisfile_bmp_header_raw['bits_per_pixel'].') - cannot read pixel data');
break;
}
break;
@@ -473,7 +487,7 @@
break;
default:
- $ThisFileInfo['error'][] = 'Unknown bits-per-pixel value ('.$thisfile_bmp_header_raw['bits_per_pixel'].') - cannot read pixel data';
+ $this->error('Unknown bits-per-pixel value ('.$thisfile_bmp_header_raw['bits_per_pixel'].') - cannot read pixel data');
break;
}
break;
@@ -520,6 +534,7 @@
// high- and low-order 4 bits, one color index for each pixel. In absolute mode,
// each run must be aligned on a word boundary.
unset($paletteindexes);
+ $paletteindexes = array();
for ($i = 0; $i < ceil($secondbyte / 2); $i++) {
$paletteindexbyte = getid3_lib::LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
$paletteindexes[] = ($paletteindexbyte & 0xF0) >> 4;
@@ -562,7 +577,7 @@
break;
default:
- $ThisFileInfo['error'][] = 'Unknown bits-per-pixel value ('.$thisfile_bmp_header_raw['bits_per_pixel'].') - cannot read pixel data';
+ $this->error('Unknown bits-per-pixel value ('.$thisfile_bmp_header_raw['bits_per_pixel'].') - cannot read pixel data');
break;
}
break;
@@ -602,7 +617,7 @@
break;
default:
- $ThisFileInfo['error'][] = 'Unknown bits-per-pixel value ('.$thisfile_bmp_header_raw['bits_per_pixel'].') - cannot read pixel data';
+ $this->error('Unknown bits-per-pixel value ('.$thisfile_bmp_header_raw['bits_per_pixel'].') - cannot read pixel data');
break;
}
break;
@@ -609,7 +624,7 @@
default: // unhandled compression type
- $ThisFileInfo['error'][] = 'Unknown/unhandled compression type value ('.$thisfile_bmp_header_raw['compression'].') - cannot decompress pixel data';
+ $this->error('Unknown/unhandled compression type value ('.$thisfile_bmp_header_raw['compression'].') - cannot decompress pixel data');
break;
}
}
@@ -617,8 +632,12 @@
return true;
}
-
- function PlotBMP(&$BMPinfo) {
+ /**
+ * @param array $BMPinfo
+ *
+ * @return bool
+ */
+ public function PlotBMP(&$BMPinfo) {
$starttime = time();
if (!isset($BMPinfo['bmp']['data']) || !is_array($BMPinfo['bmp']['data'])) {
echo 'ERROR: no pixel data<BR>';
@@ -625,7 +644,7 @@
return false;
}
set_time_limit(intval(round($BMPinfo['resolution_x'] * $BMPinfo['resolution_y'] / 10000)));
- if ($im = ImageCreateTrueColor($BMPinfo['resolution_x'], $BMPinfo['resolution_y'])) {
+ if ($im = imagecreatetruecolor($BMPinfo['resolution_x'], $BMPinfo['resolution_y'])) {
for ($row = 0; $row < $BMPinfo['resolution_y']; $row++) {
for ($col = 0; $col < $BMPinfo['resolution_x']; $col++) {
if (isset($BMPinfo['bmp']['data'][$row][$col])) {
@@ -632,8 +651,8 @@
$red = ($BMPinfo['bmp']['data'][$row][$col] & 0x00FF0000) >> 16;
$green = ($BMPinfo['bmp']['data'][$row][$col] & 0x0000FF00) >> 8;
$blue = ($BMPinfo['bmp']['data'][$row][$col] & 0x000000FF);
- $pixelcolor = ImageColorAllocate($im, $red, $green, $blue);
- ImageSetPixel($im, $col, $row, $pixelcolor);
+ $pixelcolor = imagecolorallocate($im, $red, $green, $blue);
+ imagesetpixel($im, $col, $row, $pixelcolor);
} else {
//echo 'ERROR: no data for pixel '.$row.' x '.$col.'<BR>';
//return false;
@@ -642,12 +661,12 @@
}
if (headers_sent()) {
echo 'plotted '.($BMPinfo['resolution_x'] * $BMPinfo['resolution_y']).' pixels in '.(time() - $starttime).' seconds<BR>';
- ImageDestroy($im);
+ imagedestroy($im);
exit;
} else {
header('Content-type: image/png');
- ImagePNG($im);
- ImageDestroy($im);
+ imagepng($im);
+ imagedestroy($im);
return true;
}
}
@@ -654,7 +673,12 @@
return false;
}
- function BMPcompressionWindowsLookup($compressionid) {
+ /**
+ * @param int $compressionid
+ *
+ * @return string
+ */
+ public function BMPcompressionWindowsLookup($compressionid) {
static $BMPcompressionWindowsLookup = array(
0 => 'BI_RGB',
1 => 'BI_RLE8',
@@ -666,7 +690,12 @@
return (isset($BMPcompressionWindowsLookup[$compressionid]) ? $BMPcompressionWindowsLookup[$compressionid] : 'invalid');
}
- function BMPcompressionOS2Lookup($compressionid) {
+ /**
+ * @param int $compressionid
+ *
+ * @return string
+ */
+ public function BMPcompressionOS2Lookup($compressionid) {
static $BMPcompressionOS2Lookup = array(
0 => 'BI_RGB',
1 => 'BI_RLE8',
@@ -678,6 +707,3 @@
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.gif.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.gif.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.gif.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.graphic.gif.php //
// module for analyzing GIF Image files //
@@ -13,164 +14,200 @@
// ///
/////////////////////////////////////////////////////////////////
+/**
+ * @link https://www.w3.org/Graphics/GIF/spec-gif89a.txt
+ * @link http://www.matthewflickinger.com/lab/whatsinagif/bits_and_bytes.asp
+ */
-class getid3_gif
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
+
+class getid3_gif extends getid3_handler
{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- function getid3_gif(&$fd, &$ThisFileInfo) {
- $ThisFileInfo['fileformat'] = 'gif';
- $ThisFileInfo['video']['dataformat'] = 'gif';
- $ThisFileInfo['video']['lossless'] = true;
- $ThisFileInfo['video']['pixel_aspect_ratio'] = (float) 1;
+ $info['fileformat'] = 'gif';
+ $info['video']['dataformat'] = 'gif';
+ $info['video']['lossless'] = true;
+ $info['video']['pixel_aspect_ratio'] = (float) 1;
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
- $GIFheader = fread($fd, 13);
+ $this->fseek($info['avdataoffset']);
+ $GIFheader = $this->fread(13);
$offset = 0;
- $ThisFileInfo['gif']['header']['raw']['identifier'] = substr($GIFheader, $offset, 3);
+ $info['gif']['header']['raw']['identifier'] = substr($GIFheader, $offset, 3);
$offset += 3;
- if ($ThisFileInfo['gif']['header']['raw']['identifier'] != 'GIF') {
- $ThisFileInfo['error'][] = 'Expecting "GIF" at offset '.$ThisFileInfo['avdataoffset'].', found "'.$ThisFileInfo['gif']['header']['raw']['identifier'].'"';
- unset($ThisFileInfo['fileformat']);
- unset($ThisFileInfo['gif']);
+ $magic = 'GIF';
+ if ($info['gif']['header']['raw']['identifier'] != $magic) {
+ $this->error('Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes($info['gif']['header']['raw']['identifier']).'"');
+ unset($info['fileformat']);
+ unset($info['gif']);
return false;
}
- $ThisFileInfo['gif']['header']['raw']['version'] = substr($GIFheader, $offset, 3);
+ //if (!$this->getid3->option_extra_info) {
+ // $this->warning('GIF Extensions and Global Color Table not returned due to !getid3->option_extra_info');
+ //}
+
+ $info['gif']['header']['raw']['version'] = substr($GIFheader, $offset, 3);
$offset += 3;
- $ThisFileInfo['gif']['header']['raw']['width'] = getid3_lib::LittleEndian2Int(substr($GIFheader, $offset, 2));
+ $info['gif']['header']['raw']['width'] = getid3_lib::LittleEndian2Int(substr($GIFheader, $offset, 2));
$offset += 2;
- $ThisFileInfo['gif']['header']['raw']['height'] = getid3_lib::LittleEndian2Int(substr($GIFheader, $offset, 2));
+ $info['gif']['header']['raw']['height'] = getid3_lib::LittleEndian2Int(substr($GIFheader, $offset, 2));
$offset += 2;
- $ThisFileInfo['gif']['header']['raw']['flags'] = getid3_lib::LittleEndian2Int(substr($GIFheader, $offset, 1));
+ $info['gif']['header']['raw']['flags'] = getid3_lib::LittleEndian2Int(substr($GIFheader, $offset, 1));
$offset += 1;
- $ThisFileInfo['gif']['header']['raw']['bg_color_index'] = getid3_lib::LittleEndian2Int(substr($GIFheader, $offset, 1));
+ $info['gif']['header']['raw']['bg_color_index'] = getid3_lib::LittleEndian2Int(substr($GIFheader, $offset, 1));
$offset += 1;
- $ThisFileInfo['gif']['header']['raw']['aspect_ratio'] = getid3_lib::LittleEndian2Int(substr($GIFheader, $offset, 1));
+ $info['gif']['header']['raw']['aspect_ratio'] = getid3_lib::LittleEndian2Int(substr($GIFheader, $offset, 1));
$offset += 1;
- $ThisFileInfo['video']['resolution_x'] = $ThisFileInfo['gif']['header']['raw']['width'];
- $ThisFileInfo['video']['resolution_y'] = $ThisFileInfo['gif']['header']['raw']['height'];
- $ThisFileInfo['gif']['version'] = $ThisFileInfo['gif']['header']['raw']['version'];
- $ThisFileInfo['gif']['header']['flags']['global_color_table'] = (bool) ($ThisFileInfo['gif']['header']['raw']['flags'] & 0x80);
- if ($ThisFileInfo['gif']['header']['raw']['flags'] & 0x80) {
+ $info['video']['resolution_x'] = $info['gif']['header']['raw']['width'];
+ $info['video']['resolution_y'] = $info['gif']['header']['raw']['height'];
+ $info['gif']['version'] = $info['gif']['header']['raw']['version'];
+ $info['gif']['header']['flags']['global_color_table'] = (bool) ($info['gif']['header']['raw']['flags'] & 0x80);
+ if ($info['gif']['header']['raw']['flags'] & 0x80) {
// Number of bits per primary color available to the original image, minus 1
- $ThisFileInfo['gif']['header']['bits_per_pixel'] = 3 * ((($ThisFileInfo['gif']['header']['raw']['flags'] & 0x70) >> 4) + 1);
+ $info['gif']['header']['bits_per_pixel'] = 3 * ((($info['gif']['header']['raw']['flags'] & 0x70) >> 4) + 1);
} else {
- $ThisFileInfo['gif']['header']['bits_per_pixel'] = 0;
+ $info['gif']['header']['bits_per_pixel'] = 0;
}
- $ThisFileInfo['gif']['header']['flags']['global_color_sorted'] = (bool) ($ThisFileInfo['gif']['header']['raw']['flags'] & 0x40);
- if ($ThisFileInfo['gif']['header']['flags']['global_color_table']) {
+ $info['gif']['header']['flags']['global_color_sorted'] = (bool) ($info['gif']['header']['raw']['flags'] & 0x40);
+ if ($info['gif']['header']['flags']['global_color_table']) {
// the number of bytes contained in the Global Color Table. To determine that
// actual size of the color table, raise 2 to [the value of the field + 1]
- $ThisFileInfo['gif']['header']['global_color_size'] = pow(2, ($ThisFileInfo['gif']['header']['raw']['flags'] & 0x07) + 1);
- $ThisFileInfo['video']['bits_per_sample'] = ($ThisFileInfo['gif']['header']['raw']['flags'] & 0x07) + 1;
+ $info['gif']['header']['global_color_size'] = pow(2, ($info['gif']['header']['raw']['flags'] & 0x07) + 1);
+ $info['video']['bits_per_sample'] = ($info['gif']['header']['raw']['flags'] & 0x07) + 1;
} else {
- $ThisFileInfo['gif']['header']['global_color_size'] = 0;
+ $info['gif']['header']['global_color_size'] = 0;
}
- if ($ThisFileInfo['gif']['header']['raw']['aspect_ratio'] != 0) {
+ if ($info['gif']['header']['raw']['aspect_ratio'] != 0) {
// Aspect Ratio = (Pixel Aspect Ratio + 15) / 64
- $ThisFileInfo['gif']['header']['aspect_ratio'] = ($ThisFileInfo['gif']['header']['raw']['aspect_ratio'] + 15) / 64;
+ $info['gif']['header']['aspect_ratio'] = ($info['gif']['header']['raw']['aspect_ratio'] + 15) / 64;
}
-// if ($ThisFileInfo['gif']['header']['flags']['global_color_table']) {
-// $GIFcolorTable = fread($fd, 3 * $ThisFileInfo['gif']['header']['global_color_size']);
-// $offset = 0;
-// for ($i = 0; $i < $ThisFileInfo['gif']['header']['global_color_size']; $i++) {
-// $red = getid3_lib::LittleEndian2Int(substr($GIFcolorTable, $offset++, 1));
-// $green = getid3_lib::LittleEndian2Int(substr($GIFcolorTable, $offset++, 1));
-// $blue = getid3_lib::LittleEndian2Int(substr($GIFcolorTable, $offset++, 1));
-// $ThisFileInfo['gif']['global_color_table'][$i] = (($red << 16) | ($green << 8) | ($blue));
-// }
-// }
-//
-// // Image Descriptor
-// while (!feof($fd)) {
-// $NextBlockTest = fread($fd, 1);
-// switch ($NextBlockTest) {
-//
-// case ',': // ',' - Image separator character
-//
-// $ImageDescriptorData = $NextBlockTest.fread($fd, 9);
-// $ImageDescriptor = array();
-// $ImageDescriptor['image_left'] = getid3_lib::LittleEndian2Int(substr($ImageDescriptorData, 1, 2));
-// $ImageDescriptor['image_top'] = getid3_lib::LittleEndian2Int(substr($ImageDescriptorData, 3, 2));
-// $ImageDescriptor['image_width'] = getid3_lib::LittleEndian2Int(substr($ImageDescriptorData, 5, 2));
-// $ImageDescriptor['image_height'] = getid3_lib::LittleEndian2Int(substr($ImageDescriptorData, 7, 2));
-// $ImageDescriptor['flags_raw'] = getid3_lib::LittleEndian2Int(substr($ImageDescriptorData, 9, 1));
-// $ImageDescriptor['flags']['use_local_color_map'] = (bool) ($ImageDescriptor['flags_raw'] & 0x80);
-// $ImageDescriptor['flags']['image_interlaced'] = (bool) ($ImageDescriptor['flags_raw'] & 0x40);
-// $ThisFileInfo['gif']['image_descriptor'][] = $ImageDescriptor;
-//
-// if ($ImageDescriptor['flags']['use_local_color_map']) {
-//
-// $ThisFileInfo['warning'][] = 'This version of getID3() cannot parse local color maps for GIFs';
-// return true;
-//
-// }
-//echo 'Start of raster data: '.ftell($fd).'<BR>';
-// $RasterData = array();
-// $RasterData['code_size'] = getid3_lib::LittleEndian2Int(fread($fd, 1));
-// $RasterData['block_byte_count'] = getid3_lib::LittleEndian2Int(fread($fd, 1));
-// $ThisFileInfo['gif']['raster_data'][count($ThisFileInfo['gif']['image_descriptor']) - 1] = $RasterData;
-//
-// $CurrentCodeSize = $RasterData['code_size'] + 1;
-// for ($i = 0; $i < pow(2, $RasterData['code_size']); $i++) {
-// $DefaultDataLookupTable[$i] = chr($i);
-// }
-// $DefaultDataLookupTable[pow(2, $RasterData['code_size']) + 0] = ''; // Clear Code
-// $DefaultDataLookupTable[pow(2, $RasterData['code_size']) + 1] = ''; // End Of Image Code
-//
-//
-// $NextValue = $this->GetLSBits($fd, $CurrentCodeSize);
-// echo 'Clear Code: '.$NextValue.'<BR>';
-//
-// $NextValue = $this->GetLSBits($fd, $CurrentCodeSize);
-// echo 'First Color: '.$NextValue.'<BR>';
-//
-// $Prefix = $NextValue;
-//$i = 0;
-// while ($i++ < 20) {
-// $NextValue = $this->GetLSBits($fd, $CurrentCodeSize);
-// echo $NextValue.'<BR>';
-// }
-//return true;
-// break;
-//
-// case '!':
-// // GIF Extension Block
-// $ExtensionBlockData = $NextBlockTest.fread($fd, 2);
-// $ExtensionBlock = array();
-// $ExtensionBlock['function_code'] = getid3_lib::LittleEndian2Int(substr($ExtensionBlockData, 1, 1));
-// $ExtensionBlock['byte_length'] = getid3_lib::LittleEndian2Int(substr($ExtensionBlockData, 2, 1));
-// $ExtensionBlock['data'] = fread($fd, $ExtensionBlock['byte_length']);
-// $ThisFileInfo['gif']['extension_blocks'][] = $ExtensionBlock;
-// break;
-//
-// case ';':
-// $ThisFileInfo['gif']['terminator_offset'] = ftell($fd) - 1;
-// // GIF Terminator
-// break;
-//
-// default:
-// break;
-//
-//
-// }
-// }
+ if ($info['gif']['header']['flags']['global_color_table']) {
+ $GIFcolorTable = $this->fread(3 * $info['gif']['header']['global_color_size']);
+ if ($this->getid3->option_extra_info) {
+ $offset = 0;
+ for ($i = 0; $i < $info['gif']['header']['global_color_size']; $i++) {
+ $red = getid3_lib::LittleEndian2Int(substr($GIFcolorTable, $offset++, 1));
+ $green = getid3_lib::LittleEndian2Int(substr($GIFcolorTable, $offset++, 1));
+ $blue = getid3_lib::LittleEndian2Int(substr($GIFcolorTable, $offset++, 1));
+ $info['gif']['global_color_table'][$i] = (($red << 16) | ($green << 8) | ($blue));
+ $info['gif']['global_color_table_rgb'][$i] = sprintf('%02X%02X%02X', $red, $green, $blue);
+ }
+ }
+ }
+ // Image Descriptor
+ $info['gif']['animation']['animated'] = false;
+ while (!feof($this->getid3->fp)) {
+ $NextBlockTest = $this->fread(1);
+ switch ($NextBlockTest) {
+
+/*
+ case ',': // ',' - Image separator character
+ $ImageDescriptorData = $NextBlockTest.$this->fread(9);
+ $ImageDescriptor = array();
+ $ImageDescriptor['image_left'] = getid3_lib::LittleEndian2Int(substr($ImageDescriptorData, 1, 2));
+ $ImageDescriptor['image_top'] = getid3_lib::LittleEndian2Int(substr($ImageDescriptorData, 3, 2));
+ $ImageDescriptor['image_width'] = getid3_lib::LittleEndian2Int(substr($ImageDescriptorData, 5, 2));
+ $ImageDescriptor['image_height'] = getid3_lib::LittleEndian2Int(substr($ImageDescriptorData, 7, 2));
+ $ImageDescriptor['flags_raw'] = getid3_lib::LittleEndian2Int(substr($ImageDescriptorData, 9, 1));
+ $ImageDescriptor['flags']['use_local_color_map'] = (bool) ($ImageDescriptor['flags_raw'] & 0x80);
+ $ImageDescriptor['flags']['image_interlaced'] = (bool) ($ImageDescriptor['flags_raw'] & 0x40);
+ $info['gif']['image_descriptor'][] = $ImageDescriptor;
+
+ if ($ImageDescriptor['flags']['use_local_color_map']) {
+
+ $this->warning('This version of getID3() cannot parse local color maps for GIFs');
+ return true;
+
+ }
+ $RasterData = array();
+ $RasterData['code_size'] = getid3_lib::LittleEndian2Int($this->fread(1));
+ $RasterData['block_byte_count'] = getid3_lib::LittleEndian2Int($this->fread(1));
+ $info['gif']['raster_data'][count($info['gif']['image_descriptor']) - 1] = $RasterData;
+
+ $CurrentCodeSize = $RasterData['code_size'] + 1;
+ for ($i = 0; $i < pow(2, $RasterData['code_size']); $i++) {
+ $DefaultDataLookupTable[$i] = chr($i);
+ }
+ $DefaultDataLookupTable[pow(2, $RasterData['code_size']) + 0] = ''; // Clear Code
+ $DefaultDataLookupTable[pow(2, $RasterData['code_size']) + 1] = ''; // End Of Image Code
+
+ $NextValue = $this->GetLSBits($CurrentCodeSize);
+ echo 'Clear Code: '.$NextValue.'<BR>';
+
+ $NextValue = $this->GetLSBits($CurrentCodeSize);
+ echo 'First Color: '.$NextValue.'<BR>';
+
+ $Prefix = $NextValue;
+ $i = 0;
+ while ($i++ < 20) {
+ $NextValue = $this->GetLSBits($CurrentCodeSize);
+ echo $NextValue.'<br>';
+ }
+ echo 'escaping<br>';
+ return true;
+ break;
+*/
+
+ case '!':
+ // GIF Extension Block
+ $ExtensionBlockData = $NextBlockTest.$this->fread(2);
+ $ExtensionBlock = array();
+ $ExtensionBlock['function_code'] = getid3_lib::LittleEndian2Int(substr($ExtensionBlockData, 1, 1));
+ $ExtensionBlock['byte_length'] = getid3_lib::LittleEndian2Int(substr($ExtensionBlockData, 2, 1));
+ $ExtensionBlock['data'] = (($ExtensionBlock['byte_length'] > 0) ? $this->fread($ExtensionBlock['byte_length']) : null);
+
+ if (substr($ExtensionBlock['data'], 0, 11) == 'NETSCAPE2.0') { // Netscape Application Block (NAB)
+ $ExtensionBlock['data'] .= $this->fread(4);
+ if (substr($ExtensionBlock['data'], 11, 2) == "\x03\x01") {
+ $info['gif']['animation']['animated'] = true;
+ $info['gif']['animation']['loop_count'] = getid3_lib::LittleEndian2Int(substr($ExtensionBlock['data'], 13, 2));
+ } else {
+ $this->warning('Expecting 03 01 at offset '.($this->ftell() - 4).', found "'.getid3_lib::PrintHexBytes(substr($ExtensionBlock['data'], 11, 2)).'"');
+ }
+ }
+
+ if ($this->getid3->option_extra_info) {
+ $info['gif']['extension_blocks'][] = $ExtensionBlock;
+ }
+ break;
+
+ case ';':
+ $info['gif']['terminator_offset'] = $this->ftell() - 1;
+ // GIF Terminator
+ break;
+
+ default:
+ break;
+
+
+ }
+ }
+
return true;
}
-
- function GetLSBits($fd, $bits) {
+ /**
+ * @param int $bits
+ *
+ * @return float|int
+ */
+ public function GetLSBits($bits) {
static $bitbuffer = '';
while (strlen($bitbuffer) < $bits) {
-//echo 'Read another byte: '.ftell($fd).'<BR>';
- $bitbuffer = str_pad(decbin(ord(fread($fd, 1))), 8, '0', STR_PAD_LEFT).$bitbuffer;
+ $bitbuffer = str_pad(decbin(ord($this->fread(1))), 8, '0', STR_PAD_LEFT).$bitbuffer;
}
-
$value = bindec(substr($bitbuffer, 0 - $bits));
$bitbuffer = substr($bitbuffer, 0, 0 - $bits);
@@ -178,6 +215,3 @@
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.jpg.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.jpg.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.jpg.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,72 +1,368 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.graphic.jpg.php //
// module for analyzing JPEG Image files //
-// dependencies: NONE //
+// dependencies: PHP compiled with --enable-exif (optional) //
+// module.tag.xmp.php (optional) //
// ///
/////////////////////////////////////////////////////////////////
-
-class getid3_jpg
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
+class getid3_jpg extends getid3_handler
{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
+ $info['fileformat'] = 'jpg';
+ $info['video']['dataformat'] = 'jpg';
+ $info['video']['lossless'] = false;
+ $info['video']['bits_per_sample'] = 24;
+ $info['video']['pixel_aspect_ratio'] = (float) 1;
- function getid3_jpg(&$fd, &$ThisFileInfo) {
- $ThisFileInfo['fileformat'] = 'jpg';
- $ThisFileInfo['video']['dataformat'] = 'jpg';
- $ThisFileInfo['video']['lossless'] = false;
- $ThisFileInfo['video']['bits_per_sample'] = 24;
- $ThisFileInfo['video']['pixel_aspect_ratio'] = (float) 1;
+ $this->fseek($info['avdataoffset']);
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
+ $imageinfo = array();
+ //list($width, $height, $type) = getid3_lib::GetDataImageSize($this->fread($info['filesize']), $imageinfo);
+ list($width, $height, $type) = getimagesize($info['filenamepath'], $imageinfo); // https://www.getid3.org/phpBB3/viewtopic.php?t=1474
- list($width, $height, $type) = getid3_lib::GetDataImageSize(fread($fd, $ThisFileInfo['filesize']));
- if ($type == 2) {
- $ThisFileInfo['video']['resolution_x'] = $width;
- $ThisFileInfo['video']['resolution_y'] = $height;
+ if (isset($imageinfo['APP13'])) {
+ // http://php.net/iptcparse
+ // http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/IPTC.html
+ $iptc_parsed = iptcparse($imageinfo['APP13']);
+ if (is_array($iptc_parsed)) {
+ foreach ($iptc_parsed as $iptc_key_raw => $iptc_values) {
+ list($iptc_record, $iptc_tagkey) = explode('#', $iptc_key_raw);
+ $iptc_tagkey = intval(ltrim($iptc_tagkey, '0'));
+ foreach ($iptc_values as $key => $value) {
+ $IPTCrecordName = $this->IPTCrecordName($iptc_record);
+ $IPTCrecordTagName = $this->IPTCrecordTagName($iptc_record, $iptc_tagkey);
+ if (isset($info['iptc']['comments'][$IPTCrecordName][$IPTCrecordTagName])) {
+ $info['iptc']['comments'][$IPTCrecordName][$IPTCrecordTagName][] = $value;
+ } else {
+ $info['iptc']['comments'][$IPTCrecordName][$IPTCrecordTagName] = array($value);
+ }
+ }
+ }
+ }
+ }
- if (version_compare(phpversion(), '4.2.0', '>=')) {
+ $returnOK = false;
+ switch ($type) {
+ case IMG_JPG:
+ $info['video']['resolution_x'] = $width;
+ $info['video']['resolution_y'] = $height;
- if (function_exists('exif_read_data')) {
+ if (isset($imageinfo['APP1'])) {
+ if (function_exists('exif_read_data')) {
+ if (substr($imageinfo['APP1'], 0, 4) == 'Exif') {
+ //$this->warning('known issue: https://bugs.php.net/bug.php?id=62523');
+ //return false;
+ set_error_handler(function($errno, $errstr, $errfile, $errline, array $errcontext) {
+ if (!(error_reporting() & $errno)) {
+ // error is not specified in the error_reporting setting, so we ignore it
+ return false;
+ }
- ob_start();
- $ThisFileInfo['jpg']['exif'] = exif_read_data($ThisFileInfo['filenamepath'], '', true, false);
- $errors = ob_get_contents();
- if ($errors) {
- $ThisFileInfo['error'][] = strip_tags($errors);
- unset($ThisFileInfo['jpg']['exif']);
+ $errcontext['info']['warning'][] = 'Error parsing EXIF data ('.$errstr.')';
+ });
+
+ $info['jpg']['exif'] = exif_read_data($info['filenamepath'], null, true, false);
+
+ restore_error_handler();
+ } else {
+ $this->warning('exif_read_data() cannot parse non-EXIF data in APP1 (expected "Exif", found "'.substr($imageinfo['APP1'], 0, 4).'")');
+ }
+ } else {
+ $this->warning('EXIF parsing only available when '.(GETID3_OS_ISWINDOWS ? 'php_exif.dll enabled' : 'compiled with --enable-exif'));
}
- ob_end_clean();
+ }
+ $returnOK = true;
+ break;
- } else {
+ default:
+ break;
+ }
- $ThisFileInfo['warning'][] = 'EXIF parsing only available when '.(GETID3_OS_ISWINDOWS ? 'php_exif.dll enabled' : 'compiled with --enable-exif');
+ $cast_as_appropriate_keys = array('EXIF', 'IFD0', 'THUMBNAIL');
+ foreach ($cast_as_appropriate_keys as $exif_key) {
+ if (isset($info['jpg']['exif'][$exif_key])) {
+ foreach ($info['jpg']['exif'][$exif_key] as $key => $value) {
+ $info['jpg']['exif'][$exif_key][$key] = $this->CastAsAppropriate($value);
}
+ }
+ }
- } else {
- $ThisFileInfo['warning'][] = 'EXIF parsing only available in PHP v4.2.0 and higher compiled with --enable-exif (or php_exif.dll enabled for Windows). You are using PHP v'.phpversion();
+ if (isset($info['jpg']['exif']['GPS'])) {
+ if (isset($info['jpg']['exif']['GPS']['GPSVersion'])) {
+ $version_subparts = array();
+ for ($i = 0; $i < 4; $i++) {
+ $version_subparts[$i] = ord(substr($info['jpg']['exif']['GPS']['GPSVersion'], $i, 1));
+ }
+ $info['jpg']['exif']['GPS']['computed']['version'] = 'v'.implode('.', $version_subparts);
}
- return true;
+ if (isset($info['jpg']['exif']['GPS']['GPSDateStamp'])) {
+ $explodedGPSDateStamp = explode(':', $info['jpg']['exif']['GPS']['GPSDateStamp']);
+ $computed_time[5] = (isset($explodedGPSDateStamp[0]) ? $explodedGPSDateStamp[0] : '');
+ $computed_time[3] = (isset($explodedGPSDateStamp[1]) ? $explodedGPSDateStamp[1] : '');
+ $computed_time[4] = (isset($explodedGPSDateStamp[2]) ? $explodedGPSDateStamp[2] : '');
+ $computed_time = array(0=>0, 1=>0, 2=>0, 3=>0, 4=>0, 5=>0);
+ if (isset($info['jpg']['exif']['GPS']['GPSTimeStamp']) && is_array($info['jpg']['exif']['GPS']['GPSTimeStamp'])) {
+ foreach ($info['jpg']['exif']['GPS']['GPSTimeStamp'] as $key => $value) {
+ $computed_time[$key] = getid3_lib::DecimalizeFraction($value);
+ }
+ }
+ $info['jpg']['exif']['GPS']['computed']['timestamp'] = gmmktime($computed_time[0], $computed_time[1], $computed_time[2], $computed_time[3], $computed_time[4], $computed_time[5]);
+ }
+
+ if (isset($info['jpg']['exif']['GPS']['GPSLatitude']) && is_array($info['jpg']['exif']['GPS']['GPSLatitude'])) {
+ $direction_multiplier = ((isset($info['jpg']['exif']['GPS']['GPSLatitudeRef']) && ($info['jpg']['exif']['GPS']['GPSLatitudeRef'] == 'S')) ? -1 : 1);
+ $computed_latitude = array();
+ foreach ($info['jpg']['exif']['GPS']['GPSLatitude'] as $key => $value) {
+ $computed_latitude[$key] = getid3_lib::DecimalizeFraction($value);
+ }
+ $info['jpg']['exif']['GPS']['computed']['latitude'] = $direction_multiplier * ($computed_latitude[0] + ($computed_latitude[1] / 60) + ($computed_latitude[2] / 3600));
+ }
+
+ if (isset($info['jpg']['exif']['GPS']['GPSLongitude']) && is_array($info['jpg']['exif']['GPS']['GPSLongitude'])) {
+ $direction_multiplier = ((isset($info['jpg']['exif']['GPS']['GPSLongitudeRef']) && ($info['jpg']['exif']['GPS']['GPSLongitudeRef'] == 'W')) ? -1 : 1);
+ $computed_longitude = array();
+ foreach ($info['jpg']['exif']['GPS']['GPSLongitude'] as $key => $value) {
+ $computed_longitude[$key] = getid3_lib::DecimalizeFraction($value);
+ }
+ $info['jpg']['exif']['GPS']['computed']['longitude'] = $direction_multiplier * ($computed_longitude[0] + ($computed_longitude[1] / 60) + ($computed_longitude[2] / 3600));
+ }
+ if (isset($info['jpg']['exif']['GPS']['GPSAltitudeRef'])) {
+ $info['jpg']['exif']['GPS']['GPSAltitudeRef'] = ord($info['jpg']['exif']['GPS']['GPSAltitudeRef']); // 0 = above sea level; 1 = below sea level
+ }
+ if (isset($info['jpg']['exif']['GPS']['GPSAltitude'])) {
+ $direction_multiplier = (!empty($info['jpg']['exif']['GPS']['GPSAltitudeRef']) ? -1 : 1); // 0 = above sea level; 1 = below sea level
+ $info['jpg']['exif']['GPS']['computed']['altitude'] = $direction_multiplier * getid3_lib::DecimalizeFraction($info['jpg']['exif']['GPS']['GPSAltitude']);
+ }
+
}
- unset($ThisFileInfo['fileformat']);
- return false;
+
+ getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.xmp.php', __FILE__, true);
+ if (isset($info['filenamepath'])) {
+ $image_xmp = new Image_XMP($info['filenamepath']);
+ $xmp_raw = $image_xmp->getAllTags();
+ foreach ($xmp_raw as $key => $value) {
+ if (strpos($key, ':')) {
+ list($subsection, $tagname) = explode(':', $key);
+ $info['xmp'][$subsection][$tagname] = $this->CastAsAppropriate($value);
+ } else {
+ $this->warning('XMP: expecting "<subsection>:<tagname>", found "'.$key.'"');
+ }
+ }
+ }
+
+ if (!$returnOK) {
+ unset($info['fileformat']);
+ return false;
+ }
+ return true;
}
-}
+ /**
+ * @param mixed $value
+ *
+ * @return mixed
+ */
+ public function CastAsAppropriate($value) {
+ if (is_array($value)) {
+ return $value;
+ } elseif (preg_match('#^[0-9]+/[0-9]+$#', $value)) {
+ return getid3_lib::DecimalizeFraction($value);
+ } elseif (preg_match('#^[0-9]+$#', $value)) {
+ return getid3_lib::CastAsInt($value);
+ } elseif (preg_match('#^[0-9\.]+$#', $value)) {
+ return (float) $value;
+ }
+ return $value;
+ }
+ /**
+ * @param int $iptc_record
+ *
+ * @return string
+ */
+ public function IPTCrecordName($iptc_record) {
+ // http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/IPTC.html
+ static $IPTCrecordName = array();
+ if (empty($IPTCrecordName)) {
+ $IPTCrecordName = array(
+ 1 => 'IPTCEnvelope',
+ 2 => 'IPTCApplication',
+ 3 => 'IPTCNewsPhoto',
+ 7 => 'IPTCPreObjectData',
+ 8 => 'IPTCObjectData',
+ 9 => 'IPTCPostObjectData',
+ );
+ }
+ return (isset($IPTCrecordName[$iptc_record]) ? $IPTCrecordName[$iptc_record] : '');
+ }
-?>
\ No newline at end of file
+ /**
+ * @param int $iptc_record
+ * @param int $iptc_tagkey
+ *
+ * @return string
+ */
+ public function IPTCrecordTagName($iptc_record, $iptc_tagkey) {
+ // http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/IPTC.html
+ static $IPTCrecordTagName = array();
+ if (empty($IPTCrecordTagName)) {
+ $IPTCrecordTagName = array(
+ 1 => array( // IPTC EnvelopeRecord Tags
+ 0 => 'EnvelopeRecordVersion',
+ 5 => 'Destination',
+ 20 => 'FileFormat',
+ 22 => 'FileVersion',
+ 30 => 'ServiceIdentifier',
+ 40 => 'EnvelopeNumber',
+ 50 => 'ProductID',
+ 60 => 'EnvelopePriority',
+ 70 => 'DateSent',
+ 80 => 'TimeSent',
+ 90 => 'CodedCharacterSet',
+ 100 => 'UniqueObjectName',
+ 120 => 'ARMIdentifier',
+ 122 => 'ARMVersion',
+ ),
+ 2 => array( // IPTC ApplicationRecord Tags
+ 0 => 'ApplicationRecordVersion',
+ 3 => 'ObjectTypeReference',
+ 4 => 'ObjectAttributeReference',
+ 5 => 'ObjectName',
+ 7 => 'EditStatus',
+ 8 => 'EditorialUpdate',
+ 10 => 'Urgency',
+ 12 => 'SubjectReference',
+ 15 => 'Category',
+ 20 => 'SupplementalCategories',
+ 22 => 'FixtureIdentifier',
+ 25 => 'Keywords',
+ 26 => 'ContentLocationCode',
+ 27 => 'ContentLocationName',
+ 30 => 'ReleaseDate',
+ 35 => 'ReleaseTime',
+ 37 => 'ExpirationDate',
+ 38 => 'ExpirationTime',
+ 40 => 'SpecialInstructions',
+ 42 => 'ActionAdvised',
+ 45 => 'ReferenceService',
+ 47 => 'ReferenceDate',
+ 50 => 'ReferenceNumber',
+ 55 => 'DateCreated',
+ 60 => 'TimeCreated',
+ 62 => 'DigitalCreationDate',
+ 63 => 'DigitalCreationTime',
+ 65 => 'OriginatingProgram',
+ 70 => 'ProgramVersion',
+ 75 => 'ObjectCycle',
+ 80 => 'By-line',
+ 85 => 'By-lineTitle',
+ 90 => 'City',
+ 92 => 'Sub-location',
+ 95 => 'Province-State',
+ 100 => 'Country-PrimaryLocationCode',
+ 101 => 'Country-PrimaryLocationName',
+ 103 => 'OriginalTransmissionReference',
+ 105 => 'Headline',
+ 110 => 'Credit',
+ 115 => 'Source',
+ 116 => 'CopyrightNotice',
+ 118 => 'Contact',
+ 120 => 'Caption-Abstract',
+ 121 => 'LocalCaption',
+ 122 => 'Writer-Editor',
+ 125 => 'RasterizedCaption',
+ 130 => 'ImageType',
+ 131 => 'ImageOrientation',
+ 135 => 'LanguageIdentifier',
+ 150 => 'AudioType',
+ 151 => 'AudioSamplingRate',
+ 152 => 'AudioSamplingResolution',
+ 153 => 'AudioDuration',
+ 154 => 'AudioOutcue',
+ 184 => 'JobID',
+ 185 => 'MasterDocumentID',
+ 186 => 'ShortDocumentID',
+ 187 => 'UniqueDocumentID',
+ 188 => 'OwnerID',
+ 200 => 'ObjectPreviewFileFormat',
+ 201 => 'ObjectPreviewFileVersion',
+ 202 => 'ObjectPreviewData',
+ 221 => 'Prefs',
+ 225 => 'ClassifyState',
+ 228 => 'SimilarityIndex',
+ 230 => 'DocumentNotes',
+ 231 => 'DocumentHistory',
+ 232 => 'ExifCameraInfo',
+ ),
+ 3 => array( // IPTC NewsPhoto Tags
+ 0 => 'NewsPhotoVersion',
+ 10 => 'IPTCPictureNumber',
+ 20 => 'IPTCImageWidth',
+ 30 => 'IPTCImageHeight',
+ 40 => 'IPTCPixelWidth',
+ 50 => 'IPTCPixelHeight',
+ 55 => 'SupplementalType',
+ 60 => 'ColorRepresentation',
+ 64 => 'InterchangeColorSpace',
+ 65 => 'ColorSequence',
+ 66 => 'ICC_Profile',
+ 70 => 'ColorCalibrationMatrix',
+ 80 => 'LookupTable',
+ 84 => 'NumIndexEntries',
+ 85 => 'ColorPalette',
+ 86 => 'IPTCBitsPerSample',
+ 90 => 'SampleStructure',
+ 100 => 'ScanningDirection',
+ 102 => 'IPTCImageRotation',
+ 110 => 'DataCompressionMethod',
+ 120 => 'QuantizationMethod',
+ 125 => 'EndPoints',
+ 130 => 'ExcursionTolerance',
+ 135 => 'BitsPerComponent',
+ 140 => 'MaximumDensityRange',
+ 145 => 'GammaCompensatedValue',
+ ),
+ 7 => array( // IPTC PreObjectData Tags
+ 10 => 'SizeMode',
+ 20 => 'MaxSubfileSize',
+ 90 => 'ObjectSizeAnnounced',
+ 95 => 'MaximumObjectSize',
+ ),
+ 8 => array( // IPTC ObjectData Tags
+ 10 => 'SubFile',
+ ),
+ 9 => array( // IPTC PostObjectData Tags
+ 10 => 'ConfirmedObjectSize',
+ ),
+ );
+
+ }
+ return (isset($IPTCrecordTagName[$iptc_record][$iptc_tagkey]) ? $IPTCrecordTagName[$iptc_record][$iptc_tagkey] : $iptc_tagkey);
+ }
+
+}
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.pcd.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.pcd.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.pcd.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.graphic.pcd.php //
// module for analyzing PhotoCD (PCD) Image files //
@@ -13,35 +14,45 @@
// ///
/////////////////////////////////////////////////////////////////
-
-class getid3_pcd
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
+class getid3_pcd extends getid3_handler
{
- function getid3_pcd(&$fd, &$ThisFileInfo, $ExtractData=0) {
- $ThisFileInfo['fileformat'] = 'pcd';
- $ThisFileInfo['video']['dataformat'] = 'pcd';
- $ThisFileInfo['video']['lossless'] = false;
+ public $ExtractData = 0;
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- fseek($fd, $ThisFileInfo['avdataoffset'] + 72, SEEK_SET);
+ $info['fileformat'] = 'pcd';
+ $info['video']['dataformat'] = 'pcd';
+ $info['video']['lossless'] = false;
- $PCDflags = fread($fd, 1);
+
+ $this->fseek($info['avdataoffset'] + 72);
+
+ $PCDflags = $this->fread(1);
$PCDisVertical = ((ord($PCDflags) & 0x01) ? true : false);
if ($PCDisVertical) {
- $ThisFileInfo['video']['resolution_x'] = 3072;
- $ThisFileInfo['video']['resolution_y'] = 2048;
+ $info['video']['resolution_x'] = 3072;
+ $info['video']['resolution_y'] = 2048;
} else {
- $ThisFileInfo['video']['resolution_x'] = 2048;
- $ThisFileInfo['video']['resolution_y'] = 3072;
+ $info['video']['resolution_x'] = 2048;
+ $info['video']['resolution_y'] = 3072;
}
- if ($ExtractData > 3) {
+ if ($this->ExtractData > 3) {
- $ThisFileInfo['error'][] = 'Cannot extract PSD image data for detail levels above BASE (3)';
+ $this->error('Cannot extract PSD image data for detail levels above BASE (level-3) because encrypted with Kodak-proprietary compression/encryption.');
+ return false;
- } elseif ($ExtractData > 0) {
+ } elseif ($this->ExtractData > 0) {
$PCD_levels[1] = array( 192, 128, 0x02000); // BASE/16
$PCD_levels[2] = array( 384, 256, 0x0B800); // BASE/4
@@ -52,27 +63,27 @@
list($PCD_width, $PCD_height, $PCD_dataOffset) = $PCD_levels[3];
- fseek($fd, $ThisFileInfo['avdataoffset'] + $PCD_dataOffset, SEEK_SET);
+ $this->fseek($info['avdataoffset'] + $PCD_dataOffset);
for ($y = 0; $y < $PCD_height; $y += 2) {
// The image-data of these subtypes start at the respective offsets of 02000h, 0b800h and 30000h.
// To decode the YcbYr to the more usual RGB-code, three lines of data have to be read, each
- // consisting of ‘w’ bytes, where ‘w’ is the width of the image-subtype. The first ‘w’ bytes and
- // the first half of the third ‘w’ bytes contain data for the first RGB-line, the second ‘w’ bytes
- // and the second half of the third ‘w’ bytes contain data for a second RGB-line.
+ // consisting of ‘w’ bytes, where ‘w’ is the width of the image-subtype. The first ‘w’ bytes and
+ // the first half of the third ‘w’ bytes contain data for the first RGB-line, the second ‘w’ bytes
+ // and the second half of the third ‘w’ bytes contain data for a second RGB-line.
- $PCD_data_Y1 = fread($fd, $PCD_width);
- $PCD_data_Y2 = fread($fd, $PCD_width);
- $PCD_data_Cb = fread($fd, intval(round($PCD_width / 2)));
- $PCD_data_Cr = fread($fd, intval(round($PCD_width / 2)));
+ $PCD_data_Y1 = $this->fread($PCD_width);
+ $PCD_data_Y2 = $this->fread($PCD_width);
+ $PCD_data_Cb = $this->fread(intval(round($PCD_width / 2)));
+ $PCD_data_Cr = $this->fread(intval(round($PCD_width / 2)));
for ($x = 0; $x < $PCD_width; $x++) {
if ($PCDisVertical) {
- $ThisFileInfo['pcd']['data'][$PCD_width - $x][$y] = $this->YCbCr2RGB(ord($PCD_data_Y1{$x}), ord($PCD_data_Cb{floor($x / 2)}), ord($PCD_data_Cr{floor($x / 2)}));
- $ThisFileInfo['pcd']['data'][$PCD_width - $x][$y + 1] = $this->YCbCr2RGB(ord($PCD_data_Y2{$x}), ord($PCD_data_Cb{floor($x / 2)}), ord($PCD_data_Cr{floor($x / 2)}));
+ $info['pcd']['data'][$PCD_width - $x][$y] = $this->YCbCr2RGB(ord($PCD_data_Y1[$x]), ord($PCD_data_Cb[(int) floor($x / 2)]), ord($PCD_data_Cr[(int) floor($x / 2)]));
+ $info['pcd']['data'][$PCD_width - $x][$y + 1] = $this->YCbCr2RGB(ord($PCD_data_Y2[$x]), ord($PCD_data_Cb[(int) floor($x / 2)]), ord($PCD_data_Cr[(int) floor($x / 2)]));
} else {
- $ThisFileInfo['pcd']['data'][$y][$x] = $this->YCbCr2RGB(ord($PCD_data_Y1{$x}), ord($PCD_data_Cb{floor($x / 2)}), ord($PCD_data_Cr{floor($x / 2)}));
- $ThisFileInfo['pcd']['data'][$y + 1][$x] = $this->YCbCr2RGB(ord($PCD_data_Y2{$x}), ord($PCD_data_Cb{floor($x / 2)}), ord($PCD_data_Cr{floor($x / 2)}));
+ $info['pcd']['data'][$y][$x] = $this->YCbCr2RGB(ord($PCD_data_Y1[$x]), ord($PCD_data_Cb[(int) floor($x / 2)]), ord($PCD_data_Cr[(int) floor($x / 2)]));
+ $info['pcd']['data'][$y + 1][$x] = $this->YCbCr2RGB(ord($PCD_data_Y2[$x]), ord($PCD_data_Cb[(int) floor($x / 2)]), ord($PCD_data_Cr[(int) floor($x / 2)]));
}
}
}
@@ -86,15 +97,23 @@
// $BMPinfo['resolution_x'] = $PCD_width;
// $BMPinfo['resolution_y'] = $PCD_height;
//}
- //$BMPinfo['bmp']['data'] = $ThisFileInfo['pcd']['data'];
+ //$BMPinfo['bmp']['data'] = $info['pcd']['data'];
//getid3_bmp::PlotBMP($BMPinfo);
//exit;
}
+ return false;
}
- function YCbCr2RGB($Y, $Cb, $Cr) {
+ /**
+ * @param int $Y
+ * @param int $Cb
+ * @param int $Cr
+ *
+ * @return int
+ */
+ public function YCbCr2RGB($Y, $Cb, $Cr) {
static $YCbCr_constants = array();
if (empty($YCbCr_constants)) {
$YCbCr_constants['red']['Y'] = 0.0054980 * 256;
@@ -126,5 +145,3 @@
}
}
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.png.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.png.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.png.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.graphic.png.php //
// module for analyzing PNG Image files //
@@ -13,22 +14,37 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_png
+class getid3_png extends getid3_handler
{
+ /**
+ * If data chunk is larger than this do not read it completely (getID3 only needs the first
+ * few dozen bytes for parsing).
+ *
+ * @var int
+ */
+ public $max_data_bytes = 10000000;
- function getid3_png(&$fd, &$ThisFileInfo) {
+ /**
+ * @return bool
+ */
+ public function Analyze() {
- // shortcut
- $ThisFileInfo['png'] = array();
- $thisfile_png = &$ThisFileInfo['png'];
+ $info = &$this->getid3->info;
- $ThisFileInfo['fileformat'] = 'png';
- $ThisFileInfo['video']['dataformat'] = 'png';
- $ThisFileInfo['video']['lossless'] = false;
+ // shortcut
+ $info['png'] = array();
+ $thisfile_png = &$info['png'];
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
- $PNGfiledata = fread($fd, GETID3_FREAD_BUFFER_SIZE);
+ $info['fileformat'] = 'png';
+ $info['video']['dataformat'] = 'png';
+ $info['video']['lossless'] = false;
+
+ $this->fseek($info['avdataoffset']);
+ $PNGfiledata = $this->fread($this->getid3->fread_buffer_size());
$offset = 0;
$PNGidentifier = substr($PNGfiledata, $offset, 8); // $89 $50 $4E $47 $0D $0A $1A $0A
@@ -35,21 +51,31 @@
$offset += 8;
if ($PNGidentifier != "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A") {
- $ThisFileInfo['error'][] = 'First 8 bytes of file ('.getid3_lib::PrintHexBytes($PNGidentifier).') did not match expected PNG identifier';
- unset($ThisFileInfo['fileformat']);
+ $this->error('First 8 bytes of file ('.getid3_lib::PrintHexBytes($PNGidentifier).') did not match expected PNG identifier');
+ unset($info['fileformat']);
return false;
}
- while (((ftell($fd) - (strlen($PNGfiledata) - $offset)) < $ThisFileInfo['filesize'])) {
+ while ((($this->ftell() - (strlen($PNGfiledata) - $offset)) < $info['filesize'])) {
$chunk['data_length'] = getid3_lib::BigEndian2Int(substr($PNGfiledata, $offset, 4));
+ if ($chunk['data_length'] === false) {
+ $this->error('Failed to read data_length at offset '.$offset);
+ return false;
+ }
$offset += 4;
- while (((strlen($PNGfiledata) - $offset) < ($chunk['data_length'] + 4)) && (ftell($fd) < $ThisFileInfo['filesize'])) {
- $PNGfiledata .= fread($fd, GETID3_FREAD_BUFFER_SIZE);
+ $truncated_data = false;
+ while (((strlen($PNGfiledata) - $offset) < ($chunk['data_length'] + 4)) && ($this->ftell() < $info['filesize'])) {
+ if (strlen($PNGfiledata) < $this->max_data_bytes) {
+ $PNGfiledata .= $this->fread($this->getid3->fread_buffer_size());
+ } else {
+ $this->warning('At offset '.$offset.' chunk "'.substr($PNGfiledata, $offset, 4).'" exceeded max_data_bytes value of '.$this->max_data_bytes.', data chunk will be truncated at '.(strlen($PNGfiledata) - 8).' bytes');
+ break;
+ }
}
- $chunk['type_text'] = substr($PNGfiledata, $offset, 4);
+ $chunk['type_text'] = substr($PNGfiledata, $offset, 4);
$offset += 4;
$chunk['type_raw'] = getid3_lib::BigEndian2Int($chunk['type_text']);
- $chunk['data'] = substr($PNGfiledata, $offset, $chunk['data_length']);
+ $chunk['data'] = substr($PNGfiledata, $offset, $chunk['data_length']);
$offset += $chunk['data_length'];
$chunk['crc'] = getid3_lib::BigEndian2Int(substr($PNGfiledata, $offset, 4));
$offset += 4;
@@ -67,13 +93,13 @@
case 'IHDR': // Image Header
$thisfile_png_chunk_type_text['header'] = $chunk;
- $thisfile_png_chunk_type_text['width'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 0, 4));
- $thisfile_png_chunk_type_text['height'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 4, 4));
- $thisfile_png_chunk_type_text['raw']['bit_depth'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 8, 1));
- $thisfile_png_chunk_type_text['raw']['color_type'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 9, 1));
- $thisfile_png_chunk_type_text['raw']['compression_method'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 10, 1));
- $thisfile_png_chunk_type_text['raw']['filter_method'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 11, 1));
- $thisfile_png_chunk_type_text['raw']['interlace_method'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 12, 1));
+ $thisfile_png_chunk_type_text['width'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 0, 4));
+ $thisfile_png_chunk_type_text['height'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 4, 4));
+ $thisfile_png_chunk_type_text['raw']['bit_depth'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 8, 1));
+ $thisfile_png_chunk_type_text['raw']['color_type'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 9, 1));
+ $thisfile_png_chunk_type_text['raw']['compression_method'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 10, 1));
+ $thisfile_png_chunk_type_text['raw']['filter_method'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 11, 1));
+ $thisfile_png_chunk_type_text['raw']['interlace_method'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 12, 1));
$thisfile_png_chunk_type_text['compression_method_text'] = $this->PNGcompressionMethodLookup($thisfile_png_chunk_type_text['raw']['compression_method']);
$thisfile_png_chunk_type_text['color_type']['palette'] = (bool) ($thisfile_png_chunk_type_text['raw']['color_type'] & 0x01);
@@ -80,10 +106,10 @@
$thisfile_png_chunk_type_text['color_type']['true_color'] = (bool) ($thisfile_png_chunk_type_text['raw']['color_type'] & 0x02);
$thisfile_png_chunk_type_text['color_type']['alpha'] = (bool) ($thisfile_png_chunk_type_text['raw']['color_type'] & 0x04);
- $ThisFileInfo['video']['resolution_x'] = $thisfile_png_chunk_type_text['width'];
- $ThisFileInfo['video']['resolution_y'] = $thisfile_png_chunk_type_text['height'];
+ $info['video']['resolution_x'] = $thisfile_png_chunk_type_text['width'];
+ $info['video']['resolution_y'] = $thisfile_png_chunk_type_text['height'];
- $ThisFileInfo['video']['bits_per_sample'] = $this->IHDRcalculateBitsPerSample($thisfile_png_chunk_type_text['raw']['color_type'], $thisfile_png_chunk_type_text['raw']['bit_depth']);
+ $info['video']['bits_per_sample'] = $this->IHDRcalculateBitsPerSample($thisfile_png_chunk_type_text['raw']['color_type'], $thisfile_png_chunk_type_text['raw']['bit_depth']);
break;
@@ -91,12 +117,12 @@
$thisfile_png_chunk_type_text['header'] = $chunk;
$paletteoffset = 0;
for ($i = 0; $i <= 255; $i++) {
- //$thisfile_png_chunk_type_text['red'][$i] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], $paletteoffset++, 1));
- //$thisfile_png_chunk_type_text['green'][$i] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], $paletteoffset++, 1));
- //$thisfile_png_chunk_type_text['blue'][$i] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], $paletteoffset++, 1));
- $red = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], $paletteoffset++, 1));
- $green = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], $paletteoffset++, 1));
- $blue = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], $paletteoffset++, 1));
+ //$thisfile_png_chunk_type_text['red'][$i] = getid3_lib::BigEndian2Int(substr($chunk['data'], $paletteoffset++, 1));
+ //$thisfile_png_chunk_type_text['green'][$i] = getid3_lib::BigEndian2Int(substr($chunk['data'], $paletteoffset++, 1));
+ //$thisfile_png_chunk_type_text['blue'][$i] = getid3_lib::BigEndian2Int(substr($chunk['data'], $paletteoffset++, 1));
+ $red = getid3_lib::BigEndian2Int(substr($chunk['data'], $paletteoffset++, 1));
+ $green = getid3_lib::BigEndian2Int(substr($chunk['data'], $paletteoffset++, 1));
+ $blue = getid3_lib::BigEndian2Int(substr($chunk['data'], $paletteoffset++, 1));
$thisfile_png_chunk_type_text[$i] = (($red << 16) | ($green << 8) | ($blue));
}
break;
@@ -106,27 +132,28 @@
$thisfile_png_chunk_type_text['header'] = $chunk;
switch ($thisfile_png['IHDR']['raw']['color_type']) {
case 0:
- $thisfile_png_chunk_type_text['transparent_color_gray'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 0, 2));
+ $thisfile_png_chunk_type_text['transparent_color_gray'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 0, 2));
break;
case 2:
- $thisfile_png_chunk_type_text['transparent_color_red'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 0, 2));
- $thisfile_png_chunk_type_text['transparent_color_green'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 2, 2));
- $thisfile_png_chunk_type_text['transparent_color_blue'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 4, 2));
+ $thisfile_png_chunk_type_text['transparent_color_red'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 0, 2));
+ $thisfile_png_chunk_type_text['transparent_color_green'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 2, 2));
+ $thisfile_png_chunk_type_text['transparent_color_blue'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 4, 2));
break;
case 3:
- for ($i = 0; $i < strlen($thisfile_png_chunk_type_text['header']['data']); $i++) {
- $thisfile_png_chunk_type_text['palette_opacity'][$i] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], $i, 1));
+ for ($i = 0; $i < strlen($chunk['data']); $i++) {
+ $thisfile_png_chunk_type_text['palette_opacity'][$i] = getid3_lib::BigEndian2Int(substr($chunk['data'], $i, 1));
}
break;
case 4:
case 6:
- $ThisFileInfo['error'][] = 'Invalid color_type in tRNS chunk: '.$thisfile_png['IHDR']['raw']['color_type'];
+ $this->error('Invalid color_type in tRNS chunk: '.$thisfile_png['IHDR']['raw']['color_type']);
+ break;
default:
- $ThisFileInfo['warning'][] = 'Unhandled color_type in tRNS chunk: '.$thisfile_png['IHDR']['raw']['color_type'];
+ $this->warning('Unhandled color_type in tRNS chunk: '.$thisfile_png['IHDR']['raw']['color_type']);
break;
}
break;
@@ -134,26 +161,26 @@
case 'gAMA': // Image Gamma
$thisfile_png_chunk_type_text['header'] = $chunk;
- $thisfile_png_chunk_type_text['gamma'] = getid3_lib::BigEndian2Int($thisfile_png_chunk_type_text['header']['data']) / 100000;
+ $thisfile_png_chunk_type_text['gamma'] = getid3_lib::BigEndian2Int($chunk['data']) / 100000;
break;
case 'cHRM': // Primary Chromaticities
$thisfile_png_chunk_type_text['header'] = $chunk;
- $thisfile_png_chunk_type_text['white_x'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 0, 4)) / 100000;
- $thisfile_png_chunk_type_text['white_y'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 4, 4)) / 100000;
- $thisfile_png_chunk_type_text['red_y'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 8, 4)) / 100000;
- $thisfile_png_chunk_type_text['red_y'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 12, 4)) / 100000;
- $thisfile_png_chunk_type_text['green_y'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 16, 4)) / 100000;
- $thisfile_png_chunk_type_text['green_y'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 20, 4)) / 100000;
- $thisfile_png_chunk_type_text['blue_y'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 24, 4)) / 100000;
- $thisfile_png_chunk_type_text['blue_y'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 28, 4)) / 100000;
+ $thisfile_png_chunk_type_text['white_x'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 0, 4)) / 100000;
+ $thisfile_png_chunk_type_text['white_y'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 4, 4)) / 100000;
+ $thisfile_png_chunk_type_text['red_y'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 8, 4)) / 100000;
+ $thisfile_png_chunk_type_text['red_y'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 12, 4)) / 100000;
+ $thisfile_png_chunk_type_text['green_y'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 16, 4)) / 100000;
+ $thisfile_png_chunk_type_text['green_y'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 20, 4)) / 100000;
+ $thisfile_png_chunk_type_text['blue_y'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 24, 4)) / 100000;
+ $thisfile_png_chunk_type_text['blue_y'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 28, 4)) / 100000;
break;
case 'sRGB': // Standard RGB Color Space
$thisfile_png_chunk_type_text['header'] = $chunk;
- $thisfile_png_chunk_type_text['reindering_intent'] = getid3_lib::BigEndian2Int($thisfile_png_chunk_type_text['header']['data']);
+ $thisfile_png_chunk_type_text['reindering_intent'] = getid3_lib::BigEndian2Int($chunk['data']);
$thisfile_png_chunk_type_text['reindering_intent_text'] = $this->PNGsRGBintentLookup($thisfile_png_chunk_type_text['reindering_intent']);
break;
@@ -160,7 +187,7 @@
case 'iCCP': // Embedded ICC Profile
$thisfile_png_chunk_type_text['header'] = $chunk;
- list($profilename, $compressiondata) = explode("\x00", $thisfile_png_chunk_type_text['header']['data'], 2);
+ list($profilename, $compressiondata) = explode("\x00", $chunk['data'], 2);
$thisfile_png_chunk_type_text['profile_name'] = $profilename;
$thisfile_png_chunk_type_text['compression_method'] = getid3_lib::BigEndian2Int(substr($compressiondata, 0, 1));
$thisfile_png_chunk_type_text['compression_profile'] = substr($compressiondata, 1);
@@ -171,7 +198,7 @@
case 'tEXt': // Textual Data
$thisfile_png_chunk_type_text['header'] = $chunk;
- list($keyword, $text) = explode("\x00", $thisfile_png_chunk_type_text['header']['data'], 2);
+ list($keyword, $text) = explode("\x00", $chunk['data'], 2);
$thisfile_png_chunk_type_text['keyword'] = $keyword;
$thisfile_png_chunk_type_text['text'] = $text;
@@ -181,7 +208,7 @@
case 'zTXt': // Compressed Textual Data
$thisfile_png_chunk_type_text['header'] = $chunk;
- list($keyword, $otherdata) = explode("\x00", $thisfile_png_chunk_type_text['header']['data'], 2);
+ list($keyword, $otherdata) = explode("\x00", $chunk['data'], 2);
$thisfile_png_chunk_type_text['keyword'] = $keyword;
$thisfile_png_chunk_type_text['compression_method'] = getid3_lib::BigEndian2Int(substr($otherdata, 0, 1));
$thisfile_png_chunk_type_text['compressed_text'] = substr($otherdata, 1);
@@ -204,7 +231,7 @@
case 'iTXt': // International Textual Data
$thisfile_png_chunk_type_text['header'] = $chunk;
- list($keyword, $otherdata) = explode("\x00", $thisfile_png_chunk_type_text['header']['data'], 2);
+ list($keyword, $otherdata) = explode("\x00", $chunk['data'], 2);
$thisfile_png_chunk_type_text['keyword'] = $keyword;
$thisfile_png_chunk_type_text['compression'] = (bool) getid3_lib::BigEndian2Int(substr($otherdata, 0, 1));
$thisfile_png_chunk_type_text['compression_method'] = getid3_lib::BigEndian2Int(substr($otherdata, 1, 1));
@@ -242,18 +269,18 @@
switch ($thisfile_png['IHDR']['raw']['color_type']) {
case 0:
case 4:
- $thisfile_png_chunk_type_text['background_gray'] = getid3_lib::BigEndian2Int($thisfile_png_chunk_type_text['header']['data']);
+ $thisfile_png_chunk_type_text['background_gray'] = getid3_lib::BigEndian2Int($chunk['data']);
break;
case 2:
case 6:
- $thisfile_png_chunk_type_text['background_red'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 0 * $thisfile_png['IHDR']['raw']['bit_depth'], $thisfile_png['IHDR']['raw']['bit_depth']));
- $thisfile_png_chunk_type_text['background_green'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 1 * $thisfile_png['IHDR']['raw']['bit_depth'], $thisfile_png['IHDR']['raw']['bit_depth']));
- $thisfile_png_chunk_type_text['background_blue'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 2 * $thisfile_png['IHDR']['raw']['bit_depth'], $thisfile_png['IHDR']['raw']['bit_depth']));
+ $thisfile_png_chunk_type_text['background_red'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 0 * $thisfile_png['IHDR']['raw']['bit_depth'], $thisfile_png['IHDR']['raw']['bit_depth']));
+ $thisfile_png_chunk_type_text['background_green'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 1 * $thisfile_png['IHDR']['raw']['bit_depth'], $thisfile_png['IHDR']['raw']['bit_depth']));
+ $thisfile_png_chunk_type_text['background_blue'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 2 * $thisfile_png['IHDR']['raw']['bit_depth'], $thisfile_png['IHDR']['raw']['bit_depth']));
break;
case 3:
- $thisfile_png_chunk_type_text['background_index'] = getid3_lib::BigEndian2Int($thisfile_png_chunk_type_text['header']['data']);
+ $thisfile_png_chunk_type_text['background_index'] = getid3_lib::BigEndian2Int($chunk['data']);
break;
default:
@@ -264,9 +291,9 @@
case 'pHYs': // Physical Pixel Dimensions
$thisfile_png_chunk_type_text['header'] = $chunk;
- $thisfile_png_chunk_type_text['pixels_per_unit_x'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 0, 4));
- $thisfile_png_chunk_type_text['pixels_per_unit_y'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 4, 4));
- $thisfile_png_chunk_type_text['unit_specifier'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 8, 1));
+ $thisfile_png_chunk_type_text['pixels_per_unit_x'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 0, 4));
+ $thisfile_png_chunk_type_text['pixels_per_unit_y'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 4, 4));
+ $thisfile_png_chunk_type_text['unit_specifier'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 8, 1));
$thisfile_png_chunk_type_text['unit'] = $this->PNGpHYsUnitLookup($thisfile_png_chunk_type_text['unit_specifier']);
break;
@@ -275,26 +302,26 @@
$thisfile_png_chunk_type_text['header'] = $chunk;
switch ($thisfile_png['IHDR']['raw']['color_type']) {
case 0:
- $thisfile_png_chunk_type_text['significant_bits_gray'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 0, 1));
+ $thisfile_png_chunk_type_text['significant_bits_gray'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 0, 1));
break;
case 2:
case 3:
- $thisfile_png_chunk_type_text['significant_bits_red'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 0, 1));
- $thisfile_png_chunk_type_text['significant_bits_green'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 1, 1));
- $thisfile_png_chunk_type_text['significant_bits_blue'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 2, 1));
+ $thisfile_png_chunk_type_text['significant_bits_red'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 0, 1));
+ $thisfile_png_chunk_type_text['significant_bits_green'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 1, 1));
+ $thisfile_png_chunk_type_text['significant_bits_blue'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 2, 1));
break;
case 4:
- $thisfile_png_chunk_type_text['significant_bits_gray'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 0, 1));
- $thisfile_png_chunk_type_text['significant_bits_alpha'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 1, 1));
+ $thisfile_png_chunk_type_text['significant_bits_gray'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 0, 1));
+ $thisfile_png_chunk_type_text['significant_bits_alpha'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 1, 1));
break;
case 6:
- $thisfile_png_chunk_type_text['significant_bits_red'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 0, 1));
- $thisfile_png_chunk_type_text['significant_bits_green'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 1, 1));
- $thisfile_png_chunk_type_text['significant_bits_blue'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 2, 1));
- $thisfile_png_chunk_type_text['significant_bits_alpha'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 3, 1));
+ $thisfile_png_chunk_type_text['significant_bits_red'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 0, 1));
+ $thisfile_png_chunk_type_text['significant_bits_green'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 1, 1));
+ $thisfile_png_chunk_type_text['significant_bits_blue'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 2, 1));
+ $thisfile_png_chunk_type_text['significant_bits_alpha'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 3, 1));
break;
default:
@@ -305,7 +332,7 @@
case 'sPLT': // Suggested Palette
$thisfile_png_chunk_type_text['header'] = $chunk;
- list($palettename, $otherdata) = explode("\x00", $thisfile_png_chunk_type_text['header']['data'], 2);
+ list($palettename, $otherdata) = explode("\x00", $chunk['data'], 2);
$thisfile_png_chunk_type_text['palette_name'] = $palettename;
$sPLToffset = 0;
$thisfile_png_chunk_type_text['sample_depth_bits'] = getid3_lib::BigEndian2Int(substr($otherdata, $sPLToffset, 1));
@@ -331,8 +358,8 @@
case 'hIST': // Palette Histogram
$thisfile_png_chunk_type_text['header'] = $chunk;
$hISTcounter = 0;
- while ($hISTcounter < strlen($thisfile_png_chunk_type_text['header']['data'])) {
- $thisfile_png_chunk_type_text[$hISTcounter] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], $hISTcounter / 2, 2));
+ while ($hISTcounter < strlen($chunk['data'])) {
+ $thisfile_png_chunk_type_text[$hISTcounter] = getid3_lib::BigEndian2Int(substr($chunk['data'], $hISTcounter / 2, 2));
$hISTcounter += 2;
}
break;
@@ -340,12 +367,12 @@
case 'tIME': // Image Last-Modification Time
$thisfile_png_chunk_type_text['header'] = $chunk;
- $thisfile_png_chunk_type_text['year'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 0, 2));
- $thisfile_png_chunk_type_text['month'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 2, 1));
- $thisfile_png_chunk_type_text['day'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 3, 1));
- $thisfile_png_chunk_type_text['hour'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 4, 1));
- $thisfile_png_chunk_type_text['minute'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 5, 1));
- $thisfile_png_chunk_type_text['second'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 6, 1));
+ $thisfile_png_chunk_type_text['year'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 0, 2));
+ $thisfile_png_chunk_type_text['month'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 2, 1));
+ $thisfile_png_chunk_type_text['day'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 3, 1));
+ $thisfile_png_chunk_type_text['hour'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 4, 1));
+ $thisfile_png_chunk_type_text['minute'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 5, 1));
+ $thisfile_png_chunk_type_text['second'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 6, 1));
$thisfile_png_chunk_type_text['unix'] = gmmktime($thisfile_png_chunk_type_text['hour'], $thisfile_png_chunk_type_text['minute'], $thisfile_png_chunk_type_text['second'], $thisfile_png_chunk_type_text['month'], $thisfile_png_chunk_type_text['day'], $thisfile_png_chunk_type_text['year']);
break;
@@ -352,9 +379,9 @@
case 'oFFs': // Image Offset
$thisfile_png_chunk_type_text['header'] = $chunk;
- $thisfile_png_chunk_type_text['position_x'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 0, 4), false, true);
- $thisfile_png_chunk_type_text['position_y'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 4, 4), false, true);
- $thisfile_png_chunk_type_text['unit_specifier'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 8, 1));
+ $thisfile_png_chunk_type_text['position_x'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 0, 4), false, true);
+ $thisfile_png_chunk_type_text['position_y'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 4, 4), false, true);
+ $thisfile_png_chunk_type_text['unit_specifier'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 8, 1));
$thisfile_png_chunk_type_text['unit'] = $this->PNGoFFsUnitLookup($thisfile_png_chunk_type_text['unit_specifier']);
break;
@@ -361,27 +388,27 @@
case 'pCAL': // Calibration Of Pixel Values
$thisfile_png_chunk_type_text['header'] = $chunk;
- list($calibrationname, $otherdata) = explode("\x00", $thisfile_png_chunk_type_text['header']['data'], 2);
+ list($calibrationname, $otherdata) = explode("\x00", $chunk['data'], 2);
$thisfile_png_chunk_type_text['calibration_name'] = $calibrationname;
$pCALoffset = 0;
- $thisfile_png_chunk_type_text['original_zero'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], $pCALoffset, 4), false, true);
+ $thisfile_png_chunk_type_text['original_zero'] = getid3_lib::BigEndian2Int(substr($chunk['data'], $pCALoffset, 4), false, true);
$pCALoffset += 4;
- $thisfile_png_chunk_type_text['original_max'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], $pCALoffset, 4), false, true);
+ $thisfile_png_chunk_type_text['original_max'] = getid3_lib::BigEndian2Int(substr($chunk['data'], $pCALoffset, 4), false, true);
$pCALoffset += 4;
- $thisfile_png_chunk_type_text['equation_type'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], $pCALoffset, 1));
+ $thisfile_png_chunk_type_text['equation_type'] = getid3_lib::BigEndian2Int(substr($chunk['data'], $pCALoffset, 1));
$pCALoffset += 1;
$thisfile_png_chunk_type_text['equation_type_text'] = $this->PNGpCALequationTypeLookup($thisfile_png_chunk_type_text['equation_type']);
- $thisfile_png_chunk_type_text['parameter_count'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], $pCALoffset, 1));
+ $thisfile_png_chunk_type_text['parameter_count'] = getid3_lib::BigEndian2Int(substr($chunk['data'], $pCALoffset, 1));
$pCALoffset += 1;
- $thisfile_png_chunk_type_text['parameters'] = explode("\x00", substr($thisfile_png_chunk_type_text['header']['data'], $pCALoffset));
+ $thisfile_png_chunk_type_text['parameters'] = explode("\x00", substr($chunk['data'], $pCALoffset));
break;
case 'sCAL': // Physical Scale Of Image Subject
$thisfile_png_chunk_type_text['header'] = $chunk;
- $thisfile_png_chunk_type_text['unit_specifier'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 0, 1));
+ $thisfile_png_chunk_type_text['unit_specifier'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 0, 1));
$thisfile_png_chunk_type_text['unit'] = $this->PNGsCALUnitLookup($thisfile_png_chunk_type_text['unit_specifier']);
- list($pixelwidth, $pixelheight) = explode("\x00", substr($thisfile_png_chunk_type_text['header']['data'], 1));
+ list($pixelwidth, $pixelheight) = explode("\x00", substr($chunk['data'], 1));
$thisfile_png_chunk_type_text['pixel_width'] = $pixelwidth;
$thisfile_png_chunk_type_text['pixel_height'] = $pixelheight;
break;
@@ -393,9 +420,9 @@
$gIFgCounter = count($thisfile_png_chunk_type_text);
}
$thisfile_png_chunk_type_text[$gIFgCounter]['header'] = $chunk;
- $thisfile_png_chunk_type_text[$gIFgCounter]['disposal_method'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 0, 1));
- $thisfile_png_chunk_type_text[$gIFgCounter]['user_input_flag'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 1, 1));
- $thisfile_png_chunk_type_text[$gIFgCounter]['delay_time'] = getid3_lib::BigEndian2Int(substr($thisfile_png_chunk_type_text['header']['data'], 2, 2));
+ $thisfile_png_chunk_type_text[$gIFgCounter]['disposal_method'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 0, 1));
+ $thisfile_png_chunk_type_text[$gIFgCounter]['user_input_flag'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 1, 1));
+ $thisfile_png_chunk_type_text[$gIFgCounter]['delay_time'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 2, 2));
break;
@@ -405,9 +432,9 @@
$gIFxCounter = count($thisfile_png_chunk_type_text);
}
$thisfile_png_chunk_type_text[$gIFxCounter]['header'] = $chunk;
- $thisfile_png_chunk_type_text[$gIFxCounter]['application_identifier'] = substr($thisfile_png_chunk_type_text['header']['data'], 0, 8);
- $thisfile_png_chunk_type_text[$gIFxCounter]['authentication_code'] = substr($thisfile_png_chunk_type_text['header']['data'], 8, 3);
- $thisfile_png_chunk_type_text[$gIFxCounter]['application_data'] = substr($thisfile_png_chunk_type_text['header']['data'], 11);
+ $thisfile_png_chunk_type_text[$gIFxCounter]['application_identifier'] = substr($chunk['data'], 0, 8);
+ $thisfile_png_chunk_type_text[$gIFxCounter]['authentication_code'] = substr($chunk['data'], 8, 3);
+ $thisfile_png_chunk_type_text[$gIFxCounter]['application_data'] = substr($chunk['data'], 11);
break;
@@ -420,24 +447,70 @@
$thisfile_png_chunk_type_text[$idatinformationfieldindex]['header'] = $chunk;
break;
-
case 'IEND': // Image Trailer
$thisfile_png_chunk_type_text['header'] = $chunk;
break;
+ case 'acTL': // Animation Control chunk
+ // https://wiki.mozilla.org/APNG_Specification#.60acTL.60:_The_Animation_Control_Chunk
+ $thisfile_png['animation']['num_frames'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 0, 4)); // Number of frames
+ $thisfile_png['animation']['num_plays'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 4, 4)); // Number of times to loop this APNG. 0 indicates infinite looping.
+ unset($chunk['data']);
+ $thisfile_png_chunk_type_text['header'] = $chunk;
+ break;
+
+ case 'fcTL': // Frame Control chunk
+ // https://wiki.mozilla.org/APNG_Specification#.60fcTL.60:_The_Frame_Control_Chunk
+ $fcTL = array();
+ $fcTL['sequence_number'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 0, 4)); // Sequence number of the animation chunk, starting from 0
+ $fcTL['width'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 4, 4)); // Width of the following frame
+ $fcTL['height'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 8, 4)); // Height of the following frame
+ $fcTL['x_offset'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 12, 4)); // X position at which to render the following frame
+ $fcTL['y_offset'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 16, 4)); // Y position at which to render the following frame
+ $fcTL['delay_num'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 20, 2)); // Frame delay fraction numerator
+ $fcTL['delay_den'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 22, 2)); // Frame delay fraction numerator
+ $fcTL['dispose_op'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 23, 1)); // Type of frame area disposal to be done after rendering this frame
+ $fcTL['blend_op'] = getid3_lib::BigEndian2Int(substr($chunk['data'], 23, 1)); // Type of frame area rendering for this frame
+ if ($fcTL['delay_den']) {
+ $fcTL['delay'] = $fcTL['delay_num'] / $fcTL['delay_den'];
+ }
+ $thisfile_png['animation']['fcTL'][$fcTL['sequence_number']] = $fcTL;
+
+ unset($chunk['data']);
+ $thisfile_png_chunk_type_text['header'] = $chunk;
+ break;
+
+ case 'fdAT': // Frame Data chunk
+ // https://wiki.mozilla.org/APNG_Specification#.60fcTL.60:_The_Frame_Control_Chunk
+ // "The `fdAT` chunk has the same purpose as an `IDAT` chunk. It has the same structure as an `IDAT` chunk, except preceded by a sequence number."
+ unset($chunk['data']);
+ $thisfile_png_chunk_type_text['header'] = $chunk;
+ break;
+
default:
//unset($chunk['data']);
$thisfile_png_chunk_type_text['header'] = $chunk;
- $ThisFileInfo['warning'][] = 'Unhandled chunk type: '.$chunk['type_text'];
+ $this->warning('Unhandled chunk type: '.$chunk['type_text']);
break;
}
}
-
+ if (!empty($thisfile_png['animation']['num_frames']) && !empty($thisfile_png['animation']['fcTL'])) {
+ $info['video']['dataformat'] = 'apng';
+ $info['playtime_seconds'] = 0;
+ foreach ($thisfile_png['animation']['fcTL'] as $seqno => $fcTL) {
+ $info['playtime_seconds'] += $fcTL['delay'];
+ }
+ }
return true;
}
- function PNGsRGBintentLookup($sRGB) {
+ /**
+ * @param int $sRGB
+ *
+ * @return string
+ */
+ public function PNGsRGBintentLookup($sRGB) {
static $PNGsRGBintentLookup = array(
0 => 'Perceptual',
1 => 'Relative colorimetric',
@@ -447,7 +520,12 @@
return (isset($PNGsRGBintentLookup[$sRGB]) ? $PNGsRGBintentLookup[$sRGB] : 'invalid');
}
- function PNGcompressionMethodLookup($compressionmethod) {
+ /**
+ * @param int $compressionmethod
+ *
+ * @return string
+ */
+ public function PNGcompressionMethodLookup($compressionmethod) {
static $PNGcompressionMethodLookup = array(
0 => 'deflate/inflate'
);
@@ -454,7 +532,12 @@
return (isset($PNGcompressionMethodLookup[$compressionmethod]) ? $PNGcompressionMethodLookup[$compressionmethod] : 'invalid');
}
- function PNGpHYsUnitLookup($unitid) {
+ /**
+ * @param int $unitid
+ *
+ * @return string
+ */
+ public function PNGpHYsUnitLookup($unitid) {
static $PNGpHYsUnitLookup = array(
0 => 'unknown',
1 => 'meter'
@@ -462,7 +545,12 @@
return (isset($PNGpHYsUnitLookup[$unitid]) ? $PNGpHYsUnitLookup[$unitid] : 'invalid');
}
- function PNGoFFsUnitLookup($unitid) {
+ /**
+ * @param int $unitid
+ *
+ * @return string
+ */
+ public function PNGoFFsUnitLookup($unitid) {
static $PNGoFFsUnitLookup = array(
0 => 'pixel',
1 => 'micrometer'
@@ -470,7 +558,12 @@
return (isset($PNGoFFsUnitLookup[$unitid]) ? $PNGoFFsUnitLookup[$unitid] : 'invalid');
}
- function PNGpCALequationTypeLookup($equationtype) {
+ /**
+ * @param int $equationtype
+ *
+ * @return string
+ */
+ public function PNGpCALequationTypeLookup($equationtype) {
static $PNGpCALequationTypeLookup = array(
0 => 'Linear mapping',
1 => 'Base-e exponential mapping',
@@ -480,7 +573,12 @@
return (isset($PNGpCALequationTypeLookup[$equationtype]) ? $PNGpCALequationTypeLookup[$equationtype] : 'invalid');
}
- function PNGsCALUnitLookup($unitid) {
+ /**
+ * @param int $unitid
+ *
+ * @return string
+ */
+ public function PNGsCALUnitLookup($unitid) {
static $PNGsCALUnitLookup = array(
0 => 'meter',
1 => 'radian'
@@ -488,32 +586,30 @@
return (isset($PNGsCALUnitLookup[$unitid]) ? $PNGsCALUnitLookup[$unitid] : 'invalid');
}
- function IHDRcalculateBitsPerSample($color_type, $bit_depth) {
+ /**
+ * @param int $color_type
+ * @param int $bit_depth
+ *
+ * @return int|false
+ */
+ public function IHDRcalculateBitsPerSample($color_type, $bit_depth) {
switch ($color_type) {
case 0: // Each pixel is a grayscale sample.
return $bit_depth;
- break;
case 2: // Each pixel is an R,G,B triple
return 3 * $bit_depth;
- break;
case 3: // Each pixel is a palette index; a PLTE chunk must appear.
return $bit_depth;
- break;
case 4: // Each pixel is a grayscale sample, followed by an alpha sample.
return 2 * $bit_depth;
- break;
case 6: // Each pixel is an R,G,B triple, followed by an alpha sample.
return 4 * $bit_depth;
- break;
}
return false;
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.svg.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.svg.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.svg.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,52 +1,106 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.graphic.svg.php //
// module for analyzing SVG Image files //
// dependencies: NONE //
-// author: Bryce Harrington <bryceØbryceharrington*org> //
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_svg
+class getid3_svg extends getid3_handler
{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
+ $this->fseek($info['avdataoffset']);
- function getid3_svg(&$fd, &$ThisFileInfo) {
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
+ $SVGheader = $this->fread(4096);
+ if (preg_match('#\<\?xml([^\>]+)\?\>#i', $SVGheader, $matches)) {
+ $info['svg']['xml']['raw'] = $matches;
+ }
+ if (preg_match('#\<\!DOCTYPE([^\>]+)\>#i', $SVGheader, $matches)) {
+ $info['svg']['doctype']['raw'] = $matches;
+ }
+ if (preg_match('#\<svg([^\>]+)\>#i', $SVGheader, $matches)) {
+ $info['svg']['svg']['raw'] = $matches;
+ }
+ if (isset($info['svg']['svg']['raw'])) {
- // I'm making this up, please modify as appropriate
- $SVGheader = fread($fd, 32);
- $ThisFileInfo['svg']['magic'] = substr($SVGheader, 0, 4);
- if ($ThisFileInfo['svg']['magic'] == 'aBcD') {
+ $sections_to_fix = array('xml', 'doctype', 'svg');
+ foreach ($sections_to_fix as $section_to_fix) {
+ if (!isset($info['svg'][$section_to_fix])) {
+ continue;
+ }
+ $section_data = array();
+ while (preg_match('/ "([^"]+)"/', $info['svg'][$section_to_fix]['raw'][1], $matches)) {
+ $section_data[] = $matches[1];
+ $info['svg'][$section_to_fix]['raw'][1] = str_replace($matches[0], '', $info['svg'][$section_to_fix]['raw'][1]);
+ }
+ while (preg_match('/([^\s]+)="([^"]+)"/', $info['svg'][$section_to_fix]['raw'][1], $matches)) {
+ $section_data[] = $matches[0];
+ $info['svg'][$section_to_fix]['raw'][1] = str_replace($matches[0], '', $info['svg'][$section_to_fix]['raw'][1]);
+ }
+ $section_data = array_merge($section_data, preg_split('/[\s,]+/', $info['svg'][$section_to_fix]['raw'][1]));
+ foreach ($section_data as $keyvaluepair) {
+ $keyvaluepair = trim($keyvaluepair);
+ if ($keyvaluepair) {
+ $keyvalueexploded = explode('=', $keyvaluepair);
+ $key = (isset($keyvalueexploded[0]) ? $keyvalueexploded[0] : '');
+ $value = (isset($keyvalueexploded[1]) ? $keyvalueexploded[1] : '');
+ $info['svg'][$section_to_fix]['sections'][$key] = trim($value, '"');
+ }
+ }
+ }
- $ThisFileInfo['fileformat'] = 'svg';
- $ThisFileInfo['video']['dataformat'] = 'svg';
- $ThisFileInfo['video']['lossless'] = true;
- $ThisFileInfo['video']['bits_per_sample'] = 24;
- $ThisFileInfo['video']['pixel_aspect_ratio'] = (float) 1;
+ $info['fileformat'] = 'svg';
+ $info['video']['dataformat'] = 'svg';
+ $info['video']['lossless'] = true;
+ //$info['video']['bits_per_sample'] = 24;
+ $info['video']['pixel_aspect_ratio'] = (float) 1;
- $ThisFileInfo['svg']['width'] = getid3_lib::LittleEndian2Int(substr($fileData, 4, 4));
- $ThisFileInfo['svg']['height'] = getid3_lib::LittleEndian2Int(substr($fileData, 8, 4));
+ if (!empty($info['svg']['svg']['sections']['width'])) {
+ $info['svg']['width'] = intval($info['svg']['svg']['sections']['width']);
+ }
+ if (!empty($info['svg']['svg']['sections']['height'])) {
+ $info['svg']['height'] = intval($info['svg']['svg']['sections']['height']);
+ }
+ if (!empty($info['svg']['svg']['sections']['version'])) {
+ $info['svg']['version'] = $info['svg']['svg']['sections']['version'];
+ }
+ if (!isset($info['svg']['version']) && isset($info['svg']['doctype']['sections'])) {
+ foreach ($info['svg']['doctype']['sections'] as $key => $value) {
+ if (preg_match('#//W3C//DTD SVG ([0-9\.]+)//#i', $key, $matches)) {
+ $info['svg']['version'] = $matches[1];
+ break;
+ }
+ }
+ }
- $ThisFileInfo['video']['resolution_x'] = $ThisFileInfo['svg']['width'];
- $ThisFileInfo['video']['resolution_y'] = $ThisFileInfo['svg']['height'];
+ if (!empty($info['svg']['width'])) {
+ $info['video']['resolution_x'] = $info['svg']['width'];
+ }
+ if (!empty($info['svg']['height'])) {
+ $info['video']['resolution_y'] = $info['svg']['height'];
+ }
return true;
}
- $ThisFileInfo['error'][] = 'Did not find SVG magic bytes "aBcD" at '.$ThisFileInfo['avdataoffset'];
- unset($ThisFileInfo['fileformat']);
+ $this->error('Did not find expected <svg> tag');
return false;
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.tiff.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.tiff.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.graphic.tiff.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.archive.tiff.php //
// module for analyzing TIFF files //
@@ -13,96 +14,117 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_tiff
+class getid3_tiff extends getid3_handler
{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- function getid3_tiff(&$fd, &$ThisFileInfo) {
+ $this->fseek($info['avdataoffset']);
+ $TIFFheader = $this->fread(4);
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
- $TIFFheader = fread($fd, 4);
-
switch (substr($TIFFheader, 0, 2)) {
case 'II':
- $ThisFileInfo['tiff']['byte_order'] = 'Intel';
+ $info['tiff']['byte_order'] = 'Intel';
break;
case 'MM':
- $ThisFileInfo['tiff']['byte_order'] = 'Motorola';
+ $info['tiff']['byte_order'] = 'Motorola';
break;
default:
- $ThisFileInfo['error'][] = 'Invalid TIFF byte order identifier ('.substr($TIFFheader, 0, 2).') at offset '.$ThisFileInfo['avdataoffset'];
+ $this->error('Invalid TIFF byte order identifier ('.substr($TIFFheader, 0, 2).') at offset '.$info['avdataoffset']);
return false;
- break;
}
- $ThisFileInfo['fileformat'] = 'tiff';
- $ThisFileInfo['video']['dataformat'] = 'tiff';
- $ThisFileInfo['video']['lossless'] = true;
- $ThisFileInfo['tiff']['ifd'] = array();
- $CurrentIFD = array();
+ $info['fileformat'] = 'tiff';
+ $info['video']['dataformat'] = 'tiff';
+ $info['video']['lossless'] = true;
+ $info['tiff']['ifd'] = array();
+ $CurrentIFD = array();
$FieldTypeByteLength = array(1=>1, 2=>1, 3=>2, 4=>4, 5=>8);
- $nextIFDoffset = $this->TIFFendian2Int(fread($fd, 4), $ThisFileInfo['tiff']['byte_order']);
+ $nextIFDoffset = $this->TIFFendian2Int($this->fread(4), $info['tiff']['byte_order']);
while ($nextIFDoffset > 0) {
$CurrentIFD['offset'] = $nextIFDoffset;
- fseek($fd, $ThisFileInfo['avdataoffset'] + $nextIFDoffset, SEEK_SET);
- $CurrentIFD['fieldcount'] = $this->TIFFendian2Int(fread($fd, 2), $ThisFileInfo['tiff']['byte_order']);
+ $this->fseek($info['avdataoffset'] + $nextIFDoffset);
+ $CurrentIFD['fieldcount'] = $this->TIFFendian2Int($this->fread(2), $info['tiff']['byte_order']);
for ($i = 0; $i < $CurrentIFD['fieldcount']; $i++) {
- $CurrentIFD['fields'][$i]['raw']['tag'] = $this->TIFFendian2Int(fread($fd, 2), $ThisFileInfo['tiff']['byte_order']);
- $CurrentIFD['fields'][$i]['raw']['type'] = $this->TIFFendian2Int(fread($fd, 2), $ThisFileInfo['tiff']['byte_order']);
- $CurrentIFD['fields'][$i]['raw']['length'] = $this->TIFFendian2Int(fread($fd, 4), $ThisFileInfo['tiff']['byte_order']);
- $CurrentIFD['fields'][$i]['raw']['offset'] = fread($fd, 4);
+ $CurrentIFD['fields'][$i]['raw']['tag'] = $this->TIFFendian2Int($this->fread(2), $info['tiff']['byte_order']);
+ $CurrentIFD['fields'][$i]['raw']['type'] = $this->TIFFendian2Int($this->fread(2), $info['tiff']['byte_order']);
+ $CurrentIFD['fields'][$i]['raw']['length'] = $this->TIFFendian2Int($this->fread(4), $info['tiff']['byte_order']);
+ $CurrentIFD['fields'][$i]['raw']['valoff'] = $this->fread(4); // To save time and space the Value Offset contains the Value instead of pointing to the Value if and only if the Value fits into 4 bytes. If the Value is shorter than 4 bytes, it is left-justified within the 4-byte Value Offset, i.e., stored in the lowernumbered bytes. Whether the Value fits within 4 bytes is determined by the Type and Count of the field.
+ $CurrentIFD['fields'][$i]['raw']['tag_name'] = $this->TIFFcommentName($CurrentIFD['fields'][$i]['raw']['tag']);
switch ($CurrentIFD['fields'][$i]['raw']['type']) {
case 1: // BYTE An 8-bit unsigned integer.
if ($CurrentIFD['fields'][$i]['raw']['length'] <= 4) {
- $CurrentIFD['fields'][$i]['value'] = $this->TIFFendian2Int(substr($CurrentIFD['fields'][$i]['raw']['offset'], 0, 1), $ThisFileInfo['tiff']['byte_order']);
+ $CurrentIFD['fields'][$i]['value'] = $this->TIFFendian2Int(substr($CurrentIFD['fields'][$i]['raw']['valoff'], 0, 1), $info['tiff']['byte_order']);
} else {
- $CurrentIFD['fields'][$i]['offset'] = $this->TIFFendian2Int($CurrentIFD['fields'][$i]['raw']['offset'], $ThisFileInfo['tiff']['byte_order']);
+ $CurrentIFD['fields'][$i]['offset'] = $this->TIFFendian2Int($CurrentIFD['fields'][$i]['raw']['valoff'], $info['tiff']['byte_order']);
}
break;
case 2: // ASCII 8-bit bytes that store ASCII codes; the last byte must be null.
if ($CurrentIFD['fields'][$i]['raw']['length'] <= 4) {
- $CurrentIFD['fields'][$i]['value'] = substr($CurrentIFD['fields'][$i]['raw']['offset'], 3);
+ $CurrentIFD['fields'][$i]['value'] = substr($CurrentIFD['fields'][$i]['raw']['valoff'], 3);
} else {
- $CurrentIFD['fields'][$i]['offset'] = $this->TIFFendian2Int($CurrentIFD['fields'][$i]['raw']['offset'], $ThisFileInfo['tiff']['byte_order']);
+ $CurrentIFD['fields'][$i]['offset'] = $this->TIFFendian2Int($CurrentIFD['fields'][$i]['raw']['valoff'], $info['tiff']['byte_order']);
}
break;
case 3: // SHORT A 16-bit (2-byte) unsigned integer.
if ($CurrentIFD['fields'][$i]['raw']['length'] <= 2) {
- $CurrentIFD['fields'][$i]['value'] = $this->TIFFendian2Int(substr($CurrentIFD['fields'][$i]['raw']['offset'], 0, 2), $ThisFileInfo['tiff']['byte_order']);
+ $CurrentIFD['fields'][$i]['value'] = $this->TIFFendian2Int(substr($CurrentIFD['fields'][$i]['raw']['valoff'], 0, 2), $info['tiff']['byte_order']);
} else {
- $CurrentIFD['fields'][$i]['offset'] = $this->TIFFendian2Int($CurrentIFD['fields'][$i]['raw']['offset'], $ThisFileInfo['tiff']['byte_order']);
+ $CurrentIFD['fields'][$i]['offset'] = $this->TIFFendian2Int($CurrentIFD['fields'][$i]['raw']['valoff'], $info['tiff']['byte_order']);
}
break;
case 4: // LONG A 32-bit (4-byte) unsigned integer.
- if ($CurrentIFD['fields'][$i]['raw']['length'] <= 1) {
- $CurrentIFD['fields'][$i]['value'] = $this->TIFFendian2Int($CurrentIFD['fields'][$i]['raw']['offset'], $ThisFileInfo['tiff']['byte_order']);
+ if ($CurrentIFD['fields'][$i]['raw']['length'] <= 4) {
+ $CurrentIFD['fields'][$i]['value'] = $this->TIFFendian2Int($CurrentIFD['fields'][$i]['raw']['valoff'], $info['tiff']['byte_order']);
} else {
- $CurrentIFD['fields'][$i]['offset'] = $this->TIFFendian2Int($CurrentIFD['fields'][$i]['raw']['offset'], $ThisFileInfo['tiff']['byte_order']);
+ $CurrentIFD['fields'][$i]['offset'] = $this->TIFFendian2Int($CurrentIFD['fields'][$i]['raw']['valoff'], $info['tiff']['byte_order']);
}
break;
case 5: // RATIONAL Two LONG_s: the first represents the numerator of a fraction, the second the denominator.
+ case 7: // UNDEFINED An 8-bit byte that may contain anything, depending on the definition of the field.
+ $CurrentIFD['fields'][$i]['offset'] = $this->TIFFendian2Int($CurrentIFD['fields'][$i]['raw']['valoff'], $info['tiff']['byte_order']);
break;
+
+ // Warning: It is possible that other TIFF field types will be added in the future. Readers should skip over fields containing an unexpected field type.
+ // In TIFF 6.0, some new field types have been defined:
+ // These new field types are also governed by the byte order (II or MM) in the TIFF header.
+ case 6: // SBYTE An 8-bit signed (twos-complement) integer.
+ case 8: // SSHORT A 16-bit (2-byte) signed (twos-complement) integer.
+ case 9: // SLONG A 32-bit (4-byte) signed (twos-complement) integer.
+ case 10: // SRATIONAL Two SLONGs: the first represents the numerator of a fraction, the second the denominator.
+ case 11: // FLOAT Single precision (4-byte) IEEE format
+ case 12: // DOUBLE Double precision (8-byte) IEEE format
+ default:
+ $this->warning('unhandled IFD field type '.$CurrentIFD['fields'][$i]['raw']['type'].' for IFD entry '.$i);
+ break;
}
}
- $ThisFileInfo['tiff']['ifd'][] = $CurrentIFD;
+ $info['tiff']['ifd'][] = $CurrentIFD;
$CurrentIFD = array();
- $nextIFDoffset = $this->TIFFendian2Int(fread($fd, 4), $ThisFileInfo['tiff']['byte_order']);
+ $nextIFDoffset = $this->TIFFendian2Int($this->fread(4), $info['tiff']['byte_order']);
}
- foreach ($ThisFileInfo['tiff']['ifd'] as $IFDid => $IFDarray) {
+ foreach ($info['tiff']['ifd'] as $IFDid => $IFDarray) {
foreach ($IFDarray['fields'] as $key => $fieldarray) {
switch ($fieldarray['raw']['tag']) {
case 256: // ImageWidth
@@ -110,8 +132,8 @@
case 258: // BitsPerSample
case 259: // Compression
if (!isset($fieldarray['value'])) {
- fseek($fd, $fieldarray['offset'], SEEK_SET);
- $ThisFileInfo['tiff']['ifd'][$IFDid]['fields'][$key]['raw']['data'] = fread($fd, $fieldarray['raw']['length'] * $FieldTypeByteLength[$fieldarray['raw']['type']]);
+ $this->fseek($fieldarray['offset']);
+ $info['tiff']['ifd'][$IFDid]['fields'][$key]['raw']['data'] = $this->fread($fieldarray['raw']['length'] * $FieldTypeByteLength[$fieldarray['raw']['type']]);
}
break;
@@ -124,36 +146,46 @@
case 315: // Artist
case 316: // HostComputer
if (isset($fieldarray['value'])) {
- $ThisFileInfo['tiff']['ifd'][$IFDid]['fields'][$key]['raw']['data'] = $fieldarray['value'];
+ $info['tiff']['ifd'][$IFDid]['fields'][$key]['raw']['data'] = $fieldarray['value'];
} else {
- fseek($fd, $fieldarray['offset'], SEEK_SET);
- $ThisFileInfo['tiff']['ifd'][$IFDid]['fields'][$key]['raw']['data'] = fread($fd, $fieldarray['raw']['length'] * $FieldTypeByteLength[$fieldarray['raw']['type']]);
+ $this->fseek($fieldarray['offset']);
+ $info['tiff']['ifd'][$IFDid]['fields'][$key]['raw']['data'] = $this->fread($fieldarray['raw']['length'] * $FieldTypeByteLength[$fieldarray['raw']['type']]);
}
break;
+ case 700:
+ $XMPmagic = '<?xpacket';
+ $this->fseek($fieldarray['offset']);
+ $xmpkey = (isset($info['tiff']['XMP']) ? count($info['tiff']['XMP']) : 0);
+ $info['tiff']['XMP'][$xmpkey]['raw'] = $this->fread($fieldarray['raw']['length']);
+ if (substr($info['tiff']['XMP'][$xmpkey]['raw'], 0, strlen($XMPmagic)) != $XMPmagic) {
+ $this->warning('did not find expected XMP data at offset '.$fieldarray['offset']);
+ unset($info['tiff']['XMP'][$xmpkey]['raw']);
+ }
+ break;
}
switch ($fieldarray['raw']['tag']) {
case 256: // ImageWidth
- $ThisFileInfo['video']['resolution_x'] = $fieldarray['value'];
+ $info['video']['resolution_x'] = $fieldarray['value'];
break;
case 257: // ImageLength
- $ThisFileInfo['video']['resolution_y'] = $fieldarray['value'];
+ $info['video']['resolution_y'] = $fieldarray['value'];
break;
case 258: // BitsPerSample
if (isset($fieldarray['value'])) {
- $ThisFileInfo['video']['bits_per_sample'] = $fieldarray['value'];
+ $info['video']['bits_per_sample'] = $fieldarray['value'];
} else {
- $ThisFileInfo['video']['bits_per_sample'] = 0;
+ $info['video']['bits_per_sample'] = 0;
for ($i = 0; $i < $fieldarray['raw']['length']; $i++) {
- $ThisFileInfo['video']['bits_per_sample'] += $this->TIFFendian2Int(substr($ThisFileInfo['tiff']['ifd'][$IFDid]['fields'][$key]['raw']['data'], $i * $FieldTypeByteLength[$fieldarray['raw']['type']], $FieldTypeByteLength[$fieldarray['raw']['type']]), $ThisFileInfo['tiff']['byte_order']);
+ $info['video']['bits_per_sample'] += $this->TIFFendian2Int(substr($info['tiff']['ifd'][$IFDid]['fields'][$key]['raw']['data'], $i * $FieldTypeByteLength[$fieldarray['raw']['type']], $FieldTypeByteLength[$fieldarray['raw']['type']]), $info['tiff']['byte_order']);
}
}
break;
case 259: // Compression
- $ThisFileInfo['video']['codec'] = $this->TIFFcompressionMethod($fieldarray['value']);
+ $info['video']['codec'] = $this->TIFFcompressionMethod($fieldarray['value']);
break;
case 270: // ImageDescription
@@ -163,7 +195,12 @@
case 306: // DateTime
case 315: // Artist
case 316: // HostComputer
- @$ThisFileInfo['tiff']['comments'][$this->TIFFcommentName($fieldarray['raw']['tag'])][] = $ThisFileInfo['tiff']['ifd'][$IFDid]['fields'][$key]['raw']['data'];
+ $TIFFcommentName = strtolower($fieldarray['raw']['tag_name']);
+ if (isset($info['tiff']['comments'][$TIFFcommentName])) {
+ $info['tiff']['comments'][$TIFFcommentName][] = $info['tiff']['ifd'][$IFDid]['fields'][$key]['raw']['data'];
+ } else {
+ $info['tiff']['comments'][$TIFFcommentName] = array($info['tiff']['ifd'][$IFDid]['fields'][$key]['raw']['data']);
+ }
break;
default:
@@ -175,8 +212,13 @@
return true;
}
-
- function TIFFendian2Int($bytestring, $byteorder) {
+ /**
+ * @param string $bytestring
+ * @param string $byteorder
+ *
+ * @return int|float|false
+ */
+ public function TIFFendian2Int($bytestring, $byteorder) {
if ($byteorder == 'Intel') {
return getid3_lib::LittleEndian2Int($bytestring);
} elseif ($byteorder == 'Motorola') {
@@ -185,37 +227,290 @@
return false;
}
- function TIFFcompressionMethod($id) {
+ /**
+ * @param int $id
+ *
+ * @return string
+ */
+ public function TIFFcompressionMethod($id) {
+ // https://en.wikipedia.org/wiki/TIFF#TIFF_Compression_Tag
static $TIFFcompressionMethod = array();
if (empty($TIFFcompressionMethod)) {
$TIFFcompressionMethod = array(
- 1 => 'Uncompressed',
- 2 => 'Huffman',
- 3 => 'Fax - CCITT 3',
- 5 => 'LZW',
- 32773 => 'PackBits',
+ 0x0001 => 'Uncompressed',
+ 0x0002 => 'Huffman',
+ 0x0003 => 'CCITT T.4',
+ 0x0004 => 'CCITT T.6',
+ 0x0005 => 'LZW',
+ 0x0006 => 'JPEG-old',
+ 0x0007 => 'JPEG',
+ 0x0008 => 'deflate',
+ 0x0009 => 'JBIG ITU-T T.85',
+ 0x000A => 'JBIG ITU-T T.43',
+ 0x7FFE => 'NeXT RLE 2-bit',
+ 0x8005 => 'PackBits',
+ 0x8029 => 'ThunderScan RLE 4-bit',
+ 0x807F => 'RasterPadding',
+ 0x8080 => 'RLE-LW',
+ 0x8081 => 'RLE-CT',
+ 0x8082 => 'RLE-BL',
+ 0x80B2 => 'deflate-PK',
+ 0x80B3 => 'Kodak-DCS',
+ 0x8765 => 'JBIG',
+ 0x8798 => 'JPEG2000',
+ 0x8799 => 'Nikon NEF',
+ 0x879B => 'JBIG2',
);
}
return (isset($TIFFcompressionMethod[$id]) ? $TIFFcompressionMethod[$id] : 'unknown/invalid ('.$id.')');
}
- function TIFFcommentName($id) {
+ /**
+ * @param int $id
+ *
+ * @return string
+ */
+ public function TIFFcommentName($id) {
+ // https://www.awaresystems.be/imaging/tiff/tifftags.html
static $TIFFcommentName = array();
if (empty($TIFFcommentName)) {
$TIFFcommentName = array(
- 270 => 'imagedescription',
- 271 => 'make',
- 272 => 'model',
- 305 => 'software',
- 306 => 'datetime',
- 315 => 'artist',
- 316 => 'hostcomputer',
+ 254 => 'NewSubfileType',
+ 255 => 'SubfileType',
+ 256 => 'ImageWidth',
+ 257 => 'ImageLength',
+ 258 => 'BitsPerSample',
+ 259 => 'Compression',
+ 262 => 'PhotometricInterpretation',
+ 263 => 'Threshholding',
+ 264 => 'CellWidth',
+ 265 => 'CellLength',
+ 266 => 'FillOrder',
+ 269 => 'DocumentName',
+ 270 => 'ImageDescription',
+ 271 => 'Make',
+ 272 => 'Model',
+ 273 => 'StripOffsets',
+ 274 => 'Orientation',
+ 277 => 'SamplesPerPixel',
+ 278 => 'RowsPerStrip',
+ 279 => 'StripByteCounts',
+ 280 => 'MinSampleValue',
+ 281 => 'MaxSampleValue',
+ 282 => 'XResolution',
+ 283 => 'YResolution',
+ 284 => 'PlanarConfiguration',
+ 285 => 'PageName',
+ 286 => 'XPosition',
+ 287 => 'YPosition',
+ 288 => 'FreeOffsets',
+ 289 => 'FreeByteCounts',
+ 290 => 'GrayResponseUnit',
+ 291 => 'GrayResponseCurve',
+ 292 => 'T4Options',
+ 293 => 'T6Options',
+ 296 => 'ResolutionUnit',
+ 297 => 'PageNumber',
+ 301 => 'TransferFunction',
+ 305 => 'Software',
+ 306 => 'DateTime',
+ 315 => 'Artist',
+ 316 => 'HostComputer',
+ 317 => 'Predictor',
+ 318 => 'WhitePoint',
+ 319 => 'PrimaryChromaticities',
+ 320 => 'ColorMap',
+ 321 => 'HalftoneHints',
+ 322 => 'TileWidth',
+ 323 => 'TileLength',
+ 324 => 'TileOffsets',
+ 325 => 'TileByteCounts',
+ 326 => 'BadFaxLines',
+ 327 => 'CleanFaxData',
+ 328 => 'ConsecutiveBadFaxLines',
+ 330 => 'SubIFDs',
+ 332 => 'InkSet',
+ 333 => 'InkNames',
+ 334 => 'NumberOfInks',
+ 336 => 'DotRange',
+ 337 => 'TargetPrinter',
+ 338 => 'ExtraSamples',
+ 339 => 'SampleFormat',
+ 340 => 'SMinSampleValue',
+ 341 => 'SMaxSampleValue',
+ 342 => 'TransferRange',
+ 343 => 'ClipPath',
+ 344 => 'XClipPathUnits',
+ 345 => 'YClipPathUnits',
+ 346 => 'Indexed',
+ 347 => 'JPEGTables',
+ 351 => 'OPIProxy',
+ 400 => 'GlobalParametersIFD',
+ 401 => 'ProfileType',
+ 402 => 'FaxProfile',
+ 403 => 'CodingMethods',
+ 404 => 'VersionYear',
+ 405 => 'ModeNumber',
+ 433 => 'Decode',
+ 434 => 'DefaultImageColor',
+ 512 => 'JPEGProc',
+ 513 => 'JPEGInterchangeFormat',
+ 514 => 'JPEGInterchangeFormatLngth',
+ 515 => 'JPEGRestartInterval',
+ 517 => 'JPEGLosslessPredictors',
+ 518 => 'JPEGPointTransforms',
+ 519 => 'JPEGQTables',
+ 520 => 'JPEGDCTables',
+ 521 => 'JPEGACTables',
+ 529 => 'YCbCrCoefficients',
+ 530 => 'YCbCrSubSampling',
+ 531 => 'YCbCrPositioning',
+ 532 => 'ReferenceBlackWhite',
+ 559 => 'StripRowCounts',
+ 700 => 'XMP',
+
+ 32781 => 'ImageID',
+ 33432 => 'Copyright',
+ 34732 => 'ImageLayer',
+
+ // Private Tags - https://www.awaresystems.be/imaging/tiff/tifftags/private.html
+ 32932 => 'Wang Annotation', // Annotation data, as used in 'Imaging for Windows'.
+ 33445 => 'MD FileTag', // Specifies the pixel data format encoding in the Molecular Dynamics GEL file format.
+ 33446 => 'MD ScalePixel', // Specifies a scale factor in the Molecular Dynamics GEL file format.
+ 33447 => 'MD ColorTable', // Used to specify the conversion from 16bit to 8bit in the Molecular Dynamics GEL file format.
+ 33448 => 'MD LabName', // Name of the lab that scanned this file, as used in the Molecular Dynamics GEL file format.
+ 33449 => 'MD SampleInfo', // Information about the sample, as used in the Molecular Dynamics GEL file format.
+ 33450 => 'MD PrepDate', // Date the sample was prepared, as used in the Molecular Dynamics GEL file format.
+ 33451 => 'MD PrepTime', // Time the sample was prepared, as used in the Molecular Dynamics GEL file format.
+ 33452 => 'MD FileUnits', // Units for data in this file, as used in the Molecular Dynamics GEL file format.
+ 33550 => 'ModelPixelScaleTag', // Used in interchangeable GeoTIFF files.
+ 33723 => 'IPTC', // IPTC (International Press Telecommunications Council) metadata.
+ 33918 => 'INGR Packet Data Tag', // Intergraph Application specific storage.
+ 33919 => 'INGR Flag Registers', // Intergraph Application specific flags.
+ 33920 => 'IrasB Transformation Matrix', // Originally part of Intergraph's GeoTIFF tags, but likely understood by IrasB only.
+ 33922 => 'ModelTiepointTag', // Originally part of Intergraph's GeoTIFF tags, but now used in interchangeable GeoTIFF files.
+ 34264 => 'ModelTransformationTag', // Used in interchangeable GeoTIFF files.
+ 34377 => 'Photoshop', // Collection of Photoshop 'Image Resource Blocks'.
+ 34665 => 'Exif IFD', // A pointer to the Exif IFD.
+ 34675 => 'ICC Profile', // ICC profile data.
+ 34735 => 'GeoKeyDirectoryTag', // Used in interchangeable GeoTIFF files.
+ 34736 => 'GeoDoubleParamsTag', // Used in interchangeable GeoTIFF files.
+ 34737 => 'GeoAsciiParamsTag', // Used in interchangeable GeoTIFF files.
+ 34853 => 'GPS IFD', // A pointer to the Exif-related GPS Info IFD.
+ 34908 => 'HylaFAX FaxRecvParams', // Used by HylaFAX.
+ 34909 => 'HylaFAX FaxSubAddress', // Used by HylaFAX.
+ 34910 => 'HylaFAX FaxRecvTime', // Used by HylaFAX.
+ 37724 => 'ImageSourceData', // Used by Adobe Photoshop.
+ 40965 => 'Interoperability IFD', // A pointer to the Exif-related Interoperability IFD.
+ 42112 => 'GDAL_METADATA', // Used by the GDAL library, holds an XML list of name=value 'metadata' values about the image as a whole, and about specific samples.
+ 42113 => 'GDAL_NODATA', // Used by the GDAL library, contains an ASCII encoded nodata or background pixel value.
+ 50215 => 'Oce Scanjob Description', // Used in the Oce scanning process.
+ 50216 => 'Oce Application Selector', // Used in the Oce scanning process.
+ 50217 => 'Oce Identification Number', // Used in the Oce scanning process.
+ 50218 => 'Oce ImageLogic Characteristics', // Used in the Oce scanning process.
+ 50706 => 'DNGVersion', // Used in IFD 0 of DNG files.
+ 50707 => 'DNGBackwardVersion', // Used in IFD 0 of DNG files.
+ 50708 => 'UniqueCameraModel', // Used in IFD 0 of DNG files.
+ 50709 => 'LocalizedCameraModel', // Used in IFD 0 of DNG files.
+ 50710 => 'CFAPlaneColor', // Used in Raw IFD of DNG files.
+ 50711 => 'CFALayout', // Used in Raw IFD of DNG files.
+ 50712 => 'LinearizationTable', // Used in Raw IFD of DNG files.
+ 50713 => 'BlackLevelRepeatDim', // Used in Raw IFD of DNG files.
+ 50714 => 'BlackLevel', // Used in Raw IFD of DNG files.
+ 50715 => 'BlackLevelDeltaH', // Used in Raw IFD of DNG files.
+ 50716 => 'BlackLevelDeltaV', // Used in Raw IFD of DNG files.
+ 50717 => 'WhiteLevel', // Used in Raw IFD of DNG files.
+ 50718 => 'DefaultScale', // Used in Raw IFD of DNG files.
+ 50719 => 'DefaultCropOrigin', // Used in Raw IFD of DNG files.
+ 50720 => 'DefaultCropSize', // Used in Raw IFD of DNG files.
+ 50721 => 'ColorMatrix1', // Used in IFD 0 of DNG files.
+ 50722 => 'ColorMatrix2', // Used in IFD 0 of DNG files.
+ 50723 => 'CameraCalibration1', // Used in IFD 0 of DNG files.
+ 50724 => 'CameraCalibration2', // Used in IFD 0 of DNG files.
+ 50725 => 'ReductionMatrix1', // Used in IFD 0 of DNG files.
+ 50726 => 'ReductionMatrix2', // Used in IFD 0 of DNG files.
+ 50727 => 'AnalogBalance', // Used in IFD 0 of DNG files.
+ 50728 => 'AsShotNeutral', // Used in IFD 0 of DNG files.
+ 50729 => 'AsShotWhiteXY', // Used in IFD 0 of DNG files.
+ 50730 => 'BaselineExposure', // Used in IFD 0 of DNG files.
+ 50731 => 'BaselineNoise', // Used in IFD 0 of DNG files.
+ 50732 => 'BaselineSharpness', // Used in IFD 0 of DNG files.
+ 50733 => 'BayerGreenSplit', // Used in Raw IFD of DNG files.
+ 50734 => 'LinearResponseLimit', // Used in IFD 0 of DNG files.
+ 50735 => 'CameraSerialNumber', // Used in IFD 0 of DNG files.
+ 50736 => 'LensInfo', // Used in IFD 0 of DNG files.
+ 50737 => 'ChromaBlurRadius', // Used in Raw IFD of DNG files.
+ 50738 => 'AntiAliasStrength', // Used in Raw IFD of DNG files.
+ 50740 => 'DNGPrivateData', // Used in IFD 0 of DNG files.
+ 50741 => 'MakerNoteSafety', // Used in IFD 0 of DNG files.
+ 50778 => 'CalibrationIlluminant1', // Used in IFD 0 of DNG files.
+ 50779 => 'CalibrationIlluminant2', // Used in IFD 0 of DNG files.
+ 50780 => 'BestQualityScale', // Used in Raw IFD of DNG files.
+ 50784 => 'Alias Layer Metadata', // Alias Sketchbook Pro layer usage description.
+ 50908 => 'TIFF_RSID', // This private tag is used in a GEOTIFF standard by DGIWG.
+ 50909 => 'GEO_METADATA', // This private tag is used in a GEOTIFF standard by DGIWG.
+
+ // EXIF tags - https://www.awaresystems.be/imaging/tiff/tifftags/privateifd/exif.html
+ 33434 => 'ExposureTime', // Exposure time, given in seconds.
+ 33437 => 'FNumber', // The F number.
+ 34850 => 'ExposureProgram', // The class of the program used by the camera to set exposure when the picture is taken.
+ 34852 => 'SpectralSensitivity', // Indicates the spectral sensitivity of each channel of the camera used.
+ 34855 => 'ISOSpeedRatings', // Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232.
+ 34856 => 'OECF', // Indicates the Opto-Electric Conversion Function (OECF) specified in ISO 14524.
+ 36864 => 'ExifVersion', // The version of the supported Exif standard.
+ 36867 => 'DateTimeOriginal', // The date and time when the original image data was generated.
+ 36868 => 'DateTimeDigitized', // The date and time when the image was stored as digital data.
+ 37121 => 'ComponentsConfiguration', // Specific to compressed data; specifies the channels and complements PhotometricInterpretation
+ 37122 => 'CompressedBitsPerPixel', // Specific to compressed data; states the compressed bits per pixel.
+ 37377 => 'ShutterSpeedValue', // Shutter speed.
+ 37378 => 'ApertureValue', // The lens aperture.
+ 37379 => 'BrightnessValue', // The value of brightness.
+ 37380 => 'ExposureBiasValue', // The exposure bias.
+ 37381 => 'MaxApertureValue', // The smallest F number of the lens.
+ 37382 => 'SubjectDistance', // The distance to the subject, given in meters.
+ 37383 => 'MeteringMode', // The metering mode.
+ 37384 => 'LightSource', // The kind of light source.
+ 37385 => 'Flash', // Indicates the status of flash when the image was shot.
+ 37386 => 'FocalLength', // The actual focal length of the lens, in mm.
+ 37396 => 'SubjectArea', // Indicates the location and area of the main subject in the overall scene.
+ 37500 => 'MakerNote', // Manufacturer specific information.
+ 37510 => 'UserComment', // Keywords or comments on the image; complements ImageDescription.
+ 37520 => 'SubsecTime', // A tag used to record fractions of seconds for the DateTime tag.
+ 37521 => 'SubsecTimeOriginal', // A tag used to record fractions of seconds for the DateTimeOriginal tag.
+ 37522 => 'SubsecTimeDigitized', // A tag used to record fractions of seconds for the DateTimeDigitized tag.
+ 40960 => 'FlashpixVersion', // The Flashpix format version supported by a FPXR file.
+ 40961 => 'ColorSpace', // The color space information tag is always recorded as the color space specifier.
+ 40962 => 'PixelXDimension', // Specific to compressed data; the valid width of the meaningful image.
+ 40963 => 'PixelYDimension', // Specific to compressed data; the valid height of the meaningful image.
+ 40964 => 'RelatedSoundFile', // Used to record the name of an audio file related to the image data.
+ 41483 => 'FlashEnergy', // Indicates the strobe energy at the time the image is captured, as measured in Beam Candle Power Seconds
+ 41484 => 'SpatialFrequencyResponse', // Records the camera or input device spatial frequency table and SFR values in the direction of image width, image height, and diagonal direction, as specified in ISO 12233.
+ 41486 => 'FocalPlaneXResolution', // Indicates the number of pixels in the image width (X) direction per FocalPlaneResolutionUnit on the camera focal plane.
+ 41487 => 'FocalPlaneYResolution', // Indicates the number of pixels in the image height (Y) direction per FocalPlaneResolutionUnit on the camera focal plane.
+ 41488 => 'FocalPlaneResolutionUnit', // Indicates the unit for measuring FocalPlaneXResolution and FocalPlaneYResolution.
+ 41492 => 'SubjectLocation', // Indicates the location of the main subject in the scene.
+ 41493 => 'ExposureIndex', // Indicates the exposure index selected on the camera or input device at the time the image is captured.
+ 41495 => 'SensingMethod', // Indicates the image sensor type on the camera or input device.
+ 41728 => 'FileSource', // Indicates the image source.
+ 41729 => 'SceneType', // Indicates the type of scene.
+ 41730 => 'CFAPattern', // Indicates the color filter array (CFA) geometric pattern of the image sensor when a one-chip color area sensor is used.
+ 41985 => 'CustomRendered', // Indicates the use of special processing on image data, such as rendering geared to output.
+ 41986 => 'ExposureMode', // Indicates the exposure mode set when the image was shot.
+ 41987 => 'WhiteBalance', // Indicates the white balance mode set when the image was shot.
+ 41988 => 'DigitalZoomRatio', // Indicates the digital zoom ratio when the image was shot.
+ 41989 => 'FocalLengthIn35mmFilm', // Indicates the equivalent focal length assuming a 35mm film camera, in mm.
+ 41990 => 'SceneCaptureType', // Indicates the type of scene that was shot.
+ 41991 => 'GainControl', // Indicates the degree of overall image gain adjustment.
+ 41992 => 'Contrast', // Indicates the direction of contrast processing applied by the camera when the image was shot.
+ 41993 => 'Saturation', // Indicates the direction of saturation processing applied by the camera when the image was shot.
+ 41994 => 'Sharpness', // Indicates the direction of sharpness processing applied by the camera when the image was shot.
+ 41995 => 'DeviceSettingDescription', // This tag indicates information on the picture-taking conditions of a particular camera model.
+ 41996 => 'SubjectDistanceRange', // Indicates the distance to the subject.
+ 42016 => 'ImageUniqueID', // Indicates an identifier assigned uniquely to each image.
);
}
return (isset($TIFFcommentName[$id]) ? $TIFFcommentName[$id] : 'unknown/invalid ('.$id.')');
}
+
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.misc.exe.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.misc.exe.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.misc.exe.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.misc.exe.php //
// module for analyzing EXE files //
@@ -13,47 +14,51 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_exe
+class getid3_exe extends getid3_handler
{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- function getid3_exe(&$fd, &$ThisFileInfo) {
+ $this->fseek($info['avdataoffset']);
+ $EXEheader = $this->fread(28);
- fseek($fd, $ThisFileInfo['avdataoffset'], SEEK_SET);
- $EXEheader = fread($fd, 28);
-
- if (substr($EXEheader, 0, 2) != 'MZ') {
- $ThisFileInfo['error'][] = 'Expecting "MZ" at offset '.$ThisFileInfo['avdataoffset'].', found "'.substr($EXEheader, 0, 2).'" instead.';
+ $magic = 'MZ';
+ if (substr($EXEheader, 0, 2) != $magic) {
+ $this->error('Expecting "'.getid3_lib::PrintHexBytes($magic).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes(substr($EXEheader, 0, 2)).'"');
return false;
}
- $ThisFileInfo['fileformat'] = 'exe';
- $ThisFileInfo['exe']['mz']['magic'] = 'MZ';
+ $info['fileformat'] = 'exe';
+ $info['exe']['mz']['magic'] = 'MZ';
- $ThisFileInfo['exe']['mz']['raw']['last_page_size'] = getid3_lib::LittleEndian2Int(substr($EXEheader, 2, 2));
- $ThisFileInfo['exe']['mz']['raw']['page_count'] = getid3_lib::LittleEndian2Int(substr($EXEheader, 4, 2));
- $ThisFileInfo['exe']['mz']['raw']['relocation_count'] = getid3_lib::LittleEndian2Int(substr($EXEheader, 6, 2));
- $ThisFileInfo['exe']['mz']['raw']['header_paragraphs'] = getid3_lib::LittleEndian2Int(substr($EXEheader, 8, 2));
- $ThisFileInfo['exe']['mz']['raw']['min_memory_paragraphs'] = getid3_lib::LittleEndian2Int(substr($EXEheader, 10, 2));
- $ThisFileInfo['exe']['mz']['raw']['max_memory_paragraphs'] = getid3_lib::LittleEndian2Int(substr($EXEheader, 12, 2));
- $ThisFileInfo['exe']['mz']['raw']['initial_ss'] = getid3_lib::LittleEndian2Int(substr($EXEheader, 14, 2));
- $ThisFileInfo['exe']['mz']['raw']['initial_sp'] = getid3_lib::LittleEndian2Int(substr($EXEheader, 16, 2));
- $ThisFileInfo['exe']['mz']['raw']['checksum'] = getid3_lib::LittleEndian2Int(substr($EXEheader, 18, 2));
- $ThisFileInfo['exe']['mz']['raw']['cs_ip'] = getid3_lib::LittleEndian2Int(substr($EXEheader, 20, 4));
- $ThisFileInfo['exe']['mz']['raw']['relocation_table_offset'] = getid3_lib::LittleEndian2Int(substr($EXEheader, 24, 2));
- $ThisFileInfo['exe']['mz']['raw']['overlay_number'] = getid3_lib::LittleEndian2Int(substr($EXEheader, 26, 2));
+ $info['exe']['mz']['raw']['last_page_size'] = getid3_lib::LittleEndian2Int(substr($EXEheader, 2, 2));
+ $info['exe']['mz']['raw']['page_count'] = getid3_lib::LittleEndian2Int(substr($EXEheader, 4, 2));
+ $info['exe']['mz']['raw']['relocation_count'] = getid3_lib::LittleEndian2Int(substr($EXEheader, 6, 2));
+ $info['exe']['mz']['raw']['header_paragraphs'] = getid3_lib::LittleEndian2Int(substr($EXEheader, 8, 2));
+ $info['exe']['mz']['raw']['min_memory_paragraphs'] = getid3_lib::LittleEndian2Int(substr($EXEheader, 10, 2));
+ $info['exe']['mz']['raw']['max_memory_paragraphs'] = getid3_lib::LittleEndian2Int(substr($EXEheader, 12, 2));
+ $info['exe']['mz']['raw']['initial_ss'] = getid3_lib::LittleEndian2Int(substr($EXEheader, 14, 2));
+ $info['exe']['mz']['raw']['initial_sp'] = getid3_lib::LittleEndian2Int(substr($EXEheader, 16, 2));
+ $info['exe']['mz']['raw']['checksum'] = getid3_lib::LittleEndian2Int(substr($EXEheader, 18, 2));
+ $info['exe']['mz']['raw']['cs_ip'] = getid3_lib::LittleEndian2Int(substr($EXEheader, 20, 4));
+ $info['exe']['mz']['raw']['relocation_table_offset'] = getid3_lib::LittleEndian2Int(substr($EXEheader, 24, 2));
+ $info['exe']['mz']['raw']['overlay_number'] = getid3_lib::LittleEndian2Int(substr($EXEheader, 26, 2));
- $ThisFileInfo['exe']['mz']['byte_size'] = (($ThisFileInfo['exe']['mz']['raw']['page_count'] - 1)) * 512 + $ThisFileInfo['exe']['mz']['raw']['last_page_size'];
- $ThisFileInfo['exe']['mz']['header_size'] = $ThisFileInfo['exe']['mz']['raw']['header_paragraphs'] * 16;
- $ThisFileInfo['exe']['mz']['memory_minimum'] = $ThisFileInfo['exe']['mz']['raw']['min_memory_paragraphs'] * 16;
- $ThisFileInfo['exe']['mz']['memory_recommended'] = $ThisFileInfo['exe']['mz']['raw']['max_memory_paragraphs'] * 16;
+ $info['exe']['mz']['byte_size'] = (($info['exe']['mz']['raw']['page_count'] - 1)) * 512 + $info['exe']['mz']['raw']['last_page_size'];
+ $info['exe']['mz']['header_size'] = $info['exe']['mz']['raw']['header_paragraphs'] * 16;
+ $info['exe']['mz']['memory_minimum'] = $info['exe']['mz']['raw']['min_memory_paragraphs'] * 16;
+ $info['exe']['mz']['memory_recommended'] = $info['exe']['mz']['raw']['max_memory_paragraphs'] * 16;
-$ThisFileInfo['error'][] = 'EXE parsing not enabled in this version of getID3()';
-return false;
+ $this->error('EXE parsing not enabled in this version of getID3() ['.$this->getid3->version().']');
+ return false;
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.misc.iso.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.misc.iso.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.misc.iso.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.misc.iso.php //
// module for analyzing ISO files //
@@ -13,26 +14,33 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_iso
+class getid3_iso extends getid3_handler
{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- function getid3_iso($fd, &$ThisFileInfo) {
- $ThisFileInfo['fileformat'] = 'iso';
+ $info['fileformat'] = 'iso';
for ($i = 16; $i <= 19; $i++) {
- fseek($fd, 2048 * $i, SEEK_SET);
- $ISOheader = fread($fd, 2048);
+ $this->fseek(2048 * $i);
+ $ISOheader = $this->fread(2048);
if (substr($ISOheader, 1, 5) == 'CD001') {
- switch (ord($ISOheader{0})) {
+ switch (ord($ISOheader[0])) {
case 1:
- $ThisFileInfo['iso']['primary_volume_descriptor']['offset'] = 2048 * $i;
- $this->ParsePrimaryVolumeDescriptor($ISOheader, $ThisFileInfo);
+ $info['iso']['primary_volume_descriptor']['offset'] = 2048 * $i;
+ $this->ParsePrimaryVolumeDescriptor($ISOheader);
break;
case 2:
- $ThisFileInfo['iso']['supplementary_volume_descriptor']['offset'] = 2048 * $i;
- $this->ParseSupplementaryVolumeDescriptor($ISOheader, $ThisFileInfo);
+ $info['iso']['supplementary_volume_descriptor']['offset'] = 2048 * $i;
+ $this->ParseSupplementaryVolumeDescriptor($ISOheader);
break;
default:
@@ -42,35 +50,37 @@
}
}
- $this->ParsePathTable($fd, $ThisFileInfo);
+ $this->ParsePathTable();
- $ThisFileInfo['iso']['files'] = array();
- foreach ($ThisFileInfo['iso']['path_table']['directories'] as $directorynum => $directorydata) {
-
- $ThisFileInfo['iso']['directories'][$directorynum] = $this->ParseDirectoryRecord($fd, $directorydata, $ThisFileInfo);
-
+ $info['iso']['files'] = array();
+ foreach ($info['iso']['path_table']['directories'] as $directorynum => $directorydata) {
+ $info['iso']['directories'][$directorynum] = $this->ParseDirectoryRecord($directorydata);
}
return true;
-
}
-
- function ParsePrimaryVolumeDescriptor(&$ISOheader, &$ThisFileInfo) {
+ /**
+ * @param string $ISOheader
+ *
+ * @return bool
+ */
+ public function ParsePrimaryVolumeDescriptor(&$ISOheader) {
// ISO integer values are stored *BOTH* Little-Endian AND Big-Endian format!!
// ie 12345 == 0x3039 is stored as $39 $30 $30 $39 in a 4-byte field
// shortcuts
- $ThisFileInfo['iso']['primary_volume_descriptor']['raw'] = array();
- $thisfile_iso_primaryVD = &$ThisFileInfo['iso']['primary_volume_descriptor'];
+ $info = &$this->getid3->info;
+ $info['iso']['primary_volume_descriptor']['raw'] = array();
+ $thisfile_iso_primaryVD = &$info['iso']['primary_volume_descriptor'];
$thisfile_iso_primaryVD_raw = &$thisfile_iso_primaryVD['raw'];
$thisfile_iso_primaryVD_raw['volume_descriptor_type'] = getid3_lib::LittleEndian2Int(substr($ISOheader, 0, 1));
$thisfile_iso_primaryVD_raw['standard_identifier'] = substr($ISOheader, 1, 5);
if ($thisfile_iso_primaryVD_raw['standard_identifier'] != 'CD001') {
- $ThisFileInfo['error'][] = 'Expected "CD001" at offset ('.($thisfile_iso_primaryVD['offset'] + 1).'), found "'.$thisfile_iso_primaryVD_raw['standard_identifier'].'" instead';
- unset($ThisFileInfo['fileformat']);
- unset($ThisFileInfo['iso']);
+ $this->error('Expected "CD001" at offset ('.($thisfile_iso_primaryVD['offset'] + 1).'), found "'.$thisfile_iso_primaryVD_raw['standard_identifier'].'" instead');
+ unset($info['fileformat']);
+ unset($info['iso']);
return false;
}
@@ -121,29 +131,34 @@
$thisfile_iso_primaryVD['volume_expiration_date_time'] = $this->ISOtimeText2UNIXtime($thisfile_iso_primaryVD_raw['volume_expiration_date_time']);
$thisfile_iso_primaryVD['volume_effective_date_time'] = $this->ISOtimeText2UNIXtime($thisfile_iso_primaryVD_raw['volume_effective_date_time']);
- if (($thisfile_iso_primaryVD_raw['volume_space_size'] * 2048) > $ThisFileInfo['filesize']) {
- $ThisFileInfo['error'][] = 'Volume Space Size ('.($thisfile_iso_primaryVD_raw['volume_space_size'] * 2048).' bytes) is larger than the file size ('.$ThisFileInfo['filesize'].' bytes) (truncated file?)';
+ if (($thisfile_iso_primaryVD_raw['volume_space_size'] * 2048) > $info['filesize']) {
+ $this->error('Volume Space Size ('.($thisfile_iso_primaryVD_raw['volume_space_size'] * 2048).' bytes) is larger than the file size ('.$info['filesize'].' bytes) (truncated file?)');
}
return true;
}
-
- function ParseSupplementaryVolumeDescriptor(&$ISOheader, &$ThisFileInfo) {
+ /**
+ * @param string $ISOheader
+ *
+ * @return bool
+ */
+ public function ParseSupplementaryVolumeDescriptor(&$ISOheader) {
// ISO integer values are stored Both-Endian format!!
// ie 12345 == 0x3039 is stored as $39 $30 $30 $39 in a 4-byte field
// shortcuts
- $ThisFileInfo['iso']['supplementary_volume_descriptor']['raw'] = array();
- $thisfile_iso_supplementaryVD = &$ThisFileInfo['iso']['supplementary_volume_descriptor'];
+ $info = &$this->getid3->info;
+ $info['iso']['supplementary_volume_descriptor']['raw'] = array();
+ $thisfile_iso_supplementaryVD = &$info['iso']['supplementary_volume_descriptor'];
$thisfile_iso_supplementaryVD_raw = &$thisfile_iso_supplementaryVD['raw'];
$thisfile_iso_supplementaryVD_raw['volume_descriptor_type'] = getid3_lib::LittleEndian2Int(substr($ISOheader, 0, 1));
$thisfile_iso_supplementaryVD_raw['standard_identifier'] = substr($ISOheader, 1, 5);
if ($thisfile_iso_supplementaryVD_raw['standard_identifier'] != 'CD001') {
- $ThisFileInfo['error'][] = 'Expected "CD001" at offset ('.($thisfile_iso_supplementaryVD['offset'] + 1).'), found "'.$thisfile_iso_supplementaryVD_raw['standard_identifier'].'" instead';
- unset($ThisFileInfo['fileformat']);
- unset($ThisFileInfo['iso']);
+ $this->error('Expected "CD001" at offset ('.($thisfile_iso_supplementaryVD['offset'] + 1).'), found "'.$thisfile_iso_supplementaryVD_raw['standard_identifier'].'" instead');
+ unset($info['fileformat']);
+ unset($info['iso']);
return false;
}
@@ -199,62 +214,65 @@
$thisfile_iso_supplementaryVD['volume_expiration_date_time'] = $this->ISOtimeText2UNIXtime($thisfile_iso_supplementaryVD_raw['volume_expiration_date_time']);
$thisfile_iso_supplementaryVD['volume_effective_date_time'] = $this->ISOtimeText2UNIXtime($thisfile_iso_supplementaryVD_raw['volume_effective_date_time']);
- if (($thisfile_iso_supplementaryVD_raw['volume_space_size'] * $thisfile_iso_supplementaryVD_raw['logical_block_size']) > $ThisFileInfo['filesize']) {
- $ThisFileInfo['error'][] = 'Volume Space Size ('.($thisfile_iso_supplementaryVD_raw['volume_space_size'] * $thisfile_iso_supplementaryVD_raw['logical_block_size']).' bytes) is larger than the file size ('.$ThisFileInfo['filesize'].' bytes) (truncated file?)';
+ if (($thisfile_iso_supplementaryVD_raw['volume_space_size'] * $thisfile_iso_supplementaryVD_raw['logical_block_size']) > $info['filesize']) {
+ $this->error('Volume Space Size ('.($thisfile_iso_supplementaryVD_raw['volume_space_size'] * $thisfile_iso_supplementaryVD_raw['logical_block_size']).' bytes) is larger than the file size ('.$info['filesize'].' bytes) (truncated file?)');
}
return true;
}
-
- function ParsePathTable($fd, &$ThisFileInfo) {
- if (!isset($ThisFileInfo['iso']['supplementary_volume_descriptor']['raw']['path_table_l_location']) && !isset($ThisFileInfo['iso']['primary_volume_descriptor']['raw']['path_table_l_location'])) {
+ /**
+ * @return bool
+ */
+ public function ParsePathTable() {
+ $info = &$this->getid3->info;
+ if (!isset($info['iso']['supplementary_volume_descriptor']['raw']['path_table_l_location']) && !isset($info['iso']['primary_volume_descriptor']['raw']['path_table_l_location'])) {
return false;
}
- if (isset($ThisFileInfo['iso']['supplementary_volume_descriptor']['raw']['path_table_l_location'])) {
- $PathTableLocation = $ThisFileInfo['iso']['supplementary_volume_descriptor']['raw']['path_table_l_location'];
- $PathTableSize = $ThisFileInfo['iso']['supplementary_volume_descriptor']['raw']['path_table_size'];
+ if (isset($info['iso']['supplementary_volume_descriptor']['raw']['path_table_l_location'])) {
+ $PathTableLocation = $info['iso']['supplementary_volume_descriptor']['raw']['path_table_l_location'];
+ $PathTableSize = $info['iso']['supplementary_volume_descriptor']['raw']['path_table_size'];
$TextEncoding = 'UTF-16BE'; // Big-Endian Unicode
} else {
- $PathTableLocation = $ThisFileInfo['iso']['primary_volume_descriptor']['raw']['path_table_l_location'];
- $PathTableSize = $ThisFileInfo['iso']['primary_volume_descriptor']['raw']['path_table_size'];
+ $PathTableLocation = $info['iso']['primary_volume_descriptor']['raw']['path_table_l_location'];
+ $PathTableSize = $info['iso']['primary_volume_descriptor']['raw']['path_table_size'];
$TextEncoding = 'ISO-8859-1'; // Latin-1
}
- if (($PathTableLocation * 2048) > $ThisFileInfo['filesize']) {
- $ThisFileInfo['error'][] = 'Path Table Location specifies an offset ('.($PathTableLocation * 2048).') beyond the end-of-file ('.$ThisFileInfo['filesize'].')';
+ if (($PathTableLocation * 2048) > $info['filesize']) {
+ $this->error('Path Table Location specifies an offset ('.($PathTableLocation * 2048).') beyond the end-of-file ('.$info['filesize'].')');
return false;
}
- $ThisFileInfo['iso']['path_table']['offset'] = $PathTableLocation * 2048;
- fseek($fd, $ThisFileInfo['iso']['path_table']['offset'], SEEK_SET);
- $ThisFileInfo['iso']['path_table']['raw'] = fread($fd, $PathTableSize);
+ $info['iso']['path_table']['offset'] = $PathTableLocation * 2048;
+ $this->fseek($info['iso']['path_table']['offset']);
+ $info['iso']['path_table']['raw'] = $this->fread($PathTableSize);
$offset = 0;
$pathcounter = 1;
while ($offset < $PathTableSize) {
// shortcut
- $ThisFileInfo['iso']['path_table']['directories'][$pathcounter] = array();
- $thisfile_iso_pathtable_directories_current = &$ThisFileInfo['iso']['path_table']['directories'][$pathcounter];
+ $info['iso']['path_table']['directories'][$pathcounter] = array();
+ $thisfile_iso_pathtable_directories_current = &$info['iso']['path_table']['directories'][$pathcounter];
- $thisfile_iso_pathtable_directories_current['length'] = getid3_lib::LittleEndian2Int(substr($ThisFileInfo['iso']['path_table']['raw'], $offset, 1));
+ $thisfile_iso_pathtable_directories_current['length'] = getid3_lib::LittleEndian2Int(substr($info['iso']['path_table']['raw'], $offset, 1));
$offset += 1;
- $thisfile_iso_pathtable_directories_current['extended_length'] = getid3_lib::LittleEndian2Int(substr($ThisFileInfo['iso']['path_table']['raw'], $offset, 1));
+ $thisfile_iso_pathtable_directories_current['extended_length'] = getid3_lib::LittleEndian2Int(substr($info['iso']['path_table']['raw'], $offset, 1));
$offset += 1;
- $thisfile_iso_pathtable_directories_current['location_logical'] = getid3_lib::LittleEndian2Int(substr($ThisFileInfo['iso']['path_table']['raw'], $offset, 4));
+ $thisfile_iso_pathtable_directories_current['location_logical'] = getid3_lib::LittleEndian2Int(substr($info['iso']['path_table']['raw'], $offset, 4));
$offset += 4;
- $thisfile_iso_pathtable_directories_current['parent_directory'] = getid3_lib::LittleEndian2Int(substr($ThisFileInfo['iso']['path_table']['raw'], $offset, 2));
+ $thisfile_iso_pathtable_directories_current['parent_directory'] = getid3_lib::LittleEndian2Int(substr($info['iso']['path_table']['raw'], $offset, 2));
$offset += 2;
- $thisfile_iso_pathtable_directories_current['name'] = substr($ThisFileInfo['iso']['path_table']['raw'], $offset, $thisfile_iso_pathtable_directories_current['length']);
+ $thisfile_iso_pathtable_directories_current['name'] = substr($info['iso']['path_table']['raw'], $offset, $thisfile_iso_pathtable_directories_current['length']);
$offset += $thisfile_iso_pathtable_directories_current['length'] + ($thisfile_iso_pathtable_directories_current['length'] % 2);
- $thisfile_iso_pathtable_directories_current['name_ascii'] = getid3_lib::iconv_fallback($TextEncoding, $ThisFileInfo['encoding'], $thisfile_iso_pathtable_directories_current['name']);
+ $thisfile_iso_pathtable_directories_current['name_ascii'] = getid3_lib::iconv_fallback($TextEncoding, $info['encoding'], $thisfile_iso_pathtable_directories_current['name']);
$thisfile_iso_pathtable_directories_current['location_bytes'] = $thisfile_iso_pathtable_directories_current['location_logical'] * 2048;
if ($pathcounter == 1) {
$thisfile_iso_pathtable_directories_current['full_path'] = '/';
} else {
- $thisfile_iso_pathtable_directories_current['full_path'] = $ThisFileInfo['iso']['path_table']['directories'][$thisfile_iso_pathtable_directories_current['parent_directory']]['full_path'].$thisfile_iso_pathtable_directories_current['name_ascii'].'/';
+ $thisfile_iso_pathtable_directories_current['full_path'] = $info['iso']['path_table']['directories'][$thisfile_iso_pathtable_directories_current['parent_directory']]['full_path'].$thisfile_iso_pathtable_directories_current['name_ascii'].'/';
}
$FullPathArray[] = $thisfile_iso_pathtable_directories_current['full_path'];
@@ -264,21 +282,29 @@
return true;
}
-
- function ParseDirectoryRecord(&$fd, $directorydata, &$ThisFileInfo) {
- if (isset($ThisFileInfo['iso']['supplementary_volume_descriptor'])) {
+ /**
+ * @param array $directorydata
+ *
+ * @return array
+ */
+ public function ParseDirectoryRecord($directorydata) {
+ $info = &$this->getid3->info;
+ if (isset($info['iso']['supplementary_volume_descriptor'])) {
$TextEncoding = 'UTF-16BE'; // Big-Endian Unicode
} else {
$TextEncoding = 'ISO-8859-1'; // Latin-1
}
- fseek($fd, $directorydata['location_bytes'], SEEK_SET);
- $DirectoryRecordData = fread($fd, 1);
+ $this->fseek($directorydata['location_bytes']);
+ $DirectoryRecordData = $this->fread(1);
+ $DirectoryRecord = array();
- while (ord($DirectoryRecordData{0}) > 33) {
+ while (ord($DirectoryRecordData[0]) > 33) {
- $DirectoryRecordData .= fread($fd, ord($DirectoryRecordData{0}) - 1);
+ $DirectoryRecordData .= $this->fread(ord($DirectoryRecordData[0]) - 1);
+ $ThisDirectoryRecord = array();
+
$ThisDirectoryRecord['raw']['length'] = getid3_lib::LittleEndian2Int(substr($DirectoryRecordData, 0, 1));
$ThisDirectoryRecord['raw']['extended_attribute_length'] = getid3_lib::LittleEndian2Int(substr($DirectoryRecordData, 1, 1));
$ThisDirectoryRecord['raw']['offset_logical'] = getid3_lib::LittleEndian2Int(substr($DirectoryRecordData, 2, 4));
@@ -291,7 +317,7 @@
$ThisDirectoryRecord['raw']['file_identifier_length'] = getid3_lib::LittleEndian2Int(substr($DirectoryRecordData, 32, 1));
$ThisDirectoryRecord['raw']['file_identifier'] = substr($DirectoryRecordData, 33, $ThisDirectoryRecord['raw']['file_identifier_length']);
- $ThisDirectoryRecord['file_identifier_ascii'] = getid3_lib::iconv_fallback($TextEncoding, $ThisFileInfo['encoding'], $ThisDirectoryRecord['raw']['file_identifier']);
+ $ThisDirectoryRecord['file_identifier_ascii'] = getid3_lib::iconv_fallback($TextEncoding, $info['encoding'], $ThisDirectoryRecord['raw']['file_identifier']);
$ThisDirectoryRecord['filesize'] = $ThisDirectoryRecord['raw']['filesize'];
$ThisDirectoryRecord['offset_bytes'] = $ThisDirectoryRecord['raw']['offset_logical'] * 2048;
@@ -307,17 +333,22 @@
$ThisDirectoryRecord['filename'] = $directorydata['full_path'];
} else {
$ThisDirectoryRecord['filename'] = $directorydata['full_path'].$this->ISOstripFilenameVersion($ThisDirectoryRecord['file_identifier_ascii']);
- $ThisFileInfo['iso']['files'] = getid3_lib::array_merge_clobber($ThisFileInfo['iso']['files'], getid3_lib::CreateDeepArray($ThisDirectoryRecord['filename'], '/', $ThisDirectoryRecord['filesize']));
+ $info['iso']['files'] = getid3_lib::array_merge_clobber($info['iso']['files'], getid3_lib::CreateDeepArray($ThisDirectoryRecord['filename'], '/', $ThisDirectoryRecord['filesize']));
}
$DirectoryRecord[] = $ThisDirectoryRecord;
- $DirectoryRecordData = fread($fd, 1);
+ $DirectoryRecordData = $this->fread(1);
}
return $DirectoryRecord;
}
- function ISOstripFilenameVersion($ISOfilename) {
+ /**
+ * @param string $ISOfilename
+ *
+ * @return string
+ */
+ public function ISOstripFilenameVersion($ISOfilename) {
// convert 'filename.ext;1' to 'filename.ext'
if (!strstr($ISOfilename, ';')) {
return $ISOfilename;
@@ -326,7 +357,12 @@
}
}
- function ISOtimeText2UNIXtime($ISOtime) {
+ /**
+ * @param string $ISOtime
+ *
+ * @return int|false
+ */
+ public function ISOtimeText2UNIXtime($ISOtime) {
$UNIXyear = (int) substr($ISOtime, 0, 4);
$UNIXmonth = (int) substr($ISOtime, 4, 2);
@@ -341,7 +377,12 @@
return gmmktime($UNIXhour, $UNIXminute, $UNIXsecond, $UNIXmonth, $UNIXday, $UNIXyear);
}
- function ISOtime2UNIXtime($ISOtime) {
+ /**
+ * @param string $ISOtime
+ *
+ * @return int
+ */
+ public function ISOtime2UNIXtime($ISOtime) {
// Represented by seven bytes:
// 1: Number of years since 1900
// 2: Month of the year from 1 to 12
@@ -351,18 +392,23 @@
// 6: second of the minute from 0 to 59
// 7: Offset from Greenwich Mean Time in number of 15 minute intervals from -48 (West) to +52 (East)
- $UNIXyear = ord($ISOtime{0}) + 1900;
- $UNIXmonth = ord($ISOtime{1});
- $UNIXday = ord($ISOtime{2});
- $UNIXhour = ord($ISOtime{3});
- $UNIXminute = ord($ISOtime{4});
- $UNIXsecond = ord($ISOtime{5});
- $GMToffset = $this->TwosCompliment2Decimal(ord($ISOtime{5}));
+ $UNIXyear = ord($ISOtime[0]) + 1900;
+ $UNIXmonth = ord($ISOtime[1]);
+ $UNIXday = ord($ISOtime[2]);
+ $UNIXhour = ord($ISOtime[3]);
+ $UNIXminute = ord($ISOtime[4]);
+ $UNIXsecond = ord($ISOtime[5]);
+ $GMToffset = $this->TwosCompliment2Decimal(ord($ISOtime[5]));
return gmmktime($UNIXhour, $UNIXminute, $UNIXsecond, $UNIXmonth, $UNIXday, $UNIXyear);
}
- function TwosCompliment2Decimal($BinaryValue) {
+ /**
+ * @param int $BinaryValue
+ *
+ * @return int
+ */
+ public function TwosCompliment2Decimal($BinaryValue) {
// http://sandbox.mc.edu/~bennet/cs110/tc/tctod.html
// First check if the number is negative or positive by looking at the sign bit.
// If it is positive, simply convert it to decimal.
@@ -382,5 +428,3 @@
}
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.tag.apetag.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.tag.apetag.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.tag.apetag.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.tag.apetag.php //
// module for analyzing APE tags //
@@ -13,77 +14,102 @@
// ///
/////////////////////////////////////////////////////////////////
-class getid3_apetag
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
+
+class getid3_apetag extends getid3_handler
{
+ /**
+ * true: return full data for all attachments;
+ * false: return no data for all attachments;
+ * integer: return data for attachments <= than this;
+ * string: save as file to this directory.
+ *
+ * @var int|bool|string
+ */
+ public $inline_attachments = true;
- function getid3_apetag(&$fd, &$ThisFileInfo, $overrideendoffset=0) {
+ public $overrideendoffset = 0;
+
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
+
+ if (!getid3_lib::intValueSupported($info['filesize'])) {
+ $this->warning('Unable to check for APEtags because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB');
+ return false;
+ }
+
$id3v1tagsize = 128;
$apetagheadersize = 32;
$lyrics3tagsize = 10;
- if ($overrideendoffset == 0) {
+ if ($this->overrideendoffset == 0) {
- fseek($fd, 0 - $id3v1tagsize - $apetagheadersize - $lyrics3tagsize, SEEK_END);
- $APEfooterID3v1 = fread($fd, $id3v1tagsize + $apetagheadersize + $lyrics3tagsize);
+ $this->fseek(0 - $id3v1tagsize - $apetagheadersize - $lyrics3tagsize, SEEK_END);
+ $APEfooterID3v1 = $this->fread($id3v1tagsize + $apetagheadersize + $lyrics3tagsize);
//if (preg_match('/APETAGEX.{24}TAG.{125}$/i', $APEfooterID3v1)) {
if (substr($APEfooterID3v1, strlen($APEfooterID3v1) - $id3v1tagsize - $apetagheadersize, 8) == 'APETAGEX') {
// APE tag found before ID3v1
- $ThisFileInfo['ape']['tag_offset_end'] = $ThisFileInfo['filesize'] - $id3v1tagsize;
+ $info['ape']['tag_offset_end'] = $info['filesize'] - $id3v1tagsize;
//} elseif (preg_match('/APETAGEX.{24}$/i', $APEfooterID3v1)) {
} elseif (substr($APEfooterID3v1, strlen($APEfooterID3v1) - $apetagheadersize, 8) == 'APETAGEX') {
// APE tag found, no ID3v1
- $ThisFileInfo['ape']['tag_offset_end'] = $ThisFileInfo['filesize'];
+ $info['ape']['tag_offset_end'] = $info['filesize'];
}
} else {
- fseek($fd, $overrideendoffset - $apetagheadersize, SEEK_SET);
- if (fread($fd, 8) == 'APETAGEX') {
- $ThisFileInfo['ape']['tag_offset_end'] = $overrideendoffset;
+ $this->fseek($this->overrideendoffset - $apetagheadersize);
+ if ($this->fread(8) == 'APETAGEX') {
+ $info['ape']['tag_offset_end'] = $this->overrideendoffset;
}
}
- if (!isset($ThisFileInfo['ape']['tag_offset_end'])) {
+ if (!isset($info['ape']['tag_offset_end'])) {
// APE tag not found
- unset($ThisFileInfo['ape']);
+ unset($info['ape']);
return false;
}
// shortcut
- $thisfile_ape = &$ThisFileInfo['ape'];
+ $thisfile_ape = &$info['ape'];
- fseek($fd, $thisfile_ape['tag_offset_end'] - $apetagheadersize, SEEK_SET);
- $APEfooterData = fread($fd, 32);
+ $this->fseek($thisfile_ape['tag_offset_end'] - $apetagheadersize);
+ $APEfooterData = $this->fread(32);
if (!($thisfile_ape['footer'] = $this->parseAPEheaderFooter($APEfooterData))) {
- $ThisFileInfo['error'][] = 'Error parsing APE footer at offset '.$thisfile_ape['tag_offset_end'];
+ $this->error('Error parsing APE footer at offset '.$thisfile_ape['tag_offset_end']);
return false;
}
if (isset($thisfile_ape['footer']['flags']['header']) && $thisfile_ape['footer']['flags']['header']) {
- fseek($fd, $thisfile_ape['tag_offset_end'] - $thisfile_ape['footer']['raw']['tagsize'] - $apetagheadersize, SEEK_SET);
- $thisfile_ape['tag_offset_start'] = ftell($fd);
- $APEtagData = fread($fd, $thisfile_ape['footer']['raw']['tagsize'] + $apetagheadersize);
+ $this->fseek($thisfile_ape['tag_offset_end'] - $thisfile_ape['footer']['raw']['tagsize'] - $apetagheadersize);
+ $thisfile_ape['tag_offset_start'] = $this->ftell();
+ $APEtagData = $this->fread($thisfile_ape['footer']['raw']['tagsize'] + $apetagheadersize);
} else {
$thisfile_ape['tag_offset_start'] = $thisfile_ape['tag_offset_end'] - $thisfile_ape['footer']['raw']['tagsize'];
- fseek($fd, $thisfile_ape['tag_offset_start'], SEEK_SET);
- $APEtagData = fread($fd, $thisfile_ape['footer']['raw']['tagsize']);
+ $this->fseek($thisfile_ape['tag_offset_start']);
+ $APEtagData = $this->fread($thisfile_ape['footer']['raw']['tagsize']);
}
- $ThisFileInfo['avdataend'] = $thisfile_ape['tag_offset_start'];
+ $info['avdataend'] = $thisfile_ape['tag_offset_start'];
- if (isset($ThisFileInfo['id3v1']['tag_offset_start']) && ($ThisFileInfo['id3v1']['tag_offset_start'] < $thisfile_ape['tag_offset_end'])) {
- $ThisFileInfo['warning'][] = 'ID3v1 tag information ignored since it appears to be a false synch in APEtag data';
- unset($ThisFileInfo['id3v1']);
- foreach ($ThisFileInfo['warning'] as $key => $value) {
+ if (isset($info['id3v1']['tag_offset_start']) && ($info['id3v1']['tag_offset_start'] < $thisfile_ape['tag_offset_end'])) {
+ $this->warning('ID3v1 tag information ignored since it appears to be a false synch in APEtag data');
+ unset($info['id3v1']);
+ foreach ($info['warning'] as $key => $value) {
if ($value == 'Some ID3v1 fields do not use NULL characters for padding') {
- unset($ThisFileInfo['warning'][$key]);
- sort($ThisFileInfo['warning']);
+ unset($info['warning'][$key]);
+ sort($info['warning']);
break;
}
}
@@ -94,15 +120,15 @@
if ($thisfile_ape['header'] = $this->parseAPEheaderFooter(substr($APEtagData, 0, $apetagheadersize))) {
$offset += $apetagheadersize;
} else {
- $ThisFileInfo['error'][] = 'Error parsing APE header at offset '.$thisfile_ape['tag_offset_start'];
+ $this->error('Error parsing APE header at offset '.$thisfile_ape['tag_offset_start']);
return false;
}
}
// shortcut
- $ThisFileInfo['replay_gain'] = array();
- $thisfile_replaygain = &$ThisFileInfo['replay_gain'];
-
+ $info['replay_gain'] = array();
+ $thisfile_replaygain = &$info['replay_gain'];
+
for ($i = 0; $i < $thisfile_ape['footer']['raw']['tag_items']; $i++) {
$value_size = getid3_lib::LittleEndian2Int(substr($APEtagData, $offset, 4));
$offset += 4;
@@ -109,7 +135,7 @@
$item_flags = getid3_lib::LittleEndian2Int(substr($APEtagData, $offset, 4));
$offset += 4;
if (strstr(substr($APEtagData, $offset), "\x00") === false) {
- $ThisFileInfo['error'][] = 'Cannot find null-byte (0x00) seperator between ItemKey #'.$i.' and value. ItemKey starts '.$offset.' bytes into the APE tag, at file offset '.($thisfile_ape['tag_offset_start'] + $offset);
+ $this->error('Cannot find null-byte (0x00) separator between ItemKey #'.$i.' and value. ItemKey starts '.$offset.' bytes into the APE tag, at file offset '.($thisfile_ape['tag_offset_start'] + $offset));
return false;
}
$ItemKeyLength = strpos($APEtagData, "\x00", $offset) - $offset;
@@ -119,6 +145,8 @@
$thisfile_ape['items'][$item_key] = array();
$thisfile_ape_items_current = &$thisfile_ape['items'][$item_key];
+ $thisfile_ape_items_current['offset'] = $thisfile_ape['tag_offset_start'] + $offset;
+
$offset += ($ItemKeyLength + 1); // skip 0x00 terminator
$thisfile_ape_items_current['data'] = substr($APEtagData, $offset, $value_size);
$offset += $value_size;
@@ -126,69 +154,192 @@
$thisfile_ape_items_current['flags'] = $this->parseAPEtagFlags($item_flags);
switch ($thisfile_ape_items_current['flags']['item_contents_raw']) {
case 0: // UTF-8
- case 3: // Locator (URL, filename, etc), UTF-8 encoded
- $thisfile_ape_items_current['data'] = explode("\x00", trim($thisfile_ape_items_current['data']));
+ case 2: // Locator (URL, filename, etc), UTF-8 encoded
+ $thisfile_ape_items_current['data'] = explode("\x00", $thisfile_ape_items_current['data']);
break;
- default: // binary data
+ case 1: // binary data
+ default:
break;
}
switch (strtolower($item_key)) {
+ // http://wiki.hydrogenaud.io/index.php?title=ReplayGain#MP3Gain
case 'replaygain_track_gain':
- $thisfile_replaygain['track']['adjustment'] = (float) str_replace(',', '.', $thisfile_ape_items_current['data'][0]); // float casting will see "0,95" as zero!
- $thisfile_replaygain['track']['originator'] = 'unspecified';
+ if (preg_match('#^([\\-\\+][0-9\\.,]{8})( dB)?$#', $thisfile_ape_items_current['data'][0], $matches)) {
+ $thisfile_replaygain['track']['adjustment'] = (float) str_replace(',', '.', $matches[1]); // float casting will see "0,95" as zero!
+ $thisfile_replaygain['track']['originator'] = 'unspecified';
+ } else {
+ $this->warning('MP3gainTrackGain value in APEtag appears invalid: "'.$thisfile_ape_items_current['data'][0].'"');
+ }
break;
case 'replaygain_track_peak':
- $thisfile_replaygain['track']['peak'] = (float) str_replace(',', '.', $thisfile_ape_items_current['data'][0]); // float casting will see "0,95" as zero!
- $thisfile_replaygain['track']['originator'] = 'unspecified';
- if ($thisfile_replaygain['track']['peak'] <= 0) {
- $ThisFileInfo['warning'][] = 'ReplayGain Track peak from APEtag appears invalid: '.$thisfile_replaygain['track']['peak'].' (original value = "'.$thisfile_ape_items_current['data'][0].'")';
+ if (preg_match('#^([0-9\\.,]{8})$#', $thisfile_ape_items_current['data'][0], $matches)) {
+ $thisfile_replaygain['track']['peak'] = (float) str_replace(',', '.', $matches[1]); // float casting will see "0,95" as zero!
+ $thisfile_replaygain['track']['originator'] = 'unspecified';
+ if ($thisfile_replaygain['track']['peak'] <= 0) {
+ $this->warning('ReplayGain Track peak from APEtag appears invalid: '.$thisfile_replaygain['track']['peak'].' (original value = "'.$thisfile_ape_items_current['data'][0].'")');
+ }
+ } else {
+ $this->warning('MP3gainTrackPeak value in APEtag appears invalid: "'.$thisfile_ape_items_current['data'][0].'"');
}
break;
case 'replaygain_album_gain':
- $thisfile_replaygain['album']['adjustment'] = (float) str_replace(',', '.', $thisfile_ape_items_current['data'][0]); // float casting will see "0,95" as zero!
- $thisfile_replaygain['album']['originator'] = 'unspecified';
+ if (preg_match('#^([\\-\\+][0-9\\.,]{8})( dB)?$#', $thisfile_ape_items_current['data'][0], $matches)) {
+ $thisfile_replaygain['album']['adjustment'] = (float) str_replace(',', '.', $matches[1]); // float casting will see "0,95" as zero!
+ $thisfile_replaygain['album']['originator'] = 'unspecified';
+ } else {
+ $this->warning('MP3gainAlbumGain value in APEtag appears invalid: "'.$thisfile_ape_items_current['data'][0].'"');
+ }
break;
case 'replaygain_album_peak':
- $thisfile_replaygain['album']['peak'] = (float) str_replace(',', '.', $thisfile_ape_items_current['data'][0]); // float casting will see "0,95" as zero!
- $thisfile_replaygain['album']['originator'] = 'unspecified';
- if ($thisfile_replaygain['album']['peak'] <= 0) {
- $ThisFileInfo['warning'][] = 'ReplayGain Album peak from APEtag appears invalid: '.$thisfile_replaygain['album']['peak'].' (original value = "'.$thisfile_ape_items_current['data'][0].'")';
+ if (preg_match('#^([0-9\\.,]{8})$#', $thisfile_ape_items_current['data'][0], $matches)) {
+ $thisfile_replaygain['album']['peak'] = (float) str_replace(',', '.', $matches[1]); // float casting will see "0,95" as zero!
+ $thisfile_replaygain['album']['originator'] = 'unspecified';
+ if ($thisfile_replaygain['album']['peak'] <= 0) {
+ $this->warning('ReplayGain Album peak from APEtag appears invalid: '.$thisfile_replaygain['album']['peak'].' (original value = "'.$thisfile_ape_items_current['data'][0].'")');
+ }
+ } else {
+ $this->warning('MP3gainAlbumPeak value in APEtag appears invalid: "'.$thisfile_ape_items_current['data'][0].'"');
}
break;
case 'mp3gain_undo':
- list($mp3gain_undo_left, $mp3gain_undo_right, $mp3gain_undo_wrap) = explode(',', $thisfile_ape_items_current['data'][0]);
- $thisfile_replaygain['mp3gain']['undo_left'] = intval($mp3gain_undo_left);
- $thisfile_replaygain['mp3gain']['undo_right'] = intval($mp3gain_undo_right);
- $thisfile_replaygain['mp3gain']['undo_wrap'] = (($mp3gain_undo_wrap == 'Y') ? true : false);
+ if (preg_match('#^[\\-\\+][0-9]{3},[\\-\\+][0-9]{3},[NW]$#', $thisfile_ape_items_current['data'][0])) {
+ list($mp3gain_undo_left, $mp3gain_undo_right, $mp3gain_undo_wrap) = explode(',', $thisfile_ape_items_current['data'][0]);
+ $thisfile_replaygain['mp3gain']['undo_left'] = intval($mp3gain_undo_left);
+ $thisfile_replaygain['mp3gain']['undo_right'] = intval($mp3gain_undo_right);
+ $thisfile_replaygain['mp3gain']['undo_wrap'] = (($mp3gain_undo_wrap == 'Y') ? true : false);
+ } else {
+ $this->warning('MP3gainUndo value in APEtag appears invalid: "'.$thisfile_ape_items_current['data'][0].'"');
+ }
break;
case 'mp3gain_minmax':
- list($mp3gain_globalgain_min, $mp3gain_globalgain_max) = explode(',', $thisfile_ape_items_current['data'][0]);
- $thisfile_replaygain['mp3gain']['globalgain_track_min'] = intval($mp3gain_globalgain_min);
- $thisfile_replaygain['mp3gain']['globalgain_track_max'] = intval($mp3gain_globalgain_max);
+ if (preg_match('#^[0-9]{3},[0-9]{3}$#', $thisfile_ape_items_current['data'][0])) {
+ list($mp3gain_globalgain_min, $mp3gain_globalgain_max) = explode(',', $thisfile_ape_items_current['data'][0]);
+ $thisfile_replaygain['mp3gain']['globalgain_track_min'] = intval($mp3gain_globalgain_min);
+ $thisfile_replaygain['mp3gain']['globalgain_track_max'] = intval($mp3gain_globalgain_max);
+ } else {
+ $this->warning('MP3gainMinMax value in APEtag appears invalid: "'.$thisfile_ape_items_current['data'][0].'"');
+ }
break;
case 'mp3gain_album_minmax':
- list($mp3gain_globalgain_album_min, $mp3gain_globalgain_album_max) = explode(',', $thisfile_ape_items_current['data'][0]);
- $thisfile_replaygain['mp3gain']['globalgain_album_min'] = intval($mp3gain_globalgain_album_min);
- $thisfile_replaygain['mp3gain']['globalgain_album_max'] = intval($mp3gain_globalgain_album_max);
+ if (preg_match('#^[0-9]{3},[0-9]{3}$#', $thisfile_ape_items_current['data'][0])) {
+ list($mp3gain_globalgain_album_min, $mp3gain_globalgain_album_max) = explode(',', $thisfile_ape_items_current['data'][0]);
+ $thisfile_replaygain['mp3gain']['globalgain_album_min'] = intval($mp3gain_globalgain_album_min);
+ $thisfile_replaygain['mp3gain']['globalgain_album_max'] = intval($mp3gain_globalgain_album_max);
+ } else {
+ $this->warning('MP3gainAlbumMinMax value in APEtag appears invalid: "'.$thisfile_ape_items_current['data'][0].'"');
+ }
break;
case 'tracknumber':
- foreach ($thisfile_ape_items_current['data'] as $comment) {
- $thisfile_ape['comments']['track'][] = $comment;
+ if (is_array($thisfile_ape_items_current['data'])) {
+ foreach ($thisfile_ape_items_current['data'] as $comment) {
+ $thisfile_ape['comments']['track_number'][] = $comment;
+ }
}
break;
+ case 'cover art (artist)':
+ case 'cover art (back)':
+ case 'cover art (band logo)':
+ case 'cover art (band)':
+ case 'cover art (colored fish)':
+ case 'cover art (composer)':
+ case 'cover art (conductor)':
+ case 'cover art (front)':
+ case 'cover art (icon)':
+ case 'cover art (illustration)':
+ case 'cover art (lead)':
+ case 'cover art (leaflet)':
+ case 'cover art (lyricist)':
+ case 'cover art (media)':
+ case 'cover art (movie scene)':
+ case 'cover art (other icon)':
+ case 'cover art (other)':
+ case 'cover art (performance)':
+ case 'cover art (publisher logo)':
+ case 'cover art (recording)':
+ case 'cover art (studio)':
+ // list of possible cover arts from http://taglib-sharp.sourcearchive.com/documentation/2.0.3.0-2/Ape_2Tag_8cs-source.html
+ if (is_array($thisfile_ape_items_current['data'])) {
+ $this->warning('APEtag "'.$item_key.'" should be flagged as Binary data, but was incorrectly flagged as UTF-8');
+ $thisfile_ape_items_current['data'] = implode("\x00", $thisfile_ape_items_current['data']);
+ }
+ list($thisfile_ape_items_current['filename'], $thisfile_ape_items_current['data']) = explode("\x00", $thisfile_ape_items_current['data'], 2);
+ $thisfile_ape_items_current['data_offset'] = $thisfile_ape_items_current['offset'] + strlen($thisfile_ape_items_current['filename']."\x00");
+ $thisfile_ape_items_current['data_length'] = strlen($thisfile_ape_items_current['data']);
+
+ do {
+ $thisfile_ape_items_current['image_mime'] = '';
+ $imageinfo = array();
+ $imagechunkcheck = getid3_lib::GetDataImageSize($thisfile_ape_items_current['data'], $imageinfo);
+ if (($imagechunkcheck === false) || !isset($imagechunkcheck[2])) {
+ $this->warning('APEtag "'.$item_key.'" contains invalid image data');
+ break;
+ }
+ $thisfile_ape_items_current['image_mime'] = image_type_to_mime_type($imagechunkcheck[2]);
+
+ if ($this->inline_attachments === false) {
+ // skip entirely
+ unset($thisfile_ape_items_current['data']);
+ break;
+ }
+ if ($this->inline_attachments === true) {
+ // great
+ } elseif (is_int($this->inline_attachments)) {
+ if ($this->inline_attachments < $thisfile_ape_items_current['data_length']) {
+ // too big, skip
+ $this->warning('attachment at '.$thisfile_ape_items_current['offset'].' is too large to process inline ('.number_format($thisfile_ape_items_current['data_length']).' bytes)');
+ unset($thisfile_ape_items_current['data']);
+ break;
+ }
+ } elseif (is_string($this->inline_attachments)) {
+ $this->inline_attachments = rtrim(str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $this->inline_attachments), DIRECTORY_SEPARATOR);
+ if (!is_dir($this->inline_attachments) || !getID3::is_writable($this->inline_attachments)) {
+ // cannot write, skip
+ $this->warning('attachment at '.$thisfile_ape_items_current['offset'].' cannot be saved to "'.$this->inline_attachments.'" (not writable)');
+ unset($thisfile_ape_items_current['data']);
+ break;
+ }
+ }
+ // if we get this far, must be OK
+ if (is_string($this->inline_attachments)) {
+ $destination_filename = $this->inline_attachments.DIRECTORY_SEPARATOR.md5($info['filenamepath']).'_'.$thisfile_ape_items_current['data_offset'];
+ if (!file_exists($destination_filename) || getID3::is_writable($destination_filename)) {
+ file_put_contents($destination_filename, $thisfile_ape_items_current['data']);
+ } else {
+ $this->warning('attachment at '.$thisfile_ape_items_current['offset'].' cannot be saved to "'.$destination_filename.'" (not writable)');
+ }
+ $thisfile_ape_items_current['data_filename'] = $destination_filename;
+ unset($thisfile_ape_items_current['data']);
+ } else {
+ if (!isset($info['ape']['comments']['picture'])) {
+ $info['ape']['comments']['picture'] = array();
+ }
+ $comments_picture_data = array();
+ foreach (array('data', 'image_mime', 'image_width', 'image_height', 'imagetype', 'picturetype', 'description', 'datalength') as $picture_key) {
+ if (isset($thisfile_ape_items_current[$picture_key])) {
+ $comments_picture_data[$picture_key] = $thisfile_ape_items_current[$picture_key];
+ }
+ }
+ $info['ape']['comments']['picture'][] = $comments_picture_data;
+ unset($comments_picture_data);
+ }
+ } while (false);
+ break;
+
default:
- foreach ($thisfile_ape_items_current['data'] as $comment) {
- $thisfile_ape['comments'][strtolower($item_key)][] = $comment;
+ if (is_array($thisfile_ape_items_current['data'])) {
+ foreach ($thisfile_ape_items_current['data'] as $comment) {
+ $thisfile_ape['comments'][strtolower($item_key)][] = $comment;
+ }
}
break;
}
@@ -195,13 +346,17 @@
}
if (empty($thisfile_replaygain)) {
- unset($ThisFileInfo['replay_gain']);
+ unset($info['replay_gain']);
}
-
return true;
}
- function parseAPEheaderFooter($APEheaderFooterData) {
+ /**
+ * @param string $APEheaderFooterData
+ *
+ * @return array|false
+ */
+ public function parseAPEheaderFooter($APEheaderFooterData) {
// http://www.uni-jena.de/~pfk/mpp/sv8/apeheader.html
// shortcut
@@ -225,10 +380,15 @@
return $headerfooterinfo;
}
- function parseAPEtagFlags($rawflagint) {
+ /**
+ * @param int $rawflagint
+ *
+ * @return array
+ */
+ public function parseAPEtagFlags($rawflagint) {
// "Note: APE Tags 1.0 do not use any of the APE Tag flags.
// All are set to zero on creation and ignored on reading."
- // http://www.uni-jena.de/~pfk/mpp/sv8/apetagflags.html
+ // http://wiki.hydrogenaud.io/index.php?title=Ape_Tags_Flags
$flags['header'] = (bool) ($rawflagint & 0x80000000);
$flags['footer'] = (bool) ($rawflagint & 0x40000000);
$flags['this_is_header'] = (bool) ($rawflagint & 0x20000000);
@@ -240,7 +400,12 @@
return $flags;
}
- function APEcontentTypeFlagLookup($contenttypeid) {
+ /**
+ * @param int $contenttypeid
+ *
+ * @return string
+ */
+ public function APEcontentTypeFlagLookup($contenttypeid) {
static $APEcontentTypeFlagLookup = array(
0 => 'utf-8',
1 => 'binary',
@@ -250,7 +415,12 @@
return (isset($APEcontentTypeFlagLookup[$contenttypeid]) ? $APEcontentTypeFlagLookup[$contenttypeid] : 'invalid');
}
- function APEtagItemIsUTF8Lookup($itemkey) {
+ /**
+ * @param string $itemkey
+ *
+ * @return bool
+ */
+ public function APEtagItemIsUTF8Lookup($itemkey) {
static $APEtagItemIsUTF8Lookup = array(
'title',
'subtitle',
@@ -280,5 +450,3 @@
}
}
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.tag.id3v1.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.tag.id3v1.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.tag.id3v1.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// module.tag.id3v1.php //
// module for analyzing ID3v1 tags //
@@ -13,19 +14,30 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
-class getid3_id3v1
+class getid3_id3v1 extends getid3_handler
{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- function getid3_id3v1(&$fd, &$ThisFileInfo) {
+ if (!getid3_lib::intValueSupported($info['filesize'])) {
+ $this->warning('Unable to check for ID3v1 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB');
+ return false;
+ }
- fseek($fd, -256, SEEK_END);
- $preid3v1 = fread($fd, 128);
- $id3v1tag = fread($fd, 128);
+ $this->fseek(-256, SEEK_END);
+ $preid3v1 = $this->fread(128);
+ $id3v1tag = $this->fread(128);
if (substr($id3v1tag, 0, 3) == 'TAG') {
- $ThisFileInfo['avdataend'] = $ThisFileInfo['filesize'] - 128;
+ $info['avdataend'] = $info['filesize'] - 128;
$ParsedID3v1['title'] = $this->cutfield(substr($id3v1tag, 3, 30));
$ParsedID3v1['artist'] = $this->cutfield(substr($id3v1tag, 33, 30));
@@ -36,9 +48,9 @@
// If second-last byte of comment field is null and last byte of comment field is non-null
// then this is ID3v1.1 and the comment field is 28 bytes long and the 30th byte is the track number
- if (($id3v1tag{125} === "\x00") && ($id3v1tag{126} !== "\x00")) {
- $ParsedID3v1['track'] = ord(substr($ParsedID3v1['comment'], 29, 1));
- $ParsedID3v1['comment'] = substr($ParsedID3v1['comment'], 0, 28);
+ if (($id3v1tag[125] === "\x00") && ($id3v1tag[126] !== "\x00")) {
+ $ParsedID3v1['track_number'] = ord(substr($ParsedID3v1['comment'], 29, 1));
+ $ParsedID3v1['comment'] = substr($ParsedID3v1['comment'], 0, 28);
}
$ParsedID3v1['comment'] = $this->cutfield($ParsedID3v1['comment']);
@@ -46,7 +58,7 @@
if (!empty($ParsedID3v1['genre'])) {
unset($ParsedID3v1['genreid']);
}
- if (empty($ParsedID3v1['genre']) || (@$ParsedID3v1['genre'] == 'Unknown')) {
+ if (isset($ParsedID3v1['genre']) && (empty($ParsedID3v1['genre']) || ($ParsedID3v1['genre'] == 'Unknown'))) {
unset($ParsedID3v1['genre']);
}
@@ -53,6 +65,30 @@
foreach ($ParsedID3v1 as $key => $value) {
$ParsedID3v1['comments'][$key][0] = $value;
}
+ $ID3v1encoding = $this->getid3->encoding_id3v1;
+ if ($this->getid3->encoding_id3v1_autodetect) {
+ // ID3v1 encoding detection hack START
+ // ID3v1 is defined as always using ISO-8859-1 encoding, but it is not uncommon to find files tagged with ID3v1 using Windows-1251 or other character sets
+ // Since ID3v1 has no concept of character sets there is no certain way to know we have the correct non-ISO-8859-1 character set, but we can guess
+ foreach ($ParsedID3v1['comments'] as $tag_key => $valuearray) {
+ foreach ($valuearray as $key => $value) {
+ if (preg_match('#^[\\x00-\\x40\\x80-\\xFF]+$#', $value) && !ctype_digit((string) $value)) { // check for strings with only characters above chr(128) and punctuation/numbers, but not just numeric strings (e.g. track numbers or years)
+ foreach (array('Windows-1251', 'KOI8-R') as $id3v1_bad_encoding) {
+ if (function_exists('mb_convert_encoding') && @mb_convert_encoding($value, $id3v1_bad_encoding, $id3v1_bad_encoding) === $value) {
+ $ID3v1encoding = $id3v1_bad_encoding;
+ $this->warning('ID3v1 detected as '.$id3v1_bad_encoding.' text encoding in '.$tag_key);
+ break 3;
+ } elseif (function_exists('iconv') && @iconv($id3v1_bad_encoding, $id3v1_bad_encoding, $value) === $value) {
+ $ID3v1encoding = $id3v1_bad_encoding;
+ $this->warning('ID3v1 detected as '.$id3v1_bad_encoding.' text encoding in '.$tag_key);
+ break 3;
+ }
+ }
+ }
+ }
+ }
+ // ID3v1 encoding detection hack END
+ }
// ID3v1 data is supposed to be padded with NULL characters, but some taggers pad with spaces
$GoodFormatID3v1tag = $this->GenerateID3v1Tag(
@@ -60,19 +96,20 @@
$ParsedID3v1['artist'],
$ParsedID3v1['album'],
$ParsedID3v1['year'],
- $this->LookupGenreID(@$ParsedID3v1['genre']),
+ (isset($ParsedID3v1['genre']) ? $this->LookupGenreID($ParsedID3v1['genre']) : false),
$ParsedID3v1['comment'],
- @$ParsedID3v1['track']);
+ (!empty($ParsedID3v1['track_number']) ? $ParsedID3v1['track_number'] : ''));
$ParsedID3v1['padding_valid'] = true;
if ($id3v1tag !== $GoodFormatID3v1tag) {
$ParsedID3v1['padding_valid'] = false;
- $ThisFileInfo['warning'][] = 'Some ID3v1 fields do not use NULL characters for padding';
+ $this->warning('Some ID3v1 fields do not use NULL characters for padding');
}
- $ParsedID3v1['tag_offset_end'] = $ThisFileInfo['filesize'];
+ $ParsedID3v1['tag_offset_end'] = $info['filesize'];
$ParsedID3v1['tag_offset_start'] = $ParsedID3v1['tag_offset_end'] - 128;
- $ThisFileInfo['id3v1'] = $ParsedID3v1;
+ $info['id3v1'] = $ParsedID3v1;
+ $info['id3v1']['encoding'] = $ID3v1encoding;
}
if (substr($preid3v1, 0, 3) == 'TAG') {
@@ -88,8 +125,8 @@
// a Lyrics3 tag footer was found before the last ID3v1, assume false "TAG" synch
} else {
// APE and Lyrics3 footers not found - assume double ID3v1
- $ThisFileInfo['warning'][] = 'Duplicate ID3v1 tag detected - this has been known to happen with iTunes';
- $ThisFileInfo['avdataend'] -= 128;
+ $this->warning('Duplicate ID3v1 tag detected - this has been known to happen with iTunes');
+ $info['avdataend'] -= 128;
}
}
@@ -96,11 +133,21 @@
return true;
}
- function cutfield($str) {
+ /**
+ * @param string $str
+ *
+ * @return string
+ */
+ public static function cutfield($str) {
return trim(substr($str, 0, strcspn($str, "\x00")));
}
- function ArrayOfGenres($allowSCMPXextended=false) {
+ /**
+ * @param bool $allowSCMPXextended
+ *
+ * @return string[]
+ */
+ public static function ArrayOfGenres($allowSCMPXextended=false) {
static $GenreLookup = array(
0 => 'Blues',
1 => 'Classic Rock',
@@ -246,7 +293,7 @@
141 => 'Christian Rock',
142 => 'Merengue',
143 => 'Salsa',
- 144 => 'Trash Metal',
+ 144 => 'Thrash Metal',
145 => 'Anime',
146 => 'JPop',
147 => 'Synthpop',
@@ -284,41 +331,69 @@
return ($allowSCMPXextended ? $GenreLookupSCMPX : $GenreLookup);
}
- function LookupGenreName($genreid, $allowSCMPXextended=true) {
+ /**
+ * @param string $genreid
+ * @param bool $allowSCMPXextended
+ *
+ * @return string|false
+ */
+ public static function LookupGenreName($genreid, $allowSCMPXextended=true) {
switch ($genreid) {
case 'RX':
case 'CR':
break;
default:
+ if (!is_numeric($genreid)) {
+ return false;
+ }
$genreid = intval($genreid); // to handle 3 or '3' or '03'
break;
}
- $GenreLookup = getid3_id3v1::ArrayOfGenres($allowSCMPXextended);
+ $GenreLookup = self::ArrayOfGenres($allowSCMPXextended);
return (isset($GenreLookup[$genreid]) ? $GenreLookup[$genreid] : false);
}
- function LookupGenreID($genre, $allowSCMPXextended=false) {
- $GenreLookup = getid3_id3v1::ArrayOfGenres($allowSCMPXextended);
+ /**
+ * @param string $genre
+ * @param bool $allowSCMPXextended
+ *
+ * @return string|false
+ */
+ public static function LookupGenreID($genre, $allowSCMPXextended=false) {
+ $GenreLookup = self::ArrayOfGenres($allowSCMPXextended);
$LowerCaseNoSpaceSearchTerm = strtolower(str_replace(' ', '', $genre));
foreach ($GenreLookup as $key => $value) {
- foreach ($GenreLookup as $key => $value) {
- if (strtolower(str_replace(' ', '', $value)) == $LowerCaseNoSpaceSearchTerm) {
- return $key;
- }
+ if (strtolower(str_replace(' ', '', $value)) == $LowerCaseNoSpaceSearchTerm) {
+ return $key;
}
- return false;
}
- return (isset($GenreLookup[$genreid]) ? $GenreLookup[$genreid] : false);
+ return false;
}
- function StandardiseID3v1GenreName($OriginalGenre) {
- if (($GenreID = getid3_id3v1::LookupGenreID($OriginalGenre)) !== false) {
- return getid3_id3v1::LookupGenreName($GenreID);
+ /**
+ * @param string $OriginalGenre
+ *
+ * @return string|false
+ */
+ public static function StandardiseID3v1GenreName($OriginalGenre) {
+ if (($GenreID = self::LookupGenreID($OriginalGenre)) !== false) {
+ return self::LookupGenreName($GenreID);
}
return $OriginalGenre;
}
- function GenerateID3v1Tag($title, $artist, $album, $year, $genreid, $comment, $track='') {
+ /**
+ * @param string $title
+ * @param string $artist
+ * @param string $album
+ * @param string $year
+ * @param int $genreid
+ * @param string $comment
+ * @param int|string $track
+ *
+ * @return string
+ */
+ public static function GenerateID3v1Tag($title, $artist, $album, $year, $genreid, $comment, $track='') {
$ID3v1Tag = 'TAG';
$ID3v1Tag .= str_pad(trim(substr($title, 0, 30)), 30, "\x00", STR_PAD_RIGHT);
$ID3v1Tag .= str_pad(trim(substr($artist, 0, 30)), 30, "\x00", STR_PAD_RIGHT);
@@ -351,6 +426,3 @@
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.tag.id3v2.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.tag.id3v2.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.tag.id3v2.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
/// //
// module.tag.id3v2.php //
// module for analyzing ID3v2 tags //
@@ -13,12 +14,21 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v1.php', __FILE__, true);
-class getid3_id3v2
+class getid3_id3v2 extends getid3_handler
{
+ public $StartingOffset = 0;
- function getid3_id3v2(&$fd, &$ThisFileInfo, $StartingOffset=0) {
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
+
// Overall tag structure:
// +-----------------------------+
// | Header (10 bytes) |
@@ -42,18 +52,18 @@
// shortcuts
- $ThisFileInfo['id3v2']['header'] = true;
- $thisfile_id3v2 = &$ThisFileInfo['id3v2'];
+ $info['id3v2']['header'] = true;
+ $thisfile_id3v2 = &$info['id3v2'];
$thisfile_id3v2['flags'] = array();
$thisfile_id3v2_flags = &$thisfile_id3v2['flags'];
- fseek($fd, $StartingOffset, SEEK_SET);
- $header = fread($fd, 10);
- if (substr($header, 0, 3) == 'ID3') {
+ $this->fseek($this->StartingOffset);
+ $header = $this->fread(10);
+ if (substr($header, 0, 3) == 'ID3' && strlen($header) == 10) {
- $thisfile_id3v2['majorversion'] = ord($header{3});
- $thisfile_id3v2['minorversion'] = ord($header{4});
+ $thisfile_id3v2['majorversion'] = ord($header[3]);
+ $thisfile_id3v2['minorversion'] = ord($header[4]);
// shortcut
$id3v2_majorversion = &$thisfile_id3v2['majorversion'];
@@ -60,7 +70,7 @@
} else {
- unset($ThisFileInfo['id3v2']);
+ unset($info['id3v2']);
return false;
}
@@ -67,12 +77,12 @@
if ($id3v2_majorversion > 4) { // this script probably won't correctly parse ID3v2.5.x and above (if it ever exists)
- $ThisFileInfo['error'][] = 'this script only parses up to ID3v2.4.x - this tag is ID3v2.'.$id3v2_majorversion.'.'.$thisfile_id3v2['minorversion'];
+ $this->error('this script only parses up to ID3v2.4.x - this tag is ID3v2.'.$id3v2_majorversion.'.'.$thisfile_id3v2['minorversion']);
return false;
}
- $id3_flags = ord($header{5});
+ $id3_flags = ord($header[5]);
switch ($id3v2_majorversion) {
case 2:
// %ab000000 in v2.2
@@ -98,54 +108,11 @@
$thisfile_id3v2['headerlength'] = getid3_lib::BigEndian2Int(substr($header, 6, 4), 1) + 10; // length of ID3v2 tag in 10-byte header doesn't include 10-byte header length
- $thisfile_id3v2['tag_offset_start'] = $StartingOffset;
+ $thisfile_id3v2['tag_offset_start'] = $this->StartingOffset;
$thisfile_id3v2['tag_offset_end'] = $thisfile_id3v2['tag_offset_start'] + $thisfile_id3v2['headerlength'];
- // Extended Header
- if (isset($thisfile_id3v2_flags['exthead']) && $thisfile_id3v2_flags['exthead']) {
- // Extended header size 4 * %0xxxxxxx
- // Number of flag bytes $01
- // Extended Flags $xx
- // Where the 'Extended header size' is the size of the whole extended header, stored as a 32 bit synchsafe integer.
- $thisfile_id3v2['exthead_length'] = getid3_lib::BigEndian2Int(fread($fd, 4), 1);
- $thisfile_id3v2['exthead_flag_bytes'] = ord(fread($fd, 1));
- if ($thisfile_id3v2['exthead_flag_bytes'] == 1) {
- // The extended flags field, with its size described by 'number of flag bytes', is defined as:
- // %0bcd0000
- // b - Tag is an update
- // Flag data length $00
- // c - CRC data present
- // Flag data length $05
- // Total frame CRC 5 * %0xxxxxxx
- // d - Tag restrictions
- // Flag data length $01
- $extheaderflags = fread($fd, $thisfile_id3v2['exthead_flag_bytes']);
- $id3_exthead_flags = getid3_lib::BigEndian2Bin(substr($header, 5, 1));
- $thisfile_id3v2['exthead_flags']['update'] = substr($id3_exthead_flags, 1, 1);
- $thisfile_id3v2['exthead_flags']['CRC'] = substr($id3_exthead_flags, 2, 1);
- if ($thisfile_id3v2['exthead_flags']['CRC']) {
- $extheaderrawCRC = fread($fd, 5);
- $thisfile_id3v2['exthead_flags']['CRC'] = getid3_lib::BigEndian2Int($extheaderrawCRC, 1);
- }
- $thisfile_id3v2['exthead_flags']['restrictions'] = substr($id3_exthead_flags, 3, 1);
- if ($thisfile_id3v2['exthead_flags']['restrictions']) {
- // Restrictions %ppqrrstt
- $extheaderrawrestrictions = fread($fd, 1);
- $thisfile_id3v2['exthead_flags']['restrictions_tagsize'] = (bindec('11000000') & ord($extheaderrawrestrictions)) >> 6; // p - Tag size restrictions
- $thisfile_id3v2['exthead_flags']['restrictions_textenc'] = (bindec('00100000') & ord($extheaderrawrestrictions)) >> 5; // q - Text encoding restrictions
- $thisfile_id3v2['exthead_flags']['restrictions_textsize'] = (bindec('00011000') & ord($extheaderrawrestrictions)) >> 3; // r - Text fields size restrictions
- $thisfile_id3v2['exthead_flags']['restrictions_imgenc'] = (bindec('00000100') & ord($extheaderrawrestrictions)) >> 2; // s - Image encoding restrictions
- $thisfile_id3v2['exthead_flags']['restrictions_imgsize'] = (bindec('00000011') & ord($extheaderrawrestrictions)) >> 0; // t - Image size restrictions
- }
- } else {
- $ThisFileInfo['warning'][] = '$thisfile_id3v2[exthead_flag_bytes] = "'.$thisfile_id3v2['exthead_flag_bytes'].'" (expecting "1")';
- fseek($fd, $thisfile_id3v2['exthead_length'] - 1, SEEK_CUR);
- //return false;
- }
- } // end extended header
-
// create 'encoding' key - used by getid3::HandleAllTags()
// in ID3v2 every field can have it's own encoding type
// so force everything to UTF-8 so it can be handled consistantly
@@ -163,18 +130,18 @@
// Flags $xx xx
$sizeofframes = $thisfile_id3v2['headerlength'] - 10; // not including 10-byte initial header
- if (@$thisfile_id3v2['exthead_length']) {
- $sizeofframes -= ($thisfile_id3v2['exthead_length'] + 4);
+ if (!empty($thisfile_id3v2['exthead']['length'])) {
+ $sizeofframes -= ($thisfile_id3v2['exthead']['length'] + 4);
}
- if (@$thisfile_id3v2_flags['isfooter']) {
+ if (!empty($thisfile_id3v2_flags['isfooter'])) {
$sizeofframes -= 10; // footer takes last 10 bytes of ID3v2 header, after frame data, before audio
}
if ($sizeofframes > 0) {
- $framedata = fread($fd, $sizeofframes); // read all frames from file into $framedata variable
+ $framedata = $this->fread($sizeofframes); // read all frames from file into $framedata variable
// if entire frame data is unsynched, de-unsynch it now (ID3v2.3.x)
- if (@$thisfile_id3v2_flags['unsynch'] && ($id3v2_majorversion <= 3)) {
+ if (!empty($thisfile_id3v2_flags['unsynch']) && ($id3v2_majorversion <= 3)) {
$framedata = $this->DeUnsynchronise($framedata);
}
// [in ID3v2.4.0] Unsynchronisation [S:6.1] is done on frame level, instead
@@ -183,7 +150,112 @@
// there exists an unsynchronised frame, while the new unsynchronisation flag in
// the frame header [S:4.1.2] indicates unsynchronisation.
- $framedataoffset = 10 + (@$thisfile_id3v2['exthead_length'] ? $thisfile_id3v2['exthead_length'] + 4 : 0); // how many bytes into the stream - start from after the 10-byte header (and extended header length+4, if present)
+
+ //$framedataoffset = 10 + ($thisfile_id3v2['exthead']['length'] ? $thisfile_id3v2['exthead']['length'] + 4 : 0); // how many bytes into the stream - start from after the 10-byte header (and extended header length+4, if present)
+ $framedataoffset = 10; // how many bytes into the stream - start from after the 10-byte header
+
+
+ // Extended Header
+ if (!empty($thisfile_id3v2_flags['exthead'])) {
+ $extended_header_offset = 0;
+
+ if ($id3v2_majorversion == 3) {
+
+ // v2.3 definition:
+ //Extended header size $xx xx xx xx // 32-bit integer
+ //Extended Flags $xx xx
+ // %x0000000 %00000000 // v2.3
+ // x - CRC data present
+ //Size of padding $xx xx xx xx
+
+ $thisfile_id3v2['exthead']['length'] = getid3_lib::BigEndian2Int(substr($framedata, $extended_header_offset, 4), 0);
+ $extended_header_offset += 4;
+
+ $thisfile_id3v2['exthead']['flag_bytes'] = 2;
+ $thisfile_id3v2['exthead']['flag_raw'] = getid3_lib::BigEndian2Int(substr($framedata, $extended_header_offset, $thisfile_id3v2['exthead']['flag_bytes']));
+ $extended_header_offset += $thisfile_id3v2['exthead']['flag_bytes'];
+
+ $thisfile_id3v2['exthead']['flags']['crc'] = (bool) ($thisfile_id3v2['exthead']['flag_raw'] & 0x8000);
+
+ $thisfile_id3v2['exthead']['padding_size'] = getid3_lib::BigEndian2Int(substr($framedata, $extended_header_offset, 4));
+ $extended_header_offset += 4;
+
+ if ($thisfile_id3v2['exthead']['flags']['crc']) {
+ $thisfile_id3v2['exthead']['flag_data']['crc'] = getid3_lib::BigEndian2Int(substr($framedata, $extended_header_offset, 4));
+ $extended_header_offset += 4;
+ }
+ $extended_header_offset += $thisfile_id3v2['exthead']['padding_size'];
+
+ } elseif ($id3v2_majorversion == 4) {
+
+ // v2.4 definition:
+ //Extended header size 4 * %0xxxxxxx // 28-bit synchsafe integer
+ //Number of flag bytes $01
+ //Extended Flags $xx
+ // %0bcd0000 // v2.4
+ // b - Tag is an update
+ // Flag data length $00
+ // c - CRC data present
+ // Flag data length $05
+ // Total frame CRC 5 * %0xxxxxxx
+ // d - Tag restrictions
+ // Flag data length $01
+
+ $thisfile_id3v2['exthead']['length'] = getid3_lib::BigEndian2Int(substr($framedata, $extended_header_offset, 4), true);
+ $extended_header_offset += 4;
+
+ $thisfile_id3v2['exthead']['flag_bytes'] = getid3_lib::BigEndian2Int(substr($framedata, $extended_header_offset, 1)); // should always be 1
+ $extended_header_offset += 1;
+
+ $thisfile_id3v2['exthead']['flag_raw'] = getid3_lib::BigEndian2Int(substr($framedata, $extended_header_offset, $thisfile_id3v2['exthead']['flag_bytes']));
+ $extended_header_offset += $thisfile_id3v2['exthead']['flag_bytes'];
+
+ $thisfile_id3v2['exthead']['flags']['update'] = (bool) ($thisfile_id3v2['exthead']['flag_raw'] & 0x40);
+ $thisfile_id3v2['exthead']['flags']['crc'] = (bool) ($thisfile_id3v2['exthead']['flag_raw'] & 0x20);
+ $thisfile_id3v2['exthead']['flags']['restrictions'] = (bool) ($thisfile_id3v2['exthead']['flag_raw'] & 0x10);
+
+ if ($thisfile_id3v2['exthead']['flags']['update']) {
+ $ext_header_chunk_length = getid3_lib::BigEndian2Int(substr($framedata, $extended_header_offset, 1)); // should be 0
+ $extended_header_offset += 1;
+ }
+
+ if ($thisfile_id3v2['exthead']['flags']['crc']) {
+ $ext_header_chunk_length = getid3_lib::BigEndian2Int(substr($framedata, $extended_header_offset, 1)); // should be 5
+ $extended_header_offset += 1;
+ $thisfile_id3v2['exthead']['flag_data']['crc'] = getid3_lib::BigEndian2Int(substr($framedata, $extended_header_offset, $ext_header_chunk_length), true, false);
+ $extended_header_offset += $ext_header_chunk_length;
+ }
+
+ if ($thisfile_id3v2['exthead']['flags']['restrictions']) {
+ $ext_header_chunk_length = getid3_lib::BigEndian2Int(substr($framedata, $extended_header_offset, 1)); // should be 1
+ $extended_header_offset += 1;
+
+ // %ppqrrstt
+ $restrictions_raw = getid3_lib::BigEndian2Int(substr($framedata, $extended_header_offset, 1));
+ $extended_header_offset += 1;
+ $thisfile_id3v2['exthead']['flags']['restrictions']['tagsize'] = ($restrictions_raw & 0xC0) >> 6; // p - Tag size restrictions
+ $thisfile_id3v2['exthead']['flags']['restrictions']['textenc'] = ($restrictions_raw & 0x20) >> 5; // q - Text encoding restrictions
+ $thisfile_id3v2['exthead']['flags']['restrictions']['textsize'] = ($restrictions_raw & 0x18) >> 3; // r - Text fields size restrictions
+ $thisfile_id3v2['exthead']['flags']['restrictions']['imgenc'] = ($restrictions_raw & 0x04) >> 2; // s - Image encoding restrictions
+ $thisfile_id3v2['exthead']['flags']['restrictions']['imgsize'] = ($restrictions_raw & 0x03) >> 0; // t - Image size restrictions
+
+ $thisfile_id3v2['exthead']['flags']['restrictions_text']['tagsize'] = $this->LookupExtendedHeaderRestrictionsTagSizeLimits($thisfile_id3v2['exthead']['flags']['restrictions']['tagsize']);
+ $thisfile_id3v2['exthead']['flags']['restrictions_text']['textenc'] = $this->LookupExtendedHeaderRestrictionsTextEncodings($thisfile_id3v2['exthead']['flags']['restrictions']['textenc']);
+ $thisfile_id3v2['exthead']['flags']['restrictions_text']['textsize'] = $this->LookupExtendedHeaderRestrictionsTextFieldSize($thisfile_id3v2['exthead']['flags']['restrictions']['textsize']);
+ $thisfile_id3v2['exthead']['flags']['restrictions_text']['imgenc'] = $this->LookupExtendedHeaderRestrictionsImageEncoding($thisfile_id3v2['exthead']['flags']['restrictions']['imgenc']);
+ $thisfile_id3v2['exthead']['flags']['restrictions_text']['imgsize'] = $this->LookupExtendedHeaderRestrictionsImageSizeSize($thisfile_id3v2['exthead']['flags']['restrictions']['imgsize']);
+ }
+
+ if ($thisfile_id3v2['exthead']['length'] != $extended_header_offset) {
+ $this->warning('ID3v2.4 extended header length mismatch (expecting '.intval($thisfile_id3v2['exthead']['length']).', found '.intval($extended_header_offset).')');
+ }
+ }
+
+ $framedataoffset += $extended_header_offset;
+ $framedata = substr($framedata, $extended_header_offset);
+ } // end extended header
+
+
while (isset($framedata) && (strlen($framedata) > 0)) { // cycle through until no more frame data is left to parse
if (strlen($framedata) <= $this->ID3v2HeaderLength($id3v2_majorversion)) {
// insufficient room left in ID3v2 header for actual data - must be padding
@@ -191,15 +263,19 @@
$thisfile_id3v2['padding']['length'] = strlen($framedata);
$thisfile_id3v2['padding']['valid'] = true;
for ($i = 0; $i < $thisfile_id3v2['padding']['length']; $i++) {
- if ($framedata{$i} != "\x00") {
+ if ($framedata[$i] != "\x00") {
$thisfile_id3v2['padding']['valid'] = false;
$thisfile_id3v2['padding']['errorpos'] = $thisfile_id3v2['padding']['start'] + $i;
- $ThisFileInfo['warning'][] = 'Invalid ID3v2 padding found at offset '.$thisfile_id3v2['padding']['errorpos'].' (the remaining '.($thisfile_id3v2['padding']['length'] - $i).' bytes are considered invalid)';
+ $this->warning('Invalid ID3v2 padding found at offset '.$thisfile_id3v2['padding']['errorpos'].' (the remaining '.($thisfile_id3v2['padding']['length'] - $i).' bytes are considered invalid)');
break;
}
}
break; // skip rest of ID3v2 header
}
+ $frame_header = null;
+ $frame_name = null;
+ $frame_size = null;
+ $frame_flags = null;
if ($id3v2_majorversion == 2) {
// Frame ID $xx xx xx (three characters)
// Size $xx xx xx (24-bit integer)
@@ -234,7 +310,7 @@
} elseif (($frame_name == "\x00".'MP3') || ($frame_name == "\x00\x00".'MP') || ($frame_name == ' MP3') || ($frame_name == 'MP3e')) {
// MP3ext known broken frames - "ok" for the purposes of this test
} elseif (($id3v2_majorversion == 4) && ($this->IsValidID3v2FrameName(substr($framedata, getid3_lib::BigEndian2Int(substr($frame_header, 4, 4), 0), 4), 3))) {
- $ThisFileInfo['warning'][] = 'ID3v2 tag written as ID3v2.4, but with non-synchsafe integers (ID3v2.3 style). Older versions of (Helium2; iTunes) are known culprits of this. Tag has been parsed as ID3v2.3';
+ $this->warning('ID3v2 tag written as ID3v2.4, but with non-synchsafe integers (ID3v2.3 style). Older versions of (Helium2; iTunes) are known culprits of this. Tag has been parsed as ID3v2.3');
$id3v2_majorversion = 3;
$frame_size = getid3_lib::BigEndian2Int(substr($frame_header, 4, 4), 0); // 32-bit integer
}
@@ -248,13 +324,15 @@
// padding encountered
$thisfile_id3v2['padding']['start'] = $framedataoffset;
- $thisfile_id3v2['padding']['length'] = strlen($framedata);
+ $thisfile_id3v2['padding']['length'] = strlen($frame_header) + strlen($framedata);
$thisfile_id3v2['padding']['valid'] = true;
- for ($i = 0; $i < $thisfile_id3v2['padding']['length']; $i++) {
- if ($framedata{$i} != "\x00") {
+
+ $len = strlen($framedata);
+ for ($i = 0; $i < $len; $i++) {
+ if ($framedata[$i] != "\x00") {
$thisfile_id3v2['padding']['valid'] = false;
$thisfile_id3v2['padding']['errorpos'] = $thisfile_id3v2['padding']['start'] + $i;
- $ThisFileInfo['warning'][] = 'Invalid ID3v2 padding found at offset '.$thisfile_id3v2['padding']['errorpos'].' (the remaining '.($thisfile_id3v2['padding']['length'] - $i).' bytes are considered invalid)';
+ $this->warning('Invalid ID3v2 padding found at offset '.$thisfile_id3v2['padding']['errorpos'].' (the remaining '.($thisfile_id3v2['padding']['length'] - $i).' bytes are considered invalid)');
break;
}
}
@@ -261,9 +339,9 @@
break; // skip rest of ID3v2 header
}
- if ($frame_name == 'COM ') {
- $ThisFileInfo['warning'][] = 'error parsing "'.$frame_name.'" ('.$framedataoffset.' bytes into the ID3v2.'.$id3v2_majorversion.' tag). (ERROR: IsValidID3v2FrameName("'.str_replace("\x00", ' ', $frame_name).'", '.$id3v2_majorversion.'))). [Note: this particular error has been known to happen with tags edited by iTunes (versions "X v2.0.3", "v3.0.1" are known-guilty, probably others too)]';
- $frame_name = 'COMM';
+ if ($iTunesBrokenFrameNameFixed = self::ID3v22iTunesBrokenFrameName($frame_name)) {
+ $this->warning('error parsing "'.$frame_name.'" ('.$framedataoffset.' bytes into the ID3v2.'.$id3v2_majorversion.' tag). (ERROR: IsValidID3v2FrameName("'.str_replace("\x00", ' ', $frame_name).'", '.$id3v2_majorversion.'))). [Note: this particular error has been known to happen with tags edited by iTunes (versions "X v2.0.3", "v3.0.1", "v7.0.0.70" are known-guilty, probably others too)]. Translated frame name from "'.str_replace("\x00", ' ', $frame_name).'" to "'.$iTunesBrokenFrameNameFixed.'" for parsing.');
+ $frame_name = $iTunesBrokenFrameNameFixed;
}
if (($frame_size <= strlen($framedata)) && ($this->IsValidID3v2FrameName($frame_name, $id3v2_majorversion))) {
@@ -274,7 +352,7 @@
$parsedFrame['datalength'] = getid3_lib::CastAsInt($frame_size);
$parsedFrame['dataoffset'] = $framedataoffset;
- $this->ParseID3v2Frame($parsedFrame, $ThisFileInfo);
+ $this->ParseID3v2Frame($parsedFrame);
$thisfile_id3v2[$frame_name][] = $parsedFrame;
$framedata = substr($framedata, $frame_size);
@@ -287,7 +365,7 @@
// next frame is valid, just skip the current frame
$framedata = substr($framedata, $frame_size);
- $ThisFileInfo['warning'][] = 'Next ID3v2 frame is valid, skipping current frame.';
+ $this->warning('Next ID3v2 frame is valid, skipping current frame.');
} else {
@@ -294,7 +372,7 @@
// next frame is invalid too, abort processing
//unset($framedata);
$framedata = null;
- $ThisFileInfo['error'][] = 'Next ID3v2 frame is also invalid, aborting processing.';
+ $this->error('Next ID3v2 frame is also invalid, aborting processing.');
}
@@ -301,7 +379,7 @@
} elseif ($frame_size == strlen($framedata)) {
// this is the last frame, just skip
- $ThisFileInfo['warning'][] = 'This was the last ID3v2 frame.';
+ $this->warning('This was the last ID3v2 frame.');
} else {
@@ -308,7 +386,7 @@
// next frame is invalid too, abort processing
//unset($framedata);
$framedata = null;
- $ThisFileInfo['warning'][] = 'Invalid ID3v2 frame size, aborting.';
+ $this->warning('Invalid ID3v2 frame size, aborting.');
}
if (!$this->IsValidID3v2FrameName($frame_name, $id3v2_majorversion)) {
@@ -321,21 +399,21 @@
case "\x00".'MP':
case ' MP':
case 'MP3':
- $ThisFileInfo['warning'][] = 'error parsing "'.$frame_name.'" ('.$framedataoffset.' bytes into the ID3v2.'.$id3v2_majorversion.' tag). (ERROR: !IsValidID3v2FrameName("'.str_replace("\x00", ' ', $frame_name).'", '.$id3v2_majorversion.'))). [Note: this particular error has been known to happen with tags edited by "MP3ext (www.mutschler.de/mp3ext/)"]';
+ $this->warning('error parsing "'.$frame_name.'" ('.$framedataoffset.' bytes into the ID3v2.'.$id3v2_majorversion.' tag). (ERROR: !IsValidID3v2FrameName("'.str_replace("\x00", ' ', $frame_name).'", '.$id3v2_majorversion.'))). [Note: this particular error has been known to happen with tags edited by "MP3ext (www.mutschler.de/mp3ext/)"]');
break;
default:
- $ThisFileInfo['warning'][] = 'error parsing "'.$frame_name.'" ('.$framedataoffset.' bytes into the ID3v2.'.$id3v2_majorversion.' tag). (ERROR: !IsValidID3v2FrameName("'.str_replace("\x00", ' ', $frame_name).'", '.$id3v2_majorversion.'))).';
+ $this->warning('error parsing "'.$frame_name.'" ('.$framedataoffset.' bytes into the ID3v2.'.$id3v2_majorversion.' tag). (ERROR: !IsValidID3v2FrameName("'.str_replace("\x00", ' ', $frame_name).'", '.$id3v2_majorversion.'))).');
break;
}
- } elseif ($frame_size > strlen($framedata)){
+ } elseif (!isset($framedata) || ($frame_size > strlen($framedata))) {
- $ThisFileInfo['error'][] = 'error parsing "'.$frame_name.'" ('.$framedataoffset.' bytes into the ID3v2.'.$id3v2_majorversion.' tag). (ERROR: $frame_size ('.$frame_size.') > strlen($framedata) ('.strlen($framedata).')).';
+ $this->error('error parsing "'.$frame_name.'" ('.$framedataoffset.' bytes into the ID3v2.'.$id3v2_majorversion.' tag). (ERROR: $frame_size ('.$frame_size.') > strlen($framedata) ('.(isset($framedata) ? strlen($framedata) : 'null').')).');
} else {
- $ThisFileInfo['error'][] = 'error parsing "'.$frame_name.'" ('.$framedataoffset.' bytes into the ID3v2.'.$id3v2_majorversion.' tag).';
+ $this->error('error parsing "'.$frame_name.'" ('.$framedataoffset.' bytes into the ID3v2.'.$id3v2_majorversion.' tag).');
}
@@ -356,14 +434,14 @@
// ID3v2 size 4 * %0xxxxxxx
if (isset($thisfile_id3v2_flags['isfooter']) && $thisfile_id3v2_flags['isfooter']) {
- $footer = fread($fd, 10);
+ $footer = $this->fread(10);
if (substr($footer, 0, 3) == '3DI') {
$thisfile_id3v2['footer'] = true;
- $thisfile_id3v2['majorversion_footer'] = ord($footer{3});
- $thisfile_id3v2['minorversion_footer'] = ord($footer{4});
+ $thisfile_id3v2['majorversion_footer'] = ord($footer[3]);
+ $thisfile_id3v2['minorversion_footer'] = ord($footer[4]);
}
if ($thisfile_id3v2['majorversion_footer'] <= 4) {
- $id3_flags = ord(substr($footer{5}));
+ $id3_flags = ord($footer[5]);
$thisfile_id3v2_flags['unsynch_footer'] = (bool) ($id3_flags & 0x80);
$thisfile_id3v2_flags['extfoot_footer'] = (bool) ($id3_flags & 0x40);
$thisfile_id3v2_flags['experim_footer'] = (bool) ($id3_flags & 0x20);
@@ -374,98 +452,125 @@
} // end footer
if (isset($thisfile_id3v2['comments']['genre'])) {
+ $genres = array();
foreach ($thisfile_id3v2['comments']['genre'] as $key => $value) {
- unset($thisfile_id3v2['comments']['genre'][$key]);
- $thisfile_id3v2['comments'] = getid3_lib::array_merge_noclobber($thisfile_id3v2['comments'], $this->ParseID3v2GenreString($value));
+ foreach ($this->ParseID3v2GenreString($value) as $genre) {
+ $genres[] = $genre;
+ }
}
+ $thisfile_id3v2['comments']['genre'] = array_unique($genres);
+ unset($key, $value, $genres, $genre);
}
- if (isset($thisfile_id3v2['comments']['track'])) {
- foreach ($thisfile_id3v2['comments']['track'] as $key => $value) {
+ if (isset($thisfile_id3v2['comments']['track_number'])) {
+ foreach ($thisfile_id3v2['comments']['track_number'] as $key => $value) {
if (strstr($value, '/')) {
- list($thisfile_id3v2['comments']['tracknum'][$key], $thisfile_id3v2['comments']['totaltracks'][$key]) = explode('/', $thisfile_id3v2['comments']['track'][$key]);
+ list($thisfile_id3v2['comments']['track_number'][$key], $thisfile_id3v2['comments']['totaltracks'][$key]) = explode('/', $thisfile_id3v2['comments']['track_number'][$key]);
}
}
}
- if (!isset($thisfile_id3v2['comments']['year']) && ereg('^([0-9]{4})', trim(@$thisfile_id3v2['comments']['recording_time'][0]), $matches)) {
+ if (!isset($thisfile_id3v2['comments']['year']) && !empty($thisfile_id3v2['comments']['recording_time'][0]) && preg_match('#^([0-9]{4})#', trim($thisfile_id3v2['comments']['recording_time'][0]), $matches)) {
$thisfile_id3v2['comments']['year'] = array($matches[1]);
}
+ if (!empty($thisfile_id3v2['TXXX'])) {
+ // MediaMonkey does this, maybe others: write a blank RGAD frame, but put replay-gain adjustment values in TXXX frames
+ foreach ($thisfile_id3v2['TXXX'] as $txxx_array) {
+ switch ($txxx_array['description']) {
+ case 'replaygain_track_gain':
+ if (empty($info['replay_gain']['track']['adjustment']) && !empty($txxx_array['data'])) {
+ $info['replay_gain']['track']['adjustment'] = floatval(trim(str_replace('dB', '', $txxx_array['data'])));
+ }
+ break;
+ case 'replaygain_track_peak':
+ if (empty($info['replay_gain']['track']['peak']) && !empty($txxx_array['data'])) {
+ $info['replay_gain']['track']['peak'] = floatval($txxx_array['data']);
+ }
+ break;
+ case 'replaygain_album_gain':
+ if (empty($info['replay_gain']['album']['adjustment']) && !empty($txxx_array['data'])) {
+ $info['replay_gain']['album']['adjustment'] = floatval(trim(str_replace('dB', '', $txxx_array['data'])));
+ }
+ break;
+ }
+ }
+ }
+
+
// Set avdataoffset
- $ThisFileInfo['avdataoffset'] = $thisfile_id3v2['headerlength'];
+ $info['avdataoffset'] = $thisfile_id3v2['headerlength'];
if (isset($thisfile_id3v2['footer'])) {
- $ThisFileInfo['avdataoffset'] += 10;
+ $info['avdataoffset'] += 10;
}
return true;
}
-
- function ParseID3v2GenreString($genrestring) {
+ /**
+ * @param string $genrestring
+ *
+ * @return array
+ */
+ public function ParseID3v2GenreString($genrestring) {
// Parse genres into arrays of genreName and genreID
// ID3v2.2.x, ID3v2.3.x: '(21)' or '(4)Eurodisco' or '(51)(39)' or '(55)((I think...)'
// ID3v2.4.x: '21' $00 'Eurodisco' $00
+ $clean_genres = array();
- $genrestring = trim($genrestring);
- $returnarray = array();
- if (strpos($genrestring, "\x00") !== false) {
- $unprocessed = trim($genrestring); // trailing nulls will cause an infinite loop.
- $genrestring = '';
- while (strpos($unprocessed, "\x00") !== false) {
- // convert null-seperated v2.4-format into v2.3 ()-seperated format
- $endpos = strpos($unprocessed, "\x00");
- $genrestring .= '('.substr($unprocessed, 0, $endpos).')';
- $unprocessed = substr($unprocessed, $endpos + 1);
+ // hack-fixes for some badly-written ID3v2.3 taggers, while trying not to break correctly-written tags
+ if (($this->getid3->info['id3v2']['majorversion'] == 3) && !preg_match('#[\x00]#', $genrestring)) {
+ // note: MusicBrainz Picard incorrectly stores plaintext genres separated by "/" when writing in ID3v2.3 mode, hack-fix here:
+ // replace / with NULL, then replace back the two ID3v1 genres that legitimately have "/" as part of the single genre name
+ if (strpos($genrestring, '/') !== false) {
+ $LegitimateSlashedGenreList = array( // https://github.com/JamesHeinrich/getID3/issues/223
+ 'Pop/Funk', // ID3v1 genre #62 - https://en.wikipedia.org/wiki/ID3#standard
+ 'Cut-up/DJ', // Discogs - https://www.discogs.com/style/cut-up/dj
+ 'RnB/Swing', // Discogs - https://www.discogs.com/style/rnb/swing
+ 'Funk / Soul', // Discogs (note spaces) - https://www.discogs.com/genre/funk+%2F+soul
+ );
+ $genrestring = str_replace('/', "\x00", $genrestring);
+ foreach ($LegitimateSlashedGenreList as $SlashedGenre) {
+ $genrestring = str_ireplace(str_replace('/', "\x00", $SlashedGenre), $SlashedGenre, $genrestring);
+ }
}
- unset($unprocessed);
+
+ // some other taggers separate multiple genres with semicolon, e.g. "Heavy Metal;Thrash Metal;Metal"
+ if (strpos($genrestring, ';') !== false) {
+ $genrestring = str_replace(';', "\x00", $genrestring);
+ }
}
- if (getid3_id3v1::LookupGenreID($genrestring)) {
- $returnarray['genre'][] = $genrestring;
- } else {
+ if (strpos($genrestring, "\x00") === false) {
+ $genrestring = preg_replace('#\(([0-9]{1,3})\)#', '$1'."\x00", $genrestring);
+ }
- while (strpos($genrestring, '(') !== false) {
-
- $startpos = strpos($genrestring, '(');
- $endpos = strpos($genrestring, ')');
- if (substr($genrestring, $startpos + 1, 1) == '(') {
- $genrestring = substr($genrestring, 0, $startpos).substr($genrestring, $startpos + 1);
- $endpos--;
- }
- $element = substr($genrestring, $startpos + 1, $endpos - ($startpos + 1));
- $genrestring = substr($genrestring, 0, $startpos).substr($genrestring, $endpos + 1);
- if (getid3_id3v1::LookupGenreName($element)) { // $element is a valid genre id/abbreviation
-
- if (empty($returnarray['genre']) || !in_array(getid3_id3v1::LookupGenreName($element), $returnarray['genre'])) { // avoid duplicate entires
- $returnarray['genre'][] = getid3_id3v1::LookupGenreName($element);
- }
-
+ $genre_elements = explode("\x00", $genrestring);
+ foreach ($genre_elements as $element) {
+ $element = trim($element);
+ if ($element) {
+ if (preg_match('#^[0-9]{1,3}$#', $element)) {
+ $clean_genres[] = getid3_id3v1::LookupGenreName($element);
} else {
-
- if (empty($returnarray['genre']) || !in_array($element, $returnarray['genre'])) { // avoid duplicate entires
- $returnarray['genre'][] = $element;
- }
-
+ $clean_genres[] = str_replace('((', '(', $element);
}
}
}
- if ($genrestring) {
- if (empty($returnarray['genre']) || !in_array($genrestring, $returnarray['genre'])) { // avoid duplicate entires
- $returnarray['genre'][] = $genrestring;
- }
- }
-
- return $returnarray;
+ return $clean_genres;
}
+ /**
+ * @param array $parsedFrame
+ *
+ * @return bool
+ */
+ public function ParseID3v2Frame(&$parsedFrame) {
- function ParseID3v2Frame(&$parsedFrame, &$ThisFileInfo) {
-
// shortcuts
- $id3v2_majorversion = $ThisFileInfo['id3v2']['majorversion'];
+ $info = &$this->getid3->info;
+ $id3v2_majorversion = $info['id3v2']['majorversion'];
$parsedFrame['framenamelong'] = $this->FrameNameLongLookup($parsedFrame['frame_name']);
if (empty($parsedFrame['framenamelong'])) {
@@ -503,6 +608,11 @@
if ($parsedFrame['flags']['Unsynchronisation']) {
$parsedFrame['data'] = $this->DeUnsynchronise($parsedFrame['data']);
}
+
+ if ($parsedFrame['flags']['DataLengthIndicator']) {
+ $parsedFrame['data_length_indicator'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], 0, 4), 1);
+ $parsedFrame['data'] = substr($parsedFrame['data'], 4);
+ }
}
// Frame-level de-compression
@@ -509,15 +619,25 @@
if ($parsedFrame['flags']['compression']) {
$parsedFrame['decompressed_size'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], 0, 4));
if (!function_exists('gzuncompress')) {
- $ThisFileInfo['warning'][] = 'gzuncompress() support required to decompress ID3v2 frame "'.$parsedFrame['frame_name'].'"';
- } elseif ($decompresseddata = @gzuncompress(substr($parsedFrame['data'], 4))) {
- $parsedFrame['data'] = $decompresseddata;
+ $this->warning('gzuncompress() support required to decompress ID3v2 frame "'.$parsedFrame['frame_name'].'"');
} else {
- $ThisFileInfo['warning'][] = 'gzuncompress() failed on compressed contents of ID3v2 frame "'.$parsedFrame['frame_name'].'"';
+ if ($decompresseddata = @gzuncompress(substr($parsedFrame['data'], 4))) {
+ //if ($decompresseddata = @gzuncompress($parsedFrame['data'])) {
+ $parsedFrame['data'] = $decompresseddata;
+ unset($decompresseddata);
+ } else {
+ $this->warning('gzuncompress() failed on compressed contents of ID3v2 frame "'.$parsedFrame['frame_name'].'"');
+ }
}
}
}
+ if (!empty($parsedFrame['flags']['DataLengthIndicator'])) {
+ if ($parsedFrame['data_length_indicator'] != strlen($parsedFrame['data'])) {
+ $this->warning('ID3v2 frame "'.$parsedFrame['frame_name'].'" should be '.$parsedFrame['data_length_indicator'].' bytes long according to DataLengthIndicator, but found '.strlen($parsedFrame['data']).' bytes of data');
+ }
+ }
+
if (isset($parsedFrame['datalength']) && ($parsedFrame['datalength'] == 0)) {
$warning = 'Frame "'.$parsedFrame['frame_name'].'" at offset '.$parsedFrame['dataoffset'].' has no data portion';
@@ -529,7 +649,7 @@
default:
break;
}
- $ThisFileInfo['warning'][] = $warning;
+ $this->warning($warning);
} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'UFID')) || // 4.1 UFID Unique file identifier
(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'UFI'))) { // 4.1 UFI Unique file identifier
@@ -538,14 +658,10 @@
// <Header for 'Unique file identifier', ID: 'UFID'>
// Owner identifier <text string> $00
// Identifier <up to 64 bytes binary data>
+ $exploded = explode("\x00", $parsedFrame['data'], 2);
+ $parsedFrame['ownerid'] = (isset($exploded[0]) ? $exploded[0] : '');
+ $parsedFrame['data'] = (isset($exploded[1]) ? $exploded[1] : '');
- $frame_terminatorpos = strpos($parsedFrame['data'], "\x00");
- $frame_idstring = substr($parsedFrame['data'], 0, $frame_terminatorpos);
- $parsedFrame['ownerid'] = $frame_idstring;
- $parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen("\x00"));
- unset($parsedFrame['data']);
-
-
} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'TXXX')) || // 4.2.2 TXXX User defined text information frame
(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'TXX'))) { // 4.2.2 TXX User defined text information frame
// There may be more than one 'TXXX' frame in each tag,
@@ -557,30 +673,35 @@
$frame_offset = 0;
$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
-
+ $frame_textencoding_terminator = $this->TextEncodingTerminatorLookup($frame_textencoding);
if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
- $ThisFileInfo['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
+ $this->warning('Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding');
+ $frame_textencoding_terminator = "\x00";
}
- $frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
- if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
+ $frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
+ if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
}
- $frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
- if (ord($frame_description) === 0) {
- $frame_description = '';
- }
+ $parsedFrame['description'] = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
+ $parsedFrame['description'] = $this->MakeUTF16emptyStringEmpty($parsedFrame['description']);
$parsedFrame['encodingid'] = $frame_textencoding;
$parsedFrame['encoding'] = $this->TextEncodingNameLookup($frame_textencoding);
- $parsedFrame['description'] = $frame_description;
- $parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)));
+ $parsedFrame['description'] = trim(getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['description']));
+ $parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator));
+ $parsedFrame['data'] = $this->RemoveStringTerminator($parsedFrame['data'], $frame_textencoding_terminator);
if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
- $ThisFileInfo['id3v2']['comments'][$parsedFrame['framenameshort']][] = trim(getid3_lib::iconv_fallback($parsedFrame['encoding'], $ThisFileInfo['id3v2']['encoding'], $parsedFrame['data']));
+ $commentkey = ($parsedFrame['description'] ? $parsedFrame['description'] : (isset($info['id3v2']['comments'][$parsedFrame['framenameshort']]) ? count($info['id3v2']['comments'][$parsedFrame['framenameshort']]) : 0));
+ if (!isset($info['id3v2']['comments'][$parsedFrame['framenameshort']]) || !array_key_exists($commentkey, $info['id3v2']['comments'][$parsedFrame['framenameshort']])) {
+ $info['id3v2']['comments'][$parsedFrame['framenameshort']][$commentkey] = trim(getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']));
+ } else {
+ $info['id3v2']['comments'][$parsedFrame['framenameshort']][] = trim(getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']));
+ }
}
- unset($parsedFrame['data']);
+ //unset($parsedFrame['data']); do not unset, may be needed elsewhere, e.g. for replaygain
- } elseif ($parsedFrame['frame_name']{0} == 'T') { // 4.2. T??[?] Text information frame
+ } elseif ($parsedFrame['frame_name'][0] == 'T') { // 4.2. T??[?] Text information frame
// There may only be one text information frame of its kind in an tag.
// <Header for 'Text information frame', ID: 'T000' - 'TZZZ',
// excluding 'TXXX' described in 4.2.6.>
@@ -590,16 +711,47 @@
$frame_offset = 0;
$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
- $ThisFileInfo['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
+ $this->warning('Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding');
}
$parsedFrame['data'] = (string) substr($parsedFrame['data'], $frame_offset);
+ $parsedFrame['data'] = $this->RemoveStringTerminator($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding));
$parsedFrame['encodingid'] = $frame_textencoding;
$parsedFrame['encoding'] = $this->TextEncodingNameLookup($frame_textencoding);
-
if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
- $ThisFileInfo['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $ThisFileInfo['id3v2']['encoding'], $parsedFrame['data']);
+ // ID3v2.3 specs say that TPE1 (and others) can contain multiple artist values separated with /
+ // This of course breaks when an artist name contains slash character, e.g. "AC/DC"
+ // MP3tag (maybe others) implement alternative system where multiple artists are null-separated, which makes more sense
+ // getID3 will split null-separated artists into multiple artists and leave slash-separated ones to the user
+ switch ($parsedFrame['encoding']) {
+ case 'UTF-16':
+ case 'UTF-16BE':
+ case 'UTF-16LE':
+ $wordsize = 2;
+ break;
+ case 'ISO-8859-1':
+ case 'UTF-8':
+ default:
+ $wordsize = 1;
+ break;
+ }
+ $Txxx_elements = array();
+ $Txxx_elements_start_offset = 0;
+ for ($i = 0; $i < strlen($parsedFrame['data']); $i += $wordsize) {
+ if (substr($parsedFrame['data'], $i, $wordsize) == str_repeat("\x00", $wordsize)) {
+ $Txxx_elements[] = substr($parsedFrame['data'], $Txxx_elements_start_offset, $i - $Txxx_elements_start_offset);
+ $Txxx_elements_start_offset = $i + $wordsize;
+ }
+ }
+ $Txxx_elements[] = substr($parsedFrame['data'], $Txxx_elements_start_offset, $i - $Txxx_elements_start_offset);
+ foreach ($Txxx_elements as $Txxx_element) {
+ $string = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $Txxx_element);
+ if (!empty($string)) {
+ $info['id3v2']['comments'][$parsedFrame['framenameshort']][] = $string;
+ }
+ }
+ unset($string, $wordsize, $i, $Txxx_elements, $Txxx_element, $Txxx_elements_start_offset);
}
} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'WXXX')) || // 4.3.2 WXXX User defined URL link frame
@@ -613,45 +765,29 @@
$frame_offset = 0;
$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
+ $frame_textencoding_terminator = $this->TextEncodingTerminatorLookup($frame_textencoding);
if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
- $ThisFileInfo['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
+ $this->warning('Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding');
+ $frame_textencoding_terminator = "\x00";
}
- $frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
- if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
+ $frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
+ if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
}
- $frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
-
- if (ord($frame_description) === 0) {
- $frame_description = '';
- }
- $parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)));
-
- $frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding));
- if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
- $frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
- }
- if ($frame_terminatorpos) {
- // there are null bytes after the data - this is not according to spec
- // only use data up to first null byte
- $frame_urldata = (string) substr($parsedFrame['data'], 0, $frame_terminatorpos);
- } else {
- // no null bytes following data, just use all data
- $frame_urldata = (string) $parsedFrame['data'];
- }
-
$parsedFrame['encodingid'] = $frame_textencoding;
$parsedFrame['encoding'] = $this->TextEncodingNameLookup($frame_textencoding);
+ $parsedFrame['description'] = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset); // according to the frame text encoding
+ $parsedFrame['url'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator)); // always ISO-8859-1
+ $parsedFrame['description'] = $this->RemoveStringTerminator($parsedFrame['description'], $frame_textencoding_terminator);
+ $parsedFrame['description'] = $this->MakeUTF16emptyStringEmpty($parsedFrame['description']);
- $parsedFrame['url'] = $frame_urldata;
- $parsedFrame['description'] = $frame_description;
if (!empty($parsedFrame['framenameshort']) && $parsedFrame['url']) {
- $ThisFileInfo['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $ThisFileInfo['id3v2']['encoding'], $parsedFrame['url']);
+ $info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback('ISO-8859-1', $info['id3v2']['encoding'], $parsedFrame['url']);
}
unset($parsedFrame['data']);
- } elseif ($parsedFrame['frame_name']{0} == 'W') { // 4.3. W??? URL link frames
+ } elseif ($parsedFrame['frame_name'][0] == 'W') { // 4.3. W??? URL link frames
// There may only be one URL link frame of its kind in a tag,
// except when stated otherwise in the frame description
// <Header for 'URL link frame', ID: 'W000' - 'WZZZ', excluding 'WXXX'
@@ -658,9 +794,9 @@
// described in 4.3.2.>
// URL <text string>
- $parsedFrame['url'] = trim($parsedFrame['data']);
+ $parsedFrame['url'] = trim($parsedFrame['data']); // always ISO-8859-1
if (!empty($parsedFrame['framenameshort']) && $parsedFrame['url']) {
- $ThisFileInfo['id3v2']['comments'][$parsedFrame['framenameshort']][] = $parsedFrame['url'];
+ $info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback('ISO-8859-1', $info['id3v2']['encoding'], $parsedFrame['url']);
}
unset($parsedFrame['data']);
@@ -667,6 +803,7 @@
} elseif ((($id3v2_majorversion == 3) && ($parsedFrame['frame_name'] == 'IPLS')) || // 4.4 IPLS Involved people list (ID3v2.3 only)
(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'IPL'))) { // 4.4 IPL Involved people list (ID3v2.2 only)
+ // http://id3.org/id3v2.3.0#sec4.4
// There may only be one 'IPL' frame in each tag
// <Header for 'User defined URL link frame', ID: 'IPL'>
// Text encoding $xx
@@ -675,14 +812,72 @@
$frame_offset = 0;
$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
- $ThisFileInfo['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
+ $this->warning('Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding');
}
$parsedFrame['encodingid'] = $frame_textencoding;
$parsedFrame['encoding'] = $this->TextEncodingNameLookup($parsedFrame['encodingid']);
+ $parsedFrame['data_raw'] = (string) substr($parsedFrame['data'], $frame_offset);
- $parsedFrame['data'] = (string) substr($parsedFrame['data'], $frame_offset);
+ // https://www.getid3.org/phpBB3/viewtopic.php?t=1369
+ // "this tag typically contains null terminated strings, which are associated in pairs"
+ // "there are users that use the tag incorrectly"
+ $IPLS_parts = array();
+ if (strpos($parsedFrame['data_raw'], "\x00") !== false) {
+ $IPLS_parts_unsorted = array();
+ if (((strlen($parsedFrame['data_raw']) % 2) == 0) && ((substr($parsedFrame['data_raw'], 0, 2) == "\xFF\xFE") || (substr($parsedFrame['data_raw'], 0, 2) == "\xFE\xFF"))) {
+ // UTF-16, be careful looking for null bytes since most 2-byte characters may contain one; you need to find twin null bytes, and on even padding
+ $thisILPS = '';
+ for ($i = 0; $i < strlen($parsedFrame['data_raw']); $i += 2) {
+ $twobytes = substr($parsedFrame['data_raw'], $i, 2);
+ if ($twobytes === "\x00\x00") {
+ $IPLS_parts_unsorted[] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $thisILPS);
+ $thisILPS = '';
+ } else {
+ $thisILPS .= $twobytes;
+ }
+ }
+ if (strlen($thisILPS) > 2) { // 2-byte BOM
+ $IPLS_parts_unsorted[] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $thisILPS);
+ }
+ } else {
+ // ISO-8859-1 or UTF-8 or other single-byte-null character set
+ $IPLS_parts_unsorted = explode("\x00", $parsedFrame['data_raw']);
+ }
+ if (count($IPLS_parts_unsorted) == 1) {
+ // just a list of names, e.g. "Dino Baptiste, Jimmy Copley, John Gordon, Bernie Marsden, Sharon Watson"
+ foreach ($IPLS_parts_unsorted as $key => $value) {
+ $IPLS_parts_sorted = preg_split('#[;,\\r\\n\\t]#', $value);
+ $position = '';
+ foreach ($IPLS_parts_sorted as $person) {
+ $IPLS_parts[] = array('position'=>$position, 'person'=>$person);
+ }
+ }
+ } elseif ((count($IPLS_parts_unsorted) % 2) == 0) {
+ $position = '';
+ $person = '';
+ foreach ($IPLS_parts_unsorted as $key => $value) {
+ if (($key % 2) == 0) {
+ $position = $value;
+ } else {
+ $person = $value;
+ $IPLS_parts[] = array('position'=>$position, 'person'=>$person);
+ $position = '';
+ $person = '';
+ }
+ }
+ } else {
+ foreach ($IPLS_parts_unsorted as $key => $value) {
+ $IPLS_parts[] = array($value);
+ }
+ }
+
+ } else {
+ $IPLS_parts = preg_split('#[;,\\r\\n\\t]#', $parsedFrame['data_raw']);
+ }
+ $parsedFrame['data'] = $IPLS_parts;
+
if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
- $ThisFileInfo['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $ThisFileInfo['id3v2']['encoding'], $parsedFrame['data']);
+ $info['id3v2']['comments'][$parsedFrame['framenameshort']][] = $parsedFrame['data'];
}
@@ -693,7 +888,7 @@
// CD TOC <binary data>
if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
- $ThisFileInfo['id3v2']['comments'][$parsedFrame['framenameshort']][] = $parsedFrame['data'];
+ $info['id3v2']['comments'][$parsedFrame['framenameshort']][] = $parsedFrame['data'];
}
@@ -743,6 +938,7 @@
$parsedFrame['bitsforbytesdeviation'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], 8, 1));
$parsedFrame['bitsformsdeviation'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], 9, 1));
$parsedFrame['data'] = substr($parsedFrame['data'], 10);
+ $deviationbitstream = '';
while ($frame_offset < strlen($parsedFrame['data'])) {
$deviationbitstream .= getid3_lib::BigEndian2Bin(substr($parsedFrame['data'], $frame_offset++, 1));
}
@@ -757,7 +953,7 @@
} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'SYTC')) || // 4.7 SYTC Synchronised tempo codes
- (($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'STC'))) { // 4.8 STC Synchronised tempo codes
+ (($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'STC'))) { // 4.8 STC Synchronised tempo codes
// There may only be one 'SYTC' frame in each tag
// <Header for 'Synchronised tempo codes', ID: 'SYTC'>
// Time stamp format $xx
@@ -793,30 +989,29 @@
$frame_offset = 0;
$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
+ $frame_textencoding_terminator = $this->TextEncodingTerminatorLookup($frame_textencoding);
if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
- $ThisFileInfo['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
+ $this->warning('Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding');
+ $frame_textencoding_terminator = "\x00";
}
$frame_language = substr($parsedFrame['data'], $frame_offset, 3);
$frame_offset += 3;
- $frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
- if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
+ $frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
+ if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
}
- $frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
- if (ord($frame_description) === 0) {
- $frame_description = '';
- }
- $parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)));
+ $parsedFrame['description'] = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
+ $parsedFrame['description'] = $this->MakeUTF16emptyStringEmpty($parsedFrame['description']);
+ $parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator));
+ $parsedFrame['data'] = $this->RemoveStringTerminator($parsedFrame['data'], $frame_textencoding_terminator);
$parsedFrame['encodingid'] = $frame_textencoding;
$parsedFrame['encoding'] = $this->TextEncodingNameLookup($frame_textencoding);
- $parsedFrame['data'] = $parsedFrame['data'];
$parsedFrame['language'] = $frame_language;
$parsedFrame['languagename'] = $this->LanguageLookup($frame_language, false);
- $parsedFrame['description'] = $frame_description;
if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
- $ThisFileInfo['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $ThisFileInfo['id3v2']['encoding'], $parsedFrame['data']);
+ $info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']);
}
unset($parsedFrame['data']);
@@ -839,8 +1034,10 @@
$frame_offset = 0;
$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
+ $frame_textencoding_terminator = $this->TextEncodingTerminatorLookup($frame_textencoding);
if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
- $ThisFileInfo['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
+ $this->warning('Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding');
+ $frame_textencoding_terminator = "\x00";
}
$frame_language = substr($parsedFrame['data'], $frame_offset, 3);
$frame_offset += 3;
@@ -857,17 +1054,17 @@
$frame_remainingdata = substr($parsedFrame['data'], $frame_offset);
while (strlen($frame_remainingdata)) {
$frame_offset = 0;
- $frame_terminatorpos = strpos($frame_remainingdata, $this->TextEncodingTerminatorLookup($frame_textencoding));
+ $frame_terminatorpos = strpos($frame_remainingdata, $frame_textencoding_terminator);
if ($frame_terminatorpos === false) {
$frame_remainingdata = '';
} else {
- if (ord(substr($frame_remainingdata, $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
+ if (ord(substr($frame_remainingdata, $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
}
$parsedFrame['lyrics'][$timestampindex]['data'] = substr($frame_remainingdata, $frame_offset, $frame_terminatorpos - $frame_offset);
- $frame_remainingdata = substr($frame_remainingdata, $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)));
- if (($timestampindex == 0) && (ord($frame_remainingdata{0}) != 0)) {
+ $frame_remainingdata = substr($frame_remainingdata, $frame_terminatorpos + strlen($frame_textencoding_terminator));
+ if (($timestampindex == 0) && (ord($frame_remainingdata[0]) != 0)) {
// timestamp probably omitted for first data item
} else {
$parsedFrame['lyrics'][$timestampindex]['timestamp'] = getid3_lib::BigEndian2Int(substr($frame_remainingdata, 0, 4));
@@ -891,26 +1088,27 @@
if (strlen($parsedFrame['data']) < 5) {
- $ThisFileInfo['warning'][] = 'Invalid data (too short) for "'.$parsedFrame['frame_name'].'" frame at offset '.$parsedFrame['dataoffset'];
+ $this->warning('Invalid data (too short) for "'.$parsedFrame['frame_name'].'" frame at offset '.$parsedFrame['dataoffset']);
} else {
$frame_offset = 0;
$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
+ $frame_textencoding_terminator = $this->TextEncodingTerminatorLookup($frame_textencoding);
if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
- $ThisFileInfo['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
+ $this->warning('Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding');
+ $frame_textencoding_terminator = "\x00";
}
$frame_language = substr($parsedFrame['data'], $frame_offset, 3);
$frame_offset += 3;
- $frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
- if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
+ $frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
+ if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
}
- $frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
- if (ord($frame_description) === 0) {
- $frame_description = '';
- }
- $frame_text = (string) substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)));
+ $parsedFrame['description'] = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
+ $parsedFrame['description'] = $this->MakeUTF16emptyStringEmpty($parsedFrame['description']);
+ $frame_text = (string) substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator));
+ $frame_text = $this->RemoveStringTerminator($frame_text, $frame_textencoding_terminator);
$parsedFrame['encodingid'] = $frame_textencoding;
$parsedFrame['encoding'] = $this->TextEncodingNameLookup($frame_textencoding);
@@ -917,10 +1115,14 @@
$parsedFrame['language'] = $frame_language;
$parsedFrame['languagename'] = $this->LanguageLookup($frame_language, false);
- $parsedFrame['description'] = $frame_description;
$parsedFrame['data'] = $frame_text;
if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
- $ThisFileInfo['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $ThisFileInfo['id3v2']['encoding'], $parsedFrame['data']);
+ $commentkey = ($parsedFrame['description'] ? $parsedFrame['description'] : (!empty($info['id3v2']['comments'][$parsedFrame['framenameshort']]) ? count($info['id3v2']['comments'][$parsedFrame['framenameshort']]) : 0));
+ if (!isset($info['id3v2']['comments'][$parsedFrame['framenameshort']]) || !array_key_exists($commentkey, $info['id3v2']['comments'][$parsedFrame['framenameshort']])) {
+ $info['id3v2']['comments'][$parsedFrame['framenameshort']][$commentkey] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']);
+ } else {
+ $info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']);
+ }
}
}
@@ -945,23 +1147,29 @@
}
$frame_remainingdata = substr($parsedFrame['data'], $frame_terminatorpos + strlen("\x00"));
$parsedFrame['description'] = $frame_idstring;
- while (strlen($frame_remainingdata)) {
+ $RVA2channelcounter = 0;
+ while (strlen($frame_remainingdata) >= 5) {
$frame_offset = 0;
$frame_channeltypeid = ord(substr($frame_remainingdata, $frame_offset++, 1));
- $parsedFrame[$frame_channeltypeid]['channeltypeid'] = $frame_channeltypeid;
- $parsedFrame[$frame_channeltypeid]['channeltype'] = $this->RVA2ChannelTypeLookup($frame_channeltypeid);
- $parsedFrame[$frame_channeltypeid]['volumeadjust'] = getid3_lib::BigEndian2Int(substr($frame_remainingdata, $frame_offset, 2), false, true); // 16-bit signed
+ $parsedFrame[$RVA2channelcounter]['channeltypeid'] = $frame_channeltypeid;
+ $parsedFrame[$RVA2channelcounter]['channeltype'] = $this->RVA2ChannelTypeLookup($frame_channeltypeid);
+ $parsedFrame[$RVA2channelcounter]['volumeadjust'] = getid3_lib::BigEndian2Int(substr($frame_remainingdata, $frame_offset, 2), false, true); // 16-bit signed
$frame_offset += 2;
- $parsedFrame[$frame_channeltypeid]['bitspeakvolume'] = ord(substr($frame_remainingdata, $frame_offset++, 1));
- $frame_bytespeakvolume = ceil($parsedFrame[$frame_channeltypeid]['bitspeakvolume'] / 8);
- $parsedFrame[$frame_channeltypeid]['peakvolume'] = getid3_lib::BigEndian2Int(substr($frame_remainingdata, $frame_offset, $frame_bytespeakvolume));
+ $parsedFrame[$RVA2channelcounter]['bitspeakvolume'] = ord(substr($frame_remainingdata, $frame_offset++, 1));
+ if (($parsedFrame[$RVA2channelcounter]['bitspeakvolume'] < 1) || ($parsedFrame[$RVA2channelcounter]['bitspeakvolume'] > 4)) {
+ $this->warning('ID3v2::RVA2 frame['.$RVA2channelcounter.'] contains invalid '.$parsedFrame[$RVA2channelcounter]['bitspeakvolume'].'-byte bits-representing-peak value');
+ break;
+ }
+ $frame_bytespeakvolume = ceil($parsedFrame[$RVA2channelcounter]['bitspeakvolume'] / 8);
+ $parsedFrame[$RVA2channelcounter]['peakvolume'] = getid3_lib::BigEndian2Int(substr($frame_remainingdata, $frame_offset, $frame_bytespeakvolume));
$frame_remainingdata = substr($frame_remainingdata, $frame_offset + $frame_bytespeakvolume);
+ $RVA2channelcounter++;
}
unset($parsedFrame['data']);
} elseif ((($id3v2_majorversion == 3) && ($parsedFrame['frame_name'] == 'RVAD')) || // 4.12 RVAD Relative volume adjustment (ID3v2.3 only)
- (($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'RVA'))) { // 4.12 RVA Relative volume adjustment (ID3v2.2 only)
+ (($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'RVA'))) { // 4.12 RVA Relative volume adjustment (ID3v2.2 only)
// There may only be one 'RVA' frame in each tag
// <Header for 'Relative volume adjustment', ID: 'RVA'>
// ID3v2.2 => Increment/decrement %000000ba
@@ -1156,15 +1364,17 @@
$frame_offset = 0;
$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
+ $frame_textencoding_terminator = $this->TextEncodingTerminatorLookup($frame_textencoding);
if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
- $ThisFileInfo['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
+ $this->warning('Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding');
+ $frame_textencoding_terminator = "\x00";
}
- if ($id3v2_majorversion == 2) {
+ if ($id3v2_majorversion == 2 && strlen($parsedFrame['data']) > $frame_offset) {
$frame_imagetype = substr($parsedFrame['data'], $frame_offset, 3);
if (strtolower($frame_imagetype) == 'ima') {
// complete hack for mp3Rage (www.chaoticsoftware.com) that puts ID3v2.3-formatted
- // MIME type instead of 3-char ID3v2.2-format image type (thanks xbhoffØpacbell*net)
+ // MIME type instead of 3-char ID3v2.2-format image type (thanks xbhoffØpacbell*net)
$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
$frame_mimetype = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
if (ord($frame_mimetype) === 0) {
@@ -1179,7 +1389,7 @@
$frame_offset += 3;
}
}
- if ($id3v2_majorversion > 2) {
+ if ($id3v2_majorversion > 2 && strlen($parsedFrame['data']) > $frame_offset) {
$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
$frame_mimetype = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
if (ord($frame_mimetype) === 0) {
@@ -1190,40 +1400,97 @@
$frame_picturetype = ord(substr($parsedFrame['data'], $frame_offset++, 1));
- $frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
- if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
- $frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
- }
- $frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
- if (ord($frame_description) === 0) {
- $frame_description = '';
- }
- $parsedFrame['encodingid'] = $frame_textencoding;
- $parsedFrame['encoding'] = $this->TextEncodingNameLookup($frame_textencoding);
-
- if ($id3v2_majorversion == 2) {
- $parsedFrame['imagetype'] = $frame_imagetype;
+ if ($frame_offset >= $parsedFrame['datalength']) {
+ $this->warning('data portion of APIC frame is missing at offset '.($parsedFrame['dataoffset'] + 8 + $frame_offset));
} else {
- $parsedFrame['mime'] = $frame_mimetype;
- }
- $parsedFrame['picturetypeid'] = $frame_picturetype;
- $parsedFrame['picturetype'] = $this->APICPictureTypeLookup($frame_picturetype);
- $parsedFrame['description'] = $frame_description;
- $parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)));
+ $frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
+ if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
+ $frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
+ }
+ $parsedFrame['description'] = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
+ $parsedFrame['description'] = $this->MakeUTF16emptyStringEmpty($parsedFrame['description']);
+ $parsedFrame['encodingid'] = $frame_textencoding;
+ $parsedFrame['encoding'] = $this->TextEncodingNameLookup($frame_textencoding);
- $imagechunkcheck = getid3_lib::GetDataImageSize($parsedFrame['data']);
- if (($imagechunkcheck[2] >= 1) && ($imagechunkcheck[2] <= 3)) {
- $parsedFrame['image_mime'] = 'image/'.getid3_lib::ImageTypesLookup($imagechunkcheck[2]);
- if ($imagechunkcheck[0]) {
- $parsedFrame['image_width'] = $imagechunkcheck[0];
+ if ($id3v2_majorversion == 2) {
+ $parsedFrame['imagetype'] = isset($frame_imagetype) ? $frame_imagetype : null;
+ } else {
+ $parsedFrame['mime'] = isset($frame_mimetype) ? $frame_mimetype : null;
}
- if ($imagechunkcheck[1]) {
- $parsedFrame['image_height'] = $imagechunkcheck[1];
+ $parsedFrame['picturetypeid'] = $frame_picturetype;
+ $parsedFrame['picturetype'] = $this->APICPictureTypeLookup($frame_picturetype);
+ $parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator));
+ $parsedFrame['datalength'] = strlen($parsedFrame['data']);
+
+ $parsedFrame['image_mime'] = '';
+ $imageinfo = array();
+ if ($imagechunkcheck = getid3_lib::GetDataImageSize($parsedFrame['data'], $imageinfo)) {
+ if (($imagechunkcheck[2] >= 1) && ($imagechunkcheck[2] <= 3)) {
+ $parsedFrame['image_mime'] = image_type_to_mime_type($imagechunkcheck[2]);
+ if ($imagechunkcheck[0]) {
+ $parsedFrame['image_width'] = $imagechunkcheck[0];
+ }
+ if ($imagechunkcheck[1]) {
+ $parsedFrame['image_height'] = $imagechunkcheck[1];
+ }
+ }
}
- $parsedFrame['image_bytes'] = strlen($parsedFrame['data']);
+
+ do {
+ if ($this->getid3->option_save_attachments === false) {
+ // skip entirely
+ unset($parsedFrame['data']);
+ break;
+ }
+ $dir = '';
+ if ($this->getid3->option_save_attachments === true) {
+ // great
+/*
+ } elseif (is_int($this->getid3->option_save_attachments)) {
+ if ($this->getid3->option_save_attachments < $parsedFrame['data_length']) {
+ // too big, skip
+ $this->warning('attachment at '.$frame_offset.' is too large to process inline ('.number_format($parsedFrame['data_length']).' bytes)');
+ unset($parsedFrame['data']);
+ break;
+ }
+*/
+ } elseif (is_string($this->getid3->option_save_attachments)) {
+ $dir = rtrim(str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $this->getid3->option_save_attachments), DIRECTORY_SEPARATOR);
+ if (!is_dir($dir) || !getID3::is_writable($dir)) {
+ // cannot write, skip
+ $this->warning('attachment at '.$frame_offset.' cannot be saved to "'.$dir.'" (not writable)');
+ unset($parsedFrame['data']);
+ break;
+ }
+ }
+ // if we get this far, must be OK
+ if (is_string($this->getid3->option_save_attachments)) {
+ $destination_filename = $dir.DIRECTORY_SEPARATOR.md5($info['filenamepath']).'_'.$frame_offset;
+ if (!file_exists($destination_filename) || getID3::is_writable($destination_filename)) {
+ file_put_contents($destination_filename, $parsedFrame['data']);
+ } else {
+ $this->warning('attachment at '.$frame_offset.' cannot be saved to "'.$destination_filename.'" (not writable)');
+ }
+ $parsedFrame['data_filename'] = $destination_filename;
+ unset($parsedFrame['data']);
+ } else {
+ if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
+ if (!isset($info['id3v2']['comments']['picture'])) {
+ $info['id3v2']['comments']['picture'] = array();
+ }
+ $comments_picture_data = array();
+ foreach (array('data', 'image_mime', 'image_width', 'image_height', 'imagetype', 'picturetype', 'description', 'datalength') as $picture_key) {
+ if (isset($parsedFrame[$picture_key])) {
+ $comments_picture_data[$picture_key] = $parsedFrame[$picture_key];
+ }
+ }
+ $info['id3v2']['comments']['picture'][] = $comments_picture_data;
+ unset($comments_picture_data);
+ }
+ }
+ } while (false);
}
-
} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'GEOB')) || // 4.15 GEOB General encapsulated object
(($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'GEO'))) { // 4.16 GEO General encapsulated object
// There may be more than one 'GEOB' frame in each tag,
@@ -1237,8 +1504,10 @@
$frame_offset = 0;
$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
+ $frame_textencoding_terminator = $this->TextEncodingTerminatorLookup($frame_textencoding);
if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
- $ThisFileInfo['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
+ $this->warning('Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding');
+ $frame_textencoding_terminator = "\x00";
}
$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
$frame_mimetype = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
@@ -1247,8 +1516,8 @@
}
$frame_offset = $frame_terminatorpos + strlen("\x00");
- $frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
- if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
+ $frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
+ if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
}
$frame_filename = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
@@ -1255,17 +1524,15 @@
if (ord($frame_filename) === 0) {
$frame_filename = '';
}
- $frame_offset = $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding));
+ $frame_offset = $frame_terminatorpos + strlen($frame_textencoding_terminator);
- $frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
- if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
+ $frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
+ if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
}
- $frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
- if (ord($frame_description) === 0) {
- $frame_description = '';
- }
- $frame_offset = $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding));
+ $parsedFrame['description'] = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
+ $parsedFrame['description'] = $this->MakeUTF16emptyStringEmpty($parsedFrame['description']);
+ $frame_offset = $frame_terminatorpos + strlen($frame_textencoding_terminator);
$parsedFrame['objectdata'] = (string) substr($parsedFrame['data'], $frame_offset);
$parsedFrame['encodingid'] = $frame_textencoding;
@@ -1273,7 +1540,6 @@
$parsedFrame['mime'] = $frame_mimetype;
$parsedFrame['filename'] = $frame_filename;
- $parsedFrame['description'] = $frame_description;
unset($parsedFrame['data']);
@@ -1289,7 +1555,7 @@
} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'POPM')) || // 4.17 POPM Popularimeter
- (($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'POP'))) { // 4.18 POP Popularimeter
+ (($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'POP'))) { // 4.18 POP Popularimeter
// There may be more than one 'POPM' frame in each tag,
// but only one with the same email address
// <Header for 'Popularimeter', ID: 'POPM'>
@@ -1305,9 +1571,9 @@
}
$frame_offset = $frame_terminatorpos + strlen("\x00");
$frame_rating = ord(substr($parsedFrame['data'], $frame_offset++, 1));
- $parsedFrame['data'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset));
- $parsedFrame['email'] = $frame_emailaddress;
- $parsedFrame['rating'] = $frame_rating;
+ $parsedFrame['counter'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset));
+ $parsedFrame['email'] = $frame_emailaddress;
+ $parsedFrame['rating'] = $frame_rating;
unset($parsedFrame['data']);
@@ -1343,15 +1609,12 @@
$frame_offset = $frame_terminatorpos + strlen("\x00");
$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
- $frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
- if (ord($frame_description) === 0) {
- $frame_description = '';
- }
+ $parsedFrame['description'] = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
+ $parsedFrame['description'] = $this->MakeUTF16emptyStringEmpty($parsedFrame['description']);
$frame_offset = $frame_terminatorpos + strlen("\x00");
$parsedFrame['ownerid'] = $frame_ownerid;
$parsedFrame['data'] = (string) substr($parsedFrame['data'], $frame_offset);
- $parsedFrame['description'] = $frame_description;
unset($parsedFrame['data']);
@@ -1369,7 +1632,7 @@
$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
$frame_ownerid = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
if (ord($frame_ownerid) === 0) {
- $frame_ownerid == '';
+ $frame_ownerid = '';
}
$frame_offset = $frame_terminatorpos + strlen("\x00");
$parsedFrame['ownerid'] = $frame_ownerid;
@@ -1382,7 +1645,7 @@
} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'LINK')) || // 4.20 LINK Linked information
- (($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'LNK'))) { // 4.22 LNK Linked information
+ (($id3v2_majorversion == 2) && ($parsedFrame['frame_name'] == 'LNK'))) { // 4.22 LNK Linked information
// There may be more than one 'LINK' frame in a tag,
// but only one with the same contents
// <Header for 'Linked information', ID: 'LINK'>
@@ -1410,7 +1673,7 @@
$parsedFrame['additionaldata'] = (string) substr($parsedFrame['data'], $frame_offset);
if (!empty($parsedFrame['framenameshort']) && $parsedFrame['url']) {
- $ThisFileInfo['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $ThisFileInfo['id3v2']['encoding'], $parsedFrame['url']);
+ $info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback_iso88591_utf8($parsedFrame['url']);
}
unset($parsedFrame['data']);
@@ -1438,7 +1701,7 @@
$frame_offset = 0;
$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
- $ThisFileInfo['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
+ $this->warning('Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding');
}
$frame_language = substr($parsedFrame['data'], $frame_offset, 3);
$frame_offset += 3;
@@ -1447,9 +1710,10 @@
$parsedFrame['encodingid'] = $frame_textencoding;
$parsedFrame['encoding'] = $this->TextEncodingNameLookup($frame_textencoding);
- $parsedFrame['data'] = (string) substr($parsedFrame['data'], $frame_offset);
+ $parsedFrame['data'] = (string) substr($parsedFrame['data'], $frame_offset);
+ $parsedFrame['data'] = $this->RemoveStringTerminator($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding));
if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
- $ThisFileInfo['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $ThisFileInfo['id3v2']['encoding'], $parsedFrame['data']);
+ $info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']);
}
unset($parsedFrame['data']);
@@ -1465,7 +1729,7 @@
$frame_offset = 0;
$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
- $ThisFileInfo['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
+ $this->warning('Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding');
}
$parsedFrame['encodingid'] = $frame_textencoding;
$parsedFrame['encoding'] = $this->TextEncodingNameLookup($frame_textencoding);
@@ -1479,12 +1743,13 @@
$parsedFrame['pricepaid']['value'] = substr($frame_pricepaid, 3);
$parsedFrame['purchasedate'] = substr($parsedFrame['data'], $frame_offset, 8);
- if (!$this->IsValidDateStampString($parsedFrame['purchasedate'])) {
+ if ($this->IsValidDateStampString($parsedFrame['purchasedate'])) {
$parsedFrame['purchasedateunix'] = mktime (0, 0, 0, substr($parsedFrame['purchasedate'], 4, 2), substr($parsedFrame['purchasedate'], 6, 2), substr($parsedFrame['purchasedate'], 0, 4));
}
$frame_offset += 8;
$parsedFrame['seller'] = (string) substr($parsedFrame['data'], $frame_offset);
+ $parsedFrame['seller'] = $this->RemoveStringTerminator($parsedFrame['seller'], $this->TextEncodingTerminatorLookup($frame_textencoding));
unset($parsedFrame['data']);
@@ -1504,8 +1769,10 @@
$frame_offset = 0;
$frame_textencoding = ord(substr($parsedFrame['data'], $frame_offset++, 1));
+ $frame_textencoding_terminator = $this->TextEncodingTerminatorLookup($frame_textencoding);
if ((($id3v2_majorversion <= 3) && ($frame_textencoding > 1)) || (($id3v2_majorversion == 4) && ($frame_textencoding > 3))) {
- $ThisFileInfo['warning'][] = 'Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding';
+ $this->warning('Invalid text encoding byte ('.$frame_textencoding.') in frame "'.$parsedFrame['frame_name'].'" - defaulting to ISO-8859-1 encoding');
+ $frame_textencoding_terminator = "\x00";
}
$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
@@ -1527,8 +1794,8 @@
$frame_receivedasid = ord(substr($parsedFrame['data'], $frame_offset++, 1));
- $frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
- if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
+ $frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
+ if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
}
$frame_sellername = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
@@ -1535,17 +1802,15 @@
if (ord($frame_sellername) === 0) {
$frame_sellername = '';
}
- $frame_offset = $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding));
+ $frame_offset = $frame_terminatorpos + strlen($frame_textencoding_terminator);
- $frame_terminatorpos = strpos($parsedFrame['data'], $this->TextEncodingTerminatorLookup($frame_textencoding), $frame_offset);
- if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)), 1)) === 0) {
+ $frame_terminatorpos = strpos($parsedFrame['data'], $frame_textencoding_terminator, $frame_offset);
+ if (ord(substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator), 1)) === 0) {
$frame_terminatorpos++; // strpos() fooled because 2nd byte of Unicode chars are often 0x00
}
- $frame_description = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
- if (ord($frame_description) === 0) {
- $frame_description = '';
- }
- $frame_offset = $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding));
+ $parsedFrame['description'] = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
+ $parsedFrame['description'] = $this->MakeUTF16emptyStringEmpty($parsedFrame['description']);
+ $frame_offset = $frame_terminatorpos + strlen($frame_textencoding_terminator);
$frame_terminatorpos = strpos($parsedFrame['data'], "\x00", $frame_offset);
$frame_mimetype = substr($parsedFrame['data'], $frame_offset, $frame_terminatorpos - $frame_offset);
@@ -1561,7 +1826,6 @@
$parsedFrame['receivedasid'] = $frame_receivedasid;
$parsedFrame['receivedas'] = $this->COMRReceivedAsLookup($frame_receivedasid);
$parsedFrame['sellername'] = $frame_sellername;
- $parsedFrame['description'] = $frame_description;
$parsedFrame['mime'] = $frame_mimetype;
$parsedFrame['logo'] = $frame_sellerlogo;
unset($parsedFrame['data']);
@@ -1671,7 +1935,7 @@
$frame_offset += 2;
$parsedFrame['bitsperpoint'] = ord(substr($parsedFrame['data'], $frame_offset++, 1));
$frame_bytesperpoint = ceil($parsedFrame['bitsperpoint'] / 8);
- for ($i = 0; $i < $frame_indexpoints; $i++) {
+ for ($i = 0; $i < $parsedFrame['indexpoints']; $i++) {
$parsedFrame['indexes'][$i] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, $frame_bytesperpoint));
$frame_offset += $frame_bytesperpoint;
}
@@ -1711,26 +1975,315 @@
$parsedFrame['album']['originator'] = getid3_lib::RGADoriginatorLookup($parsedFrame['raw']['album']['originator']);
$parsedFrame['album']['adjustment'] = getid3_lib::RGADadjustmentLookup($parsedFrame['raw']['album']['adjustment'], $parsedFrame['raw']['album']['signbit']);
- $ThisFileInfo['replay_gain']['track']['peak'] = $parsedFrame['peakamplitude'];
- $ThisFileInfo['replay_gain']['track']['originator'] = $parsedFrame['track']['originator'];
- $ThisFileInfo['replay_gain']['track']['adjustment'] = $parsedFrame['track']['adjustment'];
- $ThisFileInfo['replay_gain']['album']['originator'] = $parsedFrame['album']['originator'];
- $ThisFileInfo['replay_gain']['album']['adjustment'] = $parsedFrame['album']['adjustment'];
+ $info['replay_gain']['track']['peak'] = $parsedFrame['peakamplitude'];
+ $info['replay_gain']['track']['originator'] = $parsedFrame['track']['originator'];
+ $info['replay_gain']['track']['adjustment'] = $parsedFrame['track']['adjustment'];
+ $info['replay_gain']['album']['originator'] = $parsedFrame['album']['originator'];
+ $info['replay_gain']['album']['adjustment'] = $parsedFrame['album']['adjustment'];
unset($parsedFrame['data']);
+ } elseif (($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'CHAP')) { // CHAP Chapters frame (ID3v2.3+ only)
+ // http://id3.org/id3v2-chapters-1.0
+ // <ID3v2.3 or ID3v2.4 frame header, ID: "CHAP"> (10 bytes)
+ // Element ID <text string> $00
+ // Start time $xx xx xx xx
+ // End time $xx xx xx xx
+ // Start offset $xx xx xx xx
+ // End offset $xx xx xx xx
+ // <Optional embedded sub-frames>
+
+ $frame_offset = 0;
+ @list($parsedFrame['element_id']) = explode("\x00", $parsedFrame['data'], 2);
+ $frame_offset += strlen($parsedFrame['element_id']."\x00");
+ $parsedFrame['time_begin'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
+ $frame_offset += 4;
+ $parsedFrame['time_end'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
+ $frame_offset += 4;
+ if (substr($parsedFrame['data'], $frame_offset, 4) != "\xFF\xFF\xFF\xFF") {
+ // "If these bytes are all set to 0xFF then the value should be ignored and the start time value should be utilized."
+ $parsedFrame['offset_begin'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
+ }
+ $frame_offset += 4;
+ if (substr($parsedFrame['data'], $frame_offset, 4) != "\xFF\xFF\xFF\xFF") {
+ // "If these bytes are all set to 0xFF then the value should be ignored and the start time value should be utilized."
+ $parsedFrame['offset_end'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
+ }
+ $frame_offset += 4;
+
+ if ($frame_offset < strlen($parsedFrame['data'])) {
+ $parsedFrame['subframes'] = array();
+ while ($frame_offset < strlen($parsedFrame['data'])) {
+ // <Optional embedded sub-frames>
+ $subframe = array();
+ $subframe['name'] = substr($parsedFrame['data'], $frame_offset, 4);
+ $frame_offset += 4;
+ $subframe['size'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
+ $frame_offset += 4;
+ $subframe['flags_raw'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 2));
+ $frame_offset += 2;
+ if ($subframe['size'] > (strlen($parsedFrame['data']) - $frame_offset)) {
+ $this->warning('CHAP subframe "'.$subframe['name'].'" at frame offset '.$frame_offset.' claims to be "'.$subframe['size'].'" bytes, which is more than the available data ('.(strlen($parsedFrame['data']) - $frame_offset).' bytes)');
+ break;
+ }
+ $subframe_rawdata = substr($parsedFrame['data'], $frame_offset, $subframe['size']);
+ $frame_offset += $subframe['size'];
+
+ $subframe['encodingid'] = ord(substr($subframe_rawdata, 0, 1));
+ $subframe['text'] = substr($subframe_rawdata, 1);
+ $subframe['encoding'] = $this->TextEncodingNameLookup($subframe['encodingid']);
+ $encoding_converted_text = trim(getid3_lib::iconv_fallback($subframe['encoding'], $info['encoding'], $subframe['text']));
+ switch (substr($encoding_converted_text, 0, 2)) {
+ case "\xFF\xFE":
+ case "\xFE\xFF":
+ switch (strtoupper($info['id3v2']['encoding'])) {
+ case 'ISO-8859-1':
+ case 'UTF-8':
+ $encoding_converted_text = substr($encoding_converted_text, 2);
+ // remove unwanted byte-order-marks
+ break;
+ default:
+ // ignore
+ break;
+ }
+ break;
+ default:
+ // do not remove BOM
+ break;
+ }
+
+ switch ($subframe['name']) {
+ case 'TIT2':
+ $parsedFrame['chapter_name'] = $encoding_converted_text;
+ $parsedFrame['subframes'][] = $subframe;
+ break;
+ case 'TIT3':
+ $parsedFrame['chapter_description'] = $encoding_converted_text;
+ $parsedFrame['subframes'][] = $subframe;
+ break;
+ case 'WXXX':
+ list($subframe['chapter_url_description'], $subframe['chapter_url']) = explode("\x00", $encoding_converted_text, 2);
+ $parsedFrame['chapter_url'][$subframe['chapter_url_description']] = $subframe['chapter_url'];
+ $parsedFrame['subframes'][] = $subframe;
+ break;
+ case 'APIC':
+ if (preg_match('#^([^\\x00]+)*\\x00(.)([^\\x00]+)*\\x00(.+)$#s', $subframe['text'], $matches)) {
+ list($dummy, $subframe_apic_mime, $subframe_apic_picturetype, $subframe_apic_description, $subframe_apic_picturedata) = $matches;
+ $subframe['image_mime'] = trim(getid3_lib::iconv_fallback($subframe['encoding'], $info['encoding'], $subframe_apic_mime));
+ $subframe['picture_type'] = $this->APICPictureTypeLookup($subframe_apic_picturetype);
+ $subframe['description'] = trim(getid3_lib::iconv_fallback($subframe['encoding'], $info['encoding'], $subframe_apic_description));
+ if (strlen($this->TextEncodingTerminatorLookup($subframe['encoding'])) == 2) {
+ // the null terminator between "description" and "picture data" could be either 1 byte (ISO-8859-1, UTF-8) or two bytes (UTF-16)
+ // the above regex assumes one byte, if it's actually two then strip the second one here
+ $subframe_apic_picturedata = substr($subframe_apic_picturedata, 1);
+ }
+ $subframe['data'] = $subframe_apic_picturedata;
+ unset($dummy, $subframe_apic_mime, $subframe_apic_picturetype, $subframe_apic_description, $subframe_apic_picturedata);
+ unset($subframe['text'], $parsedFrame['text']);
+ $parsedFrame['subframes'][] = $subframe;
+ $parsedFrame['picture_present'] = true;
+ } else {
+ $this->warning('ID3v2.CHAP subframe #'.(count($parsedFrame['subframes']) + 1).' "'.$subframe['name'].'" not in expected format');
+ }
+ break;
+ default:
+ $this->warning('ID3v2.CHAP subframe "'.$subframe['name'].'" not handled (supported: TIT2, TIT3, WXXX, APIC)');
+ break;
+ }
+ }
+ unset($subframe_rawdata, $subframe, $encoding_converted_text);
+ unset($parsedFrame['data']); // debatable whether this this be here, without it the returned structure may contain a large amount of duplicate data if chapters contain APIC
+ }
+
+ $id3v2_chapter_entry = array();
+ foreach (array('id', 'time_begin', 'time_end', 'offset_begin', 'offset_end', 'chapter_name', 'chapter_description', 'chapter_url', 'picture_present') as $id3v2_chapter_key) {
+ if (isset($parsedFrame[$id3v2_chapter_key])) {
+ $id3v2_chapter_entry[$id3v2_chapter_key] = $parsedFrame[$id3v2_chapter_key];
+ }
+ }
+ if (!isset($info['id3v2']['chapters'])) {
+ $info['id3v2']['chapters'] = array();
+ }
+ $info['id3v2']['chapters'][] = $id3v2_chapter_entry;
+ unset($id3v2_chapter_entry, $id3v2_chapter_key);
+
+
+ } elseif (($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'CTOC')) { // CTOC Chapters Table Of Contents frame (ID3v2.3+ only)
+ // http://id3.org/id3v2-chapters-1.0
+ // <ID3v2.3 or ID3v2.4 frame header, ID: "CTOC"> (10 bytes)
+ // Element ID <text string> $00
+ // CTOC flags %xx
+ // Entry count $xx
+ // Child Element ID <string>$00 /* zero or more child CHAP or CTOC entries */
+ // <Optional embedded sub-frames>
+
+ $frame_offset = 0;
+ @list($parsedFrame['element_id']) = explode("\x00", $parsedFrame['data'], 2);
+ $frame_offset += strlen($parsedFrame['element_id']."\x00");
+ $ctoc_flags_raw = ord(substr($parsedFrame['data'], $frame_offset, 1));
+ $frame_offset += 1;
+ $parsedFrame['entry_count'] = ord(substr($parsedFrame['data'], $frame_offset, 1));
+ $frame_offset += 1;
+
+ $terminator_position = null;
+ for ($i = 0; $i < $parsedFrame['entry_count']; $i++) {
+ $terminator_position = strpos($parsedFrame['data'], "\x00", $frame_offset);
+ $parsedFrame['child_element_ids'][$i] = substr($parsedFrame['data'], $frame_offset, $terminator_position - $frame_offset);
+ $frame_offset = $terminator_position + 1;
+ }
+
+ $parsedFrame['ctoc_flags']['ordered'] = (bool) ($ctoc_flags_raw & 0x01);
+ $parsedFrame['ctoc_flags']['top_level'] = (bool) ($ctoc_flags_raw & 0x03);
+
+ unset($ctoc_flags_raw, $terminator_position);
+
+ if ($frame_offset < strlen($parsedFrame['data'])) {
+ $parsedFrame['subframes'] = array();
+ while ($frame_offset < strlen($parsedFrame['data'])) {
+ // <Optional embedded sub-frames>
+ $subframe = array();
+ $subframe['name'] = substr($parsedFrame['data'], $frame_offset, 4);
+ $frame_offset += 4;
+ $subframe['size'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
+ $frame_offset += 4;
+ $subframe['flags_raw'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 2));
+ $frame_offset += 2;
+ if ($subframe['size'] > (strlen($parsedFrame['data']) - $frame_offset)) {
+ $this->warning('CTOS subframe "'.$subframe['name'].'" at frame offset '.$frame_offset.' claims to be "'.$subframe['size'].'" bytes, which is more than the available data ('.(strlen($parsedFrame['data']) - $frame_offset).' bytes)');
+ break;
+ }
+ $subframe_rawdata = substr($parsedFrame['data'], $frame_offset, $subframe['size']);
+ $frame_offset += $subframe['size'];
+
+ $subframe['encodingid'] = ord(substr($subframe_rawdata, 0, 1));
+ $subframe['text'] = substr($subframe_rawdata, 1);
+ $subframe['encoding'] = $this->TextEncodingNameLookup($subframe['encodingid']);
+ $encoding_converted_text = trim(getid3_lib::iconv_fallback($subframe['encoding'], $info['encoding'], $subframe['text']));;
+ switch (substr($encoding_converted_text, 0, 2)) {
+ case "\xFF\xFE":
+ case "\xFE\xFF":
+ switch (strtoupper($info['id3v2']['encoding'])) {
+ case 'ISO-8859-1':
+ case 'UTF-8':
+ $encoding_converted_text = substr($encoding_converted_text, 2);
+ // remove unwanted byte-order-marks
+ break;
+ default:
+ // ignore
+ break;
+ }
+ break;
+ default:
+ // do not remove BOM
+ break;
+ }
+
+ if (($subframe['name'] == 'TIT2') || ($subframe['name'] == 'TIT3')) {
+ if ($subframe['name'] == 'TIT2') {
+ $parsedFrame['toc_name'] = $encoding_converted_text;
+ } elseif ($subframe['name'] == 'TIT3') {
+ $parsedFrame['toc_description'] = $encoding_converted_text;
+ }
+ $parsedFrame['subframes'][] = $subframe;
+ } else {
+ $this->warning('ID3v2.CTOC subframe "'.$subframe['name'].'" not handled (only TIT2 and TIT3)');
+ }
+ }
+ unset($subframe_rawdata, $subframe, $encoding_converted_text);
+ }
+
}
return true;
}
-
- function DeUnsynchronise($data) {
+ /**
+ * @param string $data
+ *
+ * @return string
+ */
+ public function DeUnsynchronise($data) {
return str_replace("\xFF\x00", "\xFF", $data);
}
- function LookupCurrencyUnits($currencyid) {
+ /**
+ * @param int $index
+ *
+ * @return string
+ */
+ public function LookupExtendedHeaderRestrictionsTagSizeLimits($index) {
+ static $LookupExtendedHeaderRestrictionsTagSizeLimits = array(
+ 0x00 => 'No more than 128 frames and 1 MB total tag size',
+ 0x01 => 'No more than 64 frames and 128 KB total tag size',
+ 0x02 => 'No more than 32 frames and 40 KB total tag size',
+ 0x03 => 'No more than 32 frames and 4 KB total tag size',
+ );
+ return (isset($LookupExtendedHeaderRestrictionsTagSizeLimits[$index]) ? $LookupExtendedHeaderRestrictionsTagSizeLimits[$index] : '');
+ }
+ /**
+ * @param int $index
+ *
+ * @return string
+ */
+ public function LookupExtendedHeaderRestrictionsTextEncodings($index) {
+ static $LookupExtendedHeaderRestrictionsTextEncodings = array(
+ 0x00 => 'No restrictions',
+ 0x01 => 'Strings are only encoded with ISO-8859-1 or UTF-8',
+ );
+ return (isset($LookupExtendedHeaderRestrictionsTextEncodings[$index]) ? $LookupExtendedHeaderRestrictionsTextEncodings[$index] : '');
+ }
+
+ /**
+ * @param int $index
+ *
+ * @return string
+ */
+ public function LookupExtendedHeaderRestrictionsTextFieldSize($index) {
+ static $LookupExtendedHeaderRestrictionsTextFieldSize = array(
+ 0x00 => 'No restrictions',
+ 0x01 => 'No string is longer than 1024 characters',
+ 0x02 => 'No string is longer than 128 characters',
+ 0x03 => 'No string is longer than 30 characters',
+ );
+ return (isset($LookupExtendedHeaderRestrictionsTextFieldSize[$index]) ? $LookupExtendedHeaderRestrictionsTextFieldSize[$index] : '');
+ }
+
+ /**
+ * @param int $index
+ *
+ * @return string
+ */
+ public function LookupExtendedHeaderRestrictionsImageEncoding($index) {
+ static $LookupExtendedHeaderRestrictionsImageEncoding = array(
+ 0x00 => 'No restrictions',
+ 0x01 => 'Images are encoded only with PNG or JPEG',
+ );
+ return (isset($LookupExtendedHeaderRestrictionsImageEncoding[$index]) ? $LookupExtendedHeaderRestrictionsImageEncoding[$index] : '');
+ }
+
+ /**
+ * @param int $index
+ *
+ * @return string
+ */
+ public function LookupExtendedHeaderRestrictionsImageSizeSize($index) {
+ static $LookupExtendedHeaderRestrictionsImageSizeSize = array(
+ 0x00 => 'No restrictions',
+ 0x01 => 'All images are 256x256 pixels or smaller',
+ 0x02 => 'All images are 64x64 pixels or smaller',
+ 0x03 => 'All images are exactly 64x64 pixels, unless required otherwise',
+ );
+ return (isset($LookupExtendedHeaderRestrictionsImageSizeSize[$index]) ? $LookupExtendedHeaderRestrictionsImageSizeSize[$index] : '');
+ }
+
+ /**
+ * @param string $currencyid
+ *
+ * @return string
+ */
+ public function LookupCurrencyUnits($currencyid) {
+
$begin = __LINE__;
/** This is not a comment!
@@ -1925,9 +2478,13 @@
return getid3_lib::EmbeddedLookup($currencyid, $begin, __LINE__, __FILE__, 'id3v2-currency-units');
}
+ /**
+ * @param string $currencyid
+ *
+ * @return string
+ */
+ public function LookupCurrencyCountry($currencyid) {
- function LookupCurrencyCountry($currencyid) {
-
$begin = __LINE__;
/** This is not a comment!
@@ -2078,7 +2635,7 @@
SOS Somalia
SPL Seborga
SRG Suriname
- STD São Tome and Principe
+ STD São Tome and Principe
SVC El Salvador
SYP Syria
SZL Swaziland
@@ -2102,13 +2659,13 @@
VND Viet Nam
VUV Vanuatu
WST Samoa
- XAF Communauté Financière Africaine
+ XAF Communauté Financière Africaine
XAG Silver
XAU Gold
XCD East Caribbean
XDR International Monetary Fund
XPD Palladium
- XPF Comptoirs Français du Pacifique
+ XPF Comptoirs Français du Pacifique
XPT Platinum
YER Yemen
YUM Yugoslavia
@@ -2121,10 +2678,14 @@
return getid3_lib::EmbeddedLookup($currencyid, $begin, __LINE__, __FILE__, 'id3v2-currency-country');
}
+ /**
+ * @param string $languagecode
+ * @param bool $casesensitive
+ *
+ * @return string
+ */
+ public static function LanguageLookup($languagecode, $casesensitive=false) {
-
- function LanguageLookup($languagecode, $casesensitive=false) {
-
if (!$casesensitive) {
$languagecode = strtolower($languagecode);
}
@@ -2552,7 +3113,7 @@
vai Vai
ven Venda
vie Vietnamese
- vol Volapük
+ vol Volapük
vot Votic
wak Wakashan Languages
wal Walamo
@@ -2578,11 +3139,15 @@
return getid3_lib::EmbeddedLookup($languagecode, $begin, __LINE__, __FILE__, 'id3v2-languagecode');
}
-
- function ETCOEventLookup($index) {
- if (($index >= 0x17) && ($index <= 0xDF)) {
- return 'reserved for future use';
- }
+ /**
+ * @param int $index
+ *
+ * @return string
+ */
+ public static function ETCOEventLookup($index) {
+ if (($index >= 0x17) && ($index <= 0xDF)) {
+ return 'reserved for future use';
+ }
if (($index >= 0xE0) && ($index <= 0xEF)) {
return 'not predefined synch 0-F';
}
@@ -2622,7 +3187,12 @@
return (isset($EventLookup[$index]) ? $EventLookup[$index] : '');
}
- function SYTLContentTypeLookup($index) {
+ /**
+ * @param int $index
+ *
+ * @return string
+ */
+ public static function SYTLContentTypeLookup($index) {
static $SYTLContentTypeLookup = array(
0x00 => 'other',
0x01 => 'lyrics',
@@ -2638,7 +3208,13 @@
return (isset($SYTLContentTypeLookup[$index]) ? $SYTLContentTypeLookup[$index] : '');
}
- function APICPictureTypeLookup($index, $returnarray=false) {
+ /**
+ * @param int $index
+ * @param bool $returnarray
+ *
+ * @return array|string
+ */
+ public static function APICPictureTypeLookup($index, $returnarray=false) {
static $APICPictureTypeLookup = array(
0x00 => 'Other',
0x01 => '32x32 pixels \'file icon\' (PNG only)',
@@ -2668,7 +3244,12 @@
return (isset($APICPictureTypeLookup[$index]) ? $APICPictureTypeLookup[$index] : '');
}
- function COMRReceivedAsLookup($index) {
+ /**
+ * @param int $index
+ *
+ * @return string
+ */
+ public static function COMRReceivedAsLookup($index) {
static $COMRReceivedAsLookup = array(
0x00 => 'Other',
0x01 => 'Standard CD album with other songs',
@@ -2684,7 +3265,12 @@
return (isset($COMRReceivedAsLookup[$index]) ? $COMRReceivedAsLookup[$index] : '');
}
- function RVA2ChannelTypeLookup($index) {
+ /**
+ * @param int $index
+ *
+ * @return string
+ */
+ public static function RVA2ChannelTypeLookup($index) {
static $RVA2ChannelTypeLookup = array(
0x00 => 'Other',
0x01 => 'Master volume',
@@ -2700,7 +3286,12 @@
return (isset($RVA2ChannelTypeLookup[$index]) ? $RVA2ChannelTypeLookup[$index] : '');
}
- function FrameNameLongLookup($framename) {
+ /**
+ * @param string $framename
+ *
+ * @return string
+ */
+ public static function FrameNameLongLookup($framename) {
$begin = __LINE__;
@@ -2757,10 +3348,12 @@
TBP BPM (Beats Per Minute)
TBPM BPM (beats per minute)
TCM Composer
+ TCMP Part of a compilation
TCO Content type
TCOM Composer
TCON Content type
TCOP Copyright message
+ TCP Part of a compilation
TCR Copyright message
TDA Date
TDAT Date
@@ -2823,15 +3416,22 @@
TRK Track number/Position in set
TRSN Internet radio station name
TRSO Internet radio station owner
+ TS2 Album-Artist sort order
+ TSA Album sort order
+ TSC Composer sort order
TSI Size
TSIZ Size
+ TSO2 Album-Artist sort order
TSOA Album sort order
+ TSOC Composer sort order
TSOP Performer sort order
TSOT Title sort order
+ TSP Performer sort order
TSRC ISRC (international standard recording code)
TSS Software/hardware and settings used for encoding
TSSE Software/Hardware and settings used for encoding
TSST Set subtitle
+ TST Title sort order
TT1 Content group description
TT2 Title/Songname/Content description
TT3 Subtitle/Description refinement
@@ -2842,7 +3442,7 @@
TYER Year
UFI Unique file identifier
UFID Unique file identifier
- ULT Unsychronised lyric/text transcription
+ ULT Unsynchronised lyric/text transcription
USER Terms of use
USLT Unsynchronised lyric/text transcription
WAF Official audio file webpage
@@ -2874,216 +3474,286 @@
// from http://privatewww.essex.ac.uk/~djmrob/replaygain/file_format_id3v2.html
}
+ /**
+ * @param string $framename
+ *
+ * @return string
+ */
+ public static function FrameNameShortLookup($framename) {
- function FrameNameShortLookup($framename) {
-
$begin = __LINE__;
- /** This is not a comment!
-
- AENC audio_encryption
- APIC attached_picture
- ASPI audio_seek_point_index
- BUF recommended_buffer_size
- CNT play_counter
- COM comments
- COMM comments
- COMR commercial_frame
- CRA audio_encryption
- CRM encrypted_meta_frame
- ENCR encryption_method_registration
- EQU equalisation
- EQU2 equalisation
- EQUA equalisation
- ETC event_timing_codes
- ETCO event_timing_codes
- GEO general_encapsulated_object
- GEOB general_encapsulated_object
- GRID group_identification_registration
- IPL involved_people_list
- IPLS involved_people_list
- LINK linked_information
- LNK linked_information
- MCDI music_cd_identifier
- MCI music_cd_identifier
- MLL mpeg_location_lookup_table
- MLLT mpeg_location_lookup_table
- OWNE ownership_frame
- PCNT play_counter
- PIC attached_picture
- POP popularimeter
- POPM popularimeter
- POSS position_synchronisation_frame
- PRIV private_frame
- RBUF recommended_buffer_size
- REV reverb
- RVA relative_volume_adjustment
- RVA2 relative_volume_adjustment
- RVAD relative_volume_adjustment
- RVRB reverb
- SEEK seek_frame
- SIGN signature_frame
- SLT synchronised_lyric
- STC synced_tempo_codes
- SYLT synchronised_lyric
- SYTC synchronised_tempo_codes
- TAL album
- TALB album
- TBP bpm
- TBPM bpm
- TCM composer
- TCO content_type
- TCOM composer
- TCON content_type
- TCOP copyright_message
- TCR copyright_message
- TDA date
- TDAT date
- TDEN encoding_time
- TDLY playlist_delay
- TDOR original_release_time
- TDRC recording_time
- TDRL release_time
- TDTG tagging_time
- TDY playlist_delay
- TEN encoded_by
- TENC encoded_by
- TEXT lyricist
- TFLT file_type
- TFT file_type
- TIM time
- TIME time
- TIPL involved_people_list
- TIT1 content_group_description
- TIT2 title
- TIT3 subtitle
- TKE initial_key
- TKEY initial_key
- TLA language
- TLAN language
- TLE length
- TLEN length
- TMCL musician_credits_list
- TMED media_type
- TMOO mood
- TMT media_type
- TOA original_artist
- TOAL original_album
- TOF original_filename
- TOFN original_filename
- TOL original_lyricist
- TOLY original_lyricist
- TOPE original_artist
- TOR original_year
- TORY original_year
- TOT original_album
- TOWN file_owner
- TP1 artist
- TP2 band
- TP3 conductor
- TP4 remixer
- TPA part_of_a_set
- TPB publisher
- TPE1 artist
- TPE2 band
- TPE3 conductor
- TPE4 remixer
- TPOS part_of_a_set
- TPRO produced_notice
- TPUB publisher
- TRC isrc
- TRCK track_number
- TRD recording_dates
- TRDA recording_dates
- TRK track_number
- TRSN internet_radio_station_name
- TRSO internet_radio_station_owner
- TSI size
- TSIZ size
- TSOA album_sort_order
- TSOP performer_sort_order
- TSOT title_sort_order
- TSRC isrc
- TSS encoder_settings
- TSSE encoder_settings
- TSST set_subtitle
- TT1 description
- TT2 title
- TT3 subtitle
- TXT lyricist
- TXX text
- TXXX text
- TYE year
- TYER year
- UFI unique_file_identifier
- UFID unique_file_identifier
- ULT unsychronised_lyric
- USER terms_of_use
- USLT unsynchronised_lyric
- WAF url_file
- WAR url_artist
- WAS url_source
- WCM commercial_information
- WCOM commercial_information
- WCOP copyright
- WCP copyright
- WOAF url_file
- WOAR url_artist
- WOAS url_source
- WORS url_station
- WPAY url_payment
- WPB url_publisher
- WPUB url_publisher
- WXX url_user
- WXXX url_user
- TFEA featured_artist
- TSTU recording_studio
- rgad replay_gain_adjustment
-
- */
+ /** This is not a comment!
+ AENC audio_encryption
+ APIC attached_picture
+ ASPI audio_seek_point_index
+ BUF recommended_buffer_size
+ CNT play_counter
+ COM comment
+ COMM comment
+ COMR commercial_frame
+ CRA audio_encryption
+ CRM encrypted_meta_frame
+ ENCR encryption_method_registration
+ EQU equalisation
+ EQU2 equalisation
+ EQUA equalisation
+ ETC event_timing_codes
+ ETCO event_timing_codes
+ GEO general_encapsulated_object
+ GEOB general_encapsulated_object
+ GRID group_identification_registration
+ IPL involved_people_list
+ IPLS involved_people_list
+ LINK linked_information
+ LNK linked_information
+ MCDI music_cd_identifier
+ MCI music_cd_identifier
+ MLL mpeg_location_lookup_table
+ MLLT mpeg_location_lookup_table
+ OWNE ownership_frame
+ PCNT play_counter
+ PIC attached_picture
+ POP popularimeter
+ POPM popularimeter
+ POSS position_synchronisation_frame
+ PRIV private_frame
+ RBUF recommended_buffer_size
+ REV reverb
+ RVA relative_volume_adjustment
+ RVA2 relative_volume_adjustment
+ RVAD relative_volume_adjustment
+ RVRB reverb
+ SEEK seek_frame
+ SIGN signature_frame
+ SLT synchronised_lyric
+ STC synced_tempo_codes
+ SYLT synchronised_lyric
+ SYTC synchronised_tempo_codes
+ TAL album
+ TALB album
+ TBP bpm
+ TBPM bpm
+ TCM composer
+ TCMP part_of_a_compilation
+ TCO genre
+ TCOM composer
+ TCON genre
+ TCOP copyright_message
+ TCP part_of_a_compilation
+ TCR copyright_message
+ TDA date
+ TDAT date
+ TDEN encoding_time
+ TDLY playlist_delay
+ TDOR original_release_time
+ TDRC recording_time
+ TDRL release_time
+ TDTG tagging_time
+ TDY playlist_delay
+ TEN encoded_by
+ TENC encoded_by
+ TEXT lyricist
+ TFLT file_type
+ TFT file_type
+ TIM time
+ TIME time
+ TIPL involved_people_list
+ TIT1 content_group_description
+ TIT2 title
+ TIT3 subtitle
+ TKE initial_key
+ TKEY initial_key
+ TLA language
+ TLAN language
+ TLE length
+ TLEN length
+ TMCL musician_credits_list
+ TMED media_type
+ TMOO mood
+ TMT media_type
+ TOA original_artist
+ TOAL original_album
+ TOF original_filename
+ TOFN original_filename
+ TOL original_lyricist
+ TOLY original_lyricist
+ TOPE original_artist
+ TOR original_year
+ TORY original_year
+ TOT original_album
+ TOWN file_owner
+ TP1 artist
+ TP2 band
+ TP3 conductor
+ TP4 remixer
+ TPA part_of_a_set
+ TPB publisher
+ TPE1 artist
+ TPE2 band
+ TPE3 conductor
+ TPE4 remixer
+ TPOS part_of_a_set
+ TPRO produced_notice
+ TPUB publisher
+ TRC isrc
+ TRCK track_number
+ TRD recording_dates
+ TRDA recording_dates
+ TRK track_number
+ TRSN internet_radio_station_name
+ TRSO internet_radio_station_owner
+ TS2 album_artist_sort_order
+ TSA album_sort_order
+ TSC composer_sort_order
+ TSI size
+ TSIZ size
+ TSO2 album_artist_sort_order
+ TSOA album_sort_order
+ TSOC composer_sort_order
+ TSOP performer_sort_order
+ TSOT title_sort_order
+ TSP performer_sort_order
+ TSRC isrc
+ TSS encoder_settings
+ TSSE encoder_settings
+ TSST set_subtitle
+ TST title_sort_order
+ TT1 content_group_description
+ TT2 title
+ TT3 subtitle
+ TXT lyricist
+ TXX text
+ TXXX text
+ TYE year
+ TYER year
+ UFI unique_file_identifier
+ UFID unique_file_identifier
+ ULT unsynchronised_lyric
+ USER terms_of_use
+ USLT unsynchronised_lyric
+ WAF url_file
+ WAR url_artist
+ WAS url_source
+ WCM commercial_information
+ WCOM commercial_information
+ WCOP copyright
+ WCP copyright
+ WOAF url_file
+ WOAR url_artist
+ WOAS url_source
+ WORS url_station
+ WPAY url_payment
+ WPB url_publisher
+ WPUB url_publisher
+ WXX url_user
+ WXXX url_user
+ TFEA featured_artist
+ TSTU recording_studio
+ rgad replay_gain_adjustment
+
+ */
+
return getid3_lib::EmbeddedLookup($framename, $begin, __LINE__, __FILE__, 'id3v2-framename_short');
}
- function TextEncodingTerminatorLookup($encoding) {
+ /**
+ * @param string $encoding
+ *
+ * @return string
+ */
+ public static function TextEncodingTerminatorLookup($encoding) {
// http://www.id3.org/id3v2.4.0-structure.txt
// Frames that allow different types of text encoding contains a text encoding description byte. Possible encodings:
- // $00 ISO-8859-1. Terminated with $00.
- // $01 UTF-16 encoded Unicode with BOM. All strings in the same frame SHALL have the same byteorder. Terminated with $00 00.
- // $02 UTF-16BE encoded Unicode without BOM. Terminated with $00 00.
- // $03 UTF-8 encoded Unicode. Terminated with $00.
-
- static $TextEncodingTerminatorLookup = array(0=>"\x00", 1=>"\x00\x00", 2=>"\x00\x00", 3=>"\x00", 255=>"\x00\x00");
-
- return @$TextEncodingTerminatorLookup[$encoding];
+ static $TextEncodingTerminatorLookup = array(
+ 0 => "\x00", // $00 ISO-8859-1. Terminated with $00.
+ 1 => "\x00\x00", // $01 UTF-16 encoded Unicode with BOM. All strings in the same frame SHALL have the same byteorder. Terminated with $00 00.
+ 2 => "\x00\x00", // $02 UTF-16BE encoded Unicode without BOM. Terminated with $00 00.
+ 3 => "\x00", // $03 UTF-8 encoded Unicode. Terminated with $00.
+ 255 => "\x00\x00"
+ );
+ return (isset($TextEncodingTerminatorLookup[$encoding]) ? $TextEncodingTerminatorLookup[$encoding] : "\x00");
}
- function TextEncodingNameLookup($encoding) {
+ /**
+ * @param int $encoding
+ *
+ * @return string
+ */
+ public static function TextEncodingNameLookup($encoding) {
// http://www.id3.org/id3v2.4.0-structure.txt
- static $TextEncodingNameLookup = array(0=>'ISO-8859-1', 1=>'UTF-16', 2=>'UTF-16BE', 3=>'UTF-8', 255=>'UTF-16BE');
+ // Frames that allow different types of text encoding contains a text encoding description byte. Possible encodings:
+ static $TextEncodingNameLookup = array(
+ 0 => 'ISO-8859-1', // $00 ISO-8859-1. Terminated with $00.
+ 1 => 'UTF-16', // $01 UTF-16 encoded Unicode with BOM. All strings in the same frame SHALL have the same byteorder. Terminated with $00 00.
+ 2 => 'UTF-16BE', // $02 UTF-16BE encoded Unicode without BOM. Terminated with $00 00.
+ 3 => 'UTF-8', // $03 UTF-8 encoded Unicode. Terminated with $00.
+ 255 => 'UTF-16BE'
+ );
return (isset($TextEncodingNameLookup[$encoding]) ? $TextEncodingNameLookup[$encoding] : 'ISO-8859-1');
}
- function IsValidID3v2FrameName($framename, $id3v2majorversion) {
+ /**
+ * @param string $string
+ * @param string $terminator
+ *
+ * @return string
+ */
+ public static function RemoveStringTerminator($string, $terminator) {
+ // Null terminator at end of comment string is somewhat ambiguous in the specification, may or may not be implemented by various taggers. Remove terminator only if present.
+ // https://github.com/JamesHeinrich/getID3/issues/121
+ // https://community.mp3tag.de/t/x-trailing-nulls-in-id3v2-comments/19227
+ if (substr($string, -strlen($terminator), strlen($terminator)) === $terminator) {
+ $string = substr($string, 0, -strlen($terminator));
+ }
+ return $string;
+ }
+
+ /**
+ * @param string $string
+ *
+ * @return string
+ */
+ public static function MakeUTF16emptyStringEmpty($string) {
+ if (in_array($string, array("\x00", "\x00\x00", "\xFF\xFE", "\xFE\xFF"))) {
+ // if string only contains a BOM or terminator then make it actually an empty string
+ $string = '';
+ }
+ return $string;
+ }
+
+ /**
+ * @param string $framename
+ * @param int $id3v2majorversion
+ *
+ * @return bool|int
+ */
+ public static function IsValidID3v2FrameName($framename, $id3v2majorversion) {
switch ($id3v2majorversion) {
case 2:
- return ereg('[A-Z][A-Z0-9]{2}', $framename);
- break;
+ return preg_match('#[A-Z][A-Z0-9]{2}#', $framename);
case 3:
case 4:
- return ereg('[A-Z][A-Z0-9]{3}', $framename);
- break;
+ return preg_match('#[A-Z][A-Z0-9]{3}#', $framename);
}
return false;
}
- function IsANumber($numberstring, $allowdecimal=false, $allownegative=false) {
+ /**
+ * @param string $numberstring
+ * @param bool $allowdecimal
+ * @param bool $allownegative
+ *
+ * @return bool
+ */
+ public static function IsANumber($numberstring, $allowdecimal=false, $allownegative=false) {
for ($i = 0; $i < strlen($numberstring); $i++) {
- if ((chr($numberstring{$i}) < chr('0')) || (chr($numberstring{$i}) > chr('9'))) {
- if (($numberstring{$i} == '.') && $allowdecimal) {
+ if ((chr($numberstring[$i]) < chr('0')) || (chr($numberstring[$i]) > chr('9'))) {
+ if (($numberstring[$i] == '.') && $allowdecimal) {
// allowed
- } elseif (($numberstring{$i} == '-') && $allownegative && ($i == 0)) {
+ } elseif (($numberstring[$i] == '-') && $allownegative && ($i == 0)) {
// allowed
} else {
return false;
@@ -3093,11 +3763,16 @@
return true;
}
- function IsValidDateStampString($datestamp) {
+ /**
+ * @param string $datestamp
+ *
+ * @return bool
+ */
+ public static function IsValidDateStampString($datestamp) {
if (strlen($datestamp) != 8) {
return false;
}
- if (!$this->IsANumber($datestamp, false)) {
+ if (!self::IsANumber($datestamp, false)) {
return false;
}
$year = substr($datestamp, 0, 4);
@@ -3121,10 +3796,104 @@
return true;
}
- function ID3v2HeaderLength($majorversion) {
+ /**
+ * @param int $majorversion
+ *
+ * @return int
+ */
+ public static function ID3v2HeaderLength($majorversion) {
return (($majorversion == 2) ? 6 : 10);
}
+ /**
+ * @param string $frame_name
+ *
+ * @return string|false
+ */
+ public static function ID3v22iTunesBrokenFrameName($frame_name) {
+ // iTunes (multiple versions) has been known to write ID3v2.3 style frames
+ // but use ID3v2.2 frame names, right-padded using either [space] or [null]
+ // to make them fit in the 4-byte frame name space of the ID3v2.3 frame.
+ // This function will detect and translate the corrupt frame name into ID3v2.3 standard.
+ static $ID3v22_iTunes_BrokenFrames = array(
+ 'BUF' => 'RBUF', // Recommended buffer size
+ 'CNT' => 'PCNT', // Play counter
+ 'COM' => 'COMM', // Comments
+ 'CRA' => 'AENC', // Audio encryption
+ 'EQU' => 'EQUA', // Equalisation
+ 'ETC' => 'ETCO', // Event timing codes
+ 'GEO' => 'GEOB', // General encapsulated object
+ 'IPL' => 'IPLS', // Involved people list
+ 'LNK' => 'LINK', // Linked information
+ 'MCI' => 'MCDI', // Music CD identifier
+ 'MLL' => 'MLLT', // MPEG location lookup table
+ 'PIC' => 'APIC', // Attached picture
+ 'POP' => 'POPM', // Popularimeter
+ 'REV' => 'RVRB', // Reverb
+ 'RVA' => 'RVAD', // Relative volume adjustment
+ 'SLT' => 'SYLT', // Synchronised lyric/text
+ 'STC' => 'SYTC', // Synchronised tempo codes
+ 'TAL' => 'TALB', // Album/Movie/Show title
+ 'TBP' => 'TBPM', // BPM (beats per minute)
+ 'TCM' => 'TCOM', // Composer
+ 'TCO' => 'TCON', // Content type
+ 'TCP' => 'TCMP', // Part of a compilation
+ 'TCR' => 'TCOP', // Copyright message
+ 'TDA' => 'TDAT', // Date
+ 'TDY' => 'TDLY', // Playlist delay
+ 'TEN' => 'TENC', // Encoded by
+ 'TFT' => 'TFLT', // File type
+ 'TIM' => 'TIME', // Time
+ 'TKE' => 'TKEY', // Initial key
+ 'TLA' => 'TLAN', // Language(s)
+ 'TLE' => 'TLEN', // Length
+ 'TMT' => 'TMED', // Media type
+ 'TOA' => 'TOPE', // Original artist(s)/performer(s)
+ 'TOF' => 'TOFN', // Original filename
+ 'TOL' => 'TOLY', // Original lyricist(s)/text writer(s)
+ 'TOR' => 'TORY', // Original release year
+ 'TOT' => 'TOAL', // Original album/movie/show title
+ 'TP1' => 'TPE1', // Lead performer(s)/Soloist(s)
+ 'TP2' => 'TPE2', // Band/orchestra/accompaniment
+ 'TP3' => 'TPE3', // Conductor/performer refinement
+ 'TP4' => 'TPE4', // Interpreted, remixed, or otherwise modified by
+ 'TPA' => 'TPOS', // Part of a set
+ 'TPB' => 'TPUB', // Publisher
+ 'TRC' => 'TSRC', // ISRC (international standard recording code)
+ 'TRD' => 'TRDA', // Recording dates
+ 'TRK' => 'TRCK', // Track number/Position in set
+ 'TS2' => 'TSO2', // Album-Artist sort order
+ 'TSA' => 'TSOA', // Album sort order
+ 'TSC' => 'TSOC', // Composer sort order
+ 'TSI' => 'TSIZ', // Size
+ 'TSP' => 'TSOP', // Performer sort order
+ 'TSS' => 'TSSE', // Software/Hardware and settings used for encoding
+ 'TST' => 'TSOT', // Title sort order
+ 'TT1' => 'TIT1', // Content group description
+ 'TT2' => 'TIT2', // Title/songname/content description
+ 'TT3' => 'TIT3', // Subtitle/Description refinement
+ 'TXT' => 'TEXT', // Lyricist/Text writer
+ 'TXX' => 'TXXX', // User defined text information frame
+ 'TYE' => 'TYER', // Year
+ 'UFI' => 'UFID', // Unique file identifier
+ 'ULT' => 'USLT', // Unsynchronised lyric/text transcription
+ 'WAF' => 'WOAF', // Official audio file webpage
+ 'WAR' => 'WOAR', // Official artist/performer webpage
+ 'WAS' => 'WOAS', // Official audio source webpage
+ 'WCM' => 'WCOM', // Commercial information
+ 'WCP' => 'WCOP', // Copyright/Legal information
+ 'WPB' => 'WPUB', // Publishers official webpage
+ 'WXX' => 'WXXX', // User defined URL link frame
+ );
+ if (strlen($frame_name) == 4) {
+ if ((substr($frame_name, 3, 1) == ' ') || (substr($frame_name, 3, 1) == "\x00")) {
+ if (isset($ID3v22_iTunes_BrokenFrames[substr($frame_name, 0, 3)])) {
+ return $ID3v22_iTunes_BrokenFrames[substr($frame_name, 0, 3)];
+ }
+ }
+ }
+ return false;
+ }
+
}
-?>
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.tag.lyrics3.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.tag.lyrics3.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.tag.lyrics3.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
/// //
// module.tag.lyrics3.php //
// module for analyzing Lyrics3 tags //
@@ -13,16 +14,27 @@
// ///
/////////////////////////////////////////////////////////////////
-
-class getid3_lyrics3
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
+class getid3_lyrics3 extends getid3_handler
{
+ /**
+ * @return bool
+ */
+ public function Analyze() {
+ $info = &$this->getid3->info;
- function getid3_lyrics3(&$fd, &$ThisFileInfo) {
// http://www.volweb.cz/str/tags.htm
- fseek($fd, (0 - 128 - 9 - 6), SEEK_END); // end - ID3v1 - LYRICSEND - [Lyrics3size]
- $lyrics3_id3v1 = fread($fd, 128 + 9 + 6);
- $lyrics3lsz = substr($lyrics3_id3v1, 0, 6); // Lyrics3size
+ if (!getid3_lib::intValueSupported($info['filesize'])) {
+ $this->warning('Unable to check for Lyrics3 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB');
+ return false;
+ }
+
+ $this->fseek((0 - 128 - 9 - 6), SEEK_END); // end - ID3v1 - "LYRICSEND" - [Lyrics3size]
+ $lyrics3_id3v1 = $this->fread(128 + 9 + 6);
+ $lyrics3lsz = (int) substr($lyrics3_id3v1, 0, 6); // Lyrics3size
$lyrics3end = substr($lyrics3_id3v1, 6, 9); // LYRICSEND or LYRICS200
$id3v1tag = substr($lyrics3_id3v1, 15, 128); // ID3v1
@@ -30,7 +42,7 @@
// Lyrics3v1, ID3v1, no APE
$lyrics3size = 5100;
- $lyrics3offset = $ThisFileInfo['filesize'] - 128 - $lyrics3size;
+ $lyrics3offset = $info['filesize'] - 128 - $lyrics3size;
$lyrics3version = 1;
} elseif ($lyrics3end == 'LYRICS200') {
@@ -38,7 +50,7 @@
// LSZ = lyrics + 'LYRICSBEGIN'; add 6-byte size field; add 'LYRICS200'
$lyrics3size = $lyrics3lsz + 6 + strlen('LYRICS200');
- $lyrics3offset = $ThisFileInfo['filesize'] - 128 - $lyrics3size;
+ $lyrics3offset = $info['filesize'] - 128 - $lyrics3size;
$lyrics3version = 2;
} elseif (substr(strrev($lyrics3_id3v1), 0, 9) == strrev('LYRICSEND')) {
@@ -45,42 +57,42 @@
// Lyrics3v1, no ID3v1, no APE
$lyrics3size = 5100;
- $lyrics3offset = $ThisFileInfo['filesize'] - $lyrics3size;
+ $lyrics3offset = $info['filesize'] - $lyrics3size;
$lyrics3version = 1;
- $lyrics3offset = $ThisFileInfo['filesize'] - $lyrics3size;
+ $lyrics3offset = $info['filesize'] - $lyrics3size;
} elseif (substr(strrev($lyrics3_id3v1), 0, 9) == strrev('LYRICS200')) {
// Lyrics3v2, no ID3v1, no APE
- $lyrics3size = strrev(substr(strrev($lyrics3_id3v1), 9, 6)) + 6 + strlen('LYRICS200'); // LSZ = lyrics + 'LYRICSBEGIN'; add 6-byte size field; add 'LYRICS200'
- $lyrics3offset = $ThisFileInfo['filesize'] - $lyrics3size;
+ $lyrics3size = (int) strrev(substr(strrev($lyrics3_id3v1), 9, 6)) + 6 + strlen('LYRICS200'); // LSZ = lyrics + 'LYRICSBEGIN'; add 6-byte size field; add 'LYRICS200'
+ $lyrics3offset = $info['filesize'] - $lyrics3size;
$lyrics3version = 2;
} else {
- if (isset($ThisFileInfo['ape']['tag_offset_start']) && ($ThisFileInfo['ape']['tag_offset_start'] > 15)) {
+ if (isset($info['ape']['tag_offset_start']) && ($info['ape']['tag_offset_start'] > 15)) {
- fseek($fd, $ThisFileInfo['ape']['tag_offset_start'] - 15, SEEK_SET);
- $lyrics3lsz = fread($fd, 6);
- $lyrics3end = fread($fd, 9);
+ $this->fseek($info['ape']['tag_offset_start'] - 15);
+ $lyrics3lsz = $this->fread(6);
+ $lyrics3end = $this->fread(9);
if ($lyrics3end == 'LYRICSEND') {
// Lyrics3v1, APE, maybe ID3v1
$lyrics3size = 5100;
- $lyrics3offset = $ThisFileInfo['ape']['tag_offset_start'] - $lyrics3size;
- $ThisFileInfo['avdataend'] = $lyrics3offset;
+ $lyrics3offset = $info['ape']['tag_offset_start'] - $lyrics3size;
+ $info['avdataend'] = $lyrics3offset;
$lyrics3version = 1;
- $ThisFileInfo['warning'][] = 'APE tag located after Lyrics3, will probably break Lyrics3 compatability';
+ $this->warning('APE tag located after Lyrics3, will probably break Lyrics3 compatability');
} elseif ($lyrics3end == 'LYRICS200') {
// Lyrics3v2, APE, maybe ID3v1
$lyrics3size = $lyrics3lsz + 6 + strlen('LYRICS200'); // LSZ = lyrics + 'LYRICSBEGIN'; add 6-byte size field; add 'LYRICS200'
- $lyrics3offset = $ThisFileInfo['ape']['tag_offset_start'] - $lyrics3size;
+ $lyrics3offset = $info['ape']['tag_offset_start'] - $lyrics3size;
$lyrics3version = 2;
- $ThisFileInfo['warning'][] = 'APE tag located after Lyrics3, will probably break Lyrics3 compatability';
+ $this->warning('APE tag located after Lyrics3, will probably break Lyrics3 compatability');
}
@@ -88,14 +100,28 @@
}
- if (isset($lyrics3offset)) {
- $ThisFileInfo['avdataend'] = $lyrics3offset;
- $this->getLyrics3Data($ThisFileInfo, $fd, $lyrics3offset, $lyrics3version, $lyrics3size);
+ if (isset($lyrics3offset) && isset($lyrics3version) && isset($lyrics3size)) {
+ $info['avdataend'] = $lyrics3offset;
+ $this->getLyrics3Data($lyrics3offset, $lyrics3version, $lyrics3size);
- if (!isset($ThisFileInfo['ape'])) {
- $GETID3_ERRORARRAY = &$ThisFileInfo['warning'];
- if (getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.apetag.php', __FILE__, false)) {
- $tag = new getid3_apetag($fd, $ThisFileInfo, $ThisFileInfo['lyrics3']['tag_offset_start']);
+ if (!isset($info['ape'])) {
+ if (isset($info['lyrics3']['tag_offset_start'])) {
+ $GETID3_ERRORARRAY = &$info['warning'];
+ getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.apetag.php', __FILE__, true);
+ $getid3_temp = new getID3();
+ $getid3_temp->openfile($this->getid3->filename, $this->getid3->info['filesize'], $this->getid3->fp);
+ $getid3_apetag = new getid3_apetag($getid3_temp);
+ $getid3_apetag->overrideendoffset = $info['lyrics3']['tag_offset_start'];
+ $getid3_apetag->Analyze();
+ if (!empty($getid3_temp->info['ape'])) {
+ $info['ape'] = $getid3_temp->info['ape'];
+ }
+ if (!empty($getid3_temp->info['replay_gain'])) {
+ $info['replay_gain'] = $getid3_temp->info['replay_gain'];
+ }
+ unset($getid3_temp, $getid3_apetag);
+ } else {
+ $this->warning('Lyrics3 and APE tags appear to have become entangled (most likely due to updating the APE tags with a non-Lyrics3-aware tagger)');
}
}
@@ -104,27 +130,49 @@
return true;
}
- function getLyrics3Data(&$ThisFileInfo, &$fd, $endoffset, $version, $length) {
+ /**
+ * @param int $endoffset
+ * @param int $version
+ * @param int $length
+ *
+ * @return bool
+ */
+ public function getLyrics3Data($endoffset, $version, $length) {
// http://www.volweb.cz/str/tags.htm
- fseek($fd, $endoffset, SEEK_SET);
+ $info = &$this->getid3->info;
+
+ if (!getid3_lib::intValueSupported($endoffset)) {
+ $this->warning('Unable to check for Lyrics3 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB');
+ return false;
+ }
+
+ $this->fseek($endoffset);
if ($length <= 0) {
return false;
}
- $rawdata = fread($fd, $length);
+ $rawdata = $this->fread($length);
+ $ParsedLyrics3 = array();
+
+ $ParsedLyrics3['raw']['lyrics3version'] = $version;
+ $ParsedLyrics3['raw']['lyrics3tagsize'] = $length;
+ $ParsedLyrics3['tag_offset_start'] = $endoffset;
+ $ParsedLyrics3['tag_offset_end'] = $endoffset + $length - 1;
+
if (substr($rawdata, 0, 11) != 'LYRICSBEGIN') {
if (strpos($rawdata, 'LYRICSBEGIN') !== false) {
- $ThisFileInfo['warning'][] = '"LYRICSBEGIN" expected at '.$endoffset.' but actually found at '.($endoffset + strpos($rawdata, 'LYRICSBEGIN')).' - this is invalid for Lyrics3 v'.$version;
- $ThisFileInfo['avdataend'] = $endoffset + strpos($rawdata, 'LYRICSBEGIN');
- $ParsedLyrics3['tag_offset_start'] = $ThisFileInfo['avdataend'];
+ $this->warning('"LYRICSBEGIN" expected at '.$endoffset.' but actually found at '.($endoffset + strpos($rawdata, 'LYRICSBEGIN')).' - this is invalid for Lyrics3 v'.$version);
+ $info['avdataend'] = $endoffset + strpos($rawdata, 'LYRICSBEGIN');
$rawdata = substr($rawdata, strpos($rawdata, 'LYRICSBEGIN'));
$length = strlen($rawdata);
+ $ParsedLyrics3['tag_offset_start'] = $info['avdataend'];
+ $ParsedLyrics3['raw']['lyrics3tagsize'] = $length;
} else {
- $ThisFileInfo['error'][] = '"LYRICSBEGIN" expected at '.$endoffset.' but found "'.substr($rawdata, 0, 11).'" instead';
+ $this->error('"LYRICSBEGIN" expected at '.$endoffset.' but found "'.substr($rawdata, 0, 11).'" instead');
return false;
}
@@ -131,11 +179,6 @@
}
- $ParsedLyrics3['raw']['lyrics3version'] = $version;
- $ParsedLyrics3['raw']['lyrics3tagsize'] = $length;
- $ParsedLyrics3['tag_offset_start'] = $endoffset;
- $ParsedLyrics3['tag_offset_end'] = $endoffset + $length;
-
switch ($version) {
case 1:
@@ -143,7 +186,7 @@
$ParsedLyrics3['raw']['LYR'] = trim(substr($rawdata, 11, strlen($rawdata) - 11 - 9));
$this->Lyrics3LyricsTimestampParse($ParsedLyrics3);
} else {
- $ThisFileInfo['error'][] = '"LYRICSEND" expected at '.(ftell($fd) - 11 + $length - 9).' but found "'.substr($rawdata, strlen($rawdata) - 9, 9).'" instead';
+ $this->error('"LYRICSEND" expected at '.($this->ftell() - 11 + $length - 9).' but found "'.substr($rawdata, strlen($rawdata) - 9, 9).'" instead');
return false;
}
break;
@@ -163,8 +206,8 @@
$i = 0;
$flagnames = array('lyrics', 'timestamps', 'inhibitrandom');
foreach ($flagnames as $flagname) {
- if (strlen($ParsedLyrics3['raw']['IND']) > ++$i) {
- $ParsedLyrics3['flags'][$flagname] = $this->IntString2Bool(substr($ParsedLyrics3['raw']['IND'], $i, 1));
+ if (strlen($ParsedLyrics3['raw']['IND']) > $i++) {
+ $ParsedLyrics3['flags'][$flagname] = $this->IntString2Bool(substr($ParsedLyrics3['raw']['IND'], $i, 1 - 1));
}
}
}
@@ -181,9 +224,9 @@
foreach ($imagestrings as $key => $imagestring) {
if (strpos($imagestring, '||') !== false) {
$imagearray = explode('||', $imagestring);
- $ParsedLyrics3['images'][$key]['filename'] = $imagearray[0];
- $ParsedLyrics3['images'][$key]['description'] = $imagearray[1];
- $ParsedLyrics3['images'][$key]['timestamp'] = $this->Lyrics3Timestamp2Seconds($imagearray[2]);
+ $ParsedLyrics3['images'][$key]['filename'] = (isset($imagearray[0]) ? $imagearray[0] : '');
+ $ParsedLyrics3['images'][$key]['description'] = (isset($imagearray[1]) ? $imagearray[1] : '');
+ $ParsedLyrics3['images'][$key]['timestamp'] = $this->Lyrics3Timestamp2Seconds(isset($imagearray[2]) ? $imagearray[2] : '');
}
}
}
@@ -191,48 +234,58 @@
$this->Lyrics3LyricsTimestampParse($ParsedLyrics3);
}
} else {
- $ThisFileInfo['error'][] = '"LYRICS200" expected at '.(ftell($fd) - 11 + $length - 9).' but found "'.substr($rawdata, strlen($rawdata) - 9, 9).'" instead';
+ $this->error('"LYRICS200" expected at '.($this->ftell() - 11 + $length - 9).' but found "'.substr($rawdata, strlen($rawdata) - 9, 9).'" instead');
return false;
}
break;
default:
- $ThisFileInfo['error'][] = 'Cannot process Lyrics3 version '.$version.' (only v1 and v2)';
+ $this->error('Cannot process Lyrics3 version '.$version.' (only v1 and v2)');
return false;
- break;
}
- if (isset($ThisFileInfo['id3v1']['tag_offset_start']) && ($ThisFileInfo['id3v1']['tag_offset_start'] < $ParsedLyrics3['tag_offset_end'])) {
- $ThisFileInfo['warning'][] = 'ID3v1 tag information ignored since it appears to be a false synch in Lyrics3 tag data';
- unset($ThisFileInfo['id3v1']);
- foreach ($ThisFileInfo['warning'] as $key => $value) {
+ if (isset($info['id3v1']['tag_offset_start']) && ($info['id3v1']['tag_offset_start'] <= $ParsedLyrics3['tag_offset_end'])) {
+ $this->warning('ID3v1 tag information ignored since it appears to be a false synch in Lyrics3 tag data');
+ unset($info['id3v1']);
+ foreach ($info['warning'] as $key => $value) {
if ($value == 'Some ID3v1 fields do not use NULL characters for padding') {
- unset($ThisFileInfo['warning'][$key]);
- sort($ThisFileInfo['warning']);
+ unset($info['warning'][$key]);
+ sort($info['warning']);
break;
}
}
}
- $ThisFileInfo['lyrics3'] = $ParsedLyrics3;
+ $info['lyrics3'] = $ParsedLyrics3;
return true;
}
- function Lyrics3Timestamp2Seconds($rawtimestamp) {
- if (ereg('^\\[([0-9]{2}):([0-9]{2})\\]$', $rawtimestamp, $regs)) {
+ /**
+ * @param string $rawtimestamp
+ *
+ * @return int|false
+ */
+ public function Lyrics3Timestamp2Seconds($rawtimestamp) {
+ if (preg_match('#^\\[([0-9]{2}):([0-9]{2})\\]$#', $rawtimestamp, $regs)) {
return (int) (($regs[1] * 60) + $regs[2]);
}
return false;
}
- function Lyrics3LyricsTimestampParse(&$Lyrics3data) {
+ /**
+ * @param array $Lyrics3data
+ *
+ * @return bool
+ */
+ public function Lyrics3LyricsTimestampParse(&$Lyrics3data) {
$lyricsarray = explode("\r\n", $Lyrics3data['raw']['LYR']);
+ $notimestamplyricsarray = array();
foreach ($lyricsarray as $key => $lyricline) {
$regs = array();
unset($thislinetimestamps);
- while (ereg('^(\\[[0-9]{2}:[0-9]{2}\\])', $lyricline, $regs)) {
+ while (preg_match('#^(\\[[0-9]{2}:[0-9]{2}\\])#', $lyricline, $regs)) {
$thislinetimestamps[] = $this->Lyrics3Timestamp2Seconds($regs[0]);
$lyricline = str_replace($regs[0], '', $lyricline);
}
@@ -257,7 +310,12 @@
return true;
}
- function IntString2Bool($char) {
+ /**
+ * @param string $char
+ *
+ * @return bool|null
+ */
+ public function IntString2Bool($char) {
if ($char == '1') {
return true;
} elseif ($char == '0') {
@@ -266,6 +324,3 @@
return null;
}
}
-
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/write.apetag.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/write.apetag.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/write.apetag.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// write.apetag.php //
// module for writing APE tags //
@@ -13,23 +14,51 @@
// ///
/////////////////////////////////////////////////////////////////
-
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.apetag.php', __FILE__, true);
class getid3_write_apetag
{
+ /**
+ * @var string
+ */
+ public $filename;
- var $filename;
- var $tag_data;
- var $always_preserve_replaygain = true; // ReplayGain / MP3gain tags will be copied from old tag even if not passed in data
- var $warnings = array(); // any non-critical errors will be stored here
- var $errors = array(); // any critical errors will be stored here
+ /**
+ * @var array
+ */
+ public $tag_data;
- function getid3_write_apetag() {
- return true;
+ /**
+ * ReplayGain / MP3gain tags will be copied from old tag even if not passed in data.
+ *
+ * @var bool
+ */
+ public $always_preserve_replaygain = true;
+
+ /**
+ * Any non-critical errors will be stored here.
+ *
+ * @var array
+ */
+ public $warnings = array();
+
+ /**
+ * Any critical errors will be stored here.
+ *
+ * @var array
+ */
+ public $errors = array();
+
+ public function __construct() {
}
- function WriteAPEtag() {
+ /**
+ * @return bool
+ */
+ public function WriteAPEtag() {
// NOTE: All data passed to this function must be UTF-8 format
$getID3 = new getID3;
@@ -56,7 +85,7 @@
}
if ($APEtag = $this->GenerateAPEtag()) {
- if ($fp = @fopen($this->filename, 'a+b')) {
+ if (getID3::is_writable($this->filename) && is_file($this->filename) && ($fp = fopen($this->filename, 'a+b'))) {
$oldignoreuserabort = ignore_user_abort(true);
flock($fp, LOCK_EX);
@@ -67,15 +96,15 @@
if (isset($ThisFileInfo['lyrics3']['tag_offset_start'])) {
$PostAPEdataOffset = max($PostAPEdataOffset, $ThisFileInfo['lyrics3']['tag_offset_start']);
}
- fseek($fp, $PostAPEdataOffset, SEEK_SET);
+ fseek($fp, $PostAPEdataOffset);
$PostAPEdata = '';
if ($ThisFileInfo['filesize'] > $PostAPEdataOffset) {
$PostAPEdata = fread($fp, $ThisFileInfo['filesize'] - $PostAPEdataOffset);
}
- fseek($fp, $PostAPEdataOffset, SEEK_SET);
+ fseek($fp, $PostAPEdataOffset);
if (isset($ThisFileInfo['ape']['tag_offset_start'])) {
- fseek($fp, $ThisFileInfo['ape']['tag_offset_start'], SEEK_SET);
+ fseek($fp, $ThisFileInfo['ape']['tag_offset_start']);
}
ftruncate($fp, ftell($fp));
fwrite($fp, $APEtag, strlen($APEtag));
@@ -86,23 +115,24 @@
fclose($fp);
ignore_user_abort($oldignoreuserabort);
return true;
-
}
- return false;
}
return false;
}
- function DeleteAPEtag() {
+ /**
+ * @return bool
+ */
+ public function DeleteAPEtag() {
$getID3 = new getID3;
$ThisFileInfo = $getID3->analyze($this->filename);
if (isset($ThisFileInfo['ape']['tag_offset_start']) && isset($ThisFileInfo['ape']['tag_offset_end'])) {
- if ($fp = @fopen($this->filename, 'a+b')) {
+ if (getID3::is_writable($this->filename) && is_file($this->filename) && ($fp = fopen($this->filename, 'a+b'))) {
flock($fp, LOCK_EX);
$oldignoreuserabort = ignore_user_abort(true);
- fseek($fp, $ThisFileInfo['ape']['tag_offset_end'], SEEK_SET);
+ fseek($fp, $ThisFileInfo['ape']['tag_offset_end']);
$DataAfterAPE = '';
if ($ThisFileInfo['filesize'] > $ThisFileInfo['ape']['tag_offset_end']) {
$DataAfterAPE = fread($fp, $ThisFileInfo['filesize'] - $ThisFileInfo['ape']['tag_offset_end']);
@@ -109,7 +139,7 @@
}
ftruncate($fp, $ThisFileInfo['ape']['tag_offset_start']);
- fseek($fp, $ThisFileInfo['ape']['tag_offset_start'], SEEK_SET);
+ fseek($fp, $ThisFileInfo['ape']['tag_offset_start']);
if (!empty($DataAfterAPE)) {
fwrite($fp, $DataAfterAPE, strlen($DataAfterAPE));
@@ -120,7 +150,6 @@
ignore_user_abort($oldignoreuserabort);
return true;
-
}
return false;
}
@@ -127,8 +156,10 @@
return true;
}
-
- function GenerateAPEtag() {
+ /**
+ * @return string|false
+ */
+ public function GenerateAPEtag() {
// NOTE: All data passed to this function must be UTF-8 format
$items = array();
@@ -162,7 +193,13 @@
return $this->GenerateAPEtagHeaderFooter($items, true).implode('', $items).$this->GenerateAPEtagHeaderFooter($items, false);
}
- function GenerateAPEtagHeaderFooter(&$items, $isheader=false) {
+ /**
+ * @param array $items
+ * @param bool $isheader
+ *
+ * @return string
+ */
+ public function GenerateAPEtagHeaderFooter(&$items, $isheader=false) {
$tagdatalength = 0;
foreach ($items as $itemdata) {
$tagdatalength += strlen($itemdata);
@@ -178,7 +215,16 @@
return $APEheader;
}
- function GenerateAPEtagFlags($header=true, $footer=true, $isheader=false, $encodingid=0, $readonly=false) {
+ /**
+ * @param bool $header
+ * @param bool $footer
+ * @param bool $isheader
+ * @param int $encodingid
+ * @param bool $readonly
+ *
+ * @return string
+ */
+ public function GenerateAPEtagFlags($header=true, $footer=true, $isheader=false, $encodingid=0, $readonly=false) {
$APEtagFlags = array_fill(0, 4, 0);
if ($header) {
$APEtagFlags[0] |= 0x80; // Tag contains a header
@@ -191,8 +237,8 @@
}
// 0: Item contains text information coded in UTF-8
- // 1: Item contains binary information °)
- // 2: Item is a locator of external stored information °°)
+ // 1: Item contains binary information °)
+ // 2: Item is a locator of external stored information °°)
// 3: reserved
$APEtagFlags[3] |= ($encodingid << 1);
@@ -203,8 +249,13 @@
return chr($APEtagFlags[3]).chr($APEtagFlags[2]).chr($APEtagFlags[1]).chr($APEtagFlags[0]);
}
- function CleanAPEtagItemKey($itemkey) {
- $itemkey = eregi_replace("[^\x20-\x7E]", '', $itemkey);
+ /**
+ * @param string $itemkey
+ *
+ * @return string
+ */
+ public function CleanAPEtagItemKey($itemkey) {
+ $itemkey = preg_replace("#[^\x20-\x7E]#i", '', $itemkey);
// http://www.personal.uni-jena.de/~pfk/mpp/sv8/apekey.html
switch (strtoupper($itemkey)) {
@@ -224,5 +275,3 @@
}
}
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/write.id3v1.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/write.id3v1.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/write.id3v1.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// write.id3v1.php //
// module for writing ID3v1 tags //
@@ -13,24 +14,57 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v1.php', __FILE__, true);
class getid3_write_id3v1
{
- var $filename;
- var $tag_data;
- var $warnings = array(); // any non-critical errors will be stored here
- var $errors = array(); // any critical errors will be stored here
+ /**
+ * @var string
+ */
+ public $filename;
- function getid3_write_id3v1() {
- return true;
+ /**
+ * @var int
+ */
+ public $filesize;
+
+ /**
+ * @var array
+ */
+ public $tag_data;
+
+ /**
+ * Any non-critical errors will be stored here.
+ *
+ * @var array
+ */
+ public $warnings = array();
+
+ /**
+ * Any critical errors will be stored here.
+ *
+ * @var array
+ */
+ public $errors = array();
+
+ public function __construct() {
}
- function WriteID3v1() {
+ /**
+ * @return bool
+ */
+ public function WriteID3v1() {
// File MUST be writeable - CHMOD(646) at least
- if (is_writeable($this->filename)) {
- if ($fp_source = @fopen($this->filename, 'r+b')) {
-
+ if (!empty($this->filename) && is_readable($this->filename) && getID3::is_writable($this->filename) && is_file($this->filename)) {
+ $this->setRealFileSize();
+ if (($this->filesize <= 0) || !getid3_lib::intValueSupported($this->filesize)) {
+ $this->errors[] = 'Unable to WriteID3v1('.$this->filename.') because filesize ('.$this->filesize.') is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
+ return false;
+ }
+ if ($fp_source = fopen($this->filename, 'r+b')) {
fseek($fp_source, -128, SEEK_END);
if (fread($fp_source, 3) == 'TAG') {
fseek($fp_source, -128, SEEK_END); // overwrite existing ID3v1 tag
@@ -37,21 +71,22 @@
} else {
fseek($fp_source, 0, SEEK_END); // append new ID3v1 tag
}
+ $this->tag_data['track_number'] = (isset($this->tag_data['track_number']) ? $this->tag_data['track_number'] : '');
$new_id3v1_tag_data = getid3_id3v1::GenerateID3v1Tag(
- @$this->tag_data['title'],
- @$this->tag_data['artist'],
- @$this->tag_data['album'],
- @$this->tag_data['year'],
- @$this->tag_data['genreid'],
- @$this->tag_data['comment'],
- @$this->tag_data['track']);
+ (isset($this->tag_data['title'] ) ? $this->tag_data['title'] : ''),
+ (isset($this->tag_data['artist'] ) ? $this->tag_data['artist'] : ''),
+ (isset($this->tag_data['album'] ) ? $this->tag_data['album'] : ''),
+ (isset($this->tag_data['year'] ) ? $this->tag_data['year'] : ''),
+ (isset($this->tag_data['genreid'] ) ? $this->tag_data['genreid'] : ''),
+ (isset($this->tag_data['comment'] ) ? $this->tag_data['comment'] : ''),
+ (isset($this->tag_data['track_number']) ? $this->tag_data['track_number'] : ''));
fwrite($fp_source, $new_id3v1_tag_data, 128);
fclose($fp_source);
return true;
} else {
- $this->errors[] = 'Could not open '.$this->filename.' mode "r+b"';
+ $this->errors[] = 'Could not fopen('.$this->filename.', "r+b")';
return false;
}
}
@@ -59,14 +94,23 @@
return false;
}
- function FixID3v1Padding() {
+ /**
+ * @return bool
+ */
+ public function FixID3v1Padding() {
// ID3v1 data is supposed to be padded with NULL characters, but some taggers incorrectly use spaces
// This function rewrites the ID3v1 tag with correct padding
// Initialize getID3 engine
$getID3 = new getID3;
+ $getID3->option_tag_id3v2 = false;
+ $getID3->option_tag_apetag = false;
+ $getID3->option_tags_html = false;
+ $getID3->option_extra_info = false;
+ $getID3->option_tag_id3v1 = true;
$ThisFileInfo = $getID3->analyze($this->filename);
if (isset($ThisFileInfo['tags']['id3v1'])) {
+ $id3v1data = array();
foreach ($ThisFileInfo['tags']['id3v1'] as $key => $value) {
$id3v1data[$key] = implode(',', $value);
}
@@ -76,14 +120,22 @@
return false;
}
- function RemoveID3v1() {
+ /**
+ * @return bool
+ */
+ public function RemoveID3v1() {
// File MUST be writeable - CHMOD(646) at least
- if (is_writeable($this->filename)) {
- if ($fp_source = @fopen($this->filename, 'r+b')) {
+ if (!empty($this->filename) && is_readable($this->filename) && getID3::is_writable($this->filename) && is_file($this->filename)) {
+ $this->setRealFileSize();
+ if (($this->filesize <= 0) || !getid3_lib::intValueSupported($this->filesize)) {
+ $this->errors[] = 'Unable to RemoveID3v1('.$this->filename.') because filesize ('.$this->filesize.') is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
+ return false;
+ }
+ if ($fp_source = fopen($this->filename, 'r+b')) {
fseek($fp_source, -128, SEEK_END);
if (fread($fp_source, 3) == 'TAG') {
- ftruncate($fp_source, filesize($this->filename) - 128);
+ ftruncate($fp_source, $this->filesize - 128);
} else {
// no ID3v1 tag to begin with - do nothing
}
@@ -91,7 +143,7 @@
return true;
} else {
- $this->errors[] = 'Could not open '.$this->filename.' mode "r+b"';
+ $this->errors[] = 'Could not fopen('.$this->filename.', "r+b")';
}
} else {
$this->errors[] = $this->filename.' is not writeable';
@@ -99,6 +151,25 @@
return false;
}
+ /**
+ * @return bool
+ */
+ public function setRealFileSize() {
+ if (PHP_INT_MAX > 2147483647) {
+ $this->filesize = filesize($this->filename);
+ return true;
+ }
+ // 32-bit PHP will not return correct values for filesize() if file is >=2GB
+ // but getID3->analyze() has workarounds to get actual filesize
+ $getID3 = new getID3;
+ $getID3->option_tag_id3v1 = false;
+ $getID3->option_tag_id3v2 = false;
+ $getID3->option_tag_apetag = false;
+ $getID3->option_tags_html = false;
+ $getID3->option_extra_info = false;
+ $ThisFileInfo = $getID3->analyze($this->filename);
+ $this->filesize = $ThisFileInfo['filesize'];
+ return true;
+ }
+
}
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/write.id3v2.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/write.id3v2.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/write.id3v2.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
/// //
// write.id3v2.php //
// module for writing ID3v2 tags //
@@ -13,33 +14,105 @@
// ///
/////////////////////////////////////////////////////////////////
+if (!defined('GETID3_INCLUDEPATH')) { // prevent path-exposing attacks that access modules directly on public webservers
+ exit;
+}
getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v2.php', __FILE__, true);
class getid3_write_id3v2
{
- var $filename;
- var $tag_data;
- var $paddedlength = 4096; // minimum length of ID3v2 tag in bytes
- var $majorversion = 3; // ID3v2 major version (2, 3 (recommended), 4)
- var $minorversion = 0; // ID3v2 minor version - always 0
- var $merge_existing_data = false; // if true, merge new data with existing tags; if false, delete old tag data and only write new tags
- var $id3v2_default_encodingid = 0; // default text encoding (ISO-8859-1) if not explicitly passed
- var $id3v2_use_unsynchronisation = false; // the specs say it should be TRUE, but most other ID3v2-aware programs are broken if unsynchronization is used, so by default don't use it.
- var $warnings = array(); // any non-critical errors will be stored here
- var $errors = array(); // any critical errors will be stored here
+ /**
+ * @var string
+ */
+ public $filename;
- function getid3_write_id3v2() {
- return true;
+ /**
+ * @var array|null
+ */
+ public $tag_data;
+
+ /**
+ * Read buffer size in bytes.
+ *
+ * @var int
+ */
+ public $fread_buffer_size = 32768;
+
+ /**
+ * Minimum length of ID3v2 tag in bytes.
+ *
+ * @var int
+ */
+ public $paddedlength = 4096;
+
+ /**
+ * ID3v2 major version (2, 3 (recommended), 4).
+ *
+ * @var int
+ */
+ public $majorversion = 3;
+
+ /**
+ * ID3v2 minor version - always 0.
+ *
+ * @var int
+ */
+ public $minorversion = 0;
+
+ /**
+ * If true, merge new data with existing tags; if false, delete old tag data and only write new tags.
+ *
+ * @var bool
+ */
+ public $merge_existing_data = false;
+
+ /**
+ * Default text encoding (ISO-8859-1) if not explicitly passed.
+ *
+ * @var int
+ */
+ public $id3v2_default_encodingid = 0;
+
+ /**
+ * The specs say it should be TRUE, but most other ID3v2-aware programs are broken if unsynchronization is used,
+ * so by default don't use it.
+ *
+ * @var bool
+ */
+ public $id3v2_use_unsynchronisation = false;
+
+ /**
+ * Any non-critical errors will be stored here.
+ *
+ * @var array
+ */
+ public $warnings = array();
+
+ /**
+ * Any critical errors will be stored here.
+ *
+ * @var array
+ */
+ public $errors = array();
+
+ public function __construct() {
}
- function WriteID3v2() {
+ /**
+ * @return bool
+ */
+ public function WriteID3v2() {
// File MUST be writeable - CHMOD(646) at least. It's best if the
// directory is also writeable, because that method is both faster and less susceptible to errors.
- if (is_writeable($this->filename) || (!file_exists($this->filename) && is_writeable(dirname($this->filename)))) {
+ if (!empty($this->filename) && (getID3::is_writable($this->filename) || (!file_exists($this->filename) && getID3::is_writable(dirname($this->filename))))) {
// Initialize getID3 engine
$getID3 = new getID3;
$OldThisFileInfo = $getID3->analyze($this->filename);
+ if (!getid3_lib::intValueSupported($OldThisFileInfo['filesize'])) {
+ $this->errors[] = 'Unable to write ID3v2 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
+ return false;
+ }
if ($this->merge_existing_data) {
// merge with existing data
if (!empty($OldThisFileInfo['id3v2'])) {
@@ -46,54 +119,49 @@
$this->tag_data = $this->array_join_merge($OldThisFileInfo['id3v2'], $this->tag_data);
}
}
- $this->paddedlength = max(@$OldThisFileInfo['id3v2']['headerlength'], $this->paddedlength);
+ $this->paddedlength = (isset($OldThisFileInfo['id3v2']['headerlength']) ? max($OldThisFileInfo['id3v2']['headerlength'], $this->paddedlength) : $this->paddedlength);
if ($NewID3v2Tag = $this->GenerateID3v2Tag()) {
- if (file_exists($this->filename) && is_writeable($this->filename) && isset($OldThisFileInfo['id3v2']['headerlength']) && ($OldThisFileInfo['id3v2']['headerlength'] == strlen($NewID3v2Tag))) {
+ if (file_exists($this->filename) && getID3::is_writable($this->filename) && isset($OldThisFileInfo['id3v2']['headerlength']) && ($OldThisFileInfo['id3v2']['headerlength'] == strlen($NewID3v2Tag))) {
// best and fastest method - insert-overwrite existing tag (padded to length of old tag if neccesary)
if (file_exists($this->filename)) {
- ob_start();
- if ($fp = fopen($this->filename, 'r+b')) {
+ if (is_readable($this->filename) && getID3::is_writable($this->filename) && is_file($this->filename) && ($fp = fopen($this->filename, 'r+b'))) {
rewind($fp);
fwrite($fp, $NewID3v2Tag, strlen($NewID3v2Tag));
fclose($fp);
} else {
- $this->errors[] = 'Could not open '.$this->filename.' mode "r+b" - '.strip_tags(ob_get_contents());
+ $this->errors[] = 'Could not fopen("'.$this->filename.'", "r+b")';
}
- ob_end_clean();
} else {
- ob_start();
- if ($fp = fopen($this->filename, 'wb')) {
+ if (getID3::is_writable($this->filename) && is_file($this->filename) && ($fp = fopen($this->filename, 'wb'))) {
rewind($fp);
fwrite($fp, $NewID3v2Tag, strlen($NewID3v2Tag));
fclose($fp);
} else {
- $this->errors[] = 'Could not open '.$this->filename.' mode "wb" - '.strip_tags(ob_get_contents());
+ $this->errors[] = 'Could not fopen("'.$this->filename.'", "wb")';
}
- ob_end_clean();
}
} else {
- if ($tempfilename = tempnam('*', 'getID3')) {
- ob_start();
- if ($fp_source = fopen($this->filename, 'rb')) {
- if ($fp_temp = fopen($tempfilename, 'wb')) {
+ if ($tempfilename = tempnam(GETID3_TEMP_DIR, 'getID3')) {
+ if (is_readable($this->filename) && is_file($this->filename) && ($fp_source = fopen($this->filename, 'rb'))) {
+ if (getID3::is_writable($tempfilename) && is_file($tempfilename) && ($fp_temp = fopen($tempfilename, 'wb'))) {
fwrite($fp_temp, $NewID3v2Tag, strlen($NewID3v2Tag));
rewind($fp_source);
if (!empty($OldThisFileInfo['avdataoffset'])) {
- fseek($fp_source, $OldThisFileInfo['avdataoffset'], SEEK_SET);
+ fseek($fp_source, $OldThisFileInfo['avdataoffset']);
}
- while ($buffer = fread($fp_source, GETID3_FREAD_BUFFER_SIZE)) {
+ while ($buffer = fread($fp_source, $this->fread_buffer_size)) {
fwrite($fp_temp, $buffer, strlen($buffer));
}
@@ -101,22 +169,16 @@
fclose($fp_source);
copy($tempfilename, $this->filename);
unlink($tempfilename);
- ob_end_clean();
return true;
} else {
-
- $this->errors[] = 'Could not open '.$tempfilename.' mode "wb" - '.strip_tags(ob_get_contents());
-
+ $this->errors[] = 'Could not fopen("'.$tempfilename.'", "wb")';
}
fclose($fp_source);
} else {
-
- $this->errors[] = 'Could not open '.$this->filename.' mode "rb" - '.strip_tags(ob_get_contents());
-
+ $this->errors[] = 'Could not fopen("'.$this->filename.'", "rb")';
}
- ob_end_clean();
}
return false;
@@ -133,38 +195,46 @@
}
return true;
} else {
- $this->errors[] = '!is_writeable('.$this->filename.')';
+ $this->errors[] = 'WriteID3v2() failed: !is_writeable('.$this->filename.')';
}
return false;
}
- function RemoveID3v2() {
-
+ /**
+ * @return bool
+ */
+ public function RemoveID3v2() {
// File MUST be writeable - CHMOD(646) at least. It's best if the
// directory is also writeable, because that method is both faster and less susceptible to errors.
- if (is_writeable(dirname($this->filename))) {
+ if (getID3::is_writable(dirname($this->filename))) {
// preferred method - only one copying operation, minimal chance of corrupting
// original file if script is interrupted, but required directory to be writeable
- if ($fp_source = @fopen($this->filename, 'rb')) {
+ if (is_readable($this->filename) && is_file($this->filename) && ($fp_source = fopen($this->filename, 'rb'))) {
+
// Initialize getID3 engine
$getID3 = new getID3;
$OldThisFileInfo = $getID3->analyze($this->filename);
+ if (!getid3_lib::intValueSupported($OldThisFileInfo['filesize'])) {
+ $this->errors[] = 'Unable to remove ID3v2 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
+ fclose($fp_source);
+ return false;
+ }
rewind($fp_source);
if ($OldThisFileInfo['avdataoffset'] !== false) {
- fseek($fp_source, $OldThisFileInfo['avdataoffset'], SEEK_SET);
+ fseek($fp_source, $OldThisFileInfo['avdataoffset']);
}
- if ($fp_temp = @fopen($this->filename.'getid3tmp', 'w+b')) {
- while ($buffer = fread($fp_source, GETID3_FREAD_BUFFER_SIZE)) {
+ if (getID3::is_writable($this->filename) && is_file($this->filename) && ($fp_temp = fopen($this->filename.'getid3tmp', 'w+b'))) {
+ while ($buffer = fread($fp_source, $this->fread_buffer_size)) {
fwrite($fp_temp, $buffer, strlen($buffer));
}
fclose($fp_temp);
} else {
- $this->errors[] = 'Could not open '.$this->filename.'getid3tmp mode "w+b"';
+ $this->errors[] = 'Could not fopen("'.$this->filename.'getid3tmp", "w+b")';
}
fclose($fp_source);
} else {
- $this->errors[] = 'Could not open '.$this->filename.' mode "rb"';
+ $this->errors[] = 'Could not fopen("'.$this->filename.'", "rb")';
}
if (file_exists($this->filename)) {
unlink($this->filename);
@@ -171,32 +241,38 @@
}
rename($this->filename.'getid3tmp', $this->filename);
- } elseif (is_writable($this->filename)) {
+ } elseif (getID3::is_writable($this->filename)) {
// less desirable alternate method - double-copies the file, overwrites original file
// and could corrupt source file if the script is interrupted or an error occurs.
- if ($fp_source = @fopen($this->filename, 'rb')) {
+ if (is_readable($this->filename) && is_file($this->filename) && ($fp_source = fopen($this->filename, 'rb'))) {
+
// Initialize getID3 engine
$getID3 = new getID3;
$OldThisFileInfo = $getID3->analyze($this->filename);
+ if (!getid3_lib::intValueSupported($OldThisFileInfo['filesize'])) {
+ $this->errors[] = 'Unable to remove ID3v2 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
+ fclose($fp_source);
+ return false;
+ }
rewind($fp_source);
if ($OldThisFileInfo['avdataoffset'] !== false) {
- fseek($fp_source, $OldThisFileInfo['avdataoffset'], SEEK_SET);
+ fseek($fp_source, $OldThisFileInfo['avdataoffset']);
}
if ($fp_temp = tmpfile()) {
- while ($buffer = fread($fp_source, GETID3_FREAD_BUFFER_SIZE)) {
+ while ($buffer = fread($fp_source, $this->fread_buffer_size)) {
fwrite($fp_temp, $buffer, strlen($buffer));
}
fclose($fp_source);
- if ($fp_source = @fopen($this->filename, 'wb')) {
+ if (getID3::is_writable($this->filename) && is_file($this->filename) && ($fp_source = fopen($this->filename, 'wb'))) {
rewind($fp_temp);
- while ($buffer = fread($fp_temp, GETID3_FREAD_BUFFER_SIZE)) {
+ while ($buffer = fread($fp_temp, $this->fread_buffer_size)) {
fwrite($fp_source, $buffer, strlen($buffer));
}
fseek($fp_temp, -128, SEEK_END);
fclose($fp_source);
} else {
- $this->errors[] = 'Could not open '.$this->filename.' mode "wb"';
+ $this->errors[] = 'Could not fopen("'.$this->filename.'", "wb")';
}
fclose($fp_temp);
} else {
@@ -203,7 +279,7 @@
$this->errors[] = 'Could not create tmpfile()';
}
} else {
- $this->errors[] = 'Could not open '.$this->filename.' mode "rb"';
+ $this->errors[] = 'Could not fopen("'.$this->filename.'", "rb")';
}
} else {
@@ -218,42 +294,59 @@
return true;
}
-
- function GenerateID3v2TagFlags($flags) {
+ /**
+ * @param array $flags
+ *
+ * @return string|false
+ */
+ public function GenerateID3v2TagFlags($flags) {
+ $flag = null;
switch ($this->majorversion) {
case 4:
// %abcd0000
- $flag = (@$flags['unsynchronisation'] ? '1' : '0'); // a - Unsynchronisation
- $flag .= (@$flags['extendedheader'] ? '1' : '0'); // b - Extended header
- $flag .= (@$flags['experimental'] ? '1' : '0'); // c - Experimental indicator
- $flag .= (@$flags['footer'] ? '1' : '0'); // d - Footer present
+ $flag = (!empty($flags['unsynchronisation']) ? '1' : '0'); // a - Unsynchronisation
+ $flag .= (!empty($flags['extendedheader'] ) ? '1' : '0'); // b - Extended header
+ $flag .= (!empty($flags['experimental'] ) ? '1' : '0'); // c - Experimental indicator
+ $flag .= (!empty($flags['footer'] ) ? '1' : '0'); // d - Footer present
$flag .= '0000';
break;
case 3:
// %abc00000
- $flag = (@$flags['unsynchronisation'] ? '1' : '0'); // a - Unsynchronisation
- $flag .= (@$flags['extendedheader'] ? '1' : '0'); // b - Extended header
- $flag .= (@$flags['experimental'] ? '1' : '0'); // c - Experimental indicator
+ $flag = (!empty($flags['unsynchronisation']) ? '1' : '0'); // a - Unsynchronisation
+ $flag .= (!empty($flags['extendedheader'] ) ? '1' : '0'); // b - Extended header
+ $flag .= (!empty($flags['experimental'] ) ? '1' : '0'); // c - Experimental indicator
$flag .= '00000';
break;
case 2:
// %ab000000
- $flag = (@$flags['unsynchronisation'] ? '1' : '0'); // a - Unsynchronisation
- $flag .= (@$flags['compression'] ? '1' : '0'); // b - Compression
+ $flag = (!empty($flags['unsynchronisation']) ? '1' : '0'); // a - Unsynchronisation
+ $flag .= (!empty($flags['compression'] ) ? '1' : '0'); // b - Compression
$flag .= '000000';
break;
default:
return false;
- break;
}
return chr(bindec($flag));
}
-
- function GenerateID3v2FrameFlags($TagAlter=false, $FileAlter=false, $ReadOnly=false, $Compression=false, $Encryption=false, $GroupingIdentity=false, $Unsynchronisation=false, $DataLengthIndicator=false) {
+ /**
+ * @param bool $TagAlter
+ * @param bool $FileAlter
+ * @param bool $ReadOnly
+ * @param bool $Compression
+ * @param bool $Encryption
+ * @param bool $GroupingIdentity
+ * @param bool $Unsynchronisation
+ * @param bool $DataLengthIndicator
+ *
+ * @return string|false
+ */
+ public function GenerateID3v2FrameFlags($TagAlter=false, $FileAlter=false, $ReadOnly=false, $Compression=false, $Encryption=false, $GroupingIdentity=false, $Unsynchronisation=false, $DataLengthIndicator=false) {
+ $flag1 = null;
+ $flag2 = null;
switch ($this->majorversion) {
case 4:
// %0abc0000 %0h00kmnp
@@ -287,13 +380,18 @@
default:
return false;
- break;
}
return chr(bindec($flag1)).chr(bindec($flag2));
}
- function GenerateID3v2FrameData($frame_name, $source_data_array) {
+ /**
+ * @param string $frame_name
+ * @param array $source_data_array
+ *
+ * @return string|false
+ */
+ public function GenerateID3v2FrameData($frame_name, $source_data_array) {
if (!getid3_id3v2::IsValidID3v2FrameName($frame_name, $this->majorversion)) {
return false;
}
@@ -324,7 +422,7 @@
// Description <text string according to encoding> $00 (00)
// Value <text string according to encoding>
$source_data_array['encodingid'] = (isset($source_data_array['encodingid']) ? $source_data_array['encodingid'] : $this->id3v2_default_encodingid);
- if (!$this->ID3v2IsValidTextEncoding($source_data_array['encodingid'], $this->majorversion)) {
+ if (!$this->ID3v2IsValidTextEncoding($source_data_array['encodingid'])) {
$this->errors[] = 'Invalid Text Encoding in '.$frame_name.' ('.$source_data_array['encodingid'].') for ID3v2.'.$this->majorversion;
} else {
$framedata .= chr($source_data_array['encodingid']);
@@ -339,9 +437,9 @@
// Description <text string according to encoding> $00 (00)
// URL <text string>
$source_data_array['encodingid'] = (isset($source_data_array['encodingid']) ? $source_data_array['encodingid'] : $this->id3v2_default_encodingid);
- if (!$this->ID3v2IsValidTextEncoding($source_data_array['encodingid'], $this->majorversion)) {
+ if (!$this->ID3v2IsValidTextEncoding($source_data_array['encodingid'])) {
$this->errors[] = 'Invalid Text Encoding in '.$frame_name.' ('.$source_data_array['encodingid'].') for ID3v2.'.$this->majorversion;
- } elseif (!isset($source_data_array['data']) || !$this->IsValidURL($source_data_array['data'], false, false)) {
+ } elseif (!isset($source_data_array['data']) || !$this->IsValidURL($source_data_array['data'], false)) {
//$this->errors[] = 'Invalid URL in '.$frame_name.' ('.$source_data_array['data'].')';
// probably should be an error, need to rewrite IsValidURL() to handle other encodings
$this->warnings[] = 'Invalid URL in '.$frame_name.' ('.$source_data_array['data'].')';
@@ -357,7 +455,7 @@
// Text encoding $xx
// People list strings <textstrings>
$source_data_array['encodingid'] = (isset($source_data_array['encodingid']) ? $source_data_array['encodingid'] : $this->id3v2_default_encodingid);
- if (!$this->ID3v2IsValidTextEncoding($source_data_array['encodingid'], $this->majorversion)) {
+ if (!$this->ID3v2IsValidTextEncoding($source_data_array['encodingid'])) {
$this->errors[] = 'Invalid Text Encoding in '.$frame_name.' ('.$source_data_array['encodingid'].') for ID3v2.'.$this->majorversion;
} else {
$framedata .= chr($source_data_array['encodingid']);
@@ -390,7 +488,7 @@
if (!$this->ID3v2IsValidETCOevent($val['typeid'])) {
$this->errors[] = 'Invalid Event Type byte in '.$frame_name.' ('.$val['typeid'].')';
} elseif (($key != 'timestampformat') && ($key != 'flags')) {
- if (($val['timestamp'] > 0) && ($previousETCOtimestamp >= $val['timestamp'])) {
+ if (($val['timestamp'] > 0) && isset($previousETCOtimestamp) && ($previousETCOtimestamp >= $val['timestamp'])) {
// The 'Time stamp' is set to zero if directly at the beginning of the sound
// or after the previous event. All events MUST be sorted in chronological order.
$this->errors[] = 'Out-of-order timestamp in '.$frame_name.' ('.$val['timestamp'].') for Event Type ('.$val['typeid'].')';
@@ -397,6 +495,7 @@
} else {
$framedata .= chr($val['typeid']);
$framedata .= getid3_lib::BigEndian2String($val['timestamp'], 4, false);
+ $previousETCOtimestamp = $val['timestamp'];
}
}
}
@@ -446,6 +545,7 @@
} else {
$this->errors[] = 'Invalid Bits For Milliseconds Deviation in '.$frame_name.' ('.$source_data_array['bitsformsdeviation'].')';
}
+ $unwrittenbitstream = '';
foreach ($source_data_array as $key => $val) {
if (($key != 'framesbetweenreferences') && ($key != 'bytesbetweenreferences') && ($key != 'msbetweenreferences') && ($key != 'bitsforbytesdeviation') && ($key != 'bitsformsdeviation') && ($key != 'flags')) {
$unwrittenbitstream .= str_pad(getid3_lib::Dec2Bin($val['bytedeviation']), $source_data_array['bitsforbytesdeviation'], '0', STR_PAD_LEFT);
@@ -610,7 +710,7 @@
if (!$this->IsWithinBitRange($source_data_array['bitsvolume'], 8, false)) {
$this->errors[] = 'Invalid Bits For Volume Description byte in '.$frame_name.' ('.$source_data_array['bitsvolume'].') (range = 1 to 255)';
} else {
- $incdecflag .= '00';
+ $incdecflag = '00';
$incdecflag .= $source_data_array['incdec']['right'] ? '1' : '0'; // a - Relative volume change, right
$incdecflag .= $source_data_array['incdec']['left'] ? '1' : '0'; // b - Relative volume change, left
$incdecflag .= $source_data_array['incdec']['rightrear'] ? '1' : '0'; // c - Relative volume change, right back
@@ -753,9 +853,9 @@
$this->errors[] = 'Invalid Text Encoding in '.$frame_name.' ('.$source_data_array['encodingid'].') for ID3v2.'.$this->majorversion;
} elseif (!$this->ID3v2IsValidAPICpicturetype($source_data_array['picturetypeid'])) {
$this->errors[] = 'Invalid Picture Type byte in '.$frame_name.' ('.$source_data_array['picturetypeid'].') for ID3v2.'.$this->majorversion;
- } elseif (($this->majorversion >= 3) && (!$this->ID3v2IsValidAPICimageformat($source_data_array['mime']))) {
+ } elseif ((!$this->ID3v2IsValidAPICimageformat($source_data_array['mime']))) {
$this->errors[] = 'Invalid MIME Type in '.$frame_name.' ('.$source_data_array['mime'].') for ID3v2.'.$this->majorversion;
- } elseif (($source_data_array['mime'] == '-->') && (!$this->IsValidURL($source_data_array['data'], false, false))) {
+ } elseif (($source_data_array['mime'] == '-->') && (!$this->IsValidURL($source_data_array['data'], false))) {
//$this->errors[] = 'Invalid URL in '.$frame_name.' ('.$source_data_array['data'].')';
// probably should be an error, need to rewrite IsValidURL() to handle other encodings
$this->warnings[] = 'Invalid URL in '.$frame_name.' ('.$source_data_array['data'].')';
@@ -763,7 +863,7 @@
$framedata .= chr($source_data_array['encodingid']);
$framedata .= str_replace("\x00", '', $source_data_array['mime'])."\x00";
$framedata .= chr($source_data_array['picturetypeid']);
- $framedata .= @$source_data_array['description'].getid3_id3v2::TextEncodingTerminatorLookup($source_data_array['encodingid']);
+ $framedata .= (!empty($source_data_array['description']) ? $source_data_array['description'] : '').getid3_id3v2::TextEncodingTerminatorLookup($source_data_array['encodingid']);
$framedata .= $source_data_array['data'];
}
break;
@@ -806,10 +906,14 @@
// Email to user <text string> $00
// Rating $xx
// Counter $xx xx xx xx (xx ...)
+ if (!$this->IsValidEmail($source_data_array['email'])) {
+ // https://github.com/JamesHeinrich/getID3/issues/216
+ // https://en.wikipedia.org/wiki/ID3#ID3v2_rating_tag_issue
+ // ID3v2 specs say it should be an email address, but Windows instead uses string like "Windows Media Player 9 Series"
+ $this->warnings[] = 'Invalid Email in '.$frame_name.' ('.$source_data_array['email'].')';
+ }
if (!$this->IsWithinBitRange($source_data_array['rating'], 8, false)) {
$this->errors[] = 'Invalid Rating byte in '.$frame_name.' ('.$source_data_array['rating'].') (range = 0 to 255)';
- } elseif (!IsValidEmail($source_data_array['email'])) {
- $this->errors[] = 'Invalid Email in '.$frame_name.' ('.$source_data_array['email'].')';
} else {
$framedata .= str_replace("\x00", '', $source_data_array['email'])."\x00";
$framedata .= chr($source_data_array['rating']);
@@ -828,7 +932,7 @@
$this->errors[] = 'Invalid Offset To Next Tag in '.$frame_name;
} else {
$framedata .= getid3_lib::BigEndian2String($source_data_array['buffersize'], 3, false);
- $flag .= '0000000';
+ $flag = '0000000';
$flag .= $source_data_array['flags']['embededinfo'] ? '1' : '0';
$framedata .= chr(bindec($flag));
$framedata .= getid3_lib::BigEndian2String($source_data_array['nexttagoffset'], 4, false);
@@ -860,7 +964,7 @@
// ID and additional data <text string(s)>
if (!getid3_id3v2::IsValidID3v2FrameName($source_data_array['frameid'], $this->majorversion)) {
$this->errors[] = 'Invalid Frame Identifier in '.$frame_name.' ('.$source_data_array['frameid'].')';
- } elseif (!$this->IsValidURL($source_data_array['data'], true, false)) {
+ } elseif (!$this->IsValidURL($source_data_array['data'], true)) {
//$this->errors[] = 'Invalid URL in '.$frame_name.' ('.$source_data_array['data'].')';
// probably should be an error, need to rewrite IsValidURL() to handle other encodings
$this->warnings[] = 'Invalid URL in '.$frame_name.' ('.$source_data_array['data'].')';
@@ -907,6 +1011,7 @@
} else {
$this->errors[] = $source_data_array['frameid'].' is not a valid Frame Identifier in '.$frame_name.' (in ID3v2.'.$this->majorversion.')';
}
+ break;
default:
if ((substr($source_data_array['frameid'], 0, 1) == 'T') || (substr($source_data_array['frameid'], 0, 1) == 'W')) {
@@ -959,9 +1064,9 @@
$source_data_array['encodingid'] = (isset($source_data_array['encodingid']) ? $source_data_array['encodingid'] : $this->id3v2_default_encodingid);
if (!$this->ID3v2IsValidTextEncoding($source_data_array['encodingid'])) {
$this->errors[] = 'Invalid Text Encoding in '.$frame_name.' ('.$source_data_array['encodingid'].')';
- } elseif (!$this->IsANumber($source_data_array['pricepaid']['value'], false)) {
+ } elseif (!getid3_id3v2::IsANumber($source_data_array['pricepaid']['value'], false)) {
$this->errors[] = 'Invalid Price Paid in '.$frame_name.' ('.$source_data_array['pricepaid']['value'].')';
- } elseif (!$this->IsValidDateStampString($source_data_array['purchasedate'])) {
+ } elseif (!getid3_id3v2::IsValidDateStampString($source_data_array['purchasedate'])) {
$this->errors[] = 'Invalid Date Of Purchase in '.$frame_name.' ('.$source_data_array['purchasedate'].') (format = YYYYMMDD)';
} else {
$framedata .= chr($source_data_array['encodingid']);
@@ -985,9 +1090,9 @@
$source_data_array['encodingid'] = (isset($source_data_array['encodingid']) ? $source_data_array['encodingid'] : $this->id3v2_default_encodingid);
if (!$this->ID3v2IsValidTextEncoding($source_data_array['encodingid'])) {
$this->errors[] = 'Invalid Text Encoding in '.$frame_name.' ('.$source_data_array['encodingid'].')';
- } elseif (!$this->IsValidDateStampString($source_data_array['pricevaliduntil'])) {
+ } elseif (!getid3_id3v2::IsValidDateStampString($source_data_array['pricevaliduntil'])) {
$this->errors[] = 'Invalid Valid Until date in '.$frame_name.' ('.$source_data_array['pricevaliduntil'].') (format = YYYYMMDD)';
- } elseif (!$this->IsValidURL($source_data_array['contacturl'], false, true)) {
+ } elseif (!$this->IsValidURL($source_data_array['contacturl'], false)) {
$this->errors[] = 'Invalid Contact URL in '.$frame_name.' ('.$source_data_array['contacturl'].') (allowed schemes: http, https, ftp, mailto)';
} elseif (!$this->ID3v2IsValidCOMRreceivedAs($source_data_array['receivedasid'])) {
$this->errors[] = 'Invalid Received As byte in '.$frame_name.' ('.$source_data_array['contacturl'].') (range = 0 to 8)';
@@ -995,7 +1100,7 @@
$this->errors[] = 'Invalid MIME Type in '.$frame_name.' ('.$source_data_array['mime'].')';
} else {
$framedata .= chr($source_data_array['encodingid']);
- unset($pricestring);
+ $pricestrings = array();
foreach ($source_data_array['price'] as $key => $val) {
if ($this->ID3v2IsValidPriceString($key.$val['value'])) {
$pricestrings[] = $key.$val['value'];
@@ -1132,7 +1237,9 @@
break;
default:
- if ($frame_name{0} == 'T') {
+ if (/*(($this->majorversion == 2) && (strlen($frame_name) != 3)) || (($this->majorversion > 2) && (*/strlen($frame_name) != 4/*))*/) {
+ $this->errors[] = 'Invalid frame name "'.$frame_name.'" for ID3v2.'.$this->majorversion;
+ } elseif ($frame_name[0] == 'T') {
// 4.2. T??? Text information frames
// Text encoding $xx
// Information <text string(s) according to encoding>
@@ -1143,10 +1250,10 @@
$framedata .= chr($source_data_array['encodingid']);
$framedata .= $source_data_array['data'];
}
- } elseif ($frame_name{0} == 'W') {
+ } elseif ($frame_name[0] == 'W') {
// 4.3. W??? URL link frames
// URL <text string>
- if (!$this->IsValidURL($source_data_array['data'], false, false)) {
+ if (!$this->IsValidURL($source_data_array['data'], false)) {
//$this->errors[] = 'Invalid URL in '.$frame_name.' ('.$source_data_array['data'].')';
// probably should be an error, need to rewrite IsValidURL() to handle other encodings
$this->warnings[] = 'Invalid URL in '.$frame_name.' ('.$source_data_array['data'].')';
@@ -1165,7 +1272,13 @@
return $framedata;
}
- function ID3v2FrameIsAllowed($frame_name, $source_data_array) {
+ /**
+ * @param string|null $frame_name
+ * @param array $source_data_array
+ *
+ * @return bool
+ */
+ public function ID3v2FrameIsAllowed($frame_name, $source_data_array) {
static $PreviousFrames = array();
if ($frame_name === null) {
@@ -1174,7 +1287,6 @@
$PreviousFrames = array();
return true;
}
-
if ($this->majorversion == 4) {
switch ($frame_name) {
case 'UFID':
@@ -1294,7 +1406,7 @@
break;
default:
- if (($frame_name{0} != 'T') && ($frame_name{0} != 'W')) {
+ if (($frame_name[0] != 'T') && ($frame_name[0] != 'W')) {
$this->errors[] = 'Frame not allowed in ID3v2.'.$this->majorversion.': '.$frame_name;
}
break;
@@ -1417,7 +1529,7 @@
break;
default:
- if (($frame_name{0} != 'T') && ($frame_name{0} != 'W')) {
+ if (($frame_name[0] != 'T') && ($frame_name[0] != 'W')) {
$this->errors[] = 'Frame not allowed in ID3v2.'.$this->majorversion.': '.$frame_name;
}
break;
@@ -1509,7 +1621,7 @@
break;
default:
- if (($frame_name{0} != 'T') && ($frame_name{0} != 'W')) {
+ if (($frame_name[0] != 'T') && ($frame_name[0] != 'W')) {
$this->errors[] = 'Frame not allowed in ID3v2.'.$this->majorversion.': '.$frame_name;
}
break;
@@ -1522,7 +1634,12 @@
return true;
}
- function GenerateID3v2Tag($noerrorsonly=true) {
+ /**
+ * @param bool $noerrorsonly
+ *
+ * @return string|false
+ */
+ public function GenerateID3v2Tag($noerrorsonly=true) {
$this->ID3v2FrameIsAllowed(null, ''); // clear static array in case this isn't the first call to $this->GenerateID3v2Tag()
$tagstring = '';
@@ -1534,6 +1651,9 @@
unset($frame_flags);
$frame_data = false;
if ($this->ID3v2FrameIsAllowed($frame_name, $source_data_array)) {
+ if(array_key_exists('description', $source_data_array) && array_key_exists('encodingid', $source_data_array) && array_key_exists('encoding', $this->tag_data)) {
+ $source_data_array['description'] = getid3_lib::iconv_fallback($this->tag_data['encoding'], $source_data_array['encoding'], $source_data_array['description']);
+ }
if ($frame_data = $this->GenerateID3v2FrameData($frame_name, $source_data_array)) {
$FrameUnsynchronisation = false;
if ($this->majorversion >= 4) {
@@ -1572,18 +1692,18 @@
if ($noerrorsonly) {
return false;
} else {
- unset($frame_name);
+ $frame_name = null;
}
}
} else {
// ignore any invalid frame names, including 'title', 'header', etc
$this->warnings[] = 'Ignoring invalid ID3v2 frame type: "'.$frame_name.'"';
- unset($frame_name);
+ $frame_name = null;
unset($frame_length);
unset($frame_flags);
unset($frame_data);
}
- if (isset($frame_name) && isset($frame_length) && isset($frame_flags) && isset($frame_data)) {
+ if (null !== $frame_name && isset($frame_length) && isset($frame_flags) && isset($frame_data)) {
$tagstring .= $frame_name.$frame_length.$frame_flags.$frame_data;
}
}
@@ -1607,10 +1727,12 @@
}
$footer = false; // ID3v2 footers not yet supported in getID3()
- if (!$footer && ($this->paddedlength > (strlen($tagstring) + getid3_id3v2::ID3v2HeaderLength($this->majorversion)))) {
+ if (/*!$footer && */($this->paddedlength > (strlen($tagstring) + getid3_id3v2::ID3v2HeaderLength($this->majorversion)))) {
// pad up to $paddedlength bytes if unpadded tag is shorter than $paddedlength
// "Furthermore it MUST NOT have any padding when a tag footer is added to the tag."
- $tagstring .= @str_repeat("\x00", $this->paddedlength - strlen($tagstring) - getid3_id3v2::ID3v2HeaderLength($this->majorversion));
+ if (($this->paddedlength - strlen($tagstring) - getid3_id3v2::ID3v2HeaderLength($this->majorversion)) > 0) {
+ $tagstring .= str_repeat("\x00", $this->paddedlength - strlen($tagstring) - getid3_id3v2::ID3v2HeaderLength($this->majorversion));
+ }
}
if ($this->id3v2_use_unsynchronisation && (substr($tagstring, strlen($tagstring) - 1, 1) == "\xFF")) {
// special unsynchronisation case:
@@ -1631,20 +1753,31 @@
return false;
}
- function ID3v2IsValidPriceString($pricestring) {
+ /**
+ * @param string $pricestring
+ *
+ * @return bool
+ */
+ public function ID3v2IsValidPriceString($pricestring) {
if (getid3_id3v2::LanguageLookup(substr($pricestring, 0, 3), true) == '') {
return false;
- } elseif (!$this->IsANumber(substr($pricestring, 3), true)) {
+ } elseif (!getid3_id3v2::IsANumber(substr($pricestring, 3), true)) {
return false;
}
return true;
}
- function ID3v2FrameFlagsLookupTagAlter($framename) {
+ /**
+ * @param string $framename
+ *
+ * @return bool
+ */
+ public function ID3v2FrameFlagsLookupTagAlter($framename) {
// unfinished
switch ($framename) {
case 'RGAD':
$allow = true;
+ break;
default:
$allow = false;
break;
@@ -1652,20 +1785,28 @@
return $allow;
}
- function ID3v2FrameFlagsLookupFileAlter($framename) {
+ /**
+ * @param string $framename
+ *
+ * @return bool
+ */
+ public function ID3v2FrameFlagsLookupFileAlter($framename) {
// unfinished
switch ($framename) {
case 'RGAD':
return false;
- break;
default:
return false;
- break;
}
}
- function ID3v2IsValidETCOevent($eventid) {
+ /**
+ * @param int $eventid
+ *
+ * @return bool
+ */
+ public function ID3v2IsValidETCOevent($eventid) {
if (($eventid < 0) || ($eventid > 0xFF)) {
// outside range of 1 byte
return false;
@@ -1685,7 +1826,12 @@
return true;
}
- function ID3v2IsValidSYLTtype($contenttype) {
+ /**
+ * @param int $contenttype
+ *
+ * @return bool
+ */
+ public function ID3v2IsValidSYLTtype($contenttype) {
if (($contenttype >= 0) && ($contenttype <= 8) && ($this->majorversion == 4)) {
return true;
} elseif (($contenttype >= 0) && ($contenttype <= 6) && ($this->majorversion == 3)) {
@@ -1694,7 +1840,12 @@
return false;
}
- function ID3v2IsValidRVA2channeltype($channeltype) {
+ /**
+ * @param int $channeltype
+ *
+ * @return bool
+ */
+ public function ID3v2IsValidRVA2channeltype($channeltype) {
if (($channeltype >= 0) && ($channeltype <= 8) && ($this->majorversion == 4)) {
return true;
}
@@ -1701,7 +1852,12 @@
return false;
}
- function ID3v2IsValidAPICpicturetype($picturetype) {
+ /**
+ * @param int $picturetype
+ *
+ * @return bool
+ */
+ public function ID3v2IsValidAPICpicturetype($picturetype) {
if (($picturetype >= 0) && ($picturetype <= 0x14) && ($this->majorversion >= 2) && ($this->majorversion <= 4)) {
return true;
}
@@ -1708,7 +1864,12 @@
return false;
}
- function ID3v2IsValidAPICimageformat($imageformat) {
+ /**
+ * @param int|string $imageformat
+ *
+ * @return bool
+ */
+ public function ID3v2IsValidAPICimageformat($imageformat) {
if ($imageformat == '-->') {
return true;
} elseif ($this->majorversion == 2) {
@@ -1723,7 +1884,12 @@
return false;
}
- function ID3v2IsValidCOMRreceivedAs($receivedas) {
+ /**
+ * @param int $receivedas
+ *
+ * @return bool
+ */
+ public function ID3v2IsValidCOMRreceivedAs($receivedas) {
if (($this->majorversion >= 3) && ($receivedas >= 0) && ($receivedas <= 8)) {
return true;
}
@@ -1730,7 +1896,12 @@
return false;
}
- function ID3v2IsValidRGADname($RGADname) {
+ /**
+ * @param int $RGADname
+ *
+ * @return bool
+ */
+ public static function ID3v2IsValidRGADname($RGADname) {
if (($RGADname >= 0) && ($RGADname <= 2)) {
return true;
}
@@ -1737,7 +1908,12 @@
return false;
}
- function ID3v2IsValidRGADoriginator($RGADoriginator) {
+ /**
+ * @param int $RGADoriginator
+ *
+ * @return bool
+ */
+ public static function ID3v2IsValidRGADoriginator($RGADoriginator) {
if (($RGADoriginator >= 0) && ($RGADoriginator <= 3)) {
return true;
}
@@ -1744,15 +1920,30 @@
return false;
}
- function ID3v2IsValidTextEncoding($textencodingbyte) {
+ /**
+ * @param int $textencodingbyte
+ *
+ * @return bool
+ */
+ public function ID3v2IsValidTextEncoding($textencodingbyte) {
+ // 0 = ISO-8859-1
+ // 1 = UTF-16 with BOM
+ // 2 = UTF-16BE without BOM
+ // 3 = UTF-8
static $ID3v2IsValidTextEncoding_cache = array(
- 2 => array(true, true),
- 3 => array(true, true),
- 4 => array(true, true, true, true));
+ 2 => array(true, true), // ID3v2.2 - allow 0=ISO-8859-1, 1=UTF-16
+ 3 => array(true, true), // ID3v2.3 - allow 0=ISO-8859-1, 1=UTF-16
+ 4 => array(true, true, true, true), // ID3v2.4 - allow 0=ISO-8859-1, 1=UTF-16, 2=UTF-16BE, 3=UTF-8
+ );
return isset($ID3v2IsValidTextEncoding_cache[$this->majorversion][$textencodingbyte]);
}
- function Unsynchronise($data) {
+ /**
+ * @param string $data
+ *
+ * @return string
+ */
+ public static function Unsynchronise($data) {
// Whenever a false synchronisation is found within the tag, one zeroed
// byte is inserted after the first false synchronisation byte. The
// format of a correct sync that should be altered by ID3 encoders is as
@@ -1769,10 +1960,10 @@
$unsyncheddata = '';
$datalength = strlen($data);
for ($i = 0; $i < $datalength; $i++) {
- $thischar = $data{$i};
+ $thischar = $data[$i];
$unsyncheddata .= $thischar;
if ($thischar == "\xFF") {
- $nextchar = ord($data{$i + 1});
+ $nextchar = ord($data[$i + 1]);
if (($nextchar & 0xE0) == 0xE0) {
// previous byte = 11111111, this byte = 111?????
$unsyncheddata .= "\x00";
@@ -1782,8 +1973,13 @@
return $unsyncheddata;
}
- function is_hash($var) {
- // written by dev-nullØchristophe*vg
+ /**
+ * @param mixed $var
+ *
+ * @return bool
+ */
+ public function is_hash($var) {
+ // written by dev-nullØchristophe*vg
// taken from http://www.php.net/manual/en/function.array-merge-recursive.php
if (is_array($var)) {
$keys = array_keys($var);
@@ -1797,8 +1993,14 @@
return false;
}
- function array_join_merge($arr1, $arr2) {
- // written by dev-nullØchristophe*vg
+ /**
+ * @param mixed $arr1
+ * @param mixed $arr2
+ *
+ * @return array
+ */
+ public function array_join_merge($arr1, $arr2) {
+ // written by dev-nullØchristophe*vg
// taken from http://www.php.net/manual/en/function.array-merge-recursive.php
if (is_array($arr1) && is_array($arr2)) {
// the same -> merge
@@ -1808,7 +2010,7 @@
// hashes -> merge based on keys
$keys = array_merge(array_keys($arr1), array_keys($arr2));
foreach ($keys as $key) {
- $new_array[$key] = $this->array_join_merge(@$arr1[$key], @$arr2[$key]);
+ $new_array[$key] = $this->array_join_merge((isset($arr1[$key]) ? $arr1[$key] : ''), (isset($arr2[$key]) ? $arr2[$key] : ''));
}
} else {
// two real arrays -> merge
@@ -1821,14 +2023,23 @@
}
}
- function IsValidMIMEstring($mimestring) {
- if ((strlen($mimestring) >= 3) && (strpos($mimestring, '/') > 0) && (strpos($mimestring, '/') < (strlen($mimestring) - 1))) {
- return true;
- }
- return false;
+ /**
+ * @param string $mimestring
+ *
+ * @return false|int
+ */
+ public static function IsValidMIMEstring($mimestring) {
+ return preg_match('#^.+/.+$#', $mimestring);
}
- function IsWithinBitRange($number, $maxbits, $signed=false) {
+ /**
+ * @param int $number
+ * @param int $maxbits
+ * @param bool $signed
+ *
+ * @return bool
+ */
+ public static function IsWithinBitRange($number, $maxbits, $signed=false) {
if ($signed) {
if (($number > (0 - pow(2, $maxbits - 1))) && ($number <= pow(2, $maxbits - 1))) {
return true;
@@ -1841,18 +2052,26 @@
return false;
}
- function safe_parse_url($url) {
- $parts = @parse_url($url);
- $parts['scheme'] = (isset($parts['scheme']) ? $parts['scheme'] : '');
- $parts['host'] = (isset($parts['host']) ? $parts['host'] : '');
- $parts['user'] = (isset($parts['user']) ? $parts['user'] : '');
- $parts['pass'] = (isset($parts['pass']) ? $parts['pass'] : '');
- $parts['path'] = (isset($parts['path']) ? $parts['path'] : '');
- $parts['query'] = (isset($parts['query']) ? $parts['query'] : '');
- return $parts;
+ /**
+ * @param string $email
+ *
+ * @return false|int|mixed
+ */
+ public static function IsValidEmail($email) {
+ if (function_exists('filter_var')) {
+ return filter_var($email, FILTER_VALIDATE_EMAIL);
+ }
+ // VERY crude email validation
+ return preg_match('#^[^ ]+@[a-z\\-\\.]+\\.[a-z]{2,}$#', $email);
}
- function IsValidURL($url, $allowUserPass=false) {
+ /**
+ * @param string $url
+ * @param bool $allowUserPass
+ *
+ * @return bool
+ */
+ public static function IsValidURL($url, $allowUserPass=false) {
if ($url == '') {
return false;
}
@@ -1863,18 +2082,22 @@
return false;
}
}
+ // 2016-06-08: relax URL checking to avoid falsely rejecting valid URLs, leave URL validation to the user
+ // https://www.getid3.org/phpBB3/viewtopic.php?t=1926
+ return true;
+ /*
if ($parts = $this->safe_parse_url($url)) {
if (($parts['scheme'] != 'http') && ($parts['scheme'] != 'https') && ($parts['scheme'] != 'ftp') && ($parts['scheme'] != 'gopher')) {
return false;
- } elseif (!eregi("^[[:alnum:]]([-.]?[0-9a-z])*\.[a-z]{2,3}$", $parts['host'], $regs) && !IsValidDottedIP($parts['host'])) {
+ } elseif (!preg_match('#^[[:alnum:]]([-.]?[0-9a-z])*\\.[a-z]{2,3}$#i', $parts['host'], $regs) && !preg_match('#^[0-9]{1,3}(\\.[0-9]{1,3}){3}$#', $parts['host'])) {
return false;
- } elseif (!eregi("^([[:alnum:]-]|[\_])*$", $parts['user'], $regs)) {
+ } elseif (!preg_match('#^([[:alnum:]-]|[\\_])*$#i', $parts['user'], $regs)) {
return false;
- } elseif (!eregi("^([[:alnum:]-]|[\_])*$", $parts['pass'], $regs)) {
+ } elseif (!preg_match('#^([[:alnum:]-]|[\\_])*$#i', $parts['pass'], $regs)) {
return false;
- } elseif (!eregi("^[[:alnum:]/_\.@~-]*$", $parts['path'], $regs)) {
+ } elseif (!preg_match('#^[[:alnum:]/_\\.@~-]*$#i', $parts['path'], $regs)) {
return false;
- } elseif (!eregi("^[[:alnum:]?&=+:;_()%#/,\.-]*$", $parts['query'], $regs)) {
+ } elseif (!empty($parts['query']) && !preg_match('#^[[:alnum:]?&=+:;_()%\\#/,\\.-]*$#i', $parts['query'], $regs)) {
return false;
} else {
return true;
@@ -1881,117 +2104,184 @@
}
}
return false;
+ */
}
- function ID3v2ShortFrameNameLookup($majorversion, $long_description) {
+ /**
+ * @param string $url
+ *
+ * @return array
+ */
+ public static function safe_parse_url($url) {
+ $parts = @parse_url($url);
+ $parts['scheme'] = (isset($parts['scheme']) ? $parts['scheme'] : '');
+ $parts['host'] = (isset($parts['host']) ? $parts['host'] : '');
+ $parts['user'] = (isset($parts['user']) ? $parts['user'] : '');
+ $parts['pass'] = (isset($parts['pass']) ? $parts['pass'] : '');
+ $parts['path'] = (isset($parts['path']) ? $parts['path'] : '');
+ $parts['query'] = (isset($parts['query']) ? $parts['query'] : '');
+ return $parts;
+ }
+
+ /**
+ * @param int $majorversion
+ * @param string $long_description
+ *
+ * @return string
+ */
+ public static function ID3v2ShortFrameNameLookup($majorversion, $long_description) {
$long_description = str_replace(' ', '_', strtolower(trim($long_description)));
static $ID3v2ShortFrameNameLookup = array();
if (empty($ID3v2ShortFrameNameLookup)) {
// The following are unique to ID3v2.2
- $ID3v2ShortFrameNameLookup[2]['comment'] = 'COM';
- $ID3v2ShortFrameNameLookup[2]['album'] = 'TAL';
- $ID3v2ShortFrameNameLookup[2]['beats_per_minute'] = 'TBP';
- $ID3v2ShortFrameNameLookup[2]['composer'] = 'TCM';
- $ID3v2ShortFrameNameLookup[2]['genre'] = 'TCO';
- $ID3v2ShortFrameNameLookup[2]['copyright'] = 'TCR';
- $ID3v2ShortFrameNameLookup[2]['encoded_by'] = 'TEN';
- $ID3v2ShortFrameNameLookup[2]['language'] = 'TLA';
- $ID3v2ShortFrameNameLookup[2]['length'] = 'TLE';
- $ID3v2ShortFrameNameLookup[2]['original_artist'] = 'TOA';
- $ID3v2ShortFrameNameLookup[2]['original_filename'] = 'TOF';
- $ID3v2ShortFrameNameLookup[2]['original_lyricist'] = 'TOL';
- $ID3v2ShortFrameNameLookup[2]['original_album_title'] = 'TOT';
- $ID3v2ShortFrameNameLookup[2]['artist'] = 'TP1';
- $ID3v2ShortFrameNameLookup[2]['band'] = 'TP2';
- $ID3v2ShortFrameNameLookup[2]['conductor'] = 'TP3';
- $ID3v2ShortFrameNameLookup[2]['remixer'] = 'TP4';
- $ID3v2ShortFrameNameLookup[2]['publisher'] = 'TPB';
- $ID3v2ShortFrameNameLookup[2]['isrc'] = 'TRC';
- $ID3v2ShortFrameNameLookup[2]['tracknumber'] = 'TRK';
- $ID3v2ShortFrameNameLookup[2]['size'] = 'TSI';
- $ID3v2ShortFrameNameLookup[2]['encoder_settings'] = 'TSS';
- $ID3v2ShortFrameNameLookup[2]['description'] = 'TT1';
- $ID3v2ShortFrameNameLookup[2]['title'] = 'TT2';
- $ID3v2ShortFrameNameLookup[2]['subtitle'] = 'TT3';
- $ID3v2ShortFrameNameLookup[2]['lyricist'] = 'TXT';
- $ID3v2ShortFrameNameLookup[2]['user_text'] = 'TXX';
- $ID3v2ShortFrameNameLookup[2]['year'] = 'TYE';
- $ID3v2ShortFrameNameLookup[2]['unique_file_identifier'] = 'UFI';
- $ID3v2ShortFrameNameLookup[2]['unsynchronised_lyrics'] = 'ULT';
- $ID3v2ShortFrameNameLookup[2]['url_file'] = 'WAF';
- $ID3v2ShortFrameNameLookup[2]['url_artist'] = 'WAR';
- $ID3v2ShortFrameNameLookup[2]['url_source'] = 'WAS';
- $ID3v2ShortFrameNameLookup[2]['copyright_information'] = 'WCP';
- $ID3v2ShortFrameNameLookup[2]['url_publisher'] = 'WPB';
- $ID3v2ShortFrameNameLookup[2]['url_user'] = 'WXX';
+ $ID3v2ShortFrameNameLookup[2]['recommended_buffer_size'] = 'BUF';
+ $ID3v2ShortFrameNameLookup[2]['comment'] = 'COM';
+ $ID3v2ShortFrameNameLookup[2]['audio_encryption'] = 'CRA';
+ $ID3v2ShortFrameNameLookup[2]['encrypted_meta_frame'] = 'CRM';
+ $ID3v2ShortFrameNameLookup[2]['equalisation'] = 'EQU';
+ $ID3v2ShortFrameNameLookup[2]['event_timing_codes'] = 'ETC';
+ $ID3v2ShortFrameNameLookup[2]['general_encapsulated_object'] = 'GEO';
+ $ID3v2ShortFrameNameLookup[2]['involved_people_list'] = 'IPL';
+ $ID3v2ShortFrameNameLookup[2]['linked_information'] = 'LNK';
+ $ID3v2ShortFrameNameLookup[2]['music_cd_identifier'] = 'MCI';
+ $ID3v2ShortFrameNameLookup[2]['mpeg_location_lookup_table'] = 'MLL';
+ $ID3v2ShortFrameNameLookup[2]['attached_picture'] = 'PIC';
+ $ID3v2ShortFrameNameLookup[2]['popularimeter'] = 'POP';
+ $ID3v2ShortFrameNameLookup[2]['reverb'] = 'REV';
+ $ID3v2ShortFrameNameLookup[2]['relative_volume_adjustment'] = 'RVA';
+ $ID3v2ShortFrameNameLookup[2]['synchronised_lyric'] = 'SLT';
+ $ID3v2ShortFrameNameLookup[2]['synchronised_tempo_codes'] = 'STC';
+ $ID3v2ShortFrameNameLookup[2]['album'] = 'TAL';
+ $ID3v2ShortFrameNameLookup[2]['beats_per_minute'] = 'TBP';
+ $ID3v2ShortFrameNameLookup[2]['bpm'] = 'TBP';
+ $ID3v2ShortFrameNameLookup[2]['composer'] = 'TCM';
+ $ID3v2ShortFrameNameLookup[2]['genre'] = 'TCO';
+ $ID3v2ShortFrameNameLookup[2]['part_of_a_compilation'] = 'TCP';
+ $ID3v2ShortFrameNameLookup[2]['copyright_message'] = 'TCR';
+ $ID3v2ShortFrameNameLookup[2]['date'] = 'TDA';
+ $ID3v2ShortFrameNameLookup[2]['playlist_delay'] = 'TDY';
+ $ID3v2ShortFrameNameLookup[2]['encoded_by'] = 'TEN';
+ $ID3v2ShortFrameNameLookup[2]['file_type'] = 'TFT';
+ $ID3v2ShortFrameNameLookup[2]['time'] = 'TIM';
+ $ID3v2ShortFrameNameLookup[2]['initial_key'] = 'TKE';
+ $ID3v2ShortFrameNameLookup[2]['language'] = 'TLA';
+ $ID3v2ShortFrameNameLookup[2]['length'] = 'TLE';
+ $ID3v2ShortFrameNameLookup[2]['media_type'] = 'TMT';
+ $ID3v2ShortFrameNameLookup[2]['original_artist'] = 'TOA';
+ $ID3v2ShortFrameNameLookup[2]['original_filename'] = 'TOF';
+ $ID3v2ShortFrameNameLookup[2]['original_lyricist'] = 'TOL';
+ $ID3v2ShortFrameNameLookup[2]['original_year'] = 'TOR';
+ $ID3v2ShortFrameNameLookup[2]['original_album'] = 'TOT';
+ $ID3v2ShortFrameNameLookup[2]['artist'] = 'TP1';
+ $ID3v2ShortFrameNameLookup[2]['band'] = 'TP2';
+ $ID3v2ShortFrameNameLookup[2]['conductor'] = 'TP3';
+ $ID3v2ShortFrameNameLookup[2]['remixer'] = 'TP4';
+ $ID3v2ShortFrameNameLookup[2]['part_of_a_set'] = 'TPA';
+ $ID3v2ShortFrameNameLookup[2]['publisher'] = 'TPB';
+ $ID3v2ShortFrameNameLookup[2]['isrc'] = 'TRC';
+ $ID3v2ShortFrameNameLookup[2]['recording_dates'] = 'TRD';
+ $ID3v2ShortFrameNameLookup[2]['tracknumber'] = 'TRK';
+ $ID3v2ShortFrameNameLookup[2]['track_number'] = 'TRK';
+ $ID3v2ShortFrameNameLookup[2]['album_artist_sort_order'] = 'TS2';
+ $ID3v2ShortFrameNameLookup[2]['album_sort_order'] = 'TSA';
+ $ID3v2ShortFrameNameLookup[2]['composer_sort_order'] = 'TSC';
+ $ID3v2ShortFrameNameLookup[2]['size'] = 'TSI';
+ $ID3v2ShortFrameNameLookup[2]['performer_sort_order'] = 'TSP';
+ $ID3v2ShortFrameNameLookup[2]['encoder_settings'] = 'TSS';
+ $ID3v2ShortFrameNameLookup[2]['title_sort_order'] = 'TST';
+ $ID3v2ShortFrameNameLookup[2]['content_group_description'] = 'TT1';
+ $ID3v2ShortFrameNameLookup[2]['title'] = 'TT2';
+ $ID3v2ShortFrameNameLookup[2]['subtitle'] = 'TT3';
+ $ID3v2ShortFrameNameLookup[2]['lyricist'] = 'TXT';
+ $ID3v2ShortFrameNameLookup[2]['text'] = 'TXX';
+ $ID3v2ShortFrameNameLookup[2]['year'] = 'TYE';
+ $ID3v2ShortFrameNameLookup[2]['unique_file_identifier'] = 'UFI';
+ $ID3v2ShortFrameNameLookup[2]['unsynchronised_lyric'] = 'ULT';
+ $ID3v2ShortFrameNameLookup[2]['url_file'] = 'WAF';
+ $ID3v2ShortFrameNameLookup[2]['url_artist'] = 'WAR';
+ $ID3v2ShortFrameNameLookup[2]['url_source'] = 'WAS';
+ $ID3v2ShortFrameNameLookup[2]['commercial_information'] = 'WCM';
+ $ID3v2ShortFrameNameLookup[2]['copyright'] = 'WCP';
+ $ID3v2ShortFrameNameLookup[2]['url_publisher'] = 'WPB';
+ $ID3v2ShortFrameNameLookup[2]['url_user'] = 'WXX';
// The following are common to ID3v2.3 and ID3v2.4
- $ID3v2ShortFrameNameLookup[3]['audio_encryption'] = 'AENC';
- $ID3v2ShortFrameNameLookup[3]['attached_picture'] = 'APIC';
- $ID3v2ShortFrameNameLookup[3]['comment'] = 'COMM';
- $ID3v2ShortFrameNameLookup[3]['commercial'] = 'COMR';
- $ID3v2ShortFrameNameLookup[3]['encryption_method_registration'] = 'ENCR';
- $ID3v2ShortFrameNameLookup[3]['event_timing_codes'] = 'ETCO';
- $ID3v2ShortFrameNameLookup[3]['general_encapsulated_object'] = 'GEOB';
- $ID3v2ShortFrameNameLookup[3]['group_identification_registration'] = 'GRID';
- $ID3v2ShortFrameNameLookup[3]['linked_information'] = 'LINK';
- $ID3v2ShortFrameNameLookup[3]['music_cd_identifier'] = 'MCDI';
- $ID3v2ShortFrameNameLookup[3]['mpeg_location_lookup_table'] = 'MLLT';
- $ID3v2ShortFrameNameLookup[3]['ownership'] = 'OWNE';
- $ID3v2ShortFrameNameLookup[3]['play_counter'] = 'PCNT';
- $ID3v2ShortFrameNameLookup[3]['popularimeter'] = 'POPM';
- $ID3v2ShortFrameNameLookup[3]['position_synchronisation'] = 'POSS';
- $ID3v2ShortFrameNameLookup[3]['private'] = 'PRIV';
- $ID3v2ShortFrameNameLookup[3]['recommended_buffer_size'] = 'RBUF';
- $ID3v2ShortFrameNameLookup[3]['reverb'] = 'RVRB';
- $ID3v2ShortFrameNameLookup[3]['synchronised_lyrics'] = 'SYLT';
- $ID3v2ShortFrameNameLookup[3]['synchronised_tempo_codes'] = 'SYTC';
- $ID3v2ShortFrameNameLookup[3]['album'] = 'TALB';
- $ID3v2ShortFrameNameLookup[3]['beats_per_minute'] = 'TBPM';
- $ID3v2ShortFrameNameLookup[3]['composer'] = 'TCOM';
- $ID3v2ShortFrameNameLookup[3]['genre'] = 'TCON';
- $ID3v2ShortFrameNameLookup[3]['copyright'] = 'TCOP';
- $ID3v2ShortFrameNameLookup[3]['playlist_delay'] = 'TDLY';
- $ID3v2ShortFrameNameLookup[3]['encoded_by'] = 'TENC';
- $ID3v2ShortFrameNameLookup[3]['lyricist'] = 'TEXT';
- $ID3v2ShortFrameNameLookup[3]['file_type'] = 'TFLT';
- $ID3v2ShortFrameNameLookup[3]['content_group_description'] = 'TIT1';
- $ID3v2ShortFrameNameLookup[3]['title'] = 'TIT2';
- $ID3v2ShortFrameNameLookup[3]['subtitle'] = 'TIT3';
- $ID3v2ShortFrameNameLookup[3]['initial_key'] = 'TKEY';
- $ID3v2ShortFrameNameLookup[3]['language'] = 'TLAN';
- $ID3v2ShortFrameNameLookup[3]['length'] = 'TLEN';
- $ID3v2ShortFrameNameLookup[3]['media_type'] = 'TMED';
- $ID3v2ShortFrameNameLookup[3]['original_album_title'] = 'TOAL';
- $ID3v2ShortFrameNameLookup[3]['original_filename'] = 'TOFN';
- $ID3v2ShortFrameNameLookup[3]['original_lyricist'] = 'TOLY';
- $ID3v2ShortFrameNameLookup[3]['original_artist'] = 'TOPE';
- $ID3v2ShortFrameNameLookup[3]['file_owner'] = 'TOWN';
- $ID3v2ShortFrameNameLookup[3]['artist'] = 'TPE1';
- $ID3v2ShortFrameNameLookup[3]['band'] = 'TPE2';
- $ID3v2ShortFrameNameLookup[3]['conductor'] = 'TPE3';
- $ID3v2ShortFrameNameLookup[3]['remixer'] = 'TPE4';
- $ID3v2ShortFrameNameLookup[3]['part_of_set'] = 'TPOS';
- $ID3v2ShortFrameNameLookup[3]['publisher'] = 'TPUB';
- $ID3v2ShortFrameNameLookup[3]['tracknumber'] = 'TRCK';
- $ID3v2ShortFrameNameLookup[3]['internet_radio_station_name'] = 'TRSN';
- $ID3v2ShortFrameNameLookup[3]['internet_radio_station_owner'] = 'TRSO';
- $ID3v2ShortFrameNameLookup[3]['isrc'] = 'TSRC';
- $ID3v2ShortFrameNameLookup[3]['encoder_settings'] = 'TSSE';
- $ID3v2ShortFrameNameLookup[3]['user_text'] = 'TXXX';
- $ID3v2ShortFrameNameLookup[3]['unique_file_identifier'] = 'UFID';
- $ID3v2ShortFrameNameLookup[3]['terms_of_use'] = 'USER';
- $ID3v2ShortFrameNameLookup[3]['unsynchronised_lyrics'] = 'USLT';
- $ID3v2ShortFrameNameLookup[3]['commercial'] = 'WCOM';
- $ID3v2ShortFrameNameLookup[3]['copyright_information'] = 'WCOP';
- $ID3v2ShortFrameNameLookup[3]['url_file'] = 'WOAF';
- $ID3v2ShortFrameNameLookup[3]['url_artist'] = 'WOAR';
- $ID3v2ShortFrameNameLookup[3]['url_source'] = 'WOAS';
- $ID3v2ShortFrameNameLookup[3]['url_station'] = 'WORS';
- $ID3v2ShortFrameNameLookup[3]['payment'] = 'WPAY';
- $ID3v2ShortFrameNameLookup[3]['url_publisher'] = 'WPUB';
- $ID3v2ShortFrameNameLookup[3]['url_user'] = 'WXXX';
+ $ID3v2ShortFrameNameLookup[3]['audio_encryption'] = 'AENC';
+ $ID3v2ShortFrameNameLookup[3]['attached_picture'] = 'APIC';
+ $ID3v2ShortFrameNameLookup[3]['picture'] = 'APIC';
+ $ID3v2ShortFrameNameLookup[3]['comment'] = 'COMM';
+ $ID3v2ShortFrameNameLookup[3]['commercial_frame'] = 'COMR';
+ $ID3v2ShortFrameNameLookup[3]['encryption_method_registration'] = 'ENCR';
+ $ID3v2ShortFrameNameLookup[3]['event_timing_codes'] = 'ETCO';
+ $ID3v2ShortFrameNameLookup[3]['general_encapsulated_object'] = 'GEOB';
+ $ID3v2ShortFrameNameLookup[3]['group_identification_registration'] = 'GRID';
+ $ID3v2ShortFrameNameLookup[3]['linked_information'] = 'LINK';
+ $ID3v2ShortFrameNameLookup[3]['music_cd_identifier'] = 'MCDI';
+ $ID3v2ShortFrameNameLookup[3]['mpeg_location_lookup_table'] = 'MLLT';
+ $ID3v2ShortFrameNameLookup[3]['ownership_frame'] = 'OWNE';
+ $ID3v2ShortFrameNameLookup[3]['play_counter'] = 'PCNT';
+ $ID3v2ShortFrameNameLookup[3]['popularimeter'] = 'POPM';
+ $ID3v2ShortFrameNameLookup[3]['position_synchronisation_frame'] = 'POSS';
+ $ID3v2ShortFrameNameLookup[3]['private_frame'] = 'PRIV';
+ $ID3v2ShortFrameNameLookup[3]['recommended_buffer_size'] = 'RBUF';
+ $ID3v2ShortFrameNameLookup[3]['replay_gain_adjustment'] = 'RGAD';
+ $ID3v2ShortFrameNameLookup[3]['reverb'] = 'RVRB';
+ $ID3v2ShortFrameNameLookup[3]['synchronised_lyric'] = 'SYLT';
+ $ID3v2ShortFrameNameLookup[3]['synchronised_tempo_codes'] = 'SYTC';
+ $ID3v2ShortFrameNameLookup[3]['album'] = 'TALB';
+ $ID3v2ShortFrameNameLookup[3]['beats_per_minute'] = 'TBPM';
+ $ID3v2ShortFrameNameLookup[3]['bpm'] = 'TBPM';
+ $ID3v2ShortFrameNameLookup[3]['part_of_a_compilation'] = 'TCMP';
+ $ID3v2ShortFrameNameLookup[3]['composer'] = 'TCOM';
+ $ID3v2ShortFrameNameLookup[3]['genre'] = 'TCON';
+ $ID3v2ShortFrameNameLookup[3]['copyright_message'] = 'TCOP';
+ $ID3v2ShortFrameNameLookup[3]['playlist_delay'] = 'TDLY';
+ $ID3v2ShortFrameNameLookup[3]['encoded_by'] = 'TENC';
+ $ID3v2ShortFrameNameLookup[3]['lyricist'] = 'TEXT';
+ $ID3v2ShortFrameNameLookup[3]['file_type'] = 'TFLT';
+ $ID3v2ShortFrameNameLookup[3]['content_group_description'] = 'TIT1';
+ $ID3v2ShortFrameNameLookup[3]['title'] = 'TIT2';
+ $ID3v2ShortFrameNameLookup[3]['subtitle'] = 'TIT3';
+ $ID3v2ShortFrameNameLookup[3]['initial_key'] = 'TKEY';
+ $ID3v2ShortFrameNameLookup[3]['language'] = 'TLAN';
+ $ID3v2ShortFrameNameLookup[3]['length'] = 'TLEN';
+ $ID3v2ShortFrameNameLookup[3]['media_type'] = 'TMED';
+ $ID3v2ShortFrameNameLookup[3]['original_album'] = 'TOAL';
+ $ID3v2ShortFrameNameLookup[3]['original_filename'] = 'TOFN';
+ $ID3v2ShortFrameNameLookup[3]['original_lyricist'] = 'TOLY';
+ $ID3v2ShortFrameNameLookup[3]['original_artist'] = 'TOPE';
+ $ID3v2ShortFrameNameLookup[3]['file_owner'] = 'TOWN';
+ $ID3v2ShortFrameNameLookup[3]['artist'] = 'TPE1';
+ $ID3v2ShortFrameNameLookup[3]['band'] = 'TPE2';
+ $ID3v2ShortFrameNameLookup[3]['conductor'] = 'TPE3';
+ $ID3v2ShortFrameNameLookup[3]['remixer'] = 'TPE4';
+ $ID3v2ShortFrameNameLookup[3]['part_of_a_set'] = 'TPOS';
+ $ID3v2ShortFrameNameLookup[3]['publisher'] = 'TPUB';
+ $ID3v2ShortFrameNameLookup[3]['tracknumber'] = 'TRCK';
+ $ID3v2ShortFrameNameLookup[3]['track_number'] = 'TRCK';
+ $ID3v2ShortFrameNameLookup[3]['internet_radio_station_name'] = 'TRSN';
+ $ID3v2ShortFrameNameLookup[3]['internet_radio_station_owner'] = 'TRSO';
+ $ID3v2ShortFrameNameLookup[3]['album_artist_sort_order'] = 'TSO2';
+ $ID3v2ShortFrameNameLookup[3]['album_sort_order'] = 'TSOA';
+ $ID3v2ShortFrameNameLookup[3]['composer_sort_order'] = 'TSOC';
+ $ID3v2ShortFrameNameLookup[3]['performer_sort_order'] = 'TSOP';
+ $ID3v2ShortFrameNameLookup[3]['title_sort_order'] = 'TSOT';
+ $ID3v2ShortFrameNameLookup[3]['isrc'] = 'TSRC';
+ $ID3v2ShortFrameNameLookup[3]['encoder_settings'] = 'TSSE';
+ $ID3v2ShortFrameNameLookup[3]['text'] = 'TXXX';
+ $ID3v2ShortFrameNameLookup[3]['unique_file_identifier'] = 'UFID';
+ $ID3v2ShortFrameNameLookup[3]['terms_of_use'] = 'USER';
+ $ID3v2ShortFrameNameLookup[3]['unsynchronised_lyric'] = 'USLT';
+ $ID3v2ShortFrameNameLookup[3]['commercial_information'] = 'WCOM';
+ $ID3v2ShortFrameNameLookup[3]['copyright'] = 'WCOP';
+ $ID3v2ShortFrameNameLookup[3]['url_file'] = 'WOAF';
+ $ID3v2ShortFrameNameLookup[3]['url_artist'] = 'WOAR';
+ $ID3v2ShortFrameNameLookup[3]['url_source'] = 'WOAS';
+ $ID3v2ShortFrameNameLookup[3]['url_station'] = 'WORS';
+ $ID3v2ShortFrameNameLookup[3]['url_payment'] = 'WPAY';
+ $ID3v2ShortFrameNameLookup[3]['url_publisher'] = 'WPUB';
+ $ID3v2ShortFrameNameLookup[3]['url_user'] = 'WXXX';
// The above are common to ID3v2.3 and ID3v2.4
// so copy them to ID3v2.4 before adding specifics for 2.3 and 2.4
@@ -1998,41 +2288,41 @@
$ID3v2ShortFrameNameLookup[4] = $ID3v2ShortFrameNameLookup[3];
// The following are unique to ID3v2.3
- $ID3v2ShortFrameNameLookup[3]['equalisation'] = 'EQUA';
- $ID3v2ShortFrameNameLookup[3]['involved_people_list'] = 'IPLS';
- $ID3v2ShortFrameNameLookup[3]['relative_volume_adjustment'] = 'RVAD';
- $ID3v2ShortFrameNameLookup[3]['date'] = 'TDAT';
- $ID3v2ShortFrameNameLookup[3]['time'] = 'TIME';
- $ID3v2ShortFrameNameLookup[3]['original_release_year'] = 'TORY';
- $ID3v2ShortFrameNameLookup[3]['recording_dates'] = 'TRDA';
- $ID3v2ShortFrameNameLookup[3]['size'] = 'TSIZ';
- $ID3v2ShortFrameNameLookup[3]['year'] = 'TYER';
+ $ID3v2ShortFrameNameLookup[3]['equalisation'] = 'EQUA';
+ $ID3v2ShortFrameNameLookup[3]['involved_people_list'] = 'IPLS';
+ $ID3v2ShortFrameNameLookup[3]['relative_volume_adjustment'] = 'RVAD';
+ $ID3v2ShortFrameNameLookup[3]['date'] = 'TDAT';
+ $ID3v2ShortFrameNameLookup[3]['time'] = 'TIME';
+ $ID3v2ShortFrameNameLookup[3]['original_year'] = 'TORY';
+ $ID3v2ShortFrameNameLookup[3]['recording_dates'] = 'TRDA';
+ $ID3v2ShortFrameNameLookup[3]['size'] = 'TSIZ';
+ $ID3v2ShortFrameNameLookup[3]['year'] = 'TYER';
// The following are unique to ID3v2.4
- $ID3v2ShortFrameNameLookup[4]['audio_seek_point_index'] = 'ASPI';
- $ID3v2ShortFrameNameLookup[4]['equalisation'] = 'EQU2';
- $ID3v2ShortFrameNameLookup[4]['relative_volume_adjustment'] = 'RVA2';
- $ID3v2ShortFrameNameLookup[4]['seek'] = 'SEEK';
- $ID3v2ShortFrameNameLookup[4]['signature'] = 'SIGN';
- $ID3v2ShortFrameNameLookup[4]['encoding_time'] = 'TDEN';
- $ID3v2ShortFrameNameLookup[4]['original_release_time'] = 'TDOR';
- $ID3v2ShortFrameNameLookup[4]['recording_time'] = 'TDRC';
- $ID3v2ShortFrameNameLookup[4]['release_time'] = 'TDRL';
- $ID3v2ShortFrameNameLookup[4]['tagging_time'] = 'TDTG';
- $ID3v2ShortFrameNameLookup[4]['involved_people_list'] = 'TIPL';
- $ID3v2ShortFrameNameLookup[4]['musician_credits_list'] = 'TMCL';
- $ID3v2ShortFrameNameLookup[4]['mood'] = 'TMOO';
- $ID3v2ShortFrameNameLookup[4]['produced_notice'] = 'TPRO';
- $ID3v2ShortFrameNameLookup[4]['album_sort_order'] = 'TSOA';
- $ID3v2ShortFrameNameLookup[4]['performer_sort_order'] = 'TSOP';
- $ID3v2ShortFrameNameLookup[4]['title_sort_order'] = 'TSOT';
- $ID3v2ShortFrameNameLookup[4]['set_subtitle'] = 'TSST';
+ $ID3v2ShortFrameNameLookup[4]['audio_seek_point_index'] = 'ASPI';
+ $ID3v2ShortFrameNameLookup[4]['equalisation'] = 'EQU2';
+ $ID3v2ShortFrameNameLookup[4]['relative_volume_adjustment'] = 'RVA2';
+ $ID3v2ShortFrameNameLookup[4]['seek_frame'] = 'SEEK';
+ $ID3v2ShortFrameNameLookup[4]['signature_frame'] = 'SIGN';
+ $ID3v2ShortFrameNameLookup[4]['encoding_time'] = 'TDEN';
+ $ID3v2ShortFrameNameLookup[4]['original_release_time'] = 'TDOR';
+ $ID3v2ShortFrameNameLookup[4]['recording_time'] = 'TDRC';
+ $ID3v2ShortFrameNameLookup[4]['release_time'] = 'TDRL';
+ $ID3v2ShortFrameNameLookup[4]['tagging_time'] = 'TDTG';
+ $ID3v2ShortFrameNameLookup[4]['involved_people_list'] = 'TIPL';
+ $ID3v2ShortFrameNameLookup[4]['musician_credits_list'] = 'TMCL';
+ $ID3v2ShortFrameNameLookup[4]['mood'] = 'TMOO';
+ $ID3v2ShortFrameNameLookup[4]['produced_notice'] = 'TPRO';
+ $ID3v2ShortFrameNameLookup[4]['album_sort_order'] = 'TSOA';
+ $ID3v2ShortFrameNameLookup[4]['performer_sort_order'] = 'TSOP';
+ $ID3v2ShortFrameNameLookup[4]['title_sort_order'] = 'TSOT';
+ $ID3v2ShortFrameNameLookup[4]['set_subtitle'] = 'TSST';
+ $ID3v2ShortFrameNameLookup[4]['year'] = 'TDRC'; // subset of ISO 8601: valid timestamps are yyyy, yyyy-MM, yyyy-MM-dd, yyyy-MM-ddTHH, yyyy-MM-ddTHH:mm and yyyy-MM-ddTHH:mm:ss. All time stamps are UTC
}
- return @$ID3v2ShortFrameNameLookup[$majorversion][strtolower($long_description)];
+ return (isset($ID3v2ShortFrameNameLookup[$majorversion][strtolower($long_description)]) ? $ID3v2ShortFrameNameLookup[$majorversion][strtolower($long_description)] : '');
}
}
-?>
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/write.lyrics3.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/write.lyrics3.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/write.lyrics3.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// write.lyrics3.php //
// module for writing Lyrics3 tags //
@@ -16,32 +17,56 @@
class getid3_write_lyrics3
{
- var $filename;
- var $tag_data;
- //var $lyrics3_version = 2; // 1 or 2
- var $warnings = array(); // any non-critical errors will be stored here
- var $errors = array(); // any critical errors will be stored here
+ /**
+ * @var string
+ */
+ public $filename;
- function getid3_write_lyrics3() {
- return true;
+ /**
+ * @var array
+ */
+ public $tag_data;
+ //public $lyrics3_version = 2; // 1 or 2
+
+ /**
+ * Any non-critical errors will be stored here.
+ *
+ * @var array
+ */
+ public $warnings = array();
+
+ /**
+ * Any critical errors will be stored here.
+ *
+ * @var array
+ */
+ public $errors = array();
+
+ public function __construct() {
}
- function WriteLyrics3() {
+ /**
+ * @return bool
+ */
+ public function WriteLyrics3() {
$this->errors[] = 'WriteLyrics3() not yet functional - cannot write Lyrics3';
return false;
}
- function DeleteLyrics3() {
+ /**
+ * @return bool
+ */
+ public function DeleteLyrics3() {
// Initialize getID3 engine
$getID3 = new getID3;
$ThisFileInfo = $getID3->analyze($this->filename);
if (isset($ThisFileInfo['lyrics3']['tag_offset_start']) && isset($ThisFileInfo['lyrics3']['tag_offset_end'])) {
- if ($fp = @fopen($this->filename, 'a+b')) {
+ if (is_readable($this->filename) && getID3::is_writable($this->filename) && is_file($this->filename) && ($fp = fopen($this->filename, 'a+b'))) {
flock($fp, LOCK_EX);
$oldignoreuserabort = ignore_user_abort(true);
- fseek($fp, $ThisFileInfo['lyrics3']['tag_offset_end'], SEEK_SET);
+ fseek($fp, $ThisFileInfo['lyrics3']['tag_offset_end']);
$DataAfterLyrics3 = '';
if ($ThisFileInfo['filesize'] > $ThisFileInfo['lyrics3']['tag_offset_end']) {
$DataAfterLyrics3 = fread($fp, $ThisFileInfo['filesize'] - $ThisFileInfo['lyrics3']['tag_offset_end']);
@@ -50,7 +75,7 @@
ftruncate($fp, $ThisFileInfo['lyrics3']['tag_offset_start']);
if (!empty($DataAfterLyrics3)) {
- fseek($fp, $ThisFileInfo['lyrics3']['tag_offset_start'], SEEK_SET);
+ fseek($fp, $ThisFileInfo['lyrics3']['tag_offset_start']);
fwrite($fp, $DataAfterLyrics3, strlen($DataAfterLyrics3));
}
@@ -61,10 +86,8 @@
return true;
} else {
-
- $this->errors[] = 'Cannot open "'.$this->filename.'" in "a+b" mode';
+ $this->errors[] = 'Cannot fopen('.$this->filename.', "a+b")';
return false;
-
}
}
// no Lyrics3 present
@@ -71,8 +94,4 @@
return true;
}
-
-
}
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/write.metaflac.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/write.metaflac.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/write.metaflac.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// write.metaflac.php //
// module for writing metaflac tags //
@@ -16,152 +17,222 @@
class getid3_write_metaflac
{
+ /**
+ * @var string
+ */
+ public $filename;
- var $filename;
- var $tag_data;
- var $warnings = array(); // any non-critical errors will be stored here
- var $errors = array(); // any critical errors will be stored here
+ /**
+ * @var array
+ */
+ public $tag_data;
- function getid3_write_metaflac() {
- return true;
+ /**
+ * Any non-critical errors will be stored here.
+ *
+ * @var array
+ */
+ public $warnings = array();
+
+ /**
+ * Any critical errors will be stored here.
+ *
+ * @var array
+ */
+ public $errors = array();
+
+ private $pictures = array();
+
+ public function __construct() {
}
- function WriteMetaFLAC() {
+ /**
+ * @return bool
+ */
+ public function WriteMetaFLAC() {
- if (!ini_get('safe_mode')) {
+ if (preg_match('#(1|ON)#i', ini_get('safe_mode'))) {
+ $this->errors[] = 'PHP running in Safe Mode (backtick operator not available) - cannot call metaflac, tags not written';
+ return false;
+ }
- // Create file with new comments
- $tempcommentsfilename = tempnam('*', 'getID3');
- if ($fpcomments = @fopen($tempcommentsfilename, 'wb')) {
+ $tempfilenames = array();
- foreach ($this->tag_data as $key => $value) {
- foreach ($value as $commentdata) {
- fwrite($fpcomments, $this->CleanmetaflacName($key).'='.$commentdata."\n");
- }
+
+ if (!empty($this->tag_data['ATTACHED_PICTURE'])) {
+ foreach ($this->tag_data['ATTACHED_PICTURE'] as $key => $picturedetails) {
+ $temppicturefilename = tempnam(GETID3_TEMP_DIR, 'getID3');
+ $tempfilenames[] = $temppicturefilename;
+ if (getID3::is_writable($temppicturefilename) && is_file($temppicturefilename) && ($fpcomments = fopen($temppicturefilename, 'wb'))) {
+ // https://xiph.org/flac/documentation_tools_flac.html#flac_options_picture
+ // [TYPE]|[MIME-TYPE]|[DESCRIPTION]|[WIDTHxHEIGHTxDEPTH[/COLORS]]|FILE
+ fwrite($fpcomments, $picturedetails['data']);
+ fclose($fpcomments);
+ $picture_typeid = (!empty($picturedetails['picturetypeid']) ? $this->ID3v2toFLACpictureTypes($picturedetails['picturetypeid']) : 3); // default to "3:Cover (front)"
+ $picture_mimetype = (!empty($picturedetails['mime']) ? $picturedetails['mime'] : ''); // should be auto-detected
+ $picture_width_height_depth = '';
+ $this->pictures[] = $picture_typeid.'|'.$picture_mimetype.'|'.preg_replace('#[^\x20-\x7B\x7D-\x7F]#', '', $picturedetails['description']).'|'.$picture_width_height_depth.'|'.$temppicturefilename;
+ } else {
+ $this->errors[] = 'failed to open temporary tags file, tags not written - fopen("'.$temppicturefilename.'", "wb")';
+ return false;
}
- fclose($fpcomments);
+ }
+ unset($this->tag_data['ATTACHED_PICTURE']);
+ }
- } else {
- $this->errors[] = 'failed to open temporary tags file "'.$tempcommentsfilename.'", tags not written';
- return false;
-
+ // Create file with new comments
+ $tempcommentsfilename = tempnam(GETID3_TEMP_DIR, 'getID3');
+ $tempfilenames[] = $tempcommentsfilename;
+ if (getID3::is_writable($tempcommentsfilename) && is_file($tempcommentsfilename) && ($fpcomments = fopen($tempcommentsfilename, 'wb'))) {
+ foreach ($this->tag_data as $key => $value) {
+ foreach ($value as $commentdata) {
+ fwrite($fpcomments, $this->CleanmetaflacName($key).'='.$commentdata."\n");
+ }
}
+ fclose($fpcomments);
- $oldignoreuserabort = ignore_user_abort(true);
- if (GETID3_OS_ISWINDOWS) {
+ } else {
+ $this->errors[] = 'failed to open temporary tags file, tags not written - fopen("'.$tempcommentsfilename.'", "wb")';
+ return false;
+ }
- if (file_exists(GETID3_HELPERAPPSDIR.'metaflac.exe')) {
- //$commandline = '"'.GETID3_HELPERAPPSDIR.'metaflac.exe" --no-utf8-convert --remove-vc-all --import-vc-from="'.$tempcommentsfilename.'" "'.str_replace('/', '\\', $this->filename).'"';
- // metaflac works fine if you copy-paste the above commandline into a command prompt,
- // but refuses to work with `backtick` if there are "doublequotes" present around BOTH
- // the metaflac pathname and the target filename. For whatever reason...??
- // The solution is simply ensure that the metaflac pathname has no spaces,
- // and therefore does not need to be quoted
+ $oldignoreuserabort = ignore_user_abort(true);
+ if (GETID3_OS_ISWINDOWS) {
- // On top of that, if error messages are not always captured properly under Windows
- // To at least see if there was a problem, compare file modification timestamps before and after writing
- clearstatcache();
- $timestampbeforewriting = filemtime($this->filename);
+ if (file_exists(GETID3_HELPERAPPSDIR.'metaflac.exe')) {
+ //$commandline = '"'.GETID3_HELPERAPPSDIR.'metaflac.exe" --no-utf8-convert --remove-all-tags --import-tags-from="'.$tempcommentsfilename.'" "'.str_replace('/', '\\', $this->filename).'"';
+ // metaflac works fine if you copy-paste the above commandline into a command prompt,
+ // but refuses to work with `backtick` if there are "doublequotes" present around BOTH
+ // the metaflac pathname and the target filename. For whatever reason...??
+ // The solution is simply ensure that the metaflac pathname has no spaces,
+ // and therefore does not need to be quoted
- $commandline = GETID3_HELPERAPPSDIR.'metaflac.exe --no-utf8-convert --remove-vc-all --import-vc-from="'.$tempcommentsfilename.'" "'.$this->filename.'" 2>&1';
- $metaflacError = `$commandline`;
+ // On top of that, if error messages are not always captured properly under Windows
+ // To at least see if there was a problem, compare file modification timestamps before and after writing
+ clearstatcache();
+ $timestampbeforewriting = filemtime($this->filename);
- if (empty($metaflacError)) {
- clearstatcache();
- if ($timestampbeforewriting == filemtime($this->filename)) {
- $metaflacError = 'File modification timestamp has not changed - it looks like the tags were not written';
- }
+ $commandline = GETID3_HELPERAPPSDIR.'metaflac.exe --no-utf8-convert --remove-all-tags --import-tags-from='.escapeshellarg($tempcommentsfilename);
+ foreach ($this->pictures as $picturecommand) {
+ $commandline .= ' --import-picture-from='.escapeshellarg($picturecommand);
+ }
+ $commandline .= ' '.escapeshellarg($this->filename).' 2>&1';
+ $metaflacError = `$commandline`;
+
+ if (empty($metaflacError)) {
+ clearstatcache();
+ if ($timestampbeforewriting == filemtime($this->filename)) {
+ $metaflacError = 'File modification timestamp has not changed - it looks like the tags were not written';
}
- } else {
- $metaflacError = 'metaflac.exe not found in '.GETID3_HELPERAPPSDIR;
}
-
} else {
+ $metaflacError = 'metaflac.exe not found in '.GETID3_HELPERAPPSDIR;
+ }
- // It's simpler on *nix
- $commandline = 'metaflac --no-utf8-convert --remove-vc-all --import-vc-from='.$tempcommentsfilename.' "'.$this->filename.'" 2>&1';
- $metaflacError = `$commandline`;
+ } else {
+ // It's simpler on *nix
+ $commandline = 'metaflac --no-utf8-convert --remove-all-tags --import-tags-from='.escapeshellarg($tempcommentsfilename);
+ foreach ($this->pictures as $picturecommand) {
+ $commandline .= ' --import-picture-from='.escapeshellarg($picturecommand);
}
+ $commandline .= ' '.escapeshellarg($this->filename).' 2>&1';
+ $metaflacError = `$commandline`;
- // Remove temporary comments file
- unlink($tempcommentsfilename);
- ignore_user_abort($oldignoreuserabort);
+ }
- if (!empty($metaflacError)) {
+ // Remove temporary comments file
+ foreach ($tempfilenames as $tempfilename) {
+ unlink($tempfilename);
+ }
+ ignore_user_abort($oldignoreuserabort);
- $this->errors[] = 'System call to metaflac failed with this message returned: '."\n\n".$metaflacError;
- return false;
+ if (!empty($metaflacError)) {
- }
+ $this->errors[] = 'System call to metaflac failed with this message returned: '."\n\n".$metaflacError;
+ return false;
- return true;
}
- $this->errors[] = 'PHP running in Safe Mode (backtick operator not available) - cannot call metaflac, tags not written';
- return false;
+ return true;
}
+ /**
+ * @return bool
+ */
+ public function DeleteMetaFLAC() {
- function DeleteMetaFLAC() {
+ if (preg_match('#(1|ON)#i', ini_get('safe_mode'))) {
+ $this->errors[] = 'PHP running in Safe Mode (backtick operator not available) - cannot call metaflac, tags not deleted';
+ return false;
+ }
- if (!ini_get('safe_mode')) {
+ $oldignoreuserabort = ignore_user_abort(true);
+ if (GETID3_OS_ISWINDOWS) {
- $oldignoreuserabort = ignore_user_abort(true);
- if (GETID3_OS_ISWINDOWS) {
+ if (file_exists(GETID3_HELPERAPPSDIR.'metaflac.exe')) {
+ // To at least see if there was a problem, compare file modification timestamps before and after writing
+ clearstatcache();
+ $timestampbeforewriting = filemtime($this->filename);
- if (file_exists(GETID3_HELPERAPPSDIR.'metaflac.exe')) {
- // To at least see if there was a problem, compare file modification timestamps before and after writing
+ $commandline = GETID3_HELPERAPPSDIR.'metaflac.exe --remove-all-tags "'.$this->filename.'" 2>&1';
+ $metaflacError = `$commandline`;
+
+ if (empty($metaflacError)) {
clearstatcache();
- $timestampbeforewriting = filemtime($this->filename);
-
- $commandline = GETID3_HELPERAPPSDIR.'metaflac.exe --remove-vc-all "'.$this->filename.'" 2>&1';
- $metaflacError = `$commandline`;
-
- if (empty($metaflacError)) {
- clearstatcache();
- if ($timestampbeforewriting == filemtime($this->filename)) {
- $metaflacError = 'File modification timestamp has not changed - it looks like the tags were not deleted';
- }
+ if ($timestampbeforewriting == filemtime($this->filename)) {
+ $metaflacError = 'File modification timestamp has not changed - it looks like the tags were not deleted';
}
- } else {
- $metaflacError = 'metaflac.exe not found in '.GETID3_HELPERAPPSDIR;
}
-
} else {
+ $metaflacError = 'metaflac.exe not found in '.GETID3_HELPERAPPSDIR;
+ }
- // It's simpler on *nix
- $commandline = 'metaflac --remove-vc-all "'.$this->filename.'" 2>&1';
- $metaflacError = `$commandline`;
+ } else {
- }
+ // It's simpler on *nix
+ $commandline = 'metaflac --remove-all-tags "'.$this->filename.'" 2>&1';
+ $metaflacError = `$commandline`;
- ignore_user_abort($oldignoreuserabort);
+ }
- if (!empty($metaflacError)) {
- $this->errors[] = 'System call to metaflac failed with this message returned: '."\n\n".$metaflacError;
- return false;
- }
- return true;
+ ignore_user_abort($oldignoreuserabort);
+
+ if (!empty($metaflacError)) {
+ $this->errors[] = 'System call to metaflac failed with this message returned: '."\n\n".$metaflacError;
+ return false;
}
- $this->errors[] = 'PHP running in Safe Mode (backtick operator not available) - cannot call metaflac, tags not deleted';
- return false;
+ return true;
}
+ /**
+ * @param int $id3v2_picture_typeid
+ *
+ * @return int
+ */
+ public function ID3v2toFLACpictureTypes($id3v2_picture_typeid) {
+ // METAFLAC picture type list is identical to ID3v2 picture type list (as least up to 0x14 "Publisher/Studio logotype")
+ // http://id3.org/id3v2.4.0-frames (section 4.14)
+ // https://xiph.org/flac/documentation_tools_flac.html#flac_options_picture
+ //return (isset($ID3v2toFLACpictureTypes[$id3v2_picture_typeid]) ? $ID3v2toFLACpictureTypes[$id3v2_picture_typeid] : 3); // default: "3: Cover (front)"
+ return (($id3v2_picture_typeid <= 0x14) ? $id3v2_picture_typeid : 3); // default: "3: Cover (front)"
+ }
- function CleanmetaflacName($originalcommentname) {
+ /**
+ * @param string $originalcommentname
+ *
+ * @return string
+ */
+ public function CleanmetaflacName($originalcommentname) {
// A case-insensitive field name that may consist of ASCII 0x20 through 0x7D, 0x3D ('=') excluded.
// ASCII 0x41 through 0x5A inclusive (A-Z) is to be considered equivalent to ASCII 0x61 through
// 0x7A inclusive (a-z).
// replace invalid chars with a space, return uppercase text
- // Thanks Chris Bolt <chris-getid3Øbolt*cx> for improving this function
- // note: ereg_replace() replaces nulls with empty string (not space)
- return strtoupper(ereg_replace('[^ -<>-}]', ' ', str_replace("\x00", ' ', $originalcommentname)));
-
+ // Thanks Chris Bolt <chris-getid3Øbolt*cx> for improving this function
+ // note: *reg_replace() replaces nulls with empty string (not space)
+ return strtoupper(preg_replace('#[^ -<>-}]#', ' ', str_replace("\x00", ' ', $originalcommentname)));
}
}
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/write.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/write.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/write.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
/// //
// write.php //
// module for writing tags (APEv2, ID3v1, ID3v2) //
@@ -20,56 +21,121 @@
/////////////////////////////////////////////////////////////////
if (!defined('GETID3_INCLUDEPATH')) {
- die('getid3.php MUST be included before calling getid3_writetags');
+ throw new Exception('getid3.php MUST be included before calling getid3_writetags');
}
-if (!lt_include(GETID3_INCLUDEPATH.'getid3.lib.php')) {
- die('write.php depends on getid3.lib.php, which is missing.');
+if (!include_once(GETID3_INCLUDEPATH.'getid3.lib.php')) {
+ throw new Exception('write.php depends on getid3.lib.php, which is missing.');
}
+/**
+ * NOTES:
+ *
+ * You should pass data here with standard field names as follows:
+ * * TITLE
+ * * ARTIST
+ * * ALBUM
+ * * TRACKNUMBER
+ * * COMMENT
+ * * GENRE
+ * * YEAR
+ * * ATTACHED_PICTURE (ID3v2 only)
+ * The APEv2 Tag Items Keys definition says "TRACK" is correct but foobar2000 uses "TRACKNUMBER" instead
+ * Pass data here as "TRACKNUMBER" for compatability with all formats
+ *
+ * @link http://www.personal.uni-jena.de/~pfk/mpp/sv8/apekey.html
+ */
+class getid3_writetags
+{
+ /**
+ * Absolute filename of file to write tags to.
+ *
+ * @var string
+ */
+ public $filename;
-// NOTES:
-//
-// You should pass data here with standard field names as follows:
-// * TITLE
-// * ARTIST
-// * ALBUM
-// * TRACKNUMBER
-// * COMMENT
-// * GENRE
-// * YEAR
-// * ATTACHED_PICTURE (ID3v2 only)
-//
-// http://www.personal.uni-jena.de/~pfk/mpp/sv8/apekey.html
-// The APEv2 Tag Items Keys definition says "TRACK" is correct but foobar2000 uses "TRACKNUMBER" instead
-// Pass data here as "TRACKNUMBER" for compatability with all formats
+ /**
+ * Array of tag formats to write ('id3v1', 'id3v2.2', 'id2v2.3', 'id3v2.4', 'ape', 'vorbiscomment',
+ * 'metaflac', 'real').
+ *
+ * @var array
+ */
+ public $tagformats = array();
+ /**
+ * 2-dimensional array of tag data (ex: $data['ARTIST'][0] = 'Elvis').
+ *
+ * @var array
+ */
+ public $tag_data = array(array());
-class getid3_writetags
-{
- // public
- var $filename; // absolute filename of file to write tags to
- var $tagformats = array(); // array of tag formats to write ('id3v1', 'id3v2.2', 'id2v2.3', 'id3v2.4', 'ape', 'vorbiscomment', 'metaflac', 'real')
- var $tag_data = array(array()); // 2-dimensional array of tag data (ex: $data['ARTIST'][0] = 'Elvis')
- var $tag_encoding = 'ISO-8859-1'; // text encoding used for tag data ('ISO-8859-1', 'UTF-8', 'UTF-16', 'UTF-16LE', 'UTF-16BE', )
- var $overwrite_tags = true; // if true will erase existing tag data and write only passed data; if false will merge passed data with existing tag data
- var $remove_other_tags = false; // if true will erase remove all existing tags and only write those passed in $tagformats; if false will ignore any tags not mentioned in $tagformats
+ /**
+ * Text encoding used for tag data ('ISO-8859-1', 'UTF-8', 'UTF-16', 'UTF-16LE', 'UTF-16BE', ).
+ *
+ * @var string
+ */
+ public $tag_encoding = 'ISO-8859-1';
- var $id3v2_tag_language = 'eng'; // ISO-639-2 3-character language code needed for some ID3v2 frames (http://www.id3.org/iso639-2.html)
- var $id3v2_paddedlength = 4096; // minimum length of ID3v2 tags (will be padded to this length if tag data is shorter)
+ /**
+ * If true will erase existing tag data and write only passed data; if false will merge passed data
+ * with existing tag data.
+ *
+ * @var bool
+ */
+ public $overwrite_tags = true;
- var $warnings = array(); // any non-critical errors will be stored here
- var $errors = array(); // any critical errors will be stored here
+ /**
+ * If true will erase remove all existing tags and only write those passed in $tagformats;
+ * If false will ignore any tags not mentioned in $tagformats.
+ *
+ * @var bool
+ */
+ public $remove_other_tags = false;
- // private
- var $ThisFileInfo; // analysis of file before writing
+ /**
+ * ISO-639-2 3-character language code needed for some ID3v2 frames.
+ *
+ * @link http://www.id3.org/iso639-2.html
+ *
+ * @var string
+ */
+ public $id3v2_tag_language = 'eng';
- function getid3_writetags() {
- return true;
+ /**
+ * Minimum length of ID3v2 tags (will be padded to this length if tag data is shorter).
+ *
+ * @var int
+ */
+ public $id3v2_paddedlength = 4096;
+
+ /**
+ * Any non-critical errors will be stored here.
+ *
+ * @var array
+ */
+ public $warnings = array();
+
+ /**
+ * Any critical errors will be stored here.
+ *
+ * @var array
+ */
+ public $errors = array();
+
+ /**
+ * Analysis of file before writing.
+ *
+ * @var array
+ */
+ private $ThisFileInfo;
+
+ public function __construct() {
}
+ /**
+ * @return bool
+ */
+ public function WriteTags() {
- function WriteTags() {
-
if (empty($this->filename)) {
$this->errors[] = 'filename is undefined in getid3_writetags';
return false;
@@ -82,8 +148,23 @@
$this->errors[] = 'tagformats must be an array in getid3_writetags';
return false;
}
+ // prevent duplicate tag formats
+ $this->tagformats = array_unique($this->tagformats);
+ // prevent trying to specify more than one version of ID3v2 tag to write simultaneously
+ $id3typecounter = 0;
+ foreach ($this->tagformats as $tagformat) {
+ if (substr(strtolower($tagformat), 0, 6) == 'id3v2.') {
+ $id3typecounter++;
+ }
+ }
+ if ($id3typecounter > 1) {
+ $this->errors[] = 'tagformats must not contain more than one version of ID3v2';
+ return false;
+ }
+
$TagFormatsToRemove = array();
+ $AllowedTagFormats = array();
if (filesize($this->filename) == 0) {
// empty file special case - allow any tag format, don't check existing format
@@ -98,7 +179,7 @@
$this->ThisFileInfo = $getID3->analyze($this->filename);
// check for what file types are allowed on this fileformat
- switch (@$this->ThisFileInfo['fileformat']) {
+ switch (isset($this->ThisFileInfo['fileformat']) ? $this->ThisFileInfo['fileformat'] : '') {
case 'mp3':
case 'mp2':
case 'mp1':
@@ -119,12 +200,11 @@
break;
case 'ogg':
- switch (@$this->ThisFileInfo['audio']['dataformat']) {
+ switch (isset($this->ThisFileInfo['audio']['dataformat']) ? $this->ThisFileInfo['audio']['dataformat'] : '') {
case 'flac':
//$AllowedTagFormats = array('metaflac');
$this->errors[] = 'metaflac is not (yet) compatible with OggFLAC files';
return false;
- break;
case 'vorbis':
$AllowedTagFormats = array('vorbiscomment');
break;
@@ -131,7 +211,6 @@
default:
$this->errors[] = 'metaflac is not (yet) compatible with Ogg files other than OggVorbis';
return false;
- break;
}
break;
@@ -141,10 +220,8 @@
}
foreach ($this->tagformats as $requested_tag_format) {
if (!in_array($requested_tag_format, $AllowedTagFormats)) {
- $errormessage = 'Tag format "'.$requested_tag_format.'" is not allowed on "'.@$this->ThisFileInfo['fileformat'];
- if (@$this->ThisFileInfo['fileformat'] != @$this->ThisFileInfo['audio']['dataformat']) {
- $errormessage .= '.'.@$this->ThisFileInfo['audio']['dataformat'];
- }
+ $errormessage = 'Tag format "'.$requested_tag_format.'" is not allowed on "'.(isset($this->ThisFileInfo['fileformat']) ? $this->ThisFileInfo['fileformat'] : '');
+ $errormessage .= (isset($this->ThisFileInfo['audio']['dataformat']) ? '.'.$this->ThisFileInfo['audio']['dataformat'] : '');
$errormessage .= '" files';
$this->errors[] = $errormessage;
return false;
@@ -180,9 +257,7 @@
switch ($tagformat) {
case 'ape':
$GETID3_ERRORARRAY = &$this->errors;
- if (!getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'write.apetag.php', __FILE__, false)) {
- return false;
- }
+ getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'write.apetag.php', __FILE__, true);
break;
case 'id3v1':
@@ -191,9 +266,7 @@
case 'metaflac':
case 'real':
$GETID3_ERRORARRAY = &$this->errors;
- if (!getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'write.'.$tagformat.'.php', __FILE__, false)) {
- return false;
- }
+ getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'write.'.$tagformat.'.php', __FILE__, true);
break;
case 'id3v2.2':
@@ -201,15 +274,12 @@
case 'id3v2.4':
case 'id3v2':
$GETID3_ERRORARRAY = &$this->errors;
- if (!getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'write.id3v2.php', __FILE__, false)) {
- return false;
- }
+ getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'write.id3v2.php', __FILE__, true);
break;
default:
$this->errors[] = 'unknown tag format "'.$tagformat.'" in $tagformats in WriteTags()';
return false;
- break;
}
}
@@ -216,7 +286,7 @@
// Validation of supplied data
if (!is_array($this->tag_data)) {
- $this->errors[] = '$tag_data is not an array in WriteTags()';
+ $this->errors[] = '$this->tag_data is not an array in WriteTags()';
return false;
}
// convert supplied data array keys to upper case, if they're not already
@@ -238,9 +308,9 @@
}
}
- // Convert "TRACK" to "TRACKNUMBER" (if needed) for compatability with all formats
- if (isset($this->tag_data['TRACK']) && !isset($this->tag_data['TRACKNUMBER'])) {
- $this->tag_data['TRACKNUMBER'] = $this->tag_data['TRACK'];
+ // Convert "TRACK" to "TRACK_NUMBER" (if needed) for compatability with all formats
+ if (isset($this->tag_data['TRACK']) && !isset($this->tag_data['TRACK_NUMBER'])) {
+ $this->tag_data['TRACK_NUMBER'] = $this->tag_data['TRACK'];
unset($this->tag_data['TRACK']);
}
@@ -255,10 +325,10 @@
switch ($tagformat) {
case 'ape':
$ape_writer = new getid3_write_apetag;
- if (($ape_writer->tag_data = $this->FormatDataForAPE()) !== false) {
+ if ($ape_writer->tag_data = $this->FormatDataForAPE()) {
$ape_writer->filename = $this->filename;
if (($success = $ape_writer->WriteAPEtag()) === false) {
- $this->errors[] = 'WriteAPEtag() failed with message(s):<PRE><UL><LI>'.trim(implode('</LI><LI>', $ape_writer->errors)).'</LI></UL></PRE>';
+ $this->errors[] = 'WriteAPEtag() failed with message(s):<pre><ul><li>'.str_replace("\n", '</li><li>', htmlentities(trim(implode("\n", $ape_writer->errors)))).'</li></ul></pre>';
}
} else {
$this->errors[] = 'FormatDataForAPE() failed';
@@ -267,10 +337,10 @@
case 'id3v1':
$id3v1_writer = new getid3_write_id3v1;
- if (($id3v1_writer->tag_data = $this->FormatDataForID3v1()) !== false) {
+ if ($id3v1_writer->tag_data = $this->FormatDataForID3v1()) {
$id3v1_writer->filename = $this->filename;
if (($success = $id3v1_writer->WriteID3v1()) === false) {
- $this->errors[] = 'WriteID3v1() failed with message(s):<PRE><UL><LI>'.trim(implode('</LI><LI>', $id3v1_writer->errors)).'</LI></UL></PRE>';
+ $this->errors[] = 'WriteID3v1() failed with message(s):<pre><ul><li>'.str_replace("\n", '</li><li>', htmlentities(trim(implode("\n", $id3v1_writer->errors)))).'</li></ul></pre>';
}
} else {
$this->errors[] = 'FormatDataForID3v1() failed';
@@ -283,10 +353,13 @@
$id3v2_writer = new getid3_write_id3v2;
$id3v2_writer->majorversion = intval(substr($tagformat, -1));
$id3v2_writer->paddedlength = $this->id3v2_paddedlength;
- if (($id3v2_writer->tag_data = $this->FormatDataForID3v2($id3v2_writer->majorversion)) !== false) {
+ $id3v2_writer_tag_data = $this->FormatDataForID3v2($id3v2_writer->majorversion);
+ if ($id3v2_writer_tag_data !== false) {
+ $id3v2_writer->tag_data = $id3v2_writer_tag_data;
+ unset($id3v2_writer_tag_data);
$id3v2_writer->filename = $this->filename;
if (($success = $id3v2_writer->WriteID3v2()) === false) {
- $this->errors[] = 'WriteID3v2() failed with message(s):<PRE><UL><LI>'.trim(implode('</LI><LI>', $id3v2_writer->errors)).'</LI></UL></PRE>';
+ $this->errors[] = 'WriteID3v2() failed with message(s):<pre><ul><li>'.str_replace("\n", '</li><li>', htmlentities(trim(implode("\n", $id3v2_writer->errors)))).'</li></ul></pre>';
}
} else {
$this->errors[] = 'FormatDataForID3v2() failed';
@@ -295,10 +368,10 @@
case 'vorbiscomment':
$vorbiscomment_writer = new getid3_write_vorbiscomment;
- if (($vorbiscomment_writer->tag_data = $this->FormatDataForVorbisComment()) !== false) {
+ if ($vorbiscomment_writer->tag_data = $this->FormatDataForVorbisComment()) {
$vorbiscomment_writer->filename = $this->filename;
if (($success = $vorbiscomment_writer->WriteVorbisComment()) === false) {
- $this->errors[] = 'WriteVorbisComment() failed with message(s):<PRE><UL><LI>'.trim(implode('</LI><LI>', $vorbiscomment_writer->errors)).'</LI></UL></PRE>';
+ $this->errors[] = 'WriteVorbisComment() failed with message(s):<pre><ul><li>'.str_replace("\n", '</li><li>', htmlentities(trim(implode("\n", $vorbiscomment_writer->errors)))).'</li></ul></pre>';
}
} else {
$this->errors[] = 'FormatDataForVorbisComment() failed';
@@ -307,10 +380,10 @@
case 'metaflac':
$metaflac_writer = new getid3_write_metaflac;
- if (($metaflac_writer->tag_data = $this->FormatDataForMetaFLAC()) !== false) {
+ if ($metaflac_writer->tag_data = $this->FormatDataForMetaFLAC()) {
$metaflac_writer->filename = $this->filename;
if (($success = $metaflac_writer->WriteMetaFLAC()) === false) {
- $this->errors[] = 'WriteMetaFLAC() failed with message(s):<PRE><UL><LI>'.trim(implode('</LI><LI>', $metaflac_writer->errors)).'</LI></UL></PRE>';
+ $this->errors[] = 'WriteMetaFLAC() failed with message(s):<pre><ul><li>'.str_replace("\n", '</li><li>', htmlentities(trim(implode("\n", $metaflac_writer->errors)))).'</li></ul></pre>';
}
} else {
$this->errors[] = 'FormatDataForMetaFLAC() failed';
@@ -319,10 +392,10 @@
case 'real':
$real_writer = new getid3_write_real;
- if (($real_writer->tag_data = $this->FormatDataForReal()) !== false) {
+ if ($real_writer->tag_data = $this->FormatDataForReal()) {
$real_writer->filename = $this->filename;
if (($success = $real_writer->WriteReal()) === false) {
- $this->errors[] = 'WriteReal() failed with message(s):<PRE><UL><LI>'.trim(implode('</LI><LI>', $real_writer->errors)).'</LI></UL></PRE>';
+ $this->errors[] = 'WriteReal() failed with message(s):<pre><ul><li>'.str_replace("\n", '</li><li>', htmlentities(trim(implode("\n", $real_writer->errors)))).'</li></ul></pre>';
}
} else {
$this->errors[] = 'FormatDataForReal() failed';
@@ -332,7 +405,6 @@
default:
$this->errors[] = 'Invalid tag format to write: "'.$tagformat.'"';
return false;
- break;
}
if (!$success) {
return false;
@@ -342,8 +414,12 @@
}
-
- function DeleteTags($TagFormatsToDelete) {
+ /**
+ * @param string[] $TagFormatsToDelete
+ *
+ * @return bool
+ */
+ public function DeleteTags($TagFormatsToDelete) {
foreach ($TagFormatsToDelete as $DeleteTagFormat) {
$success = false; // overridden if tag deletion is successful
switch ($DeleteTagFormat) {
@@ -404,9 +480,8 @@
break;
default:
- $this->errors[] = 'Invalid tag format to delete: "'.$tagformat.'"';
+ $this->errors[] = 'Invalid tag format to delete: "'.$DeleteTagFormat.'"';
return false;
- break;
}
if (!$success) {
return false;
@@ -415,21 +490,31 @@
return true;
}
-
- function MergeExistingTagData($TagFormat, &$tag_data) {
+ /**
+ * @param string $TagFormat
+ * @param array $tag_data
+ *
+ * @return bool
+ * @throws Exception
+ */
+ public function MergeExistingTagData($TagFormat, &$tag_data) {
// Merge supplied data with existing data, if requested
if ($this->overwrite_tags) {
// do nothing - ignore previous data
} else {
- if (!isset($this->ThisFileInfo['tags'][$TagFormat])) {
- return false;
- }
- $tag_data = array_merge_recursive($tag_data, $this->ThisFileInfo['tags'][$TagFormat]);
+ throw new Exception('$this->overwrite_tags=false is known to be buggy in this version of getID3. Check http://github.com/JamesHeinrich/getID3 for a newer version.');
+// if (!isset($this->ThisFileInfo['tags'][$TagFormat])) {
+// return false;
+// }
+// $tag_data = array_merge_recursive($tag_data, $this->ThisFileInfo['tags'][$TagFormat]);
}
return true;
}
- function FormatDataForAPE() {
+ /**
+ * @return array
+ */
+ public function FormatDataForAPE() {
$ape_tag_data = array();
foreach ($this->tag_data as $tag_key => $valuearray) {
switch ($tag_key) {
@@ -455,8 +540,11 @@
return $ape_tag_data;
}
-
- function FormatDataForID3v1() {
+ /**
+ * @return array
+ */
+ public function FormatDataForID3v1() {
+ $tag_data_id3v1 = array();
$tag_data_id3v1['genreid'] = 255;
if (!empty($this->tag_data['GENRE'])) {
foreach ($this->tag_data['GENRE'] as $key => $value) {
@@ -466,16 +554,14 @@
}
}
}
-
- $tag_data_id3v1['title'] = getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', @implode(' ', @$this->tag_data['TITLE']));
- $tag_data_id3v1['artist'] = getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', @implode(' ', @$this->tag_data['ARTIST']));
- $tag_data_id3v1['album'] = getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', @implode(' ', @$this->tag_data['ALBUM']));
- $tag_data_id3v1['year'] = getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', @implode(' ', @$this->tag_data['YEAR']));
- $tag_data_id3v1['comment'] = getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', @implode(' ', @$this->tag_data['COMMENT']));
-
- $tag_data_id3v1['track'] = intval(getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', @implode(' ', @$this->tag_data['TRACKNUMBER'])));
- if ($tag_data_id3v1['track'] <= 0) {
- $tag_data_id3v1['track'] = '';
+ $tag_data_id3v1['title'] = getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', implode(' ', (isset($this->tag_data['TITLE'] ) ? $this->tag_data['TITLE'] : array())));
+ $tag_data_id3v1['artist'] = getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', implode(' ', (isset($this->tag_data['ARTIST'] ) ? $this->tag_data['ARTIST'] : array())));
+ $tag_data_id3v1['album'] = getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', implode(' ', (isset($this->tag_data['ALBUM'] ) ? $this->tag_data['ALBUM'] : array())));
+ $tag_data_id3v1['year'] = getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', implode(' ', (isset($this->tag_data['YEAR'] ) ? $this->tag_data['YEAR'] : array())));
+ $tag_data_id3v1['comment'] = getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', implode(' ', (isset($this->tag_data['COMMENT'] ) ? $this->tag_data['COMMENT'] : array())));
+ $tag_data_id3v1['track_number'] = intval(getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', implode(' ', (isset($this->tag_data['TRACK_NUMBER']) ? $this->tag_data['TRACK_NUMBER'] : array()))));
+ if ($tag_data_id3v1['track_number'] <= 0) {
+ $tag_data_id3v1['track_number'] = '';
}
$this->MergeExistingTagData('id3v1', $tag_data_id3v1);
@@ -482,7 +568,12 @@
return $tag_data_id3v1;
}
- function FormatDataForID3v2($id3v2_majorversion) {
+ /**
+ * @param int $id3v2_majorversion
+ *
+ * @return array|false
+ */
+ public function FormatDataForID3v2($id3v2_majorversion) {
$tag_data_id3v2 = array();
$ID3v2_text_encoding_lookup[2] = array('ISO-8859-1'=>0, 'UTF-16'=>1);
@@ -505,6 +596,51 @@
}
break;
+ case 'POPM':
+ if (isset($valuearray['email']) &&
+ isset($valuearray['rating']) &&
+ isset($valuearray['data'])) {
+ $tag_data_id3v2['POPM'][] = $valuearray;
+ } else {
+ $this->errors[] = 'ID3v2 POPM data is not properly structured';
+ return false;
+ }
+ break;
+
+ case 'GRID':
+ if (
+ isset($valuearray['groupsymbol']) &&
+ isset($valuearray['ownerid']) &&
+ isset($valuearray['data'])
+ ) {
+ $tag_data_id3v2['GRID'][] = $valuearray;
+ } else {
+ $this->errors[] = 'ID3v2 GRID data is not properly structured';
+ return false;
+ }
+ break;
+
+ case 'UFID':
+ if (isset($valuearray['ownerid']) &&
+ isset($valuearray['data'])) {
+ $tag_data_id3v2['UFID'][] = $valuearray;
+ } else {
+ $this->errors[] = 'ID3v2 UFID data is not properly structured';
+ return false;
+ }
+ break;
+
+ case 'TXXX':
+ foreach ($valuearray as $key => $txxx_data_array) {
+ if (isset($txxx_data_array['description']) && isset($txxx_data_array['data'])) {
+ $tag_data_id3v2['TXXX'][] = $txxx_data_array;
+ } else {
+ $this->errors[] = 'ID3v2 TXXX data is not properly structured';
+ return false;
+ }
+ }
+ break;
+
case '':
$this->errors[] = 'ID3v2: Skipping "'.$tag_key.'" because cannot match it to a known ID3v2 frame type';
// some other data type, don't know how to handle it, ignore it
@@ -520,9 +656,35 @@
} else {
// source encoding is NOT valid in ID3v2 - convert it to an ID3v2-valid encoding first
if ($id3v2_majorversion < 4) {
- // convert data from other encoding to UTF-16
- $tag_data_id3v2[$ID3v2_framename][$key]['encodingid'] = 1;
- $tag_data_id3v2[$ID3v2_framename][$key]['data'] = getid3_lib::iconv_fallback($this->tag_encoding, 'UTF-16', $value);
+ // convert data from other encoding to UTF-16 (with BOM)
+ // note: some software, notably Windows Media Player and iTunes are broken and treat files tagged with UTF-16BE (with BOM) as corrupt
+ // therefore we force data to UTF-16LE and manually prepend the BOM
+ $ID3v2_tag_data_converted = false;
+ if (/*!$ID3v2_tag_data_converted && */($this->tag_encoding == 'ISO-8859-1')) {
+ // great, leave data as-is for minimum compatability problems
+ $tag_data_id3v2[$ID3v2_framename][$key]['encodingid'] = 0;
+ $tag_data_id3v2[$ID3v2_framename][$key]['data'] = $value;
+ $ID3v2_tag_data_converted = true;
+ }
+ if (!$ID3v2_tag_data_converted && ($this->tag_encoding == 'UTF-8')) {
+ do {
+ // if UTF-8 string does not include any characters above chr(127) then it is identical to ISO-8859-1
+ for ($i = 0; $i < strlen($value); $i++) {
+ if (ord($value[$i]) > 127) {
+ break 2;
+ }
+ }
+ $tag_data_id3v2[$ID3v2_framename][$key]['encodingid'] = 0;
+ $tag_data_id3v2[$ID3v2_framename][$key]['data'] = $value;
+ $ID3v2_tag_data_converted = true;
+ } while (false);
+ }
+ if (!$ID3v2_tag_data_converted) {
+ $tag_data_id3v2[$ID3v2_framename][$key]['encodingid'] = 1;
+ //$tag_data_id3v2[$ID3v2_framename][$key]['data'] = getid3_lib::iconv_fallback($this->tag_encoding, 'UTF-16', $value); // output is UTF-16LE+BOM or UTF-16BE+BOM depending on system architecture
+ $tag_data_id3v2[$ID3v2_framename][$key]['data'] = "\xFF\xFE".getid3_lib::iconv_fallback($this->tag_encoding, 'UTF-16LE', $value); // force LittleEndian order version of UTF-16
+ $ID3v2_tag_data_converted = true;
+ }
} else {
// convert data from other encoding to UTF-8
@@ -542,7 +704,10 @@
return $tag_data_id3v2;
}
- function FormatDataForVorbisComment() {
+ /**
+ * @return array
+ */
+ public function FormatDataForVorbisComment() {
$tag_data_vorbiscomment = $this->tag_data;
// check for multi-line comment values - split out to multiple comments if neccesary
@@ -549,21 +714,25 @@
// and convert data to UTF-8 strings
foreach ($tag_data_vorbiscomment as $tag_key => $valuearray) {
foreach ($valuearray as $key => $value) {
- str_replace("\r", "\n", $value);
- if (strstr($value, "\n")) {
- unset($tag_data_vorbiscomment[$tag_key][$key]);
- $multilineexploded = explode("\n", $value);
- foreach ($multilineexploded as $newcomment) {
- if (strlen(trim($newcomment)) > 0) {
- $tag_data_vorbiscomment[$tag_key][] = getid3_lib::iconv_fallback($this->tag_encoding, 'UTF-8', $newcomment);
+ if (($tag_key == 'ATTACHED_PICTURE') && is_array($value)) {
+ continue; // handled separately in write.metaflac.php
+ } else {
+ str_replace("\r", "\n", $value);
+ if (strstr($value, "\n")) {
+ unset($tag_data_vorbiscomment[$tag_key][$key]);
+ $multilineexploded = explode("\n", $value);
+ foreach ($multilineexploded as $newcomment) {
+ if (strlen(trim($newcomment)) > 0) {
+ $tag_data_vorbiscomment[$tag_key][] = getid3_lib::iconv_fallback($this->tag_encoding, 'UTF-8', $newcomment);
+ }
}
+ } elseif (is_string($value) || is_numeric($value)) {
+ $tag_data_vorbiscomment[$tag_key][$key] = getid3_lib::iconv_fallback($this->tag_encoding, 'UTF-8', $value);
+ } else {
+ $this->warnings[] = '$data['.$tag_key.']['.$key.'] is not a string value - all of $data['.$tag_key.'] NOT written to VorbisComment tag';
+ unset($tag_data_vorbiscomment[$tag_key]);
+ break;
}
- } elseif (is_string($value) || is_numeric($value)) {
- $tag_data_vorbiscomment[$tag_key][$key] = getid3_lib::iconv_fallback($this->tag_encoding, 'UTF-8', $value);
- } else {
- $this->warnings[] = '$data['.$tag_key.']['.$key.'] is not a string value - all of $data['.$tag_key.'] NOT written to VorbisComment tag';
- unset($tag_data_vorbiscomment[$tag_key]);
- break;
}
}
}
@@ -571,17 +740,23 @@
return $tag_data_vorbiscomment;
}
- function FormatDataForMetaFLAC() {
+ /**
+ * @return array
+ */
+ public function FormatDataForMetaFLAC() {
// FLAC & OggFLAC use VorbisComments same as OggVorbis
// but require metaflac to do the writing rather than vorbiscomment
return $this->FormatDataForVorbisComment();
}
- function FormatDataForReal() {
- $tag_data_real['title'] = getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', @implode(' ', @$this->tag_data['TITLE']));
- $tag_data_real['artist'] = getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', @implode(' ', @$this->tag_data['ARTIST']));
- $tag_data_real['copyright'] = getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', @implode(' ', @$this->tag_data['COPYRIGHT']));
- $tag_data_real['comment'] = getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', @implode(' ', @$this->tag_data['COMMENT']));
+ /**
+ * @return array
+ */
+ public function FormatDataForReal() {
+ $tag_data_real['title'] = getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', implode(' ', (isset($this->tag_data['TITLE'] ) ? $this->tag_data['TITLE'] : array())));
+ $tag_data_real['artist'] = getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', implode(' ', (isset($this->tag_data['ARTIST'] ) ? $this->tag_data['ARTIST'] : array())));
+ $tag_data_real['copyright'] = getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', implode(' ', (isset($this->tag_data['COPYRIGHT']) ? $this->tag_data['COPYRIGHT'] : array())));
+ $tag_data_real['comment'] = getid3_lib::iconv_fallback($this->tag_encoding, 'ISO-8859-1', implode(' ', (isset($this->tag_data['COMMENT'] ) ? $this->tag_data['COMMENT'] : array())));
$this->MergeExistingTagData('real', $tag_data_real);
return $tag_data_real;
@@ -588,5 +763,3 @@
}
}
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/write.real.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/write.real.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/write.real.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,11 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
-/////////////////////////////////////////////////////////////////
// //
// write.real.php //
// module for writing RealAudio/RealVideo tags //
@@ -15,128 +16,159 @@
class getid3_write_real
{
- var $filename;
- var $tag_data = array();
- var $warnings = array(); // any non-critical errors will be stored here
- var $errors = array(); // any critical errors will be stored here
- var $paddedlength = 512; // minimum length of CONT tag in bytes
+ /**
+ * @var string
+ */
+ public $filename;
- function getid3_write_real() {
- return true;
+ /**
+ * @var array
+ */
+ public $tag_data = array();
+
+ /**
+ * Read buffer size in bytes.
+ *
+ * @var int
+ */
+ public $fread_buffer_size = 32768;
+
+ /**
+ * Any non-critical errors will be stored here.
+ *
+ * @var array
+ */
+ public $warnings = array();
+
+ /**
+ * Any critical errors will be stored here.
+ *
+ * @var array
+ */
+ public $errors = array();
+
+ /**
+ * Minimum length of CONT tag in bytes.
+ *
+ * @var int
+ */
+ public $paddedlength = 512;
+
+ public function __construct() {
}
- function WriteReal() {
+ /**
+ * @return bool
+ */
+ public function WriteReal() {
// File MUST be writeable - CHMOD(646) at least
- if (is_writeable($this->filename)) {
- if ($fp_source = @fopen($this->filename, 'r+b')) {
+ if (getID3::is_writable($this->filename) && is_file($this->filename) && ($fp_source = fopen($this->filename, 'r+b'))) {
- // Initialize getID3 engine
- $getID3 = new getID3;
- $OldThisFileInfo = $getID3->analyze($this->filename);
- if (empty($OldThisFileInfo['real']['chunks']) && !empty($OldThisFileInfo['real']['old_ra_header'])) {
- $this->errors[] = 'Cannot write Real tags on old-style file format';
- fclose($fp_source);
- return false;
- }
+ // Initialize getID3 engine
+ $getID3 = new getID3;
+ $OldThisFileInfo = $getID3->analyze($this->filename);
+ if (empty($OldThisFileInfo['real']['chunks']) && !empty($OldThisFileInfo['real']['old_ra_header'])) {
+ $this->errors[] = 'Cannot write Real tags on old-style file format';
+ fclose($fp_source);
+ return false;
+ }
- if (empty($OldThisFileInfo['real']['chunks'])) {
- $this->errors[] = 'Cannot write Real tags because cannot find DATA chunk in file';
- fclose($fp_source);
- return false;
- }
- foreach ($OldThisFileInfo['real']['chunks'] as $chunknumber => $chunkarray) {
- $oldChunkInfo[$chunkarray['name']] = $chunkarray;
- }
- if (!empty($oldChunkInfo['CONT']['length'])) {
- $this->paddedlength = max($oldChunkInfo['CONT']['length'], $this->paddedlength);
- }
+ if (empty($OldThisFileInfo['real']['chunks'])) {
+ $this->errors[] = 'Cannot write Real tags because cannot find DATA chunk in file';
+ fclose($fp_source);
+ return false;
+ }
+ $oldChunkInfo = array();
+ foreach ($OldThisFileInfo['real']['chunks'] as $chunknumber => $chunkarray) {
+ $oldChunkInfo[$chunkarray['name']] = $chunkarray;
+ }
+ if (!empty($oldChunkInfo['CONT']['length'])) {
+ $this->paddedlength = max($oldChunkInfo['CONT']['length'], $this->paddedlength);
+ }
- $new_CONT_tag_data = $this->GenerateCONTchunk();
- $new_PROP_tag_data = $this->GeneratePROPchunk($OldThisFileInfo['real']['chunks'], $new_CONT_tag_data);
- $new__RMF_tag_data = $this->GenerateRMFchunk($OldThisFileInfo['real']['chunks']);
+ $new_CONT_tag_data = $this->GenerateCONTchunk();
+ $new_PROP_tag_data = $this->GeneratePROPchunk($OldThisFileInfo['real']['chunks'], $new_CONT_tag_data);
+ $new__RMF_tag_data = $this->GenerateRMFchunk($OldThisFileInfo['real']['chunks']);
- if (@$oldChunkInfo['.RMF']['length'] == strlen($new__RMF_tag_data)) {
- fseek($fp_source, $oldChunkInfo['.RMF']['offset'], SEEK_SET);
- fwrite($fp_source, $new__RMF_tag_data);
- } else {
- $this->errors[] = 'new .RMF tag ('.strlen($new__RMF_tag_data).' bytes) different length than old .RMF tag ('.$oldChunkInfo['.RMF']['length'].' bytes)';
- fclose($fp_source);
- return false;
- }
+ if (isset($oldChunkInfo['.RMF']['length']) && ($oldChunkInfo['.RMF']['length'] == strlen($new__RMF_tag_data))) {
+ fseek($fp_source, $oldChunkInfo['.RMF']['offset']);
+ fwrite($fp_source, $new__RMF_tag_data);
+ } else {
+ $this->errors[] = 'new .RMF tag ('.strlen($new__RMF_tag_data).' bytes) different length than old .RMF tag ('.$oldChunkInfo['.RMF']['length'].' bytes)';
+ fclose($fp_source);
+ return false;
+ }
- if (@$oldChunkInfo['PROP']['length'] == strlen($new_PROP_tag_data)) {
- fseek($fp_source, $oldChunkInfo['PROP']['offset'], SEEK_SET);
- fwrite($fp_source, $new_PROP_tag_data);
- } else {
- $this->errors[] = 'new PROP tag ('.strlen($new_PROP_tag_data).' bytes) different length than old PROP tag ('.$oldChunkInfo['PROP']['length'].' bytes)';
- fclose($fp_source);
- return false;
- }
+ if (isset($oldChunkInfo['PROP']['length']) && ($oldChunkInfo['PROP']['length'] == strlen($new_PROP_tag_data))) {
+ fseek($fp_source, $oldChunkInfo['PROP']['offset']);
+ fwrite($fp_source, $new_PROP_tag_data);
+ } else {
+ $this->errors[] = 'new PROP tag ('.strlen($new_PROP_tag_data).' bytes) different length than old PROP tag ('.$oldChunkInfo['PROP']['length'].' bytes)';
+ fclose($fp_source);
+ return false;
+ }
- if (@$oldChunkInfo['CONT']['length'] == strlen($new_CONT_tag_data)) {
+ if (isset($oldChunkInfo['CONT']['length']) && ($oldChunkInfo['CONT']['length'] == strlen($new_CONT_tag_data))) {
- // new data length is same as old data length - just overwrite
- fseek($fp_source, $oldChunkInfo['CONT']['offset'], SEEK_SET);
- fwrite($fp_source, $new_CONT_tag_data);
- fclose($fp_source);
- return true;
+ // new data length is same as old data length - just overwrite
+ fseek($fp_source, $oldChunkInfo['CONT']['offset']);
+ fwrite($fp_source, $new_CONT_tag_data);
+ fclose($fp_source);
+ return true;
+ } else {
+
+ if (empty($oldChunkInfo['CONT'])) {
+ // no existing CONT chunk
+ $BeforeOffset = $oldChunkInfo['DATA']['offset'];
+ $AfterOffset = $oldChunkInfo['DATA']['offset'];
} else {
+ // new data is longer than old data
+ $BeforeOffset = $oldChunkInfo['CONT']['offset'];
+ $AfterOffset = $oldChunkInfo['CONT']['offset'] + $oldChunkInfo['CONT']['length'];
+ }
+ if ($tempfilename = tempnam(GETID3_TEMP_DIR, 'getID3')) {
+ if (getID3::is_writable($tempfilename) && is_file($tempfilename) && ($fp_temp = fopen($tempfilename, 'wb'))) {
- if (empty($oldChunkInfo['CONT'])) {
- // no existing CONT chunk
- $BeforeOffset = $oldChunkInfo['DATA']['offset'];
- $AfterOffset = $oldChunkInfo['DATA']['offset'];
- } else {
- // new data is longer than old data
- $BeforeOffset = $oldChunkInfo['CONT']['offset'];
- $AfterOffset = $oldChunkInfo['CONT']['offset'] + $oldChunkInfo['CONT']['length'];
- }
- if ($tempfilename = tempnam('*', 'getID3')) {
- ob_start();
- if ($fp_temp = fopen($tempfilename, 'wb')) {
+ rewind($fp_source);
+ fwrite($fp_temp, fread($fp_source, $BeforeOffset));
+ fwrite($fp_temp, $new_CONT_tag_data);
+ fseek($fp_source, $AfterOffset);
+ while ($buffer = fread($fp_source, $this->fread_buffer_size)) {
+ fwrite($fp_temp, $buffer, strlen($buffer));
+ }
+ fclose($fp_temp);
- rewind($fp_source);
- fwrite($fp_temp, fread($fp_source, $BeforeOffset));
- fwrite($fp_temp, $new_CONT_tag_data);
- fseek($fp_source, $AfterOffset, SEEK_SET);
- while ($buffer = fread($fp_source, GETID3_FREAD_BUFFER_SIZE)) {
- fwrite($fp_temp, $buffer, strlen($buffer));
- }
- fclose($fp_temp);
-
- if (copy($tempfilename, $this->filename)) {
- unlink($tempfilename);
- fclose($fp_source);
- return true;
- }
+ if (copy($tempfilename, $this->filename)) {
unlink($tempfilename);
- $this->errors[] = 'FAILED: copy('.$tempfilename.', '.$this->filename.') - '.strip_tags(ob_get_contents());
+ fclose($fp_source);
+ return true;
+ }
+ unlink($tempfilename);
+ $this->errors[] = 'FAILED: copy('.$tempfilename.', '.$this->filename.')';
- } else {
-
- $this->errors[] = 'Could not open '.$tempfilename.' mode "wb" - '.strip_tags(ob_get_contents());
-
- }
- ob_end_clean();
+ } else {
+ $this->errors[] = 'Could not fopen("'.$tempfilename.'", "wb")';
}
- fclose($fp_source);
- return false;
-
}
+ fclose($fp_source);
+ return false;
+ }
- } else {
- $this->errors[] = 'Could not open '.$this->filename.' mode "r+b"';
- return false;
- }
}
- $this->errors[] = 'File is not writeable: '.$this->filename;
+ $this->errors[] = 'Could not fopen("'.$this->filename.'", "r+b")';
return false;
}
- function GenerateRMFchunk(&$chunks) {
+ /**
+ * @param array $chunks
+ *
+ * @return string
+ */
+ public function GenerateRMFchunk(&$chunks) {
$oldCONTexists = false;
+ $chunkNameKeys = array();
foreach ($chunks as $key => $chunk) {
$chunkNameKeys[$chunk['name']] = $key;
if ($chunk['name'] == 'CONT') {
@@ -153,10 +185,17 @@
return $RMFchunk;
}
- function GeneratePROPchunk(&$chunks, &$new_CONT_tag_data) {
+ /**
+ * @param array $chunks
+ * @param string $new_CONT_tag_data
+ *
+ * @return string
+ */
+ public function GeneratePROPchunk(&$chunks, &$new_CONT_tag_data) {
$old_CONT_length = 0;
$old_DATA_offset = 0;
$old_INDX_offset = 0;
+ $chunkNameKeys = array();
foreach ($chunks as $key => $chunk) {
$chunkNameKeys[$chunk['name']] = $key;
if ($chunk['name'] == 'CONT') {
@@ -190,7 +229,10 @@
return $PROPchunk;
}
- function GenerateCONTchunk() {
+ /**
+ * @return string
+ */
+ public function GenerateCONTchunk() {
foreach ($this->tag_data as $key => $value) {
// limit each value to 0xFFFF bytes
$this->tag_data[$key] = substr($value, 0, 65535);
@@ -198,17 +240,17 @@
$CONTchunk = "\x00\x00"; // object version
- $CONTchunk .= getid3_lib::BigEndian2String(strlen(@$this->tag_data['title']), 2);
- $CONTchunk .= @$this->tag_data['title'];
+ $CONTchunk .= getid3_lib::BigEndian2String((!empty($this->tag_data['title']) ? strlen($this->tag_data['title']) : 0), 2);
+ $CONTchunk .= (!empty($this->tag_data['title']) ? strlen($this->tag_data['title']) : '');
- $CONTchunk .= getid3_lib::BigEndian2String(strlen(@$this->tag_data['artist']), 2);
- $CONTchunk .= @$this->tag_data['artist'];
+ $CONTchunk .= getid3_lib::BigEndian2String((!empty($this->tag_data['artist']) ? strlen($this->tag_data['artist']) : 0), 2);
+ $CONTchunk .= (!empty($this->tag_data['artist']) ? strlen($this->tag_data['artist']) : '');
- $CONTchunk .= getid3_lib::BigEndian2String(strlen(@$this->tag_data['copyright']), 2);
- $CONTchunk .= @$this->tag_data['copyright'];
+ $CONTchunk .= getid3_lib::BigEndian2String((!empty($this->tag_data['copyright']) ? strlen($this->tag_data['copyright']) : 0), 2);
+ $CONTchunk .= (!empty($this->tag_data['copyright']) ? strlen($this->tag_data['copyright']) : '');
- $CONTchunk .= getid3_lib::BigEndian2String(strlen(@$this->tag_data['comment']), 2);
- $CONTchunk .= @$this->tag_data['comment'];
+ $CONTchunk .= getid3_lib::BigEndian2String((!empty($this->tag_data['comment']) ? strlen($this->tag_data['comment']) : 0), 2);
+ $CONTchunk .= (!empty($this->tag_data['comment']) ? strlen($this->tag_data['comment']) : '');
if ($this->paddedlength > (strlen($CONTchunk) + 8)) {
$CONTchunk .= str_repeat("\x00", $this->paddedlength - strlen($CONTchunk) - 8);
@@ -219,77 +261,67 @@
return $CONTchunk;
}
- function RemoveReal() {
+ /**
+ * @return bool
+ */
+ public function RemoveReal() {
// File MUST be writeable - CHMOD(646) at least
- if (is_writeable($this->filename)) {
- if ($fp_source = @fopen($this->filename, 'r+b')) {
+ if (getID3::is_writable($this->filename) && is_file($this->filename) && ($fp_source = fopen($this->filename, 'r+b'))) {
- // Initialize getID3 engine
- $getID3 = new getID3;
- $OldThisFileInfo = $getID3->analyze($this->filename);
- if (empty($OldThisFileInfo['real']['chunks']) && !empty($OldThisFileInfo['real']['old_ra_header'])) {
- $this->errors[] = 'Cannot remove Real tags from old-style file format';
- fclose($fp_source);
- return false;
- }
+ // Initialize getID3 engine
+ $getID3 = new getID3;
+ $OldThisFileInfo = $getID3->analyze($this->filename);
+ if (empty($OldThisFileInfo['real']['chunks']) && !empty($OldThisFileInfo['real']['old_ra_header'])) {
+ $this->errors[] = 'Cannot remove Real tags from old-style file format';
+ fclose($fp_source);
+ return false;
+ }
- if (empty($OldThisFileInfo['real']['chunks'])) {
- $this->errors[] = 'Cannot remove Real tags because cannot find DATA chunk in file';
- fclose($fp_source);
- return false;
- }
- foreach ($OldThisFileInfo['real']['chunks'] as $chunknumber => $chunkarray) {
- $oldChunkInfo[$chunkarray['name']] = $chunkarray;
- }
+ if (empty($OldThisFileInfo['real']['chunks'])) {
+ $this->errors[] = 'Cannot remove Real tags because cannot find DATA chunk in file';
+ fclose($fp_source);
+ return false;
+ }
+ foreach ($OldThisFileInfo['real']['chunks'] as $chunknumber => $chunkarray) {
+ $oldChunkInfo[$chunkarray['name']] = $chunkarray;
+ }
- if (empty($oldChunkInfo['CONT'])) {
- // no existing CONT chunk
- fclose($fp_source);
- return true;
- }
+ if (empty($oldChunkInfo['CONT'])) {
+ // no existing CONT chunk
+ fclose($fp_source);
+ return true;
+ }
- $BeforeOffset = $oldChunkInfo['CONT']['offset'];
- $AfterOffset = $oldChunkInfo['CONT']['offset'] + $oldChunkInfo['CONT']['length'];
- if ($tempfilename = tempnam('*', 'getID3')) {
- ob_start();
- if ($fp_temp = fopen($tempfilename, 'wb')) {
+ $BeforeOffset = $oldChunkInfo['CONT']['offset'];
+ $AfterOffset = $oldChunkInfo['CONT']['offset'] + $oldChunkInfo['CONT']['length'];
+ if ($tempfilename = tempnam(GETID3_TEMP_DIR, 'getID3')) {
+ if (getID3::is_writable($tempfilename) && is_file($tempfilename) && ($fp_temp = fopen($tempfilename, 'wb'))) {
- rewind($fp_source);
- fwrite($fp_temp, fread($fp_source, $BeforeOffset));
- fseek($fp_source, $AfterOffset, SEEK_SET);
- while ($buffer = fread($fp_source, GETID3_FREAD_BUFFER_SIZE)) {
- fwrite($fp_temp, $buffer, strlen($buffer));
- }
- fclose($fp_temp);
+ rewind($fp_source);
+ fwrite($fp_temp, fread($fp_source, $BeforeOffset));
+ fseek($fp_source, $AfterOffset);
+ while ($buffer = fread($fp_source, $this->fread_buffer_size)) {
+ fwrite($fp_temp, $buffer, strlen($buffer));
+ }
+ fclose($fp_temp);
- if (copy($tempfilename, $this->filename)) {
- unlink($tempfilename);
- fclose($fp_source);
- return true;
- }
+ if (copy($tempfilename, $this->filename)) {
unlink($tempfilename);
- $this->errors[] = 'FAILED: copy('.$tempfilename.', '.$this->filename.') - '.strip_tags(ob_get_contents());
+ fclose($fp_source);
+ return true;
+ }
+ unlink($tempfilename);
+ $this->errors[] = 'FAILED: copy('.$tempfilename.', '.$this->filename.')';
- } else {
-
- $this->errors[] = 'Could not open '.$tempfilename.' mode "wb" - '.strip_tags(ob_get_contents());
-
- }
- ob_end_clean();
+ } else {
+ $this->errors[] = 'Could not fopen("'.$tempfilename.'", "wb")';
}
- fclose($fp_source);
- return false;
-
-
- } else {
- $this->errors[] = 'Could not open '.$this->filename.' mode "r+b"';
- return false;
}
+ fclose($fp_source);
+ return false;
}
- $this->errors[] = 'File is not writeable: '.$this->filename;
+ $this->errors[] = 'Could not fopen("'.$this->filename.'", "r+b")';
return false;
}
}
-
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/class/gallery/getid3/write.vorbiscomment.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/write.vorbiscomment.php 2020-07-14 05:31:27 UTC (rev 7235)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/write.vorbiscomment.php 2020-07-15 07:52:53 UTC (rev 7236)
@@ -1,10 +1,12 @@
<?php
+
/////////////////////////////////////////////////////////////////
/// getID3() by James Heinrich <info at getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
+// available at https://github.com/JamesHeinrich/getID3 //
+// or https://www.getid3.org //
+// or http://getid3.sourceforge.net //
/////////////////////////////////////////////////////////////////
-// See readme.txt for more details //
+// see readme.txt for more details //
/////////////////////////////////////////////////////////////////
// //
// write.vorbiscomment.php //
@@ -16,109 +18,132 @@
class getid3_write_vorbiscomment
{
+ /**
+ * @var string
+ */
+ public $filename;
- var $filename;
- var $tag_data;
- var $warnings = array(); // any non-critical errors will be stored here
- var $errors = array(); // any critical errors will be stored here
+ /**
+ * @var array
+ */
+ public $tag_data;
- function getid3_write_vorbiscomment() {
- return true;
+ /**
+ * Any non-critical errors will be stored here.
+ *
+ * @var array
+ */
+ public $warnings = array();
+
+ /**
+ * Any critical errors will be stored here.
+ *
+ * @var array
+ */
+ public $errors = array();
+
+ public function __construct() {
}
- function WriteVorbisComment() {
+ /**
+ * @return bool
+ */
+ public function WriteVorbisComment() {
- if (!ini_get('safe_mode')) {
+ if (preg_match('#(1|ON)#i', ini_get('safe_mode'))) {
+ $this->errors[] = 'PHP running in Safe Mode (backtick operator not available) - cannot call vorbiscomment, tags not written';
+ return false;
+ }
- // Create file with new comments
- $tempcommentsfilename = tempnam('*', 'getID3');
- if ($fpcomments = @fopen($tempcommentsfilename, 'wb')) {
+ // Create file with new comments
+ $tempcommentsfilename = tempnam(GETID3_TEMP_DIR, 'getID3');
+ if (getID3::is_writable($tempcommentsfilename) && is_file($tempcommentsfilename) && ($fpcomments = fopen($tempcommentsfilename, 'wb'))) {
- foreach ($this->tag_data as $key => $value) {
- foreach ($value as $commentdata) {
- fwrite($fpcomments, $this->CleanVorbisCommentName($key).'='.$commentdata."\n");
- }
+ foreach ($this->tag_data as $key => $value) {
+ foreach ($value as $commentdata) {
+ fwrite($fpcomments, $this->CleanVorbisCommentName($key).'='.$commentdata."\n");
}
- fclose($fpcomments);
+ }
+ fclose($fpcomments);
- } else {
+ } else {
+ $this->errors[] = 'failed to open temporary tags file "'.$tempcommentsfilename.'", tags not written';
+ return false;
+ }
- $this->errors[] = 'failed to open temporary tags file "'.$tempcommentsfilename.'", tags not written';
- return false;
+ $oldignoreuserabort = ignore_user_abort(true);
+ if (GETID3_OS_ISWINDOWS) {
- }
+ if (file_exists(GETID3_HELPERAPPSDIR.'vorbiscomment.exe')) {
+ //$commandline = '"'.GETID3_HELPERAPPSDIR.'vorbiscomment.exe" -w --raw -c "'.$tempcommentsfilename.'" "'.str_replace('/', '\\', $this->filename).'"';
+ // vorbiscomment works fine if you copy-paste the above commandline into a command prompt,
+ // but refuses to work with `backtick` if there are "doublequotes" present around BOTH
+ // the metaflac pathname and the target filename. For whatever reason...??
+ // The solution is simply ensure that the metaflac pathname has no spaces,
+ // and therefore does not need to be quoted
- $oldignoreuserabort = ignore_user_abort(true);
- if (GETID3_OS_ISWINDOWS) {
+ // On top of that, if error messages are not always captured properly under Windows
+ // To at least see if there was a problem, compare file modification timestamps before and after writing
+ clearstatcache();
+ $timestampbeforewriting = filemtime($this->filename);
- if (file_exists(GETID3_HELPERAPPSDIR.'vorbiscomment.exe')) {
- //$commandline = '"'.GETID3_HELPERAPPSDIR.'vorbiscomment.exe" -w --raw -c "'.$tempcommentsfilename.'" "'.str_replace('/', '\\', $this->filename).'"';
- // vorbiscomment works fine if you copy-paste the above commandline into a command prompt,
- // but refuses to work with `backtick` if there are "doublequotes" present around BOTH
- // the metaflac pathname and the target filename. For whatever reason...??
- // The solution is simply ensure that the metaflac pathname has no spaces,
- // and therefore does not need to be quoted
+ $commandline = GETID3_HELPERAPPSDIR.'vorbiscomment.exe -w --raw -c "'.$tempcommentsfilename.'" "'.$this->filename.'" 2>&1';
+ $VorbiscommentError = `$commandline`;
- // On top of that, if error messages are not always captured properly under Windows
- // To at least see if there was a problem, compare file modification timestamps before and after writing
+ if (empty($VorbiscommentError)) {
clearstatcache();
- $timestampbeforewriting = filemtime($this->filename);
-
- $commandline = GETID3_HELPERAPPSDIR.'vorbiscomment.exe -w --raw -c "'.$tempcommentsfilename.'" "'.$this->filename.'" 2>&1';
- $VorbiscommentError = `$commandline`;
-
- if (empty($VorbiscommentError)) {
- clearstatcache();
- if ($timestampbeforewriting == filemtime($this->filename)) {
- $VorbiscommentError = 'File modification timestamp has not changed - it looks like the tags were not written';
- }
+ if ($timestampbeforewriting == filemtime($this->filename)) {
+ $VorbiscommentError = 'File modification timestamp has not changed - it looks like the tags were not written';
}
- } else {
- $VorbiscommentError = 'vorbiscomment.exe not found in '.GETID3_HELPERAPPSDIR;
}
-
} else {
+ $VorbiscommentError = 'vorbiscomment.exe not found in '.GETID3_HELPERAPPSDIR;
+ }
- $commandline = 'vorbiscomment -w --raw -c "'.$tempcommentsfilename.'" "'.$this->filename.'" 2>&1';
- $VorbiscommentError = `$commandline`;
+ } else {
- }
+ $commandline = 'vorbiscomment -w --raw -c "'.$tempcommentsfilename.'" "'.$this->filename.'" 2>&1';
+ $VorbiscommentError = `$commandline`;
- // Remove temporary comments file
- unlink($tempcommentsfilename);
- ignore_user_abort($oldignoreuserabort);
+ }
- if (!empty($VorbiscommentError)) {
+ // Remove temporary comments file
+ unlink($tempcommentsfilename);
+ ignore_user_abort($oldignoreuserabort);
- $this->errors[] = 'system call to vorbiscomment failed with message: '."\n\n".$VorbiscommentError;
- return false;
+ if (!empty($VorbiscommentError)) {
- }
+ $this->errors[] = 'system call to vorbiscomment failed with message: '."\n\n".$VorbiscommentError;
+ return false;
- return true;
}
- $this->errors[] = 'PHP running in Safe Mode (backtick operator not available) - cannot call vorbiscomment, tags not written';
- return false;
+ return true;
}
- function DeleteVorbisComment() {
+ /**
+ * @return bool
+ */
+ public function DeleteVorbisComment() {
$this->tag_data = array(array());
return $this->WriteVorbisComment();
}
- function CleanVorbisCommentName($originalcommentname) {
+ /**
+ * @param string $originalcommentname
+ *
+ * @return string
+ */
+ public function CleanVorbisCommentName($originalcommentname) {
// A case-insensitive field name that may consist of ASCII 0x20 through 0x7D, 0x3D ('=') excluded.
// ASCII 0x41 through 0x5A inclusive (A-Z) is to be considered equivalent to ASCII 0x61 through
// 0x7A inclusive (a-z).
// replace invalid chars with a space, return uppercase text
- // Thanks Chris Bolt <chris-getid3Øbolt*cx> for improving this function
- // note: ereg_replace() replaces nulls with empty string (not space)
- return strtoupper(ereg_replace('[^ -<>-}]', ' ', str_replace("\x00", ' ', $originalcommentname)));
+ // Thanks Chris Bolt <chris-getid3Øbolt*cx> for improving this function
+ // note: *reg_replace() replaces nulls with empty string (not space)
+ return strtoupper(preg_replace('#[^ -<>-}]#', ' ', str_replace("\x00", ' ', $originalcommentname)));
}
}
-
-?>
\ No newline at end of file
More information about the pLog-svn
mailing list