From: <an...@us...> - 2008-05-25 04:28:04
|
Revision: 17621 http://gallery.svn.sourceforge.net/gallery/?rev=17621&view=rev Author: andy_st Date: 2008-05-24 21:28:11 -0700 (Sat, 24 May 2008) Log Message: ----------- Codeaudit cleanup Modified Paths: -------------- trunk/gallery2/modules/core/test/phpunit/PlatformTest.class trunk/gallery2/modules/ffmpeg/AdminFfmpeg.inc trunk/gallery2/modules/ffmpeg/classes/FfmpegToolkit.class trunk/gallery2/modules/ffmpeg/classes/FfmpegToolkitHelper.class Modified: trunk/gallery2/modules/core/test/phpunit/PlatformTest.class =================================================================== --- trunk/gallery2/modules/core/test/phpunit/PlatformTest.class 2008-05-25 04:01:37 UTC (rev 17620) +++ trunk/gallery2/modules/core/test/phpunit/PlatformTest.class 2008-05-25 04:28:11 UTC (rev 17621) @@ -74,13 +74,14 @@ function testTempnam() { global $gallery; - $platform = $gallery->getPlatform(); + $platform =& $gallery->getPlatform(); if ($this->_platform->isSymlinkSupported()) { $sourceDir = $dataBase = $gallery->getConfig('data.gallery.tmp'); foreach (array('platformTest', 'srcDir') as $subDir) { $sourceDir .= "$subDir/"; - $this->assert(mkdir($sourceDir, 0777), 'Failed to create test directory: ' . $subDir); + $this->assert(mkdir($sourceDir, 0777), + 'Failed to create test directory: ' . $subDir); } $symlink = $dataBase . 'platformTest/data'; Modified: trunk/gallery2/modules/ffmpeg/AdminFfmpeg.inc =================================================================== --- trunk/gallery2/modules/ffmpeg/AdminFfmpeg.inc 2008-05-25 04:01:37 UTC (rev 17620) +++ trunk/gallery2/modules/ffmpeg/AdminFfmpeg.inc 2008-05-25 04:28:11 UTC (rev 17621) @@ -267,7 +267,8 @@ } $platform =& $gallery->getPlatform(); - $tests = $mimeTypes = $mimeTypesEncoder = $encoderCodecs = $version = $encodeWarnings = array(); + $tests = $mimeTypes = $mimeTypesEncoder = $encoderCodecs = array(); + $version = $encodeWarnings = array(); $debugSnippet = ''; $failCount = 0; if (isset($form['action']['test'])) { @@ -275,16 +276,19 @@ $form['error']['path']['missing'] = 1; } else { $gallery->startRecordingDebugSnippet(); - list ($ret, $tests, $mimeTypes, $supportsOffset, $mimeTypesEncoder, $encoderCodecs, $version) = - FfmpegToolkitHelper::testBinary($form['path']); - if (in_array('video/x-flv', $mimeTypesEncoder) && !in_array('mp3', $encoderCodecs)) { + list ($ret, $tests, $mimeTypes, $supportsOffset, + $mimeTypesEncoder, $encoderCodecs, $version) = + FfmpegToolkitHelper::testBinary($form['path']); + if (in_array('video/x-flv', $mimeTypesEncoder) + && !in_array('mp3', $encoderCodecs)) { $encodeWarnings['video/x-flv']['mute'] = true; } $debugSnippet = $gallery->stopRecordingDebugSnippet(); if ($ret) { if ($ret->getErrorCode() & ERROR_BAD_PATH) { $form['error']['path']['badPath'] = 1; - $tests = $mimeTypes = $mimeTypesEncoder = $encoderCodecs = $version = array(); + $tests = $mimeTypes = $mimeTypesEncoder = array(); + $encoderCodecs = $version = array(); } else { return array($ret, null); } Modified: trunk/gallery2/modules/ffmpeg/classes/FfmpegToolkit.class =================================================================== --- trunk/gallery2/modules/ffmpeg/classes/FfmpegToolkit.class 2008-05-25 04:01:37 UTC (rev 17620) +++ trunk/gallery2/modules/ffmpeg/classes/FfmpegToolkit.class 2008-05-25 04:28:11 UTC (rev 17621) @@ -297,7 +297,8 @@ $duration = 3600*$regs[1] + 60*$regs[2] + $regs[3]; } - if (preg_match("/Stream.*?Video:.*?(\d+)x(\d+).*\ +([0-9\.]+) (fps|tb).*/", $resultLine, $regs)) { + if (preg_match("/Stream.*?Video:.*?(\d+)x(\d+).*\ +([0-9\.]+) (fps|tb).*/", + $resultLine, $regs)) { $successfulRun = true; list ($width, $height, $vframerate) = array($regs[1], $regs[2], $regs[3]); } @@ -324,7 +325,8 @@ if ($successfulRun) { return array(null, $width, $height, $duration, $vframerate, $asamplerate, $achannels); } else { - return array(GalleryCoreApi::error(ERROR_TOOLKIT_FAILURE), null, null, null, null, null, null); + return array(GalleryCoreApi::error(ERROR_TOOLKIT_FAILURE), + null, null, null, null, null, null); } } Modified: trunk/gallery2/modules/ffmpeg/classes/FfmpegToolkitHelper.class =================================================================== --- trunk/gallery2/modules/ffmpeg/classes/FfmpegToolkitHelper.class 2008-05-25 04:01:37 UTC (rev 17620) +++ trunk/gallery2/modules/ffmpeg/classes/FfmpegToolkitHelper.class 2008-05-25 04:28:11 UTC (rev 17621) @@ -47,8 +47,9 @@ return array(GalleryCoreApi::error(ERROR_MISSING_VALUE), null); } - list ($ret, $tests, $mimeTypes, $supportsOffset, $mimeTypesEncoder, $encoderAudioCodecs, $version) = - FfmpegToolkitHelper::testBinary($ffmpegPath); + list ($ret, $tests, $mimeTypes, $supportsOffset, + $mimeTypesEncoder, $encoderAudioCodecs, $version) = + FfmpegToolkitHelper::testBinary($ffmpegPath); if ($ret) { return array($ret, null); } @@ -73,7 +74,8 @@ /* Convert to Flash Video */ if (in_array('video/x-flv', $mimeTypesEncoder)) { $operations['convert-to-video/x-flv']['params'] = array(); - $operations['convert-to-video/x-flv']['description'] = $gallery->i18n('Convert to Flash Video'); + $operations['convert-to-video/x-flv']['description'] = + $gallery->i18n('Convert to Flash Video'); $operations['convert-to-video/x-flv']['mimeTypes'] = $mimeTypes; $operations['convert-to-video/x-flv']['outputMimeType'] = 'video/x-flv'; @@ -81,7 +83,8 @@ $operations['set-video-dimensions']['params'] = array( array('type' => 'int', 'description' => $gallery->i18n('video width in pixels')), array('type' => 'int', 'description' => $gallery->i18n('video height in pixels'))); - $operations['set-video-dimensions']['description'] = $gallery->i18n('Set video dimensions'); + $operations['set-video-dimensions']['description'] = + $gallery->i18n('Set video dimensions'); $operations['set-video-dimensions']['mimeTypes'] = $mimeTypes; $operations['set-video-dimensions']['outputMimeType'] = null; @@ -95,7 +98,8 @@ $operations['set-video-framerate']['outputMimeType'] = null; $operations['set-video-sameq']['params'] = array(); - $operations['set-video-sameq']['description'] = $gallery->i18n('Set same video quality'); + $operations['set-video-sameq']['description'] = + $gallery->i18n('Set same video quality'); $operations['set-video-sameq']['mimeTypes'] = $mimeTypes; $operations['set-video-sameq']['outputMimeType'] = null; @@ -179,21 +183,26 @@ */ if (!$platform->isRestrictedByOpenBaseDir($ffmpegPath)) { if (!$platform->file_exists($ffmpegPath) || !$platform->is_file($ffmpegPath)) { - return array(GalleryCoreApi::error(ERROR_BAD_PATH), null, null, null); + return array(GalleryCoreApi::error(ERROR_BAD_PATH), + null, null, null, null, null, null); } } /* We only care about video for now */ /** @todo: Add '3g2' => '3g2', '3gp' => '3gp' when recognized as videos */ - $relevantTypes = array('mpeg' => 'mpeg', 'asf' => 'asf', 'avi' => 'avi', - 'mov' => 'mov', 'wmv1' => 'wmv', 'flv' => 'flv', 'mp4' => 'mp4'); + $relevantTypes = array('mpeg' => 'mpeg', 'asf' => 'asf', 'avi' => 'avi', + 'mov' => 'mov', 'wmv1' => 'wmv', 'flv' => 'flv', 'mp4' => 'mp4'); /* We only care about encoding flash video for now */ $relevantEncode = array('flv' => 'flv'); - /** @todo: Add 'adpcm_swf' => 'adpcm_swf' to relevantAudioCodecs if/when videos play correctly */ + /** + * @todo: Add 'adpcm_swf' => 'adpcm_swf' to relevantAudioCodecs if/when videos play + * correctly + */ $relevantAudioCodecs = array('mp3' => 'mp3', 'libmp3lame' => 'mp3'); list ($ignored, $results) = $platform->exec(array(array($ffmpegPath, '-formats'))); $version = array(); - list ($ignored, $ignored, $version) = $platform->exec(array(array($ffmpegPath, '-version'))); + list ($ignored, $ignored, $version) = + $platform->exec(array(array($ffmpegPath, '-version'))); $mimeTypes = array(); $mimeTypesEncoder = array(); @@ -247,7 +256,7 @@ list ($ret, $mime) = GalleryCoreApi::convertExtensionToMime($relevantTypes[$type]); if ($ret) { - return array($ret, null, null, null); + return array($ret, null, null, null, null, null, null); } $mimeTypes[$mime] = 1; } @@ -262,7 +271,7 @@ list ($ret, $mime) = GalleryCoreApi::convertExtensionToMime( $relevantTypes[$type]); if ($ret) { - return array($ret, null, null, null); + return array($ret, null, null, null, null, null, null); } $mimeTypes[$mime] = 1; } @@ -291,7 +300,8 @@ if (preg_match('|D|', $capabilities)) { $mimeTypes[$mime] = 1; } - if (isset($relevantEncode[$type]) && preg_match('|E|', $capabilities)) { + if (isset($relevantEncode[$type]) + && preg_match('|E|', $capabilities)) { $mimeTypesEncoder[$mime] = 1; } } @@ -339,8 +349,8 @@ } } - return array(null, $tests, array_keys($mimeTypes), $supportsOffset, array_keys($mimeTypesEncoder), - array_keys($encoderAudioCodecs), $version); + return array(null, $tests, array_keys($mimeTypes), $supportsOffset, + array_keys($mimeTypesEncoder), array_keys($encoderAudioCodecs), $version); } } ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |