<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[24696] trunk: ID3 1.9.7.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/24696">24696</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-07-13 00:37:36 +0000 (Sat, 13 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>ID3 1.9.7.
props wonderboymusic.
fixes <a href="http://core.trac.wordpress.org/ticket/24737">#24737</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpincludesID3getid3libphp">trunk/wp-includes/ID3/getid3.lib.php</a></li>
<li><a href="#trunkwpincludesID3licensetxt">trunk/wp-includes/ID3/license.txt</a></li>
<li><a href="#trunkwpincludesID3moduleaudiovideomatroskaphp">trunk/wp-includes/ID3/module.audio-video.matroska.php</a></li>
<li><a href="#trunkwpincludesID3moduleaudiovideoquicktimephp">trunk/wp-includes/ID3/module.audio-video.quicktime.php</a></li>
<li><a href="#trunkwpincludesID3moduletagid3v2php">trunk/wp-includes/ID3/module.tag.id3v2.php</a></li>
<li><a href="#trunkwpincludesID3readmetxt">trunk/wp-includes/ID3/readme.txt</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpincludesID3getid3php">trunk/wp-includes/ID3/getid3.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkwpincludesID3classgetid3php">trunk/wp-includes/ID3/class-getid3.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (24695 => 24696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2013-07-12 23:32:32 UTC (rev 24695)
+++ trunk/wp-admin/includes/media.php 2013-07-13 00:37:36 UTC (rev 24696)
</span><span class="lines">@@ -2578,7 +2578,7 @@
</span><span class="cx"> $metadata = array();
</span><span class="cx">
</span><span class="cx"> if ( ! class_exists( 'getID3' ) )
</span><del>- require( ABSPATH . WPINC . '/ID3/class-getid3.php' );
</del><ins>+ require( ABSPATH . WPINC . '/ID3/getid3.php' );
</ins><span class="cx"> $id3 = new getID3();
</span><span class="cx"> $data = $id3->analyze( $file );
</span><span class="cx">
</span><span class="lines">@@ -2633,7 +2633,7 @@
</span><span class="cx"> $metadata = array();
</span><span class="cx">
</span><span class="cx"> if ( ! class_exists( 'getID3' ) )
</span><del>- require( ABSPATH . WPINC . '/ID3/class-getid3.php' );
</del><ins>+ require( ABSPATH . WPINC . '/ID3/getid3.php' );
</ins><span class="cx"> $id3 = new getID3();
</span><span class="cx"> $data = $id3->analyze( $file );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesID3classgetid3php"></a>
<div class="delfile"><h4>Deleted: trunk/wp-includes/ID3/class-getid3.php (24695 => 24696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ID3/class-getid3.php 2013-07-12 23:32:32 UTC (rev 24695)
+++ trunk/wp-includes/ID3/class-getid3.php 2013-07-13 00:37:36 UTC (rev 24696)
</span><span class="lines">@@ -1,1771 +0,0 @@
</span><del>-<?php
-/////////////////////////////////////////////////////////////////
-/// getID3() by James Heinrich <info@getid3.org> //
-// available at http://getid3.sourceforge.net //
-// or http://www.getid3.org //
-/////////////////////////////////////////////////////////////////
-// //
-// Please see readme.txt for more information //
-// ///
-/////////////////////////////////////////////////////////////////
-
-// 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);
-}
-
-// 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')) {
- // 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);
-$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
-define('GETID3_TEMP_DIR', $temp_dir);
-unset($open_basedir, $temp_dir);
-
-// End: Defines
-
-
-class getID3
-{
- // public: Settings
- public $encoding = 'UTF-8'; // CASE SENSITIVE! - i.e. (must be supported by iconv()). Examples: ISO-8859-1 UTF-8 UTF-16 UTF-16BE
- public $encoding_id3v1 = 'ISO-8859-1'; // Should always be 'ISO-8859-1', but some tags may be written in other encodings such as 'EUC-CN' or 'CP1252'
-
- // public: Optional tag checks - disable for speed.
- public $option_tag_id3v1 = true; // Read and process ID3v1 tags
- public $option_tag_id3v2 = true; // Read and process ID3v2 tags
- public $option_tag_lyrics3 = true; // Read and process Lyrics3 tags
- public $option_tag_apetag = true; // Read and process APE tags
- public $option_tags_process = true; // Copy tags to root key 'tags' and encode to $this->encoding
- public $option_tags_html = true; // Copy tags to root key 'tags_html' properly translated from various encodings to HTML entities
-
- // public: Optional tag/comment calucations
- public $option_extra_info = true; // Calculate additional info such as bitrate, channelmode etc
-
- // public: Optional handling of embedded attachments (e.g. images)
- public $option_save_attachments = true; // defaults to true (ATTACHMENTS_INLINE) for backward compatibility
-
- // public: Optional calculations
- public $option_md5_data = false; // Get MD5 sum of data part - slow
- public $option_md5_data_source = false; // Use MD5 of source file if availble - only FLAC and OptimFROG
- public $option_sha1_data = false; // Get SHA1 sum of data part - slow
- public $option_max_2gb_check = null; // Check whether file is larger than 2GB and thus not supported by 32-bit PHP (null: auto-detect based on PHP_INT_MAX)
-
- // public: Read buffer size in bytes
- public $option_fread_buffer_size = 32768;
-
- // Public variables
- public $filename; // Filename of file being analysed.
- public $fp; // Filepointer to file being analysed.
- public $info; // Result array.
- public $tempdir = GETID3_TEMP_DIR;
-
- // Protected variables
- protected $startup_error = '';
- protected $startup_warning = '';
- protected $memory_limit = 0;
-
- const VERSION = '1.9.5-20130220';
- const FREAD_BUFFER_SIZE = 32768;
-
- const ATTACHMENTS_NONE = false;
- const ATTACHMENTS_INLINE = true;
-
- // public: constructor
- public function __construct() {
-
- // Check for PHP version
- $required_php_version = '5.0.5';
- 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;
- return false;
- }
-
- // Check memory
- $this->memory_limit = ini_get('memory_limit');
- if (preg_match('#([0-9]+)M#i', $this->memory_limit, $matches)) {
- // could be stored as "16M" rather than 16777216 for example
- $this->memory_limit = $matches[1] * 1048576;
- } elseif (preg_match('#([0-9]+)G#i', $this->memory_limit, $matches)) { // The 'G' modifier is available since PHP 5.1.0
- // could be stored as "2G" rather than 2147483648 for example
- $this->memory_limit = $matches[1] * 1073741824;
- }
- if ($this->memory_limit <= 0) {
- // memory limits probably disabled
- } 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';
- } 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';
- }
-
- // Check safe_mode off
- 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.');
- }
-
- if (intval(ini_get('mbstring.func_overload')) > 0) {
- $this->warning('WARNING: php.ini contains "mbstring.func_overload = '.ini_get('mbstring.func_overload').'", this may break things.');
- }
-
- // Check for magic_quotes_runtime
- if (function_exists('get_magic_quotes_runtime')) {
- if (get_magic_quotes_runtime()) {
- return $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).');
- }
- }
-
- // Check for magic_quotes_gpc
- if (function_exists('magic_quotes_gpc')) {
- if (get_magic_quotes_gpc()) {
- return $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).');
- }
- }
-
- // Load support library
- if (!include_once(GETID3_INCLUDEPATH.'getid3.lib.php')) {
- $this->startup_error .= 'getid3.lib.php is missing or corrupt';
- }
-
- 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
- // 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_warning .= '"'.$helperappsdir.'" cannot be defined as GETID3_HELPERAPPSDIR because it does not exist';
- } elseif (strpos(realpath($helperappsdir), ' ') !== false) {
- $DirPieces = explode(DIRECTORY_SEPARATOR, realpath($helperappsdir));
- $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.';
- }
- }
- $path_so_far[] = $value;
- }
- $helperappsdir = implode(DIRECTORY_SEPARATOR, $path_so_far);
- }
- define('GETID3_HELPERAPPSDIR', $helperappsdir.DIRECTORY_SEPARATOR);
- }
-
- return true;
- }
-
- public function version() {
- return self::VERSION;
- }
-
- public function fread_buffer_size() {
- return $this->option_fread_buffer_size;
- }
-
- // public: setOption
- public function setOption($optArray) {
- if (!is_array($optArray) || empty($optArray)) {
- return false;
- }
- foreach ($optArray as $opt => $val) {
- if (isset($this->$opt) === false) {
- continue;
- }
- $this->$opt = $val;
- }
- return true;
- }
-
- public function openfile($filename) {
- try {
- if (!empty($this->startup_error)) {
- throw new getid3_exception($this->startup_error);
- }
- if (!empty($this->startup_warning)) {
- $this->warning($this->startup_warning);
- }
-
- // 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;
-
- // 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');
- }
-
- $filename = str_replace('/', DIRECTORY_SEPARATOR, $filename);
- $filename = preg_replace('#(.+)'.preg_quote(DIRECTORY_SEPARATOR).'{2,}#U', '\1'.DIRECTORY_SEPARATOR, $filename);
-
- // open local file
- if (is_readable($filename) && is_file($filename) && ($this->fp = fopen($filename, 'rb'))) {
- // great
- } else {
- throw new getid3_exception('Could not open "'.$filename.'" (does not exist, or is not a file)');
- }
-
- $this->info['filesize'] = filesize($filename);
- // 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'];
-
-
- // 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']);
-
- 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, 3).'GB, please report to info@getid3.org');
- }
- $this->info['filesize'] = $real_filesize;
- $this->error('File is larger than '.round(PHP_INT_MAX / 1073741824).'GB (filesystem reports it as '.number_format($real_filesize, 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;
-
- } catch (Exception $e) {
- $this->error($e->getMessage());
- }
- return false;
- }
-
- // public: analyze file
- public function analyze($filename) {
- try {
- if (!$this->openfile($filename)) {
- return $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']);
- }
- }
-
- // 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, SEEK_SET);
- $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'], SEEK_SET);
- $formattest = fread($this->fp, 32774);
-
- // determine format
- $determined_format = $this->GetFileFormat($formattest, $filename);
-
- // unable to determine file format
- if (!$determined_format) {
- fclose($this->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($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.');
- }
- }
-
- // 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.');
- }
- }
-
- // set mime type
- $this->info['mime_type'] = $determined_format['mime_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.');
- }
-
- // module requires iconv support
- // Check encoding/iconv support
- if (!empty($determined_format['iconv_req']) && !function_exists('iconv') && !in_array($this->encoding, array('ISO-8859-1', 'UTF-8', 'UTF-16LE', 'UTF-16BE', 'UTF-16'))) {
- $errormessage = '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 iconv() support. Please enable php_iconv.dll in php.ini, and copy iconv.dll from c:/php/dlls to c:/windows/system32';
- } else {
- $errormessage .= 'PHP is not compiled with iconv() support. Please recompile with the --with-iconv switch';
- }
- return $this->error($errormessage);
- }
-
- // include module
- include_once(GETID3_INCLUDEPATH.$determined_format['include']);
-
- // 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);
-
- // close file
- fclose($this->fp);
-
- // process all tags - copy to 'tags' and convert charsets
- if ($this->option_tags_process) {
- $this->HandleAllTags();
- }
-
- // perform more calculations
- if ($this->option_extra_info) {
- $this->ChannelsBitratePlaytimeCalculations();
- $this->CalculateCompressionRatioVideo();
- $this->CalculateCompressionRatioAudio();
- $this->CalculateReplayGain();
- $this->ProcessAudioStreams();
- }
-
- // 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');
- }
- }
-
- // 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();
-
- } catch (Exception $e) {
- $this->error('Caught exception: '.$e->getMessage());
- }
-
- // return info array
- return $this->info;
- }
-
-
- // private: error handling
- 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
- public function warning($message) {
- $this->info['warning'][] = $message;
- return true;
- }
-
-
- // private: CleanUp
- private function CleanUp() {
-
- // remove possible empty keys
- $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]);
- }
- if (empty($this->info['video'][$key]) && isset($this->info['video'][$key])) {
- unset($this->info['video'][$key]);
- }
- }
-
- // remove empty root keys
- if (!empty($this->info)) {
- foreach ($this->info as $key => $value) {
- if (empty($this->info[$key]) && ($this->info[$key] !== 0) && ($this->info[$key] !== '0')) {
- unset($this->info[$key]);
- }
- }
- }
-
- // remove meaningless entries from unknown-format files
- if (empty($this->info['fileformat'])) {
- if (isset($this->info['avdataoffset'])) {
- unset($this->info['avdataoffset']);
- }
- if (isset($this->info['avdataend'])) {
- 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
- public function GetFileFormatArray() {
- static $format_info = array();
- if (empty($format_info)) {
- $format_info = array(
-
- // Audio formats
-
- // AC-3 - audio - Dolby AC-3 / Dolby Digital
- 'ac3' => array(
- 'pattern' => '^\x0B\x77',
- 'group' => 'audio',
- 'module' => 'ac3',
- 'mime_type' => 'audio/ac3',
- ),
-
- // AAC - audio - Advanced Audio Coding (AAC) - ADIF format
- 'adif' => array(
- 'pattern' => '^ADIF',
- 'group' => 'audio',
- 'module' => 'aac',
- 'mime_type' => 'application/octet-stream',
- '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]',
- 'group' => 'audio',
- 'module' => 'aac',
- 'mime_type' => 'application/octet-stream',
- 'fail_ape' => 'WARNING',
- ),
-
-
- // AU - audio - NeXT/Sun AUdio (AU)
- 'au' => array(
- 'pattern' => '^\.snd',
- 'group' => 'audio',
- 'module' => 'au',
- 'mime_type' => 'audio/basic',
- ),
-
- // AVR - audio - Audio Visual Research
- 'avr' => array(
- 'pattern' => '^2BIT',
- 'group' => 'audio',
- 'module' => 'avr',
- 'mime_type' => 'application/octet-stream',
- ),
-
- // BONK - audio - Bonk v0.9+
- 'bonk' => array(
- 'pattern' => '^\x00(BONK|INFO|META| ID3)',
- 'group' => 'audio',
- 'module' => 'bonk',
- 'mime_type' => 'audio/xmms-bonk',
- ),
-
- // DSS - audio - Digital Speech Standard
- 'dss' => array(
- 'pattern' => '^[\x02-\x03]ds[s2]',
- 'group' => 'audio',
- 'module' => 'dss',
- 'mime_type' => 'application/octet-stream',
- ),
-
- // 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',
- ),
-
- // LA - audio - Lossless Audio (LA)
- 'la' => array(
- 'pattern' => '^LA0[2-4]',
- 'group' => 'audio',
- 'module' => 'la',
- 'mime_type' => 'application/octet-stream',
- ),
-
- // LPAC - audio - Lossless Predictive Audio Compression (LPAC)
- 'lpac' => array(
- 'pattern' => '^LPAC',
- 'group' => 'audio',
- 'module' => 'lpac',
- 'mime_type' => 'application/octet-stream',
- ),
-
- // MIDI - audio - MIDI (Musical Instrument Digital Interface)
- 'midi' => array(
- 'pattern' => '^MThd',
- 'group' => 'audio',
- 'module' => 'midi',
- 'mime_type' => 'audio/midi',
- ),
-
- // MAC - audio - Monkey's Audio Compressor
- 'mac' => array(
- 'pattern' => '^MAC ',
- 'group' => 'audio',
- 'module' => 'monkey',
- 'mime_type' => 'application/octet-stream',
- ),
-
-// 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(
- 'pattern' => '^IMPM',
- 'group' => 'audio',
- 'module' => 'mod',
- //'option' => 'it',
- 'mime_type' => 'audio/it',
- ),
-
- // MOD - audio - MODule (eXtended Module, various sub-formats)
- 'xm' => array(
- 'pattern' => '^Extended Module',
- 'group' => 'audio',
- 'module' => 'mod',
- //'option' => 'xm',
- 'mime_type' => 'audio/xm',
- ),
-
- // MOD - audio - MODule (ScreamTracker)
- 's3m' => array(
- 'pattern' => '^.{44}SCRM',
- 'group' => 'audio',
- 'module' => 'mod',
- //'option' => 's3m',
- 'mime_type' => 'audio/s3m',
- ),
-
- // MPC - audio - Musepack / MPEGplus
- 'mpc' => array(
- 'pattern' => '^(MPCK|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])',
- 'group' => 'audio',
- 'module' => 'mpc',
- '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-\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',
- ),
-
- // OFR - audio - OptimFROG
- 'ofr' => array(
- 'pattern' => '^(\*RIFF|OFR)',
- 'group' => 'audio',
- 'module' => 'optimfrog',
- 'mime_type' => 'application/octet-stream',
- ),
-
- // RKAU - audio - RKive AUdio compressor
- 'rkau' => array(
- 'pattern' => '^RKA',
- 'group' => 'audio',
- 'module' => 'rkau',
- 'mime_type' => 'application/octet-stream',
- ),
-
- // SHN - audio - Shorten
- 'shn' => array(
- 'pattern' => '^ajkg',
- 'group' => 'audio',
- 'module' => 'shorten',
- 'mime_type' => 'audio/xmms-shn',
- 'fail_id3' => 'ERROR',
- 'fail_ape' => 'ERROR',
- ),
-
- // TTA - audio - TTA Lossless Audio Compressor (http://tta.corecodec.org)
- 'tta' => array(
- 'pattern' => '^TTA', // could also be '^TTA(\x01|\x02|\x03|2|1)'
- 'group' => 'audio',
- 'module' => 'tta',
- 'mime_type' => 'application/octet-stream',
- ),
-
- // VOC - audio - Creative Voice (VOC)
- 'voc' => array(
- 'pattern' => '^Creative Voice File',
- 'group' => 'audio',
- 'module' => 'voc',
- 'mime_type' => 'audio/voc',
- ),
-
- // VQF - audio - transform-domain weighted interleave Vector Quantization Format (VQF)
- 'vqf' => array(
- 'pattern' => '^TWIN',
- 'group' => 'audio',
- 'module' => 'vqf',
- 'mime_type' => 'application/octet-stream',
- ),
-
- // WV - audio - WavPack (v4.0+)
- 'wv' => array(
- 'pattern' => '^wvpk',
- 'group' => 'audio',
- 'module' => 'wavpack',
- 'mime_type' => 'application/octet-stream',
- ),
-
-
- // Audio-Video formats
-
- // 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',
- 'group' => 'audio-video',
- 'module' => 'asf',
- 'mime_type' => 'video/x-ms-asf',
- 'iconv_req' => false,
- ),
-
- // BINK - audio/video - Bink / Smacker
- 'bink' => array(
- 'pattern' => '^(BIK|SMK)',
- 'group' => 'audio-video',
- 'module' => 'bink',
- 'mime_type' => 'application/octet-stream',
- ),
-
- // FLV - audio/video - FLash Video
- 'flv' => array(
- 'pattern' => '^FLV\x01',
- 'group' => 'audio-video',
- 'module' => 'flv',
- 'mime_type' => 'video/x-flv',
- ),
-
- // MKAV - audio/video - Mastroka
- 'matroska' => array(
- 'pattern' => '^\x1A\x45\xDF\xA3',
- 'group' => 'audio-video',
- 'module' => 'matroska',
- '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)',
- 'group' => 'audio-video',
- 'module' => 'mpeg',
- 'mime_type' => 'video/mpeg',
- ),
-
- // NSV - audio/video - Nullsoft Streaming Video (NSV)
- 'nsv' => array(
- 'pattern' => '^NSV[sf]',
- 'group' => 'audio-video',
- 'module' => 'nsv',
- 'mime_type' => 'application/octet-stream',
- ),
-
- // Ogg - audio/video - Ogg (Ogg-Vorbis, Ogg-FLAC, Speex, Ogg-Theora(*), Ogg-Tarkin(*))
- 'ogg' => array(
- 'pattern' => '^OggS',
- 'group' => 'audio',
- 'module' => 'ogg',
- 'mime_type' => 'application/ogg',
- 'fail_id3' => 'WARNING',
- 'fail_ape' => 'WARNING',
- ),
-
- // QT - audio/video - Quicktime
- 'quicktime' => array(
- 'pattern' => '^.{4}(cmov|free|ftyp|mdat|moov|pnot|skip|wide)',
- 'group' => 'audio-video',
- 'module' => 'quicktime',
- 'mime_type' => 'video/quicktime',
- ),
-
- // RIFF - audio/video - Resource Interchange File Format (RIFF) / WAV / AVI / CD-audio / SDSS = renamed variant used by SmartSound QuickTracks (www.smartsound.com) / FORM = Audio Interchange File Format (AIFF)
- 'riff' => array(
- 'pattern' => '^(RIFF|SDSS|FORM)',
- 'group' => 'audio-video',
- 'module' => 'riff',
- 'mime_type' => 'audio/x-wave',
- 'fail_ape' => 'WARNING',
- ),
-
- // Real - audio/video - RealAudio, RealVideo
- 'real' => array(
- 'pattern' => '^(\\.RMF|\\.ra)',
- 'group' => 'audio-video',
- 'module' => 'real',
- 'mime_type' => 'audio/x-realaudio',
- ),
-
- // SWF - audio/video - ShockWave Flash
- 'swf' => array(
- 'pattern' => '^(F|C)WS',
- 'group' => 'audio-video',
- 'module' => 'swf',
- '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',
- ),
-
-
- // Still-Image formats
-
- // BMP - still image - Bitmap (Windows, OS/2; uncompressed, RLE8, RLE4)
- 'bmp' => array(
- 'pattern' => '^BM',
- 'group' => 'graphic',
- 'module' => 'bmp',
- 'mime_type' => 'image/bmp',
- 'fail_id3' => 'ERROR',
- 'fail_ape' => 'ERROR',
- ),
-
- // GIF - still image - Graphics Interchange Format
- 'gif' => array(
- 'pattern' => '^GIF',
- 'group' => 'graphic',
- 'module' => 'gif',
- 'mime_type' => 'image/gif',
- 'fail_id3' => 'ERROR',
- 'fail_ape' => 'ERROR',
- ),
-
- // JPEG - still image - Joint Photographic Experts Group (JPEG)
- 'jpg' => array(
- 'pattern' => '^\xFF\xD8\xFF',
- 'group' => 'graphic',
- 'module' => 'jpg',
- 'mime_type' => 'image/jpeg',
- 'fail_id3' => 'ERROR',
- 'fail_ape' => 'ERROR',
- ),
-
- // PCD - still image - Kodak Photo CD
- 'pcd' => array(
- 'pattern' => '^.{2048}PCD_IPI\x00',
- 'group' => 'graphic',
- 'module' => 'pcd',
- 'mime_type' => 'image/x-photo-cd',
- 'fail_id3' => 'ERROR',
- 'fail_ape' => 'ERROR',
- ),
-
-
- // PNG - still image - Portable Network Graphics (PNG)
- 'png' => array(
- 'pattern' => '^\x89\x50\x4E\x47\x0D\x0A\x1A\x0A',
- 'group' => 'graphic',
- 'module' => 'png',
- 'mime_type' => 'image/png',
- 'fail_id3' => 'ERROR',
- 'fail_ape' => 'ERROR',
- ),
-
-
- // 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)',
- 'group' => 'graphic',
- 'module' => 'tiff',
- 'mime_type' => 'image/tiff',
- 'fail_id3' => 'ERROR',
- 'fail_ape' => 'ERROR',
- ),
-
-
- // 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
- 'iso' => array(
- 'pattern' => '^.{32769}CD001',
- 'group' => 'misc',
- 'module' => 'iso',
- 'mime_type' => 'application/octet-stream',
- 'fail_id3' => 'ERROR',
- 'fail_ape' => 'ERROR',
- 'iconv_req' => false,
- ),
-
- // RAR - data - RAR compressed data
- 'rar' => array(
- 'pattern' => '^Rar\!',
- 'group' => 'archive',
- 'module' => 'rar',
- 'mime_type' => 'application/octet-stream',
- 'fail_id3' => 'ERROR',
- 'fail_ape' => 'ERROR',
- ),
-
- // SZIP - audio/data - SZIP compressed data
- 'szip' => array(
- 'pattern' => '^SZ\x0A\x04',
- 'group' => 'archive',
- 'module' => 'szip',
- 'mime_type' => 'application/octet-stream',
- 'fail_id3' => 'ERROR',
- 'fail_ape' => 'ERROR',
- ),
-
- // 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}',
- 'group' => 'archive',
- 'module' => 'tar',
- 'mime_type' => 'application/x-tar',
- 'fail_id3' => 'ERROR',
- 'fail_ape' => 'ERROR',
- ),
-
- // GZIP - data - GZIP compressed data
- 'gz' => array(
- 'pattern' => '^\x1F\x8B\x08',
- 'group' => 'archive',
- 'module' => 'gzip',
- 'mime_type' => 'application/x-gzip',
- 'fail_id3' => 'ERROR',
- 'fail_ape' => 'ERROR',
- ),
-
- // ZIP - data - ZIP compressed data
- 'zip' => array(
- 'pattern' => '^PK\x03\x04',
- 'group' => 'archive',
- 'module' => 'zip',
- 'mime_type' => 'application/zip',
- 'fail_id3' => 'ERROR',
- 'fail_ape' => 'ERROR',
- ),
-
-
- // Misc other formats
-
- // 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',
- 'group' => 'misc',
- 'module' => 'pdf',
- 'mime_type' => 'application/pdf',
- 'fail_id3' => 'ERROR',
- 'fail_ape' => 'ERROR',
- ),
-
- // MSOFFICE - data - ZIP compressed data
- 'msoffice' => array(
- 'pattern' => '^\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1', // D0CF11E == DOCFILE == Microsoft Office Document
- 'group' => 'misc',
- 'module' => 'msoffice',
- 'mime_type' => 'application/octet-stream',
- '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',
- ),
-
- );
- }
-
- return $format_info;
- }
-
-
-
- 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
- // of the file).
-
- // Identify file format - loop through $format_info and detect with reg expr
- foreach ($this->GetFileFormatArray() as $format_name => $info) {
- // The /s switch on preg_match() forces preg_match() NOT to treat
- // newline (0x0A) characters as special chars but do a binary match
- if (!empty($info['pattern']) && preg_match('#'.$info['pattern'].'#s', $filedata)) {
- $info['include'] = 'module.'.$info['group'].'.'.$info['module'].'.php';
- return $info;
- }
- }
-
-
- if (preg_match('#\.mp[123a]$#i', $filename)) {
- // Too many mp3 encoders on the market put gabage 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
- public function CharConvert(&$array, $encoding) {
-
- // identical encoding - end here
- if ($encoding == $this->encoding) {
- return;
- }
-
- // loop thru array
- foreach ($array as $key => $value) {
-
- // go recursive
- if (is_array($value)) {
- $this->CharConvert($array[$key], $encoding);
- }
-
- // convert string
- elseif (is_string($value)) {
- $array[$key] = trim(getid3_lib::iconv_fallback($encoding, $this->encoding, $value));
- }
- }
- }
-
-
- public function HandleAllTags() {
-
- // key name => array (tag name, character encoding)
- static $tags;
- if (empty($tags)) {
- $tags = array(
- 'asf' => array('asf' , 'UTF-16LE'),
- 'midi' => array('midi' , 'ISO-8859-1'),
- 'nsv' => array('nsv' , 'ISO-8859-1'),
- 'ogg' => array('vorbiscomment' , 'UTF-8'),
- 'png' => array('png' , 'UTF-8'),
- 'tiff' => array('tiff' , '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'),
- 'riff' => array('riff' , 'ISO-8859-1'),
- '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'),
- 'cue' => array('cue' , 'ISO-8859-1'),
- 'matroska' => array('matroska' , 'UTF-8'),
- 'flac' => array('vorbiscomment' , 'UTF-8'),
- 'divxtag' => array('divx' , 'ISO-8859-1'),
- );
- }
-
- // loop through comments array
- foreach ($tags as $comment_name => $tagname_encoding_array) {
- list($tag_name, $encoding) = $tagname_encoding_array;
-
- // fill in default encoding type if not already present
- if (isset($this->info[$comment_name]) && !isset($this->info[$comment_name]['encoding'])) {
- $this->info[$comment_name]['encoding'] = $encoding;
- }
-
- // 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 (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) {
- $this->info['tags'][trim($tag_name)][trim($tag_key)][] = $value;
- }
- }
- if ($tag_key == 'picture') {
- unset($this->info[$comment_name]['comments'][$tag_key]);
- }
- }
-
- if (!isset($this->info['tags'][$tag_name])) {
- // comments are set but contain nothing but empty strings, so skip
- continue;
- }
-
- 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('�', '', trim(getid3_lib::MultiByteCharString2HTML($value, $encoding)));
- } else {
- $this->info['tags_html'][$tag_name][$tag_key][$key] = $value;
- }
- }
- }
- }
-
- $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;
- }
-
-
- public function getHashdata($algorithm) {
- switch ($algorithm) {
- case 'md5':
- case 'sha1':
- break;
-
- default:
- return $this->error('bad algorithm "'.$algorithm.'" in getHashdata()');
- break;
- }
-
- 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
- // comments) using the normal getID3() method of MD5'ing the data between the
- // end of the comments and the end of the file (minus any trailing tags),
- // because the page sequence numbers of the pages that the audio data is on
- // do not match. Under normal circumstances, where comments are smaller than
- // the nominal 4-8kB page size, then this is not a problem, but if there are
- // very large comments, the only way around it is to strip off the comment
- // tags with vorbiscomment and MD5 that file.
- // This procedure must be applied to ALL Ogg files, not just the ones with
- // comments larger than 1 page, because the below method simply MD5's the
- // whole file with the comments stripped, not just the portion after the
- // comments block (which is the standard getID3() method.
-
- // The above-mentioned problem of comments spanning multiple pages and changing
- // page sequence numbers likely happens for OggSpeex and OggFLAC as well, but
- // currently vorbiscomment only works on OggVorbis files.
-
- if (preg_match('#(1|ON)#i', ini_get('safe_mode'))) {
-
- $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 {
-
- // Prevent user from aborting script
- $old_abort = ignore_user_abort(true);
-
- // Create empty file
- $empty = tempnam(GETID3_TEMP_DIR, 'getID3');
- touch($empty);
-
- // Use vorbiscomment to make temp file without comments
- $temp = tempnam(GETID3_TEMP_DIR, 'getID3');
- $file = $this->info['filenamepath'];
-
- if (GETID3_OS_ISWINDOWS) {
-
- if (file_exists(GETID3_HELPERAPPSDIR.'vorbiscomment.exe')) {
-
- $commandline = '"'.GETID3_HELPERAPPSDIR.'vorbiscomment.exe" -w -c "'.$empty.'" "'.$file.'" "'.$temp.'"';
- $VorbisCommentError = `$commandline`;
-
- } else {
-
- $VorbisCommentError = 'vorbiscomment.exe not found in '.GETID3_HELPERAPPSDIR;
-
- }
-
- } else {
-
- $commandline = 'vorbiscomment -w -c "'.$empty.'" "'.$file.'" "'.$temp.'" 2>&1';
- $commandline = 'vorbiscomment -w -c '.escapeshellarg($empty).' '.escapeshellarg($file).' '.escapeshellarg($temp).' 2>&1';
- $VorbisCommentError = `$commandline`;
-
- }
-
- 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;
-
- } else {
-
- // Get hash of newly created file
- switch ($algorithm) {
- case 'md5':
- $this->info[$algorithm.'_data'] = md5_file($temp);
- break;
-
- case 'sha1':
- $this->info[$algorithm.'_data'] = sha1_file($temp);
- break;
- }
- }
-
- // Clean up
- unlink($empty);
- unlink($temp);
-
- // Reset abort setting
- ignore_user_abort($old_abort);
-
- }
-
- } else {
-
- if (!empty($this->info['avdataoffset']) || (isset($this->info['avdataend']) && ($this->info['avdataend'] < $this->info['filesize']))) {
-
- // get hash from part of file
- $this->info[$algorithm.'_data'] = getid3_lib::hash_data($this->info['filenamepath'], $this->info['avdataoffset'], $this->info['avdataend'], $algorithm);
-
- } else {
-
- // get hash from whole file
- switch ($algorithm) {
- case 'md5':
- $this->info[$algorithm.'_data'] = md5_file($this->info['filenamepath']);
- break;
-
- case 'sha1':
- $this->info[$algorithm.'_data'] = sha1_file($this->info['filenamepath']);
- break;
- }
- }
-
- }
- return true;
- }
-
-
- public function ChannelsBitratePlaytimeCalculations() {
-
- // set channelmode on audio
- 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) {
- $this->info['audio']['channelmode'] = 'stereo';
- }
-
- // Calculate combined bitrate - audio + video
- $CombinedBitrate = 0;
- $CombinedBitrate += (isset($this->info['audio']['bitrate']) ? $this->info['audio']['bitrate'] : 0);
- $CombinedBitrate += (isset($this->info['video']['bitrate']) ? $this->info['video']['bitrate'] : 0);
- if (($CombinedBitrate > 0) && empty($this->info['bitrate'])) {
- $this->info['bitrate'] = $CombinedBitrate;
- }
- //if ((isset($this->info['video']) && !isset($this->info['video']['bitrate'])) || (isset($this->info['audio']) && !isset($this->info['audio']['bitrate']))) {
- // // for example, VBR MPEG video files cannot determine video bitrate:
- // // should not set overall bitrate and playtime from audio bitrate only
- // unset($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']);
- }
- }
-
-
- public function CalculateCompressionRatioVideo() {
- if (empty($this->info['video'])) {
- return false;
- }
- if (empty($this->info['video']['resolution_x']) || empty($this->info['video']['resolution_y'])) {
- return false;
- }
- if (empty($this->info['video']['bits_per_sample'])) {
- return false;
- }
-
- switch ($this->info['video']['dataformat']) {
- case 'bmp':
- case 'gif':
- case 'jpeg':
- case 'jpg':
- case 'png':
- case 'tiff':
- $FrameRate = 1;
- $PlaytimeSeconds = 1;
- $BitrateCompressed = $this->info['filesize'] * 8;
- break;
-
- default:
- if (!empty($this->info['video']['frame_rate'])) {
- $FrameRate = $this->info['video']['frame_rate'];
- } else {
- return false;
- }
- if (!empty($this->info['playtime_seconds'])) {
- $PlaytimeSeconds = $this->info['playtime_seconds'];
- } else {
- return false;
- }
- if (!empty($this->info['video']['bitrate'])) {
- $BitrateCompressed = $this->info['video']['bitrate'];
- } else {
- return false;
- }
- break;
- }
- $BitrateUncompressed = $this->info['video']['resolution_x'] * $this->info['video']['resolution_y'] * $this->info['video']['bits_per_sample'] * $FrameRate;
-
- $this->info['video']['compression_ratio'] = $BitrateCompressed / $BitrateUncompressed;
- return true;
- }
-
-
- 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));
-
- if (!empty($this->info['audio']['streams'])) {
- foreach ($this->info['audio']['streams'] as $streamnumber => $streamdata) {
- if (!empty($streamdata['bitrate']) && !empty($streamdata['channels']) && !empty($streamdata['sample_rate'])) {
- $this->info['audio']['streams'][$streamnumber]['compression_ratio'] = $streamdata['bitrate'] / ($streamdata['channels'] * $streamdata['sample_rate'] * (!empty($streamdata['bits_per_sample']) ? $streamdata['bits_per_sample'] : 16));
- }
- }
- }
- return true;
- }
-
-
- public function CalculateReplayGain() {
- if (isset($this->info['replay_gain'])) {
- if (!isset($this->info['replay_gain']['reference_volume'])) {
- $this->info['replay_gain']['reference_volume'] = (double) 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'];
- }
- if (isset($this->info['replay_gain']['album']['adjustment'])) {
- $this->info['replay_gain']['album']['volume'] = $this->info['replay_gain']['reference_volume'] - $this->info['replay_gain']['album']['adjustment'];
- }
-
- if (isset($this->info['replay_gain']['track']['peak'])) {
- $this->info['replay_gain']['track']['max_noclip_gain'] = 0 - getid3_lib::RGADamplitude2dB($this->info['replay_gain']['track']['peak']);
- }
- if (isset($this->info['replay_gain']['album']['peak'])) {
- $this->info['replay_gain']['album']['max_noclip_gain'] = 0 - getid3_lib::RGADamplitude2dB($this->info['replay_gain']['album']['peak']);
- }
- }
- return true;
- }
-
- 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) {
- if ($key != 'streams') {
- $this->info['audio']['streams'][0][$key] = $value;
- }
- }
- }
- }
- return true;
- }
-
- public function getid3_tempnam() {
- return tempnam($this->tempdir, 'gI3');
- }
-
- 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;
- }
-
-}
-
-
-abstract class getid3_handler
-{
- protected $getid3; // pointer
-
- protected $data_string_flag = false; // analyzing filepointer or string
- protected $data_string = ''; // string to analyze
- protected $data_string_position = 0; // seek position in string
- protected $data_string_length = 0; // string length
-
- private $dependency_to = null;
-
-
- 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
- abstract public function Analyze();
-
-
- // Analyze from string instead
- 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;
- }
-
- public function setStringMode($string) {
- $this->data_string_flag = true;
- $this->data_string = $string;
- $this->data_string_length = strlen($string);
- }
-
- protected function ftell() {
- if ($this->data_string_flag) {
- return $this->data_string_position;
- }
- return ftell($this->getid3->fp);
- }
-
- 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);
- }
-
- 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->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);
- }
-
- protected function feof() {
- if ($this->data_string_flag) {
- return $this->data_string_position >= $this->data_string_length;
- }
- return feof($this->getid3->fp);
- }
-
- final protected function isDependencyFor($module) {
- return $this->dependency_to == $module;
- }
-
- protected function error($text)
- {
- $this->getid3->info['error'][] = $text;
-
- return false;
- }
-
- protected function warning($text)
- {
- return $this->getid3->warning($text);
- }
-
- protected function notice($text)
- {
- // does nothing for now
- }
-
- 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) || !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);
- 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;
-}
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesID3getid3libphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ID3/getid3.lib.php (24695 => 24696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ID3/getid3.lib.php 2013-07-12 23:32:32 UTC (rev 24695)
+++ trunk/wp-includes/ID3/getid3.lib.php 2013-07-13 00:37:36 UTC (rev 24696)
</span><span class="lines">@@ -1138,7 +1138,7 @@
</span><span class="cx"> static $tempdir = '';
</span><span class="cx"> if (empty($tempdir)) {
</span><span class="cx"> // yes this is ugly, feel free to suggest a better way
</span><del>- require_once(dirname(__FILE__).'/class-getid3.php');
</del><ins>+ require_once(dirname(__FILE__).'/getid3.php');
</ins><span class="cx"> $getid3_temp = new getID3();
</span><span class="cx"> $tempdir = $getid3_temp->tempdir;
</span><span class="cx"> unset($getid3_temp);
</span></span></pre></div>
<a id="trunkwpincludesID3getid3phpfromrev24649trunkwpincludesID3classgetid3php"></a>
<div class="copfile"><h4>Copied: trunk/wp-includes/ID3/getid3.php (from rev 24649, trunk/wp-includes/ID3/class-getid3.php) (0 => 24696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ID3/getid3.php (rev 0)
+++ trunk/wp-includes/ID3/getid3.php 2013-07-13 00:37:36 UTC (rev 24696)
</span><span class="lines">@@ -0,0 +1,1776 @@
</span><ins>+<?php
+/////////////////////////////////////////////////////////////////
+/// getID3() by James Heinrich <info@getid3.org> //
+// available at http://getid3.sourceforge.net //
+// or http://www.getid3.org //
+/////////////////////////////////////////////////////////////////
+// //
+// Please see readme.txt for more information //
+// ///
+/////////////////////////////////////////////////////////////////
+
+// 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);
+}
+
+// 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')) {
+ // 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);
+$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
+define('GETID3_TEMP_DIR', $temp_dir);
+unset($open_basedir, $temp_dir);
+
+// End: Defines
+
+
+class getID3
+{
+ // public: Settings
+ public $encoding = 'UTF-8'; // CASE SENSITIVE! - i.e. (must be supported by iconv()). Examples: ISO-8859-1 UTF-8 UTF-16 UTF-16BE
+ public $encoding_id3v1 = 'ISO-8859-1'; // Should always be 'ISO-8859-1', but some tags may be written in other encodings such as 'EUC-CN' or 'CP1252'
+
+ // public: Optional tag checks - disable for speed.
+ public $option_tag_id3v1 = true; // Read and process ID3v1 tags
+ public $option_tag_id3v2 = true; // Read and process ID3v2 tags
+ public $option_tag_lyrics3 = true; // Read and process Lyrics3 tags
+ public $option_tag_apetag = true; // Read and process APE tags
+ public $option_tags_process = true; // Copy tags to root key 'tags' and encode to $this->encoding
+ public $option_tags_html = true; // Copy tags to root key 'tags_html' properly translated from various encodings to HTML entities
+
+ // public: Optional tag/comment calucations
+ public $option_extra_info = true; // Calculate additional info such as bitrate, channelmode etc
+
+ // public: Optional handling of embedded attachments (e.g. images)
+ public $option_save_attachments = true; // defaults to true (ATTACHMENTS_INLINE) for backward compatibility
+
+ // public: Optional calculations
+ public $option_md5_data = false; // Get MD5 sum of data part - slow
+ public $option_md5_data_source = false; // Use MD5 of source file if availble - only FLAC and OptimFROG
+ public $option_sha1_data = false; // Get SHA1 sum of data part - slow
+ public $option_max_2gb_check = null; // Check whether file is larger than 2GB and thus not supported by 32-bit PHP (null: auto-detect based on PHP_INT_MAX)
+
+ // public: Read buffer size in bytes
+ public $option_fread_buffer_size = 32768;
+
+ // Public variables
+ public $filename; // Filename of file being analysed.
+ public $fp; // Filepointer to file being analysed.
+ public $info; // Result array.
+ public $tempdir = GETID3_TEMP_DIR;
+
+ // Protected variables
+ protected $startup_error = '';
+ protected $startup_warning = '';
+ protected $memory_limit = 0;
+
+ const VERSION = '1.9.7-20130705';
+ const FREAD_BUFFER_SIZE = 32768;
+
+ const ATTACHMENTS_NONE = false;
+ const ATTACHMENTS_INLINE = true;
+
+ // public: constructor
+ public function __construct() {
+
+ // Check for PHP version
+ $required_php_version = '5.0.5';
+ 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;
+ return false;
+ }
+
+ // Check memory
+ $this->memory_limit = ini_get('memory_limit');
+ if (preg_match('#([0-9]+)M#i', $this->memory_limit, $matches)) {
+ // could be stored as "16M" rather than 16777216 for example
+ $this->memory_limit = $matches[1] * 1048576;
+ } elseif (preg_match('#([0-9]+)G#i', $this->memory_limit, $matches)) { // The 'G' modifier is available since PHP 5.1.0
+ // could be stored as "2G" rather than 2147483648 for example
+ $this->memory_limit = $matches[1] * 1073741824;
+ }
+ if ($this->memory_limit <= 0) {
+ // memory limits probably disabled
+ } 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';
+ } 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';
+ }
+
+ // Check safe_mode off
+ 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.');
+ }
+
+ if (intval(ini_get('mbstring.func_overload')) > 0) {
+ $this->warning('WARNING: php.ini contains "mbstring.func_overload = '.ini_get('mbstring.func_overload').'", this may break things.');
+ }
+
+ // Check for magic_quotes_runtime
+ if (function_exists('get_magic_quotes_runtime')) {
+ if (get_magic_quotes_runtime()) {
+ return $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).');
+ }
+ }
+
+ // Check for magic_quotes_gpc
+ if (function_exists('magic_quotes_gpc')) {
+ if (get_magic_quotes_gpc()) {
+ return $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).');
+ }
+ }
+
+ // Load support library
+ if (!include_once(GETID3_INCLUDEPATH.'getid3.lib.php')) {
+ $this->startup_error .= 'getid3.lib.php is missing or corrupt';
+ }
+
+ 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
+ // 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_warning .= '"'.$helperappsdir.'" cannot be defined as GETID3_HELPERAPPSDIR because it does not exist';
+ } elseif (strpos(realpath($helperappsdir), ' ') !== false) {
+ $DirPieces = explode(DIRECTORY_SEPARATOR, realpath($helperappsdir));
+ $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.';
+ }
+ }
+ $path_so_far[] = $value;
+ }
+ $helperappsdir = implode(DIRECTORY_SEPARATOR, $path_so_far);
+ }
+ define('GETID3_HELPERAPPSDIR', $helperappsdir.DIRECTORY_SEPARATOR);
+ }
+
+ return true;
+ }
+
+ public function version() {
+ return self::VERSION;
+ }
+
+ public function fread_buffer_size() {
+ return $this->option_fread_buffer_size;
+ }
+
+
+ // public: setOption
+ public function setOption($optArray) {
+ if (!is_array($optArray) || empty($optArray)) {
+ return false;
+ }
+ foreach ($optArray as $opt => $val) {
+ if (isset($this->$opt) === false) {
+ continue;
+ }
+ $this->$opt = $val;
+ }
+ return true;
+ }
+
+
+ public function openfile($filename) {
+ try {
+ if (!empty($this->startup_error)) {
+ throw new getid3_exception($this->startup_error);
+ }
+ if (!empty($this->startup_warning)) {
+ $this->warning($this->startup_warning);
+ }
+
+ // 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;
+
+ // 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');
+ }
+
+ $filename = str_replace('/', DIRECTORY_SEPARATOR, $filename);
+ $filename = preg_replace('#(.+)'.preg_quote(DIRECTORY_SEPARATOR).'{2,}#U', '\1'.DIRECTORY_SEPARATOR, $filename);
+
+ // open local file
+ if (is_readable($filename) && is_file($filename) && ($this->fp = fopen($filename, 'rb'))) {
+ // great
+ } else {
+ throw new getid3_exception('Could not open "'.$filename.'" (does not exist, or is not a file)');
+ }
+
+ $this->info['filesize'] = filesize($filename);
+ // 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'];
+
+
+ // 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']);
+
+ 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, 3).'GB, please report to info@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, 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;
+
+ } catch (Exception $e) {
+ $this->error($e->getMessage());
+ }
+ return false;
+ }
+
+ // public: analyze file
+ public function analyze($filename) {
+ try {
+ if (!$this->openfile($filename)) {
+ return $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']);
+ }
+ }
+
+ // 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, SEEK_SET);
+ $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'], SEEK_SET);
+ $formattest = fread($this->fp, 32774);
+
+ // determine format
+ $determined_format = $this->GetFileFormat($formattest, $filename);
+
+ // unable to determine file format
+ if (!$determined_format) {
+ fclose($this->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($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.');
+ }
+ }
+
+ // 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.');
+ }
+ }
+
+ // set mime type
+ $this->info['mime_type'] = $determined_format['mime_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.');
+ }
+
+ // module requires iconv support
+ // Check encoding/iconv support
+ if (!empty($determined_format['iconv_req']) && !function_exists('iconv') && !in_array($this->encoding, array('ISO-8859-1', 'UTF-8', 'UTF-16LE', 'UTF-16BE', 'UTF-16'))) {
+ $errormessage = '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 iconv() support. Please enable php_iconv.dll in php.ini, and copy iconv.dll from c:/php/dlls to c:/windows/system32';
+ } else {
+ $errormessage .= 'PHP is not compiled with iconv() support. Please recompile with the --with-iconv switch';
+ }
+ return $this->error($errormessage);
+ }
+
+ // include module
+ include_once(GETID3_INCLUDEPATH.$determined_format['include']);
+
+ // 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);
+
+ // close file
+ fclose($this->fp);
+
+ // process all tags - copy to 'tags' and convert charsets
+ if ($this->option_tags_process) {
+ $this->HandleAllTags();
+ }
+
+ // perform more calculations
+ if ($this->option_extra_info) {
+ $this->ChannelsBitratePlaytimeCalculations();
+ $this->CalculateCompressionRatioVideo();
+ $this->CalculateCompressionRatioAudio();
+ $this->CalculateReplayGain();
+ $this->ProcessAudioStreams();
+ }
+
+ // 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');
+ }
+ }
+
+ // 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();
+
+ } catch (Exception $e) {
+ $this->error('Caught exception: '.$e->getMessage());
+ }
+
+ // return info array
+ return $this->info;
+ }
+
+
+ // private: error handling
+ 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
+ public function warning($message) {
+ $this->info['warning'][] = $message;
+ return true;
+ }
+
+
+ // private: CleanUp
+ private function CleanUp() {
+
+ // remove possible empty keys
+ $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]);
+ }
+ if (empty($this->info['video'][$key]) && isset($this->info['video'][$key])) {
+ unset($this->info['video'][$key]);
+ }
+ }
+
+ // remove empty root keys
+ if (!empty($this->info)) {
+ foreach ($this->info as $key => $value) {
+ if (empty($this->info[$key]) && ($this->info[$key] !== 0) && ($this->info[$key] !== '0')) {
+ unset($this->info[$key]);
+ }
+ }
+ }
+
+ // remove meaningless entries from unknown-format files
+ if (empty($this->info['fileformat'])) {
+ if (isset($this->info['avdataoffset'])) {
+ unset($this->info['avdataoffset']);
+ }
+ if (isset($this->info['avdataend'])) {
+ 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
+ public function GetFileFormatArray() {
+ static $format_info = array();
+ if (empty($format_info)) {
+ $format_info = array(
+
+ // Audio formats
+
+ // AC-3 - audio - Dolby AC-3 / Dolby Digital
+ 'ac3' => array(
+ 'pattern' => '^\x0B\x77',
+ 'group' => 'audio',
+ 'module' => 'ac3',
+ 'mime_type' => 'audio/ac3',
+ ),
+
+ // AAC - audio - Advanced Audio Coding (AAC) - ADIF format
+ 'adif' => array(
+ 'pattern' => '^ADIF',
+ 'group' => 'audio',
+ 'module' => 'aac',
+ 'mime_type' => 'application/octet-stream',
+ '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]',
+ 'group' => 'audio',
+ 'module' => 'aac',
+ 'mime_type' => 'application/octet-stream',
+ 'fail_ape' => 'WARNING',
+ ),
+
+
+ // AU - audio - NeXT/Sun AUdio (AU)
+ 'au' => array(
+ 'pattern' => '^\.snd',
+ 'group' => 'audio',
+ 'module' => 'au',
+ 'mime_type' => 'audio/basic',
+ ),
+
+ // AVR - audio - Audio Visual Research
+ 'avr' => array(
+ 'pattern' => '^2BIT',
+ 'group' => 'audio',
+ 'module' => 'avr',
+ 'mime_type' => 'application/octet-stream',
+ ),
+
+ // BONK - audio - Bonk v0.9+
+ 'bonk' => array(
+ 'pattern' => '^\x00(BONK|INFO|META| ID3)',
+ 'group' => 'audio',
+ 'module' => 'bonk',
+ 'mime_type' => 'audio/xmms-bonk',
+ ),
+
+ // DSS - audio - Digital Speech Standard
+ 'dss' => array(
+ 'pattern' => '^[\x02-\x03]ds[s2]',
+ 'group' => 'audio',
+ 'module' => 'dss',
+ 'mime_type' => 'application/octet-stream',
+ ),
+
+ // 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',
+ ),
+
+ // LA - audio - Lossless Audio (LA)
+ 'la' => array(
+ 'pattern' => '^LA0[2-4]',
+ 'group' => 'audio',
+ 'module' => 'la',
+ 'mime_type' => 'application/octet-stream',
+ ),
+
+ // LPAC - audio - Lossless Predictive Audio Compression (LPAC)
+ 'lpac' => array(
+ 'pattern' => '^LPAC',
+ 'group' => 'audio',
+ 'module' => 'lpac',
+ 'mime_type' => 'application/octet-stream',
+ ),
+
+ // MIDI - audio - MIDI (Musical Instrument Digital Interface)
+ 'midi' => array(
+ 'pattern' => '^MThd',
+ 'group' => 'audio',
+ 'module' => 'midi',
+ 'mime_type' => 'audio/midi',
+ ),
+
+ // MAC - audio - Monkey's Audio Compressor
+ 'mac' => array(
+ 'pattern' => '^MAC ',
+ 'group' => 'audio',
+ 'module' => 'monkey',
+ 'mime_type' => 'application/octet-stream',
+ ),
+
+// 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(
+ 'pattern' => '^IMPM',
+ 'group' => 'audio',
+ 'module' => 'mod',
+ //'option' => 'it',
+ 'mime_type' => 'audio/it',
+ ),
+
+ // MOD - audio - MODule (eXtended Module, various sub-formats)
+ 'xm' => array(
+ 'pattern' => '^Extended Module',
+ 'group' => 'audio',
+ 'module' => 'mod',
+ //'option' => 'xm',
+ 'mime_type' => 'audio/xm',
+ ),
+
+ // MOD - audio - MODule (ScreamTracker)
+ 's3m' => array(
+ 'pattern' => '^.{44}SCRM',
+ 'group' => 'audio',
+ 'module' => 'mod',
+ //'option' => 's3m',
+ 'mime_type' => 'audio/s3m',
+ ),
+
+ // MPC - audio - Musepack / MPEGplus
+ 'mpc' => array(
+ 'pattern' => '^(MPCK|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])',
+ 'group' => 'audio',
+ 'module' => 'mpc',
+ '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-\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',
+ ),
+
+ // OFR - audio - OptimFROG
+ 'ofr' => array(
+ 'pattern' => '^(\*RIFF|OFR)',
+ 'group' => 'audio',
+ 'module' => 'optimfrog',
+ 'mime_type' => 'application/octet-stream',
+ ),
+
+ // RKAU - audio - RKive AUdio compressor
+ 'rkau' => array(
+ 'pattern' => '^RKA',
+ 'group' => 'audio',
+ 'module' => 'rkau',
+ 'mime_type' => 'application/octet-stream',
+ ),
+
+ // SHN - audio - Shorten
+ 'shn' => array(
+ 'pattern' => '^ajkg',
+ 'group' => 'audio',
+ 'module' => 'shorten',
+ 'mime_type' => 'audio/xmms-shn',
+ 'fail_id3' => 'ERROR',
+ 'fail_ape' => 'ERROR',
+ ),
+
+ // TTA - audio - TTA Lossless Audio Compressor (http://tta.corecodec.org)
+ 'tta' => array(
+ 'pattern' => '^TTA', // could also be '^TTA(\x01|\x02|\x03|2|1)'
+ 'group' => 'audio',
+ 'module' => 'tta',
+ 'mime_type' => 'application/octet-stream',
+ ),
+
+ // VOC - audio - Creative Voice (VOC)
+ 'voc' => array(
+ 'pattern' => '^Creative Voice File',
+ 'group' => 'audio',
+ 'module' => 'voc',
+ 'mime_type' => 'audio/voc',
+ ),
+
+ // VQF - audio - transform-domain weighted interleave Vector Quantization Format (VQF)
+ 'vqf' => array(
+ 'pattern' => '^TWIN',
+ 'group' => 'audio',
+ 'module' => 'vqf',
+ 'mime_type' => 'application/octet-stream',
+ ),
+
+ // WV - audio - WavPack (v4.0+)
+ 'wv' => array(
+ 'pattern' => '^wvpk',
+ 'group' => 'audio',
+ 'module' => 'wavpack',
+ 'mime_type' => 'application/octet-stream',
+ ),
+
+
+ // Audio-Video formats
+
+ // 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',
+ 'group' => 'audio-video',
+ 'module' => 'asf',
+ 'mime_type' => 'video/x-ms-asf',
+ 'iconv_req' => false,
+ ),
+
+ // BINK - audio/video - Bink / Smacker
+ 'bink' => array(
+ 'pattern' => '^(BIK|SMK)',
+ 'group' => 'audio-video',
+ 'module' => 'bink',
+ 'mime_type' => 'application/octet-stream',
+ ),
+
+ // FLV - audio/video - FLash Video
+ 'flv' => array(
+ 'pattern' => '^FLV\x01',
+ 'group' => 'audio-video',
+ 'module' => 'flv',
+ 'mime_type' => 'video/x-flv',
+ ),
+
+ // MKAV - audio/video - Mastroka
+ 'matroska' => array(
+ 'pattern' => '^\x1A\x45\xDF\xA3',
+ 'group' => 'audio-video',
+ 'module' => 'matroska',
+ '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)',
+ 'group' => 'audio-video',
+ 'module' => 'mpeg',
+ 'mime_type' => 'video/mpeg',
+ ),
+
+ // NSV - audio/video - Nullsoft Streaming Video (NSV)
+ 'nsv' => array(
+ 'pattern' => '^NSV[sf]',
+ 'group' => 'audio-video',
+ 'module' => 'nsv',
+ 'mime_type' => 'application/octet-stream',
+ ),
+
+ // Ogg - audio/video - Ogg (Ogg-Vorbis, Ogg-FLAC, Speex, Ogg-Theora(*), Ogg-Tarkin(*))
+ 'ogg' => array(
+ 'pattern' => '^OggS',
+ 'group' => 'audio',
+ 'module' => 'ogg',
+ 'mime_type' => 'application/ogg',
+ 'fail_id3' => 'WARNING',
+ 'fail_ape' => 'WARNING',
+ ),
+
+ // QT - audio/video - Quicktime
+ 'quicktime' => array(
+ 'pattern' => '^.{4}(cmov|free|ftyp|mdat|moov|pnot|skip|wide)',
+ 'group' => 'audio-video',
+ 'module' => 'quicktime',
+ 'mime_type' => 'video/quicktime',
+ ),
+
+ // RIFF - audio/video - Resource Interchange File Format (RIFF) / WAV / AVI / CD-audio / SDSS = renamed variant used by SmartSound QuickTracks (www.smartsound.com) / FORM = Audio Interchange File Format (AIFF)
+ 'riff' => array(
+ 'pattern' => '^(RIFF|SDSS|FORM)',
+ 'group' => 'audio-video',
+ 'module' => 'riff',
+ 'mime_type' => 'audio/x-wave',
+ 'fail_ape' => 'WARNING',
+ ),
+
+ // Real - audio/video - RealAudio, RealVideo
+ 'real' => array(
+ 'pattern' => '^(\\.RMF|\\.ra)',
+ 'group' => 'audio-video',
+ 'module' => 'real',
+ 'mime_type' => 'audio/x-realaudio',
+ ),
+
+ // SWF - audio/video - ShockWave Flash
+ 'swf' => array(
+ 'pattern' => '^(F|C)WS',
+ 'group' => 'audio-video',
+ 'module' => 'swf',
+ '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',
+ ),
+
+
+ // Still-Image formats
+
+ // BMP - still image - Bitmap (Windows, OS/2; uncompressed, RLE8, RLE4)
+ 'bmp' => array(
+ 'pattern' => '^BM',
+ 'group' => 'graphic',
+ 'module' => 'bmp',
+ 'mime_type' => 'image/bmp',
+ 'fail_id3' => 'ERROR',
+ 'fail_ape' => 'ERROR',
+ ),
+
+ // GIF - still image - Graphics Interchange Format
+ 'gif' => array(
+ 'pattern' => '^GIF',
+ 'group' => 'graphic',
+ 'module' => 'gif',
+ 'mime_type' => 'image/gif',
+ 'fail_id3' => 'ERROR',
+ 'fail_ape' => 'ERROR',
+ ),
+
+ // JPEG - still image - Joint Photographic Experts Group (JPEG)
+ 'jpg' => array(
+ 'pattern' => '^\xFF\xD8\xFF',
+ 'group' => 'graphic',
+ 'module' => 'jpg',
+ 'mime_type' => 'image/jpeg',
+ 'fail_id3' => 'ERROR',
+ 'fail_ape' => 'ERROR',
+ ),
+
+ // PCD - still image - Kodak Photo CD
+ 'pcd' => array(
+ 'pattern' => '^.{2048}PCD_IPI\x00',
+ 'group' => 'graphic',
+ 'module' => 'pcd',
+ 'mime_type' => 'image/x-photo-cd',
+ 'fail_id3' => 'ERROR',
+ 'fail_ape' => 'ERROR',
+ ),
+
+
+ // PNG - still image - Portable Network Graphics (PNG)
+ 'png' => array(
+ 'pattern' => '^\x89\x50\x4E\x47\x0D\x0A\x1A\x0A',
+ 'group' => 'graphic',
+ 'module' => 'png',
+ 'mime_type' => 'image/png',
+ 'fail_id3' => 'ERROR',
+ 'fail_ape' => 'ERROR',
+ ),
+
+
+ // 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)',
+ 'group' => 'graphic',
+ 'module' => 'tiff',
+ 'mime_type' => 'image/tiff',
+ 'fail_id3' => 'ERROR',
+ 'fail_ape' => 'ERROR',
+ ),
+
+
+ // 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
+ 'iso' => array(
+ 'pattern' => '^.{32769}CD001',
+ 'group' => 'misc',
+ 'module' => 'iso',
+ 'mime_type' => 'application/octet-stream',
+ 'fail_id3' => 'ERROR',
+ 'fail_ape' => 'ERROR',
+ 'iconv_req' => false,
+ ),
+
+ // RAR - data - RAR compressed data
+ 'rar' => array(
+ 'pattern' => '^Rar\!',
+ 'group' => 'archive',
+ 'module' => 'rar',
+ 'mime_type' => 'application/octet-stream',
+ 'fail_id3' => 'ERROR',
+ 'fail_ape' => 'ERROR',
+ ),
+
+ // SZIP - audio/data - SZIP compressed data
+ 'szip' => array(
+ 'pattern' => '^SZ\x0A\x04',
+ 'group' => 'archive',
+ 'module' => 'szip',
+ 'mime_type' => 'application/octet-stream',
+ 'fail_id3' => 'ERROR',
+ 'fail_ape' => 'ERROR',
+ ),
+
+ // 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}',
+ 'group' => 'archive',
+ 'module' => 'tar',
+ 'mime_type' => 'application/x-tar',
+ 'fail_id3' => 'ERROR',
+ 'fail_ape' => 'ERROR',
+ ),
+
+ // GZIP - data - GZIP compressed data
+ 'gz' => array(
+ 'pattern' => '^\x1F\x8B\x08',
+ 'group' => 'archive',
+ 'module' => 'gzip',
+ 'mime_type' => 'application/x-gzip',
+ 'fail_id3' => 'ERROR',
+ 'fail_ape' => 'ERROR',
+ ),
+
+ // ZIP - data - ZIP compressed data
+ 'zip' => array(
+ 'pattern' => '^PK\x03\x04',
+ 'group' => 'archive',
+ 'module' => 'zip',
+ 'mime_type' => 'application/zip',
+ 'fail_id3' => 'ERROR',
+ 'fail_ape' => 'ERROR',
+ ),
+
+
+ // Misc other formats
+
+ // 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',
+ 'group' => 'misc',
+ 'module' => 'pdf',
+ 'mime_type' => 'application/pdf',
+ 'fail_id3' => 'ERROR',
+ 'fail_ape' => 'ERROR',
+ ),
+
+ // MSOFFICE - data - ZIP compressed data
+ 'msoffice' => array(
+ 'pattern' => '^\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1', // D0CF11E == DOCFILE == Microsoft Office Document
+ 'group' => 'misc',
+ 'module' => 'msoffice',
+ 'mime_type' => 'application/octet-stream',
+ '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',
+ ),
+
+ );
+ }
+
+ return $format_info;
+ }
+
+
+
+ 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
+ // of the file).
+
+ // Identify file format - loop through $format_info and detect with reg expr
+ foreach ($this->GetFileFormatArray() as $format_name => $info) {
+ // The /s switch on preg_match() forces preg_match() NOT to treat
+ // newline (0x0A) characters as special chars but do a binary match
+ if (!empty($info['pattern']) && preg_match('#'.$info['pattern'].'#s', $filedata)) {
+ $info['include'] = 'module.'.$info['group'].'.'.$info['module'].'.php';
+ return $info;
+ }
+ }
+
+
+ if (preg_match('#\.mp[123a]$#i', $filename)) {
+ // Too many mp3 encoders on the market put gabage 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
+ public function CharConvert(&$array, $encoding) {
+
+ // identical encoding - end here
+ if ($encoding == $this->encoding) {
+ return;
+ }
+
+ // loop thru array
+ foreach ($array as $key => $value) {
+
+ // go recursive
+ if (is_array($value)) {
+ $this->CharConvert($array[$key], $encoding);
+ }
+
+ // convert string
+ elseif (is_string($value)) {
+ $array[$key] = trim(getid3_lib::iconv_fallback($encoding, $this->encoding, $value));
+ }
+ }
+ }
+
+
+ public function HandleAllTags() {
+
+ // key name => array (tag name, character encoding)
+ static $tags;
+ if (empty($tags)) {
+ $tags = array(
+ 'asf' => array('asf' , 'UTF-16LE'),
+ 'midi' => array('midi' , 'ISO-8859-1'),
+ 'nsv' => array('nsv' , 'ISO-8859-1'),
+ 'ogg' => array('vorbiscomment' , 'UTF-8'),
+ 'png' => array('png' , 'UTF-8'),
+ 'tiff' => array('tiff' , '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'),
+ 'riff' => array('riff' , 'ISO-8859-1'),
+ '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'),
+ 'cue' => array('cue' , 'ISO-8859-1'),
+ 'matroska' => array('matroska' , 'UTF-8'),
+ 'flac' => array('vorbiscomment' , 'UTF-8'),
+ 'divxtag' => array('divx' , 'ISO-8859-1'),
+ );
+ }
+
+ // loop through comments array
+ foreach ($tags as $comment_name => $tagname_encoding_array) {
+ list($tag_name, $encoding) = $tagname_encoding_array;
+
+ // fill in default encoding type if not already present
+ if (isset($this->info[$comment_name]) && !isset($this->info[$comment_name]['encoding'])) {
+ $this->info[$comment_name]['encoding'] = $encoding;
+ }
+
+ // 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 (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) {
+ $this->info['tags'][trim($tag_name)][trim($tag_key)][] = $value;
+ }
+ }
+ if ($tag_key == 'picture') {
+ unset($this->info[$comment_name]['comments'][$tag_key]);
+ }
+ }
+
+ if (!isset($this->info['tags'][$tag_name])) {
+ // comments are set but contain nothing but empty strings, so skip
+ continue;
+ }
+
+ 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('�', '', trim(getid3_lib::MultiByteCharString2HTML($value, $encoding)));
+ } else {
+ $this->info['tags_html'][$tag_name][$tag_key][$key] = $value;
+ }
+ }
+ }
+ }
+
+ $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;
+ }
+
+
+ public function getHashdata($algorithm) {
+ switch ($algorithm) {
+ case 'md5':
+ case 'sha1':
+ break;
+
+ default:
+ return $this->error('bad algorithm "'.$algorithm.'" in getHashdata()');
+ break;
+ }
+
+ 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
+ // comments) using the normal getID3() method of MD5'ing the data between the
+ // end of the comments and the end of the file (minus any trailing tags),
+ // because the page sequence numbers of the pages that the audio data is on
+ // do not match. Under normal circumstances, where comments are smaller than
+ // the nominal 4-8kB page size, then this is not a problem, but if there are
+ // very large comments, the only way around it is to strip off the comment
+ // tags with vorbiscomment and MD5 that file.
+ // This procedure must be applied to ALL Ogg files, not just the ones with
+ // comments larger than 1 page, because the below method simply MD5's the
+ // whole file with the comments stripped, not just the portion after the
+ // comments block (which is the standard getID3() method.
+
+ // The above-mentioned problem of comments spanning multiple pages and changing
+ // page sequence numbers likely happens for OggSpeex and OggFLAC as well, but
+ // currently vorbiscomment only works on OggVorbis files.
+
+ if (preg_match('#(1|ON)#i', ini_get('safe_mode'))) {
+
+ $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 {
+
+ // Prevent user from aborting script
+ $old_abort = ignore_user_abort(true);
+
+ // Create empty file
+ $empty = tempnam(GETID3_TEMP_DIR, 'getID3');
+ touch($empty);
+
+ // Use vorbiscomment to make temp file without comments
+ $temp = tempnam(GETID3_TEMP_DIR, 'getID3');
+ $file = $this->info['filenamepath'];
+
+ if (GETID3_OS_ISWINDOWS) {
+
+ if (file_exists(GETID3_HELPERAPPSDIR.'vorbiscomment.exe')) {
+
+ $commandline = '"'.GETID3_HELPERAPPSDIR.'vorbiscomment.exe" -w -c "'.$empty.'" "'.$file.'" "'.$temp.'"';
+ $VorbisCommentError = `$commandline`;
+
+ } else {
+
+ $VorbisCommentError = 'vorbiscomment.exe not found in '.GETID3_HELPERAPPSDIR;
+
+ }
+
+ } else {
+
+ $commandline = 'vorbiscomment -w -c "'.$empty.'" "'.$file.'" "'.$temp.'" 2>&1';
+ $commandline = 'vorbiscomment -w -c '.escapeshellarg($empty).' '.escapeshellarg($file).' '.escapeshellarg($temp).' 2>&1';
+ $VorbisCommentError = `$commandline`;
+
+ }
+
+ 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;
+
+ } else {
+
+ // Get hash of newly created file
+ switch ($algorithm) {
+ case 'md5':
+ $this->info[$algorithm.'_data'] = md5_file($temp);
+ break;
+
+ case 'sha1':
+ $this->info[$algorithm.'_data'] = sha1_file($temp);
+ break;
+ }
+ }
+
+ // Clean up
+ unlink($empty);
+ unlink($temp);
+
+ // Reset abort setting
+ ignore_user_abort($old_abort);
+
+ }
+
+ } else {
+
+ if (!empty($this->info['avdataoffset']) || (isset($this->info['avdataend']) && ($this->info['avdataend'] < $this->info['filesize']))) {
+
+ // get hash from part of file
+ $this->info[$algorithm.'_data'] = getid3_lib::hash_data($this->info['filenamepath'], $this->info['avdataoffset'], $this->info['avdataend'], $algorithm);
+
+ } else {
+
+ // get hash from whole file
+ switch ($algorithm) {
+ case 'md5':
+ $this->info[$algorithm.'_data'] = md5_file($this->info['filenamepath']);
+ break;
+
+ case 'sha1':
+ $this->info[$algorithm.'_data'] = sha1_file($this->info['filenamepath']);
+ break;
+ }
+ }
+
+ }
+ return true;
+ }
+
+
+ public function ChannelsBitratePlaytimeCalculations() {
+
+ // set channelmode on audio
+ 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) {
+ $this->info['audio']['channelmode'] = 'stereo';
+ }
+
+ // Calculate combined bitrate - audio + video
+ $CombinedBitrate = 0;
+ $CombinedBitrate += (isset($this->info['audio']['bitrate']) ? $this->info['audio']['bitrate'] : 0);
+ $CombinedBitrate += (isset($this->info['video']['bitrate']) ? $this->info['video']['bitrate'] : 0);
+ if (($CombinedBitrate > 0) && empty($this->info['bitrate'])) {
+ $this->info['bitrate'] = $CombinedBitrate;
+ }
+ //if ((isset($this->info['video']) && !isset($this->info['video']['bitrate'])) || (isset($this->info['audio']) && !isset($this->info['audio']['bitrate']))) {
+ // // for example, VBR MPEG video files cannot determine video bitrate:
+ // // should not set overall bitrate and playtime from audio bitrate only
+ // unset($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']);
+ }
+ }
+
+
+ public function CalculateCompressionRatioVideo() {
+ if (empty($this->info['video'])) {
+ return false;
+ }
+ if (empty($this->info['video']['resolution_x']) || empty($this->info['video']['resolution_y'])) {
+ return false;
+ }
+ if (empty($this->info['video']['bits_per_sample'])) {
+ return false;
+ }
+
+ switch ($this->info['video']['dataformat']) {
+ case 'bmp':
+ case 'gif':
+ case 'jpeg':
+ case 'jpg':
+ case 'png':
+ case 'tiff':
+ $FrameRate = 1;
+ $PlaytimeSeconds = 1;
+ $BitrateCompressed = $this->info['filesize'] * 8;
+ break;
+
+ default:
+ if (!empty($this->info['video']['frame_rate'])) {
+ $FrameRate = $this->info['video']['frame_rate'];
+ } else {
+ return false;
+ }
+ if (!empty($this->info['playtime_seconds'])) {
+ $PlaytimeSeconds = $this->info['playtime_seconds'];
+ } else {
+ return false;
+ }
+ if (!empty($this->info['video']['bitrate'])) {
+ $BitrateCompressed = $this->info['video']['bitrate'];
+ } else {
+ return false;
+ }
+ break;
+ }
+ $BitrateUncompressed = $this->info['video']['resolution_x'] * $this->info['video']['resolution_y'] * $this->info['video']['bits_per_sample'] * $FrameRate;
+
+ $this->info['video']['compression_ratio'] = $BitrateCompressed / $BitrateUncompressed;
+ return true;
+ }
+
+
+ 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));
+
+ if (!empty($this->info['audio']['streams'])) {
+ foreach ($this->info['audio']['streams'] as $streamnumber => $streamdata) {
+ if (!empty($streamdata['bitrate']) && !empty($streamdata['channels']) && !empty($streamdata['sample_rate'])) {
+ $this->info['audio']['streams'][$streamnumber]['compression_ratio'] = $streamdata['bitrate'] / ($streamdata['channels'] * $streamdata['sample_rate'] * (!empty($streamdata['bits_per_sample']) ? $streamdata['bits_per_sample'] : 16));
+ }
+ }
+ }
+ return true;
+ }
+
+
+ public function CalculateReplayGain() {
+ if (isset($this->info['replay_gain'])) {
+ if (!isset($this->info['replay_gain']['reference_volume'])) {
+ $this->info['replay_gain']['reference_volume'] = (double) 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'];
+ }
+ if (isset($this->info['replay_gain']['album']['adjustment'])) {
+ $this->info['replay_gain']['album']['volume'] = $this->info['replay_gain']['reference_volume'] - $this->info['replay_gain']['album']['adjustment'];
+ }
+
+ if (isset($this->info['replay_gain']['track']['peak'])) {
+ $this->info['replay_gain']['track']['max_noclip_gain'] = 0 - getid3_lib::RGADamplitude2dB($this->info['replay_gain']['track']['peak']);
+ }
+ if (isset($this->info['replay_gain']['album']['peak'])) {
+ $this->info['replay_gain']['album']['max_noclip_gain'] = 0 - getid3_lib::RGADamplitude2dB($this->info['replay_gain']['album']['peak']);
+ }
+ }
+ return true;
+ }
+
+ 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) {
+ if ($key != 'streams') {
+ $this->info['audio']['streams'][0][$key] = $value;
+ }
+ }
+ }
+ }
+ return true;
+ }
+
+ public function getid3_tempnam() {
+ return tempnam($this->tempdir, 'gI3');
+ }
+
+ 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;
+ }
+
+}
+
+
+abstract class getid3_handler
+{
+ protected $getid3; // pointer
+
+ protected $data_string_flag = false; // analyzing filepointer or string
+ protected $data_string = ''; // string to analyze
+ protected $data_string_position = 0; // seek position in string
+ protected $data_string_length = 0; // string length
+
+ private $dependency_to = null;
+
+
+ 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
+ abstract public function Analyze();
+
+
+ // Analyze from string instead
+ 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;
+ }
+
+ public function setStringMode($string) {
+ $this->data_string_flag = true;
+ $this->data_string = $string;
+ $this->data_string_length = strlen($string);
+ }
+
+ protected function ftell() {
+ if ($this->data_string_flag) {
+ return $this->data_string_position;
+ }
+ return ftell($this->getid3->fp);
+ }
+
+ 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);
+ }
+
+ 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->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);
+ }
+
+ protected function feof() {
+ if ($this->data_string_flag) {
+ return $this->data_string_position >= $this->data_string_length;
+ }
+ return feof($this->getid3->fp);
+ }
+
+ final protected function isDependencyFor($module) {
+ return $this->dependency_to == $module;
+ }
+
+ protected function error($text)
+ {
+ $this->getid3->info['error'][] = $text;
+
+ return false;
+ }
+
+ protected function warning($text)
+ {
+ return $this->getid3->warning($text);
+ }
+
+ protected function notice($text)
+ {
+ // does nothing for now
+ }
+
+ 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) || !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);
+ 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;
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesID3licensetxt"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ID3/license.txt (24695 => 24696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ID3/license.txt 2013-07-12 23:32:32 UTC (rev 24695)
+++ trunk/wp-includes/ID3/license.txt 2013-07-13 00:37:36 UTC (rev 24696)
</span><span class="lines">@@ -1,340 +1,28 @@
</span><del>- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
</del><ins>+/////////////////////////////////////////////////////////////////
+/// getID3() by James Heinrich <info@getid3.org> //
+// available at http://getid3.sourceforge.net //
+// or http://www.getid3.org //
+/////////////////////////////////////////////////////////////////
</ins><span class="cx">
</span><del>- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
</del><ins>+*****************************************************************
+*****************************************************************
</ins><span class="cx">
</span><del>- Preamble
</del><ins>+ getID3() is released under multiple licenses. You may choose
+ from the following licenses, and use getID3 according to the
+ terms of the license most suitable to your project.
</ins><span class="cx">
</span><del>- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
</del><ins>+GNU GPL: https://gnu.org/licenses/gpl.html (v3)
+ https://gnu.org/licenses/old-licenses/gpl-2.0.html (v2)
+ https://gnu.org/licenses/old-licenses/gpl-1.0.html (v1)
</ins><span class="cx">
</span><del>- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
</del><ins>+GNU LGPL: https://gnu.org/licenses/lgpl.html (v3)
</ins><span class="cx">
</span><del>- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
</del><ins>+Mozilla MPL: http://www.mozilla.org/MPL/2.0/ (v2)
</ins><span class="cx">
</span><del>- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
</del><ins>+getID3 Commercial License: http://getid3.org/#gCL (payment required)
</ins><span class="cx">
</span><del>- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
</del><ins>+*****************************************************************
+*****************************************************************
</ins><span class="cx">
</span><del>- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
</del><ins>+Copies of each of the above licenses are included in the 'licenses'
+directory of the getID3 distribution.
</ins></span></pre></div>
<a id="trunkwpincludesID3moduleaudiovideomatroskaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ID3/module.audio-video.matroska.php (24695 => 24696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ID3/module.audio-video.matroska.php 2013-07-12 23:32:32 UTC (rev 24695)
+++ trunk/wp-includes/ID3/module.audio-video.matroska.php 2013-07-13 00:37:36 UTC (rev 24696)
</span><span class="lines">@@ -216,14 +216,14 @@
</span><span class="cx"> {
</span><span class="cx"> // public options
</span><span class="cx"> public static $hide_clusters = true; // if true, do not return information about CLUSTER chunks, since there's a lot of them and they're not usually useful [default: TRUE]
</span><del>- public static $parse_whole_file = false; // true to parse the whole file, not only header [default: FALSE]
</del><ins>+ public static $parse_whole_file = false; // true to parse the whole file, not only header [default: FALSE]
</ins><span class="cx">
</span><del>- // 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);
</del><ins>+ // 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);
</ins><span class="cx">
</span><span class="cx"> public function Analyze()
</span><span class="cx"> {
</span><span class="lines">@@ -495,7 +495,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // determine mime type
</del><ins>+ // determine mime type
</ins><span class="cx"> if (!empty($info['video']['streams'])) {
</span><span class="cx"> $info['mime_type'] = ($info['matroska']['doctype'] == 'webm' ? 'video/webm' : 'video/x-matroska');
</span><span class="cx"> } elseif (!empty($info['audio']['streams'])) {
</span><span class="lines">@@ -507,7 +507,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- private function parseEBML(&$info) {
</del><ins>+ private function parseEBML(&$info) {
</ins><span class="cx"> // http://www.matroska.org/technical/specs/index.html#EBMLBasics
</span><span class="cx"> $this->current_offset = $info['avdataoffset'];
</span><span class="cx">
</span><span class="lines">@@ -536,18 +536,12 @@
</span><span class="cx"> $info['matroska']['doctype'] = $element_data['data'];
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case EBML_ID_CRC32: // not useful, ignore
- $this->current_offset = $element_data['end'];
- unset($element_data);
- break;
-
</del><span class="cx"> default:
</span><span class="cx"> $this->unhandledElement('header', __LINE__, $element_data);
</span><span class="cx"> }
</span><del>- if (!empty($element_data)) {
- unset($element_data['offset'], $element_data['end']);
- $info['matroska']['header']['elements'][] = $element_data;
- }
</del><ins>+
+ unset($element_data['offset'], $element_data['end']);
+ $info['matroska']['header']['elements'][] = $element_data;
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -874,7 +868,7 @@
</span><span class="cx"> switch ($sub_subelement['id']) {
</span><span class="cx">
</span><span class="cx"> case EBML_ID_CUETRACKPOSITIONS:
</span><del>- $cuetrackpositions_entry = array();
</del><ins>+ $cuetrackpositions_entry = array();
</ins><span class="cx">
</span><span class="cx"> while ($this->getEBMLelement($sub_sub_subelement, $sub_subelement['end'], true)) {
</span><span class="cx"> switch ($sub_sub_subelement['id']) {
</span><span class="lines">@@ -912,7 +906,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case EBML_ID_TAGS: // Element containing elements specific to Tracks/Chapters.
</span><del>- $tags_entry = array();
</del><ins>+ $tags_entry = array();
</ins><span class="cx">
</span><span class="cx"> while ($this->getEBMLelement($subelement, $element_data['end'], false)) {
</span><span class="cx"> switch ($subelement['id']) {
</span><span class="lines">@@ -1209,7 +1203,7 @@
</span><span class="cx"> $this->unhandledElement('root', __LINE__, $top_element);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- }
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> private function EnsureBufferHasEnoughData($min_data=1024) {
</span><span class="cx"> if (($this->current_offset - $this->EBMLbuffer_offset) >= ($this->EBMLbuffer_length - $min_data)) {
</span><span class="lines">@@ -1391,7 +1385,7 @@
</span><span class="cx"> }
</span><span class="cx"> $block_data['flags']['lacing_type'] = self::BlockLacingType($block_data['flags']['lacing']);
</span><span class="cx">
</span><del>- // Lace (when lacing bit is set)
</del><ins>+ // Lace (when lacing bit is set)
</ins><span class="cx"> if ($block_data['flags']['lacing'] > 0) {
</span><span class="cx"> $block_data['lace_frames'] = getid3_lib::BigEndian2Int($this->readEBMLelementData(1)) + 1; // Number of frames in the lace-1 (uint8)
</span><span class="cx"> if ($block_data['flags']['lacing'] != 0x02) {
</span></span></pre></div>
<a id="trunkwpincludesID3moduleaudiovideoquicktimephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ID3/module.audio-video.quicktime.php (24695 => 24696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ID3/module.audio-video.quicktime.php 2013-07-12 23:32:32 UTC (rev 24695)
+++ trunk/wp-includes/ID3/module.audio-video.quicktime.php 2013-07-13 00:37:36 UTC (rev 24696)
</span><span class="lines">@@ -10,10 +10,12 @@
</span><span class="cx"> // module.audio-video.quicktime.php //
</span><span class="cx"> // module for analyzing Quicktime and MP3-in-MP4 files //
</span><span class="cx"> // dependencies: module.audio.mp3.php //
</span><ins>+// dependencies: module.tag.id3v2.php //
</ins><span class="cx"> // ///
</span><span class="cx"> /////////////////////////////////////////////////////////////////
</span><span class="cx">
</span><span class="cx"> getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.mp3.php', __FILE__, true);
</span><ins>+getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.id3v2.php', __FILE__, true); // needed for ISO 639-2 language code lookup
</ins><span class="cx">
</span><span class="cx"> class getid3_quicktime extends getid3_handler
</span><span class="cx"> {
</span><span class="lines">@@ -170,7 +172,8 @@
</span><span class="cx">
</span><span class="cx"> $info = &$this->getid3->info;
</span><span class="cx">
</span><del>- $atom_parent = array_pop($atomHierarchy);
</del><ins>+ //$atom_parent = array_pop($atomHierarchy);
+ $atom_parent = end($atomHierarchy); // http://www.getid3.org/phpBB3/viewtopic.php?t=1717
</ins><span class="cx"> array_push($atomHierarchy, $atomname);
</span><span class="cx"> $atom_structure['hierarchy'] = implode(' ', $atomHierarchy);
</span><span class="cx"> $atom_structure['name'] = $atomname;
</span><span class="lines">@@ -366,6 +369,12 @@
</span><span class="cx"> $boxsmallsize = getid3_lib::BigEndian2Int(substr($atom_data, $atomoffset, 2));
</span><span class="cx"> $boxsmalltype = substr($atom_data, $atomoffset + 2, 2);
</span><span class="cx"> $boxsmalldata = substr($atom_data, $atomoffset + 4, $boxsmallsize);
</span><ins>+ if ($boxsmallsize <= 1) {
+ $info['warning'][] = 'Invalid QuickTime atom smallbox size "'.$boxsmallsize.'" in atom "'.$atomname.'" at offset: '.($atom_structure['offset'] + $atomoffset);
+ $atom_structure['data'] = null;
+ $atomoffset = strlen($atom_data);
+ break;
+ }
</ins><span class="cx"> switch ($boxsmalltype) {
</span><span class="cx"> case "\x10\xB5":
</span><span class="cx"> $atom_structure['data'] = $boxsmalldata;
</span><span class="lines">@@ -657,19 +666,65 @@
</span><span class="cx"> switch ($atom_structure['sample_description_table'][$i]['encoder_vendor']) {
</span><span class="cx">
</span><span class="cx"> case "\x00\x00\x00\x00":
</span><del>- // audio atom
</del><ins>+ // audio tracks
</ins><span class="cx"> $atom_structure['sample_description_table'][$i]['audio_channels'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 8, 2));
</span><span class="cx"> $atom_structure['sample_description_table'][$i]['audio_bit_depth'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 10, 2));
</span><span class="cx"> $atom_structure['sample_description_table'][$i]['audio_compression_id'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 12, 2));
</span><span class="cx"> $atom_structure['sample_description_table'][$i]['audio_packet_size'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 14, 2));
</span><span class="cx"> $atom_structure['sample_description_table'][$i]['audio_sample_rate'] = getid3_lib::FixedPoint16_16(substr($atom_structure['sample_description_table'][$i]['data'], 16, 4));
</span><span class="cx">
</span><ins>+ // 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));
+
</ins><span class="cx"> switch ($atom_structure['sample_description_table'][$i]['data_format']) {
</span><ins>+ case '2vuY':
</ins><span class="cx"> case 'avc1':
</span><ins>+ case 'cvid':
+ case 'dvc ':
+ case 'dvcp':
+ case 'gif ':
+ case 'h263':
+ case 'jpeg':
+ case 'kpcd':
+ case 'mjpa':
+ case 'mjpb':
</ins><span class="cx"> case 'mp4v':
</span><ins>+ 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':
</ins><span class="cx"> $info['fileformat'] = 'mp4';
</span><span class="cx"> $info['video']['fourcc'] = $atom_structure['sample_description_table'][$i]['data_format'];
</span><del>- //$info['warning'][] = 'This version of getID3() ['.$this->getid3->version().'] does not fully support MPEG-4 audio/video streams'; // 2011-02-18: why am I warning about this again? What's not supported?
</del><ins>+// http://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'];
+}
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'qtvr':
</span><span class="lines">@@ -1121,18 +1176,19 @@
</span><span class="cx"> $atom_structure['alternate_group'] = getid3_lib::BigEndian2Int(substr($atom_data, 34, 2));
</span><span class="cx"> $atom_structure['volume'] = getid3_lib::FixedPoint8_8(substr($atom_data, 36, 2));
</span><span class="cx"> $atom_structure['reserved3'] = getid3_lib::BigEndian2Int(substr($atom_data, 38, 2));
</span><ins>+// 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
</ins><span class="cx"> $atom_structure['matrix_a'] = getid3_lib::FixedPoint16_16(substr($atom_data, 40, 4));
</span><span class="cx"> $atom_structure['matrix_b'] = getid3_lib::FixedPoint16_16(substr($atom_data, 44, 4));
</span><del>- $atom_structure['matrix_u'] = getid3_lib::FixedPoint16_16(substr($atom_data, 48, 4));
</del><ins>+ $atom_structure['matrix_u'] = getid3_lib::FixedPoint2_30(substr($atom_data, 48, 4));
</ins><span class="cx"> $atom_structure['matrix_c'] = getid3_lib::FixedPoint16_16(substr($atom_data, 52, 4));
</span><span class="cx"> $atom_structure['matrix_d'] = getid3_lib::FixedPoint16_16(substr($atom_data, 56, 4));
</span><del>- $atom_structure['matrix_v'] = getid3_lib::FixedPoint16_16(substr($atom_data, 60, 4));
- $atom_structure['matrix_x'] = getid3_lib::FixedPoint2_30(substr($atom_data, 64, 4));
- $atom_structure['matrix_y'] = getid3_lib::FixedPoint2_30(substr($atom_data, 68, 4));
</del><ins>+ $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));
</ins><span class="cx"> $atom_structure['matrix_w'] = getid3_lib::FixedPoint2_30(substr($atom_data, 72, 4));
</span><span class="cx"> $atom_structure['width'] = getid3_lib::FixedPoint16_16(substr($atom_data, 76, 4));
</span><span class="cx"> $atom_structure['height'] = getid3_lib::FixedPoint16_16(substr($atom_data, 80, 4));
</span><del>-
</del><span class="cx"> $atom_structure['flags']['enabled'] = (bool) ($atom_structure['flags_raw'] & 0x0001);
</span><span class="cx"> $atom_structure['flags']['in_movie'] = (bool) ($atom_structure['flags_raw'] & 0x0002);
</span><span class="cx"> $atom_structure['flags']['in_preview'] = (bool) ($atom_structure['flags_raw'] & 0x0004);
</span><span class="lines">@@ -1384,119 +1440,139 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> public function QuicktimeLanguageLookup($languageid) {
</span><ins>+ // http://developer.apple.com/library/mac/#documentation/QuickTime/QTFF/QTFFChap4/qtff4.html#//apple_ref/doc/uid/TP40000939-CH206-34353
</ins><span class="cx"> static $QuicktimeLanguageLookup = array();
</span><span class="cx"> if (empty($QuicktimeLanguageLookup)) {
</span><del>- $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';
</del><ins>+ $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';
</ins><span class="cx"> }
</span><ins>+ 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);
+ }
</ins><span class="cx"> return (isset($QuicktimeLanguageLookup[$languageid]) ? $QuicktimeLanguageLookup[$languageid] : 'invalid');
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesID3moduletagid3v2php"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ID3/module.tag.id3v2.php (24695 => 24696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ID3/module.tag.id3v2.php 2013-07-12 23:32:32 UTC (rev 24695)
+++ trunk/wp-includes/ID3/module.tag.id3v2.php 2013-07-13 00:37:36 UTC (rev 24696)
</span><span class="lines">@@ -667,7 +667,7 @@
</span><span class="cx">
</span><span class="cx"> if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
</span><span class="cx"> // ID3v2.3 specs say that TPE1 (and others) can contain multiple artist values separated with /
</span><del>- // This of course breaks when an aritst name contains slash character, e.g. "AC/DC"
</del><ins>+ // This of course breaks when an artist name contains slash character, e.g. "AC/DC"
</ins><span class="cx"> // MP3tag (maybe others) implement alternative system where multiple artists are null-separated, which makes more sense
</span><span class="cx"> // getID3 will split null-separated artists into multiple artists and leave slash-separated ones to the user
</span><span class="cx"> switch ($parsedFrame['encoding']) {
</span><span class="lines">@@ -3410,4 +3410,5 @@
</span><span class="cx"> return (($majorversion == 2) ? 6 : 10);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+}
+
</ins></span></pre></div>
<a id="trunkwpincludesID3readmetxt"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ID3/readme.txt (24695 => 24696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ID3/readme.txt 2013-07-12 23:32:32 UTC (rev 24695)
+++ trunk/wp-includes/ID3/readme.txt 2013-07-13 00:37:36 UTC (rev 24696)
</span><span class="lines">@@ -3,25 +3,36 @@
</span><span class="cx"> // available at http://getid3.sourceforge.net //
</span><span class="cx"> // or http://www.getid3.org //
</span><span class="cx"> /////////////////////////////////////////////////////////////////
</span><del>-// //
-// changelog.txt - part of getID3() //
-// See readme.txt for more details //
-// ///
-/////////////////////////////////////////////////////////////////
</del><span class="cx">
</span><del>- This code is released under the GNU GPL:
- http://www.gnu.org/copyleft/gpl.html
</del><ins>+*****************************************************************
+*****************************************************************
</ins><span class="cx">
</span><del>- +---------------------------------------------+
- | If you do use this code somewhere, send me |
- | an email and tell me how/where you used it. |
- | |
- | If you want to donate, there is a link on |
- | http://www.getid3.org for PayPal donations. |
- +---------------------------------------------+
</del><ins>+ getID3() is released under multiple licenses. You may choose
+ from the following licenses, and use getID3 according to the
+ terms of the license most suitable to your project.
</ins><span class="cx">
</span><ins>+GNU GPL: https://gnu.org/licenses/gpl.html (v3)
+ https://gnu.org/licenses/old-licenses/gpl-2.0.html (v2)
+ https://gnu.org/licenses/old-licenses/gpl-1.0.html (v1)
</ins><span class="cx">
</span><ins>+GNU LGPL: https://gnu.org/licenses/lgpl.html (v3)
</ins><span class="cx">
</span><ins>+Mozilla MPL: http://www.mozilla.org/MPL/2.0/ (v2)
+
+getID3 Commercial License: http://getid3.org/#gCL (payment required)
+
+*****************************************************************
+*****************************************************************
+Copies of each of the above licenses are included in the 'licenses'
+directory of the getID3 distribution.
+
+
+ +---------------------------------------------+
+ | If you want to donate, there is a link on |
+ | http://www.getid3.org for PayPal donations. |
+ +---------------------------------------------+
+
+
</ins><span class="cx"> Quick Start
</span><span class="cx"> ===========================================================================
</span><span class="cx">
</span><span class="lines">@@ -56,13 +67,13 @@
</span><span class="cx"> ===========================================================================
</span><span class="cx">
</span><span class="cx"> Reads & parses (to varying degrees):
</span><del>- \xA4 tags:
</del><ins>+# tags:
</ins><span class="cx"> * APE (v1 and v2)
</span><span class="cx"> * ID3v1 (& ID3v1.1)
</span><span class="cx"> * ID3v2 (v2.4, v2.3, v2.2)
</span><span class="cx"> * Lyrics3 (v1 & v2)
</span><span class="cx">
</span><del>- \xA4 audio-lossy:
</del><ins>+# audio-lossy:
</ins><span class="cx"> * MP3/MP2/MP1
</span><span class="cx"> * MPC / Musepack
</span><span class="cx"> * Ogg (Vorbis, OggFLAC, Speex)
</span><span class="lines">@@ -74,7 +85,7 @@
</span><span class="cx"> * DSS
</span><span class="cx"> * VQF
</span><span class="cx">
</span><del>- \xA4 audio-lossless:
</del><ins>+# audio-lossless:
</ins><span class="cx"> * AIFF
</span><span class="cx"> * AU
</span><span class="cx"> * Bonk
</span><span class="lines">@@ -93,7 +104,7 @@
</span><span class="cx"> * WAV (RIFF)
</span><span class="cx"> * WavPack
</span><span class="cx">
</span><del>- \xA4 audio-video:
</del><ins>+# audio-video:
</ins><span class="cx"> * ASF: ASF, Windows Media Audio (WMA), Windows Media Video (WMV)
</span><span class="cx"> * AVI (RIFF)
</span><span class="cx"> * Flash
</span><span class="lines">@@ -103,7 +114,7 @@
</span><span class="cx"> * Quicktime (including MP4)
</span><span class="cx"> * RealVideo
</span><span class="cx">
</span><del>- \xA4 still image:
</del><ins>+# still image:
</ins><span class="cx"> * BMP
</span><span class="cx"> * GIF
</span><span class="cx"> * JPEG
</span><span class="lines">@@ -112,7 +123,7 @@
</span><span class="cx"> * SWF (Flash)
</span><span class="cx"> * PhotoCD
</span><span class="cx">
</span><del>- \xA4 data:
</del><ins>+# data:
</ins><span class="cx"> * ISO-9660 CD-ROM image (directory structure)
</span><span class="cx"> * SZIP (limited support)
</span><span class="cx"> * ZIP (directory structure)
</span><span class="lines">@@ -298,7 +309,7 @@
</span><span class="cx"> (http://web.inter.nl.net/users/hvdh/lossless/lossless.htm)
</span><span class="cx"> * Support for RIFF-INFO chunks
</span><span class="cx"> * http://lotto.st-andrews.ac.uk/~njh/tag_interchange.html
</span><del>- (thanks Nick Humfrey <njh\xD8surgeradio*co*uk>)
</del><ins>+ (thanks Nick Humfrey <njh@surgeradio*co*uk>)
</ins><span class="cx"> * http://abcavi.narod.ru/sof/abcavi/infotags.htm
</span><span class="cx"> (thanks Kibi)
</span><span class="cx"> * Better support for Bink video
</span><span class="lines">@@ -313,23 +324,23 @@
</span><span class="cx"> * Support for IFF
</span><span class="cx"> * Support for ICO
</span><span class="cx"> * Support for ANI
</span><del>-* Support for EXE (comments, author, etc) (thanks p*quaedackers\xD8planet*nl)
</del><ins>+* Support for EXE (comments, author, etc) (thanks p*quaedackers@planet*nl)
</ins><span class="cx"> * Support for DVD-IFO (region, subtitles, aspect ratio, etc)
</span><del>- (thanks p*quaedackers\xD8planet*nl)
</del><ins>+ (thanks p*quaedackers@planet*nl)
</ins><span class="cx"> * More complete support for SWF - parsing encapsulated MP3 and/or JPEG content
</span><del>- (thanks n8n8\xD8yahoo*com)
</del><ins>+ (thanks n8n8@yahoo*com)
</ins><span class="cx"> * Support for a2b
</span><span class="cx"> * Optional scan-through-frames for AVI verification
</span><del>- (thanks rockcohen\xD8massive-interactive*nl)
-* Support for TTF (thanks info\xD8butterflyx*com)
</del><ins>+ (thanks rockcohen@massive-interactive*nl)
+* Support for TTF (thanks info@butterflyx*com)
</ins><span class="cx"> * Support for DSS (http://www.getid3.org/phpBB3/viewtopic.php?t=171)
</span><span class="cx"> * Support for SMAF (http://smaf-yamaha.com/what/demo.html)
</span><span class="cx"> http://www.getid3.org/phpBB3/viewtopic.php?t=182
</span><span class="cx"> * Support for AMR (http://www.getid3.org/phpBB3/viewtopic.php?t=195)
</span><span class="cx"> * Support for 3gpp (http://www.getid3.org/phpBB3/viewtopic.php?t=195)
</span><del>-* Support for ID4 (http://www.wackysoft.cjb.net grizlyY2K\xD8hotmail*com)
</del><ins>+* Support for ID4 (http://www.wackysoft.cjb.net grizlyY2K@hotmail*com)
</ins><span class="cx"> * Parse XML data returned in Ogg comments
</span><del>-* Parse XML data from Quicktime SMIL metafiles (klausrath\xD8mac*com)
</del><ins>+* Parse XML data from Quicktime SMIL metafiles (klausrath@mac*com)
</ins><span class="cx"> * ID3v2 genre string creator function
</span><span class="cx"> * More complete parsing of JPG
</span><span class="cx"> * Support for all old-style ASF packets
</span></span></pre>
</div>
</div>
</body>
</html>