| Index: trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscodeJob.php |
| — | — | @@ -47,11 +47,11 @@ |
| 48 | 48 | } |
| 49 | 49 | $options = WebVideoTranscode::$derivativeSettings[ $transcodeKey ]; |
| 50 | 50 | |
| 51 | | - $this->output( "Encoding to codec: " . $options['codec'] ); |
| | 51 | + $this->output( "Encoding to codec: " . $options['videoCodec'] ); |
| 52 | 52 | // Check the codec see which encode method to call; |
| 53 | | - if( $options['codec'] == 'theora' ){ |
| | 53 | + if( $options['videoCodec'] == 'theora' ){ |
| 54 | 54 | $status = $this->ffmpeg2TheoraEncode( $file, $destinationFile, $options ); |
| 55 | | - } else if( $options['codec'] == 'vp8' ){ |
| | 55 | + } else if( $options['videoCodec'] == 'vp8' ){ |
| 56 | 56 | // Check for twopass: |
| 57 | 57 | if( isset( $options['twopass'] ) ){ |
| 58 | 58 | // ffmpeg requires manual two pass |
| Index: trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscode.php |
| — | — | @@ -59,7 +59,7 @@ |
| 60 | 60 | 'twopass' => 'true', |
| 61 | 61 | 'keyframeInterval' => '64', |
| 62 | 62 | 'bufDelay' => '128', |
| 63 | | - 'codec' => 'theora', |
| | 63 | + 'videoCodec' => 'theora', |
| 64 | 64 | ), |
| 65 | 65 | WebVideoTranscode::ENC_OGV_4MBS => |
| 66 | 66 | array( |
| — | — | @@ -70,7 +70,7 @@ |
| 71 | 71 | 'twopass' => 'true', |
| 72 | 72 | 'keyframeInterval' => '128', |
| 73 | 73 | 'bufDelay' => '256', |
| 74 | | - 'codec' => 'theora', |
| | 74 | + 'videoCodec' => 'theora', |
| 75 | 75 | ), |
| 76 | 76 | WebVideoTranscode::ENC_OGV_6MBS => |
| 77 | 77 | array( |
| — | — | @@ -81,7 +81,7 @@ |
| 82 | 82 | 'twopass' => 'true', |
| 83 | 83 | 'keyframeInterval' => '128', |
| 84 | 84 | 'bufDelay' => '256', |
| 85 | | - 'codec' => 'theora', |
| | 85 | + 'videoCodec' => 'theora', |
| 86 | 86 | ), |
| 87 | 87 | |
| 88 | 88 | WebVideoTranscode::ENC_OGV_HQ_VBR => |
| — | — | @@ -91,7 +91,7 @@ |
| 92 | 92 | 'audioQuality' => 3, |
| 93 | 93 | 'noUpscaling' => 'true', |
| 94 | 94 | 'keyframeInterval' => '128', |
| 95 | | - 'codec' => 'theora', |
| | 95 | + 'videoCodec' => 'theora', |
| 96 | 96 | ), |
| 97 | 97 | |
| 98 | 98 | // WebM transcode: |
| — | — | @@ -104,7 +104,7 @@ |
| 105 | 105 | 'twopass' => 'true', |
| 106 | 106 | 'keyframeInterval' => '128', |
| 107 | 107 | 'bufDelay' => '256', |
| 108 | | - 'codec' => 'vp8', |
| | 108 | + 'videoCodec' => 'vp8', |
| 109 | 109 | ), |
| 110 | 110 | WebVideoTranscode::ENC_WEBM_HQ_VBR => |
| 111 | 111 | array( |
| — | — | @@ -112,7 +112,7 @@ |
| 113 | 113 | 'videoQuality' => 7, |
| 114 | 114 | 'audioQuality' => 3, |
| 115 | 115 | 'noUpscaling' => 'true', |
| 116 | | - 'codec' => 'vp8', |
| | 116 | + 'videoCodec' => 'vp8', |
| 117 | 117 | ) |
| 118 | 118 | ); |
| 119 | 119 | |
| — | — | @@ -214,7 +214,7 @@ |
| 215 | 215 | |
| 216 | 216 | foreach( $wgEnabledTranscodeSet as $transcodeKey ){ |
| 217 | 217 | $derivativeFile = self::getDerivativeFilePath( $file, $transcodeKey); |
| 218 | | - $codec = self::$derivativeSettings[$transcodeKey]['codec']; |
| | 218 | + $codec = self::$derivativeSettings[$transcodeKey]['videoCodec']; |
| 219 | 219 | // Check if we should add derivative to job queue |
| 220 | 220 | // Skip if we have both an Ogg & WebM and if target encode larger than source |
| 221 | 221 | if( self::isTargetLargerThanFile( $file, self::$derivativeSettings[$transcodeKey]['maxSize']) ){ |
| — | — | @@ -233,11 +233,11 @@ |
| 234 | 234 | // Make sure we got at least one ogg and webm encode |
| 235 | 235 | if( !$addOggFlag || !$addWebMFlag){ |
| 236 | 236 | foreach( $wgEnabledTranscodeSet as $transcodeKey ){ |
| 237 | | - if( !$addOggFlag && self::$derivativeSettings[$transcodeKey]['codec'] == 'theora' ){ |
| | 237 | + if( !$addOggFlag && self::$derivativeSettings[$transcodeKey]['videoCodec'] == 'theora' ){ |
| 238 | 238 | self::tryAddSource( $file, $sources, $transcodeKey, $dataPrefix ); |
| 239 | 239 | $addOggFlag = true; |
| 240 | 240 | } |
| 241 | | - if( !$addWebMFlag && self::$derivativeSettings[$transcodeKey]['codec'] == 'vp8' ){ |
| | 241 | + if( !$addWebMFlag && self::$derivativeSettings[$transcodeKey]['videoCodec'] == 'vp8' ){ |
| 242 | 242 | self::tryAddSource( $file, $sources, $transcodeKey, $dataPrefix ); |
| 243 | 243 | $addWebMFlag = true; |
| 244 | 244 | } |