http://www.mediawiki.org/wiki/Special:Code/MediaWiki/82799
Revision: 82799
Author: dale
Date: 2011-02-25 16:20:04 +0000 (Fri, 25 Feb 2011)
Log Message:
-----------
check for callbacks before running them
added 720P ogg derivative to default encoding set.
Modified Paths:
--------------
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/MediaPlayer.js
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
trunk/extensions/TimedMediaHandler/MwEmbedModules/TimedText/resources/mw.TimedText.js
trunk/extensions/TimedMediaHandler/TimedMediaHandler.php
trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscode.php
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/MediaPlayer.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/MediaPlayer.js
2011-02-25 16:19:44 UTC (rev 82798)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/MediaPlayer.js
2011-02-25 16:20:04 UTC (rev 82799)
@@ -68,7 +68,9 @@
mw.load( [
'mw.EmbedPlayer' +
this.library.substr(0,1).toUpperCase() + this.library.substr(1)
], function() {
- callback();
+ if( callback ){
+ callback();
+ }
} );
}
};
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
2011-02-25 16:19:44 UTC (rev 82798)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
2011-02-25 16:20:04 UTC (rev 82799)
@@ -139,7 +139,8 @@
}
})
if( playersLoaded ){
- callback();
+ if( callback )
+ callback();
}
}
/**
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/TimedText/resources/mw.TimedText.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/TimedText/resources/mw.TimedText.js
2011-02-25 16:19:44 UTC (rev 82798)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/TimedText/resources/mw.TimedText.js
2011-02-25 16:20:04 UTC (rev 82799)
@@ -427,7 +427,8 @@
// If there are inline sources don't check the api )
if( this.textSources.length != 0 ){
- callback();
+ if( callback )
+ callback();
return ;
}
@@ -464,7 +465,8 @@
_this.textSources.push( source );
}
// All sources loaded run callback:
- callback();
+ if( callback )
+ callback();
} );
},
@@ -1540,11 +1542,13 @@
if( ! sourcePages.query.allpages ) {
//Check if a shared asset
mw.log( 'no subtitle pages found');
- callback();
+ if( callback )
+ callback();
return ;
}
// We have sources put them into the player
- callback( _this.getSources( sourcePages ) );
+ if( callback )
+ callback( _this.getSources( sourcePages
) );
} );
},
Modified: trunk/extensions/TimedMediaHandler/TimedMediaHandler.php
===================================================================
--- trunk/extensions/TimedMediaHandler/TimedMediaHandler.php 2011-02-25
16:19:44 UTC (rev 82798)
+++ trunk/extensions/TimedMediaHandler/TimedMediaHandler.php 2011-02-25
16:20:04 UTC (rev 82799)
@@ -121,6 +121,9 @@
// A standard web streamable ogg video
WebVideoTranscode::ENC_OGV_6MBS,
+ // High quality 720P ogg video:
+ WebVideoTranscode::ENC_OGV_HQ_VBR,
+
// A standard web streamable WebM video
WebVideoTranscode::ENC_WEBM_6MBS,
Modified:
trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscode.php
===================================================================
--- trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscode.php
2011-02-25 16:19:44 UTC (rev 82798)
+++ trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscode.php
2011-02-25 16:20:04 UTC (rev 82799)
@@ -24,9 +24,8 @@
* key constant. ( Or just run a maintenance script to delete all
* the assets for a given profile )
*
- * Msg keys for derivatives are the profile constant with underscores
instead of .
- * 200_200kbs.ogv look up would be:
- * $messages['timedmedia-derivative-200_200kbs_ogv'] => 'Ogg 200';
+ * Msg keys for derivatives are set as follows:
+ * $messages['timedmedia-derivative-200_200kbs.ogv'] => 'Ogg 200';
*/
// Ogg Profiles
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
