r58284 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r58283‎ | r58284 | r58285 >
Date:21:06, 28 October 2009
Author:dale
Status:ok
Tags:
Comment:
* updated local cortado applet to cortado-ovt-stripped-0.5.0.jar per http://lists.xiph.org/pipermail/theora/2009-October/002976.html
* slight bugfix for getting bitrate
Modified paths:
  • /trunk/extensions/OggHandler/OggHandler.php (modified) (history)
  • /trunk/extensions/OggHandler/OggHandler_body.php (modified) (history)
  • /trunk/extensions/OggHandler/cortado-ovt-stripped-0.5.0.jar (added) (history)
  • /trunk/extensions/OggHandler/cortado-ovt-stripped-wm_r36976.jar (deleted) (history)
  • /trunk/extensions/OggHandler/cortado-ovt-stripped-wm_r38710.jar (deleted) (history)
  • /trunk/extensions/OggHandler/cortado_0.2.2-89.jar (deleted) (history)

Diff [purge]

Index: trunk/extensions/OggHandler/cortado_0.2.2-89.jar
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/extensions/OggHandler/cortado-ovt-stripped-wm_r36976.jar
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/extensions/OggHandler/cortado-ovt-stripped-wm_r38710.jar
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/extensions/OggHandler/OggHandler.php
@@ -87,4 +87,4 @@
8888 // as the uploaded media files or Java security rules will
8989 // prevent the applet from loading them.
9090 //
91 -$wgCortadoJarFile = "cortado_0.2.2-89.jar";
 91+$wgCortadoJarFile = "cortado-ovt-stripped-0.5.0.jar";
Index: trunk/extensions/OggHandler/cortado-ovt-stripped-0.5.0.jar
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/OggHandler/cortado-ovt-stripped-0.5.0.jar
___________________________________________________________________
Name: svn:mime-type
9292 + application/octet-stream
Index: trunk/extensions/OggHandler/OggHandler_body.php
@@ -503,10 +503,10 @@
504504 $size += $stream['size'];
505505 }
506506 }
507 - if( $size != 0 ){
 507+ if( isset( $unpacked['bitrate'] ) ){
 508+ $bitrate = $unpacked['bitrate'];
 509+ }else{
508510 $bitrate = $length == 0 ? 0 : $size / $length * 8;
509 - }else{
510 - $bitrate = $unpacked['bitrate'];
511511 }
512512 return wfMsg( $msg, implode( '/', $streamTypes ),
513513 $wgLang->formatTimePeriod( $length ),

Status & tagging log