| Index: trunk/extensions/TimedMediaHandler/TimedMediaHandler.php |
| — | — | @@ -121,6 +121,9 @@ |
| 122 | 122 | // A standard web streamable ogg video |
| 123 | 123 | WebVideoTranscode::ENC_OGV_6MBS, |
| 124 | 124 | |
| | 125 | + // High quality 720P ogg video: |
| | 126 | + WebVideoTranscode::ENC_OGV_HQ_VBR, |
| | 127 | + |
| 125 | 128 | // A standard web streamable WebM video |
| 126 | 129 | WebVideoTranscode::ENC_WEBM_6MBS, |
| 127 | 130 | |
| Index: trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscode.php |
| — | — | @@ -24,9 +24,8 @@ |
| 25 | 25 | * key constant. ( Or just run a maintenance script to delete all |
| 26 | 26 | * the assets for a given profile ) |
| 27 | 27 | * |
| 28 | | - * Msg keys for derivatives are the profile constant with underscores instead of . |
| 29 | | - * 200_200kbs.ogv look up would be: |
| 30 | | - * $messages['timedmedia-derivative-200_200kbs_ogv'] => 'Ogg 200'; |
| | 28 | + * Msg keys for derivatives are set as follows: |
| | 29 | + * $messages['timedmedia-derivative-200_200kbs.ogv'] => 'Ogg 200'; |
| 31 | 30 | */ |
| 32 | 31 | |
| 33 | 32 | // Ogg Profiles |
| Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/TimedText/resources/mw.TimedText.js |
| — | — | @@ -427,7 +427,8 @@ |
| 428 | 428 | |
| 429 | 429 | // If there are inline sources don't check the api ) |
| 430 | 430 | if( this.textSources.length != 0 ){ |
| 431 | | - callback(); |
| | 431 | + if( callback ) |
| | 432 | + callback(); |
| 432 | 433 | return ; |
| 433 | 434 | } |
| 434 | 435 | |
| — | — | @@ -464,7 +465,8 @@ |
| 465 | 466 | _this.textSources.push( source ); |
| 466 | 467 | } |
| 467 | 468 | // All sources loaded run callback: |
| 468 | | - callback(); |
| | 469 | + if( callback ) |
| | 470 | + callback(); |
| 469 | 471 | } ); |
| 470 | 472 | }, |
| 471 | 473 | |
| — | — | @@ -1540,11 +1542,13 @@ |
| 1541 | 1543 | if( ! sourcePages.query.allpages ) { |
| 1542 | 1544 | //Check if a shared asset |
| 1543 | 1545 | mw.log( 'no subtitle pages found'); |
| 1544 | | - callback(); |
| | 1546 | + if( callback ) |
| | 1547 | + callback(); |
| 1545 | 1548 | return ; |
| 1546 | 1549 | } |
| 1547 | 1550 | // We have sources put them into the player |
| 1548 | | - callback( _this.getSources( sourcePages ) ); |
| | 1551 | + if( callback ) |
| | 1552 | + callback( _this.getSources( sourcePages ) ); |
| 1549 | 1553 | } ); |
| 1550 | 1554 | }, |
| 1551 | 1555 | |
| Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js |
| — | — | @@ -139,7 +139,8 @@ |
| 140 | 140 | } |
| 141 | 141 | }) |
| 142 | 142 | if( playersLoaded ){ |
| 143 | | - callback(); |
| | 143 | + if( callback ) |
| | 144 | + callback(); |
| 144 | 145 | } |
| 145 | 146 | } |
| 146 | 147 | /** |
| Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/MediaPlayer.js |
| — | — | @@ -68,7 +68,9 @@ |
| 69 | 69 | mw.load( [ |
| 70 | 70 | 'mw.EmbedPlayer' + this.library.substr(0,1).toUpperCase() + this.library.substr(1) |
| 71 | 71 | ], function() { |
| 72 | | - callback(); |
| | 72 | + if( callback ){ |
| | 73 | + callback(); |
| | 74 | + } |
| 73 | 75 | } ); |
| 74 | 76 | } |
| 75 | 77 | }; |