| Index: trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscodeJob.php |
| — | — | @@ -31,7 +31,7 @@ |
| 32 | 32 | private function getTargetEncodePath(){ |
| 33 | 33 | if( !$this->targetEncodePath ){ |
| 34 | 34 | $file = wfLocalFile( $this->title ); |
| 35 | | - $transcodeKey = $this->params['transcodeKey']; |
| | 35 | + $transcodeKey = $this->params[ 'transcodeKey' ]; |
| 36 | 36 | $this->targetEncodePath = WebVideoTranscode::getTargetEncodePath( $file, $transcodeKey ); |
| 37 | 37 | } |
| 38 | 38 | return $this->targetEncodePath; |
| — | — | @@ -496,9 +496,9 @@ |
| 497 | 497 | // only run check if we are outputing to target file |
| 498 | 498 | // ( two pass encoding does not output to target on first pass ) |
| 499 | 499 | clearstatcache(); |
| 500 | | - $newFileSize = filesize( $this->getTargetEncodePath() ); |
| | 500 | + $newFileSize = is_file( $this->getTargetEncodePath() ) ? filesize( $this->getTargetEncodePath() ) : 0; |
| 501 | 501 | // Don't start checking for file growth until we have an initial positive file size: |
| 502 | | - if( is_file( $this->getTargetEncodePath() ) && $newFileSize > 0 ){ |
| | 502 | + if( $newFileSize > 0 ){ |
| 503 | 503 | $this->output( $wgLang->formatSize( $newFileSize ). ' Total size, encoding ' . |
| 504 | 504 | $wgLang->formatSize( ( $newFileSize - $oldFileSize ) / 5 ) . ' per second' ); |
| 505 | 505 | if( $newFileSize == $oldFileSize ){ |