r85054 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r85053‎ \| r85054 \| r85055 >
Date:	23:28, 30 March 2011
Author:	dale
Status:	deferred
Tags:
Comment:	fixes to 84988 ( updated transcode keys in settings and i18n )
Modified paths:	/trunk/extensions/TimedMediaHandler/README (modified) (history) /trunk/extensions/TimedMediaHandler/TimedMediaHandler.i18n.php (modified) (history) /trunk/extensions/TimedMediaHandler/TimedMediaHandler.php (modified) (history) /trunk/extensions/TimedMediaHandler/TimedMediaIframeOutput.php (modified) (history) /trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscode.php (modified) (history)

Diff [purge]

Index: trunk/extensions/TimedMediaHandler/TimedMediaHandler.i18n.php
—	—	@@ -43,18 +43,20 @@
44	44	'timedmedia-derivative-220_200kbs.ogv' => 'Ogg 200P',
45	45	'timedmedia-derivative-desc-220_200kbs.ogv' => 'Low bandwidth Ogg video (200P)',
46	46
47		~~- 'timedmedia-derivative-360_400kbs.ogv' => 'Ogg 360P',~~
48		~~- 'timedmedia-derivative-desc-360_400kbs.ogv' => 'Web streamable Ogg video (360P)',~~
	47	+ 'timedmedia-derivative-360_560kbs.ogv' => 'Ogg 360P',
	48	+ 'timedmedia-derivative-desc-360_560kbs.ogv' => 'Web streamable Ogg video (360P)',
49	49
50		~~- 'timedmedia-derivative-480_600kbs.ogv' => 'Ogg 480P',~~
51		~~- 'timedmedia-derivative-desc-480_600kbs.ogv' => 'Web streamable Ogg video (480P)',~~
	50	+ 'timedmedia-derivative-480_880kbs.ogv' => 'Ogg 480P',
	51	+ 'timedmedia-derivative-desc-480_880kbs.ogv' => 'Web streamable Ogg video (480P)',
52	52
53	53	'timedmedia-derivative-720_VBR.ogv' => 'Ogg HQ',
54	54	'timedmedia-derivative-desc-720_VBR.ogv' => 'High quality downloadable Ogg video (720P)',
55	55
56	56	// WebM profiles:
57		~~- 'timedmedia-derivative-480_600kbs.webm' => 'WebM 480P',~~
58		~~- 'timedmedia-derivative-desc-480_600kbs.webm' => 'Web streamable WebM (480P)',~~
	57	+ 'timedmedia-derivative-360_560kbs.webm' => 'WebM 360P',
	58	+ 'timedmedia-derivative-desc-360_560kbs.webm' => 'Web streamable WebM (360P)',
	59	+ 'timedmedia-derivative-480_900kbs.webm' => 'WebM 480P',
	60	+ 'timedmedia-derivative-desc-480_900kbs.webm' => 'Web streamable WebM (480P)',
59	61	'timedmedia-derivative-720_VBR.webm' => 'WebM 720P',
60	62	'timedmedia-derivative-desc-720_VBR.webm' => 'High quality downloadable WebM (720P)',
61	63
—	—	@@ -301,8 +303,8 @@
302	304	'timedmedia-source-file' => 'Крыніца $1',
303	305	'timedmedia-derivative-220_200kbs.ogv' => 'Ogg 200P',
304	306	'timedmedia-derivative-desc-220_200kbs.ogv' => 'Нізкапаточнае Ogg-відэа (200P)',
305		~~- 'timedmedia-derivative-desc-360_400kbs.ogv' => 'Паточнае Ogg-відэа (360 пкс)',~~
306		~~- 'timedmedia-derivative-desc-480_600kbs.ogv' => 'Паточнае Ogg-відэа (480 пкс)',~~
	307	+ 'timedmedia-derivative-desc-360_560kbs.ogv' => 'Паточнае Ogg-відэа (360 пкс)',
	308	+ 'timedmedia-derivative-desc-480_880kbs.ogv' => 'Паточнае Ogg-відэа (480 пкс)',
307	309	'timedmedia-derivative-desc-720_VBR.ogv' => 'Высакаякаснае Ogg-відэа для загрузкі (720 пкс)',
308	310	'timedmedia-subtitle-language' => 'Субтытры ($2) на $1',
309	311	);
—	—	@@ -508,10 +510,10 @@
509	511	'timedmedia-source-file-desc' => 'Original $1, $2 x $3 ($4)',
510	512	'timedmedia-derivative-220_200kbs.ogv' => 'Ogg (200p)',
511	513	'timedmedia-derivative-desc-220_200kbs.ogv' => 'Ogg-Videodatei mit niedriger Datenübertragungsrate (200p)',
512		~~- 'timedmedia-derivative-desc-360_400kbs.ogv' => 'Webstreamingfähige Ogg-Videodatei (360p)',~~
513		~~- 'timedmedia-derivative-desc-480_600kbs.ogv' => 'Webstreamingfähige Ogg-Videodatei (480p)',~~
	514	+ 'timedmedia-derivative-desc-360_560kbs.ogv' => 'Webstreamingfähige Ogg-Videodatei (360p)',
	515	+ 'timedmedia-derivative-desc-480_880kbs.ogv' => 'Webstreamingfähige Ogg-Videodatei (480p)',
514	516	'timedmedia-derivative-desc-720_VBR.ogv' => 'Qualitativ hochwertige Ogg-Videodatei (720p)',
515		~~- 'timedmedia-derivative-desc-480_600kbs.webm' => 'Webstreamingfähige WebM-Videodatei (480p)',~~
	517	+ 'timedmedia-derivative-desc-480_900kbs.webm' => 'Webstreamingfähige WebM-Videodatei (480p)',
516	518	'timedmedia-derivative-desc-720_VBR.webm' => 'Qualitativ hochwertige WebM-Videodatei (720p)',
517	519	'timedmedia-subtitle-language' => '$1 ($2) Untertitel',
518	520	);
—	—	@@ -755,10 +757,10 @@
756	758	'timedmedia-source-file-desc' => 'Initial $1, $2 × $3 ($4)',
757	759	'timedmedia-derivative-220_200kbs.ogv' => 'Ogg 200p',
758	760	'timedmedia-derivative-desc-220_200kbs.ogv' => 'Vidéo Ogg bas débit (200P)',
759		~~- 'timedmedia-derivative-desc-360_400kbs.ogv' => 'Vidéo Ogg lisible en continu sur le Web (360p)',~~
760		~~- 'timedmedia-derivative-desc-480_600kbs.ogv' => 'Vidéo Ogg lisible en continu sur le web (480p)',~~
	761	+ 'timedmedia-derivative-desc-360_560kbs.ogv' => 'Vidéo Ogg lisible en continu sur le Web (360p)',
	762	+ 'timedmedia-derivative-desc-480_880kbs.ogv' => 'Vidéo Ogg lisible en continu sur le web (480p)',
761	763	'timedmedia-derivative-desc-720_VBR.ogv' => 'Vidéo Ogg téléchargeable de grande qualité (720p)',
762		~~- 'timedmedia-derivative-desc-480_600kbs.webm' => 'WebM lisible en continu depuis le web (480p)',~~
	764	+ 'timedmedia-derivative-desc-480_900kbs.webm' => 'WebM lisible en continu depuis le web (480p)',
763	765	'timedmedia-derivative-desc-720_VBR.webm' => 'Vidéo WebM téléchargeable de grande qualité (720p)',
764	766	'timedmedia-subtitle-language' => 'soustitres en $1 ($2)',
765	767	);
—	—	@@ -839,10 +841,10 @@
840	842	'timedmedia-source-file-desc' => 'Orixinal $1, $2 × $3 ($4)',
841	843	'timedmedia-derivative-220_200kbs.ogv' => 'Ogg 200P',
842	844	'timedmedia-derivative-desc-220_200kbs.ogv' => 'Vídeo Ogg de baixo ancho de banda (200P)',
843		~~- 'timedmedia-derivative-desc-360_400kbs.ogv' => 'Vídeo Ogg para a web (360P)',~~
844		~~- 'timedmedia-derivative-desc-480_600kbs.ogv' => 'Vídeo Ogg para a web (480P)',~~
	845	+ 'timedmedia-derivative-desc-360_560kbs.ogv' => 'Vídeo Ogg para a web (360P)',
	846	+ 'timedmedia-derivative-desc-480_880kbs.ogv' => 'Vídeo Ogg para a web (480P)',
845	847	'timedmedia-derivative-desc-720_VBR.ogv' => 'Vídeo Ogg de alta calidade que se pode descargar (720P)',
846		~~- 'timedmedia-derivative-desc-480_600kbs.webm' => 'WebM para a web (480P)',~~
	848	+ 'timedmedia-derivative-desc-480_900kbs.webm' => 'WebM para a web (480P)',
847	849	'timedmedia-derivative-desc-720_VBR.webm' => 'WebM de alta calidade que se pode descargar (720P)',
848	850	'timedmedia-subtitle-language' => 'Subtítulos en $1 ($2)',
849	851	);
—	—	@@ -920,10 +922,10 @@
921	923	'timedmedia-source-file-desc' => '$1 מקורי, $2 × $3&rlm; ($4)',
922	924	'timedmedia-derivative-220_200kbs.ogv' => 'Ogg 200P',
923	925	'timedmedia-derivative-desc-220_200kbs.ogv' => 'וידאו Ogg (200P)&lrm; לרוחב פס נמוך',
924		~~- 'timedmedia-derivative-desc-360_400kbs.ogv' => 'וידאו Ogg (360P)&lrm; לנגינה שוטפת מהרשת',~~
925		~~- 'timedmedia-derivative-desc-480_600kbs.ogv' => 'וידאו Ogg (480P)&lrm; לנגינה שוטפת מהרשת',~~
	926	+ 'timedmedia-derivative-desc-360_560kbs.ogv' => 'וידאו Ogg (360P)&lrm; לנגינה שוטפת מהרשת',
	927	+ 'timedmedia-derivative-desc-480_880kbs.ogv' => 'וידאו Ogg (480P)&lrm; לנגינה שוטפת מהרשת',
926	928	'timedmedia-derivative-desc-720_VBR.ogv' => 'וידאו Ogg (720P)&lrm; באיכות גבוהה שניתן להורדה',
927		~~- 'timedmedia-derivative-desc-480_600kbs.webm' => 'וידאו WebM (480P)&lrm; לנגינה שוטפת מהרשת',~~
	929	+ 'timedmedia-derivative-desc-480_900kbs.webm' => 'וידאו WebM (480P)&lrm; לנגינה שוטפת מהרשת',
928	930	'timedmedia-derivative-desc-720_VBR.webm' => 'וידאו WebM (720P)&lrm; באיכות גבוהה שניתן להורדה',
929	931	'timedmedia-subtitle-language' => 'כתוביות ב$1&rlm; ($2)',
930	932	);
—	—	@@ -1000,10 +1002,10 @@
1001	1003	'timedmedia-source-file-desc' => 'Originalny $1, $2 x $3 ($4)',
1002	1004	'timedmedia-derivative-220_200kbs.ogv' => 'Ogg (200p)',
1003	1005	'timedmedia-derivative-desc-220_200kbs.ogv' => 'Ogg-widejo z niskej šěrokosću pasma (200p)',
1004		~~- 'timedmedia-derivative-desc-360_400kbs.ogv' => 'Ogg-widejo (360p), kotrež da so přez Web přenjesć',~~
1005		~~- 'timedmedia-derivative-desc-480_600kbs.ogv' => 'Ogg-widejo (480p), kotrež da so přez Web přenjesć',~~
	1006	+ 'timedmedia-derivative-desc-360_560kbs.ogv' => 'Ogg-widejo (360p), kotrež da so přez Web přenjesć',
	1007	+ 'timedmedia-derivative-desc-480_880kbs.ogv' => 'Ogg-widejo (480p), kotrež da so přez Web přenjesć',
1006	1008	'timedmedia-derivative-desc-720_VBR.ogv' => 'Sćahujomne Ogg-widejo wysokeje kwality (720p)',
1007		~~- 'timedmedia-derivative-desc-480_600kbs.webm' => 'WebM-widejo (480p), kotrež da so přez Web přenjesć',~~
	1009	+ 'timedmedia-derivative-desc-480_900kbs.webm' => 'WebM-widejo (480p), kotrež da so přez Web přenjesć',
1008	1010	'timedmedia-derivative-desc-720_VBR.webm' => 'Sćahujomna WebM-dataja wysokeje kwality (720p)',
1009	1011	'timedmedia-subtitle-language' => '$1 ($2) podtitule',
1010	1012	);
—	—	@@ -1061,10 +1063,10 @@
1062	1064	'timedmedia-source-file-desc' => 'Original $1, $2 × $3 ($4)',
1063	1065	'timedmedia-derivative-220_200kbs.ogv' => 'Ogg 200P',
1064	1066	'timedmedia-derivative-desc-220_200kbs.ogv' => 'Video Ogg a basse largor de banda (200P)',
1065		~~- 'timedmedia-derivative-desc-360_400kbs.ogv' => 'Video Ogg fluibile per web (360P)',~~
1066		~~- 'timedmedia-derivative-desc-480_600kbs.ogv' => 'Video Ogg fluibile per web (480P)',~~
	1067	+ 'timedmedia-derivative-desc-360_560kbs.ogv' => 'Video Ogg fluibile per web (360P)',
	1068	+ 'timedmedia-derivative-desc-480_880kbs.ogv' => 'Video Ogg fluibile per web (480P)',
1067	1069	'timedmedia-derivative-desc-720_VBR.ogv' => 'Video Ogg discargabile de alte qualitate (720P)',
1068		~~- 'timedmedia-derivative-desc-480_600kbs.webm' => 'WebM fluibile per web (480P)',~~
	1070	+ 'timedmedia-derivative-desc-480_900kbs.webm' => 'WebM fluibile per web (480P)',
1069	1071	'timedmedia-derivative-desc-720_VBR.webm' => 'WebM discargabile de alte qualitate (720P)',
1070	1072	'timedmedia-subtitle-language' => '$1 ($2) subtitulos',
1071	1073	);
—	—	@@ -1349,10 +1351,10 @@
1350	1352	'timedmedia-source-file-desc' => 'Ojinaal $1-Dattei, $2 × $3 ($4)',
1351	1353	'timedmedia-derivative-220_200kbs.ogv' => 'En Viddejo-Dattei em OGG-Fommaat met 720p',
1352	1354	'timedmedia-derivative-desc-220_200kbs.ogv' => 'En Viddejo-Dattei met winnesch Bandbreide (200P) em <i lang="en">Ogg</i>-Fommaat',
1353		~~- 'timedmedia-derivative-desc-360_400kbs.ogv' => 'En Viddejo-Dattei em <i lang="en">Ogg</i>-Fommaat (360p) för ene Dahteshtrohm övver et Nez',~~
1354		~~- 'timedmedia-derivative-desc-480_600kbs.ogv' => 'En Viddejo-Dattei (met 480p) em <i lang="en">Ogg</i>-Fommaat för ene Dahteshtrohm övver et Nez',~~
	1355	+ 'timedmedia-derivative-desc-360_560kbs.ogv' => 'En Viddejo-Dattei em <i lang="en">Ogg</i>-Fommaat (360p) för ene Dahteshtrohm övver et Nez',
	1356	+ 'timedmedia-derivative-desc-480_880kbs.ogv' => 'En Viddejo-Dattei (met 480p) em <i lang="en">Ogg</i>-Fommaat för ene Dahteshtrohm övver et Nez',
1355	1357	'timedmedia-derivative-desc-720_VBR.ogv' => 'En Viddejo-Dattei met huhe Qualiteit (met 720p) em <i lang="en">Ogg</i>-Fommaat zom eronger laade',
1356		~~- 'timedmedia-derivative-desc-480_600kbs.webm' => 'Ene WebM Viddejo (met 480p) för ene Dahteshtrohm övver et Nez',~~
	1358	+ 'timedmedia-derivative-desc-480_900kbs.webm' => 'Ene WebM Viddejo (met 480p) för ene Dahteshtrohm övver et Nez',
1357	1359	'timedmedia-derivative-desc-720_VBR.webm' => 'En <i lang="en">WebM</i> Viddejo-Dattei met huhe Qualiteit (met 720p) zom eronger laade',
1358	1360	'timedmedia-subtitle-language' => 'Ongertittele en $1 ($2)',
1359	1361	);
—	—	@@ -1472,13 +1474,13 @@
1473	1475	'timedmedia-source-file-desc' => 'Изворен $1, $2 × $3 ($4)',
1474	1476	'timedmedia-derivative-220_200kbs.ogv' => 'Ogg 200P',
1475	1477	'timedmedia-derivative-desc-220_200kbs.ogv' => 'Нископропусно Ogg-видео (200п)',
1476		~~- 'timedmedia-derivative-360_400kbs.ogv' => 'Ogg 360п',~~
1477		~~- 'timedmedia-derivative-desc-360_400kbs.ogv' => 'Ogg-видео за емитување (360 пиксели)',~~
1478		~~- 'timedmedia-derivative-480_600kbs.ogv' => 'Ogg 480п',~~
1479		~~- 'timedmedia-derivative-desc-480_600kbs.ogv' => 'Ogg-видео за емитување (480 пиксели)',~~
	1478	+ 'timedmedia-derivative-360_560kbs.ogv' => 'Ogg 360п',
	1479	+ 'timedmedia-derivative-desc-360_560kbs.ogv' => 'Ogg-видео за емитување (360 пиксели)',
	1480	+ 'timedmedia-derivative-480_880kbs.ogv' => 'Ogg 480п',
	1481	+ 'timedmedia-derivative-desc-480_880kbs.ogv' => 'Ogg-видео за емитување (480 пиксели)',
1480	1482	'timedmedia-derivative-desc-720_VBR.ogv' => 'Висококвалитетно Ogg-видео (720 пиксели)',
1481		~~- 'timedmedia-derivative-480_600kbs.webm' => 'Висококвалитетен WebM за преземање (720п)',~~
1482		~~- 'timedmedia-derivative-desc-480_600kbs.webm' => 'Висококвалитетен WebM за преземање (720п)',~~
	1483	+ 'timedmedia-derivative-480_900kbs.webm' => 'Висококвалитетен WebM за преземање (720п)',
	1484	+ 'timedmedia-derivative-desc-480_900kbs.webm' => 'Висококвалитетен WebM за преземање (720п)',
1483	1485	'timedmedia-derivative-720_VBR.webm' => 'WebM 720п',
1484	1486	'timedmedia-derivative-desc-720_VBR.webm' => 'Висококвалитетен WebM за преземање (720п)',
1485	1487	'timedmedia-subtitle-language' => '$1 ($2) титлови',
—	—	@@ -1627,10 +1629,10 @@
1628	1630	'timedmedia-source-file-desc' => 'Origineel $1, $2 × $3 ($4)',
1629	1631	'timedmedia-derivative-220_200kbs.ogv' => 'Ogg 200P',
1630	1632	'timedmedia-derivative-desc-220_200kbs.ogv' => 'Lage bandbreedte Ogg video (200P)',
1631		~~- 'timedmedia-derivative-desc-360_400kbs.ogv' => 'Te webstreamen Off video (360P)',~~
1632		~~- 'timedmedia-derivative-desc-480_600kbs.ogv' => 'Te webstreamen Ogg video (480P)',~~
	1633	+ 'timedmedia-derivative-desc-360_560kbs.ogv' => 'Te webstreamen Off video (360P)',
	1634	+ 'timedmedia-derivative-desc-480_880kbs.ogv' => 'Te webstreamen Ogg video (480P)',
1633	1635	'timedmedia-derivative-desc-720_VBR.ogv' => 'Hoge kwaliteit downloadbare Ogg video (720P)',
1634		~~- 'timedmedia-derivative-desc-480_600kbs.webm' => 'Via web te streamen WebM (480P)',~~
	1636	+ 'timedmedia-derivative-desc-480_900kbs.webm' => 'Via web te streamen WebM (480P)',
1635	1637	'timedmedia-derivative-desc-720_VBR.webm' => 'Hoge kwaliteit downloadbare WebM (720P)',
1636	1638	'timedmedia-subtitle-language' => 'Ondertitels in $1 ($2)',
1637	1639	);
—	—	@@ -1817,10 +1819,10 @@
1818	1820	'timedmedia-source-file-desc' => 'Original $1, $2 × $3 ($4)',
1819	1821	'timedmedia-derivative-220_200kbs.ogv' => 'Ogg 200P',
1820	1822	'timedmedia-derivative-desc-220_200kbs.ogv' => 'Vídeo Ogg de baixa largura de banda (200P)',
1821		~~- 'timedmedia-derivative-desc-360_400kbs.ogv' => 'Vídeo Ogg para web streaming (360P)',~~
1822		~~- 'timedmedia-derivative-desc-480_600kbs.ogv' => 'Vídeo Ogg para web streaming (480P)',~~
	1823	+ 'timedmedia-derivative-desc-360_560kbs.ogv' => 'Vídeo Ogg para web streaming (360P)',
	1824	+ 'timedmedia-derivative-desc-480_880kbs.ogv' => 'Vídeo Ogg para web streaming (480P)',
1823	1825	'timedmedia-derivative-desc-720_VBR.ogv' => 'Vídeo Ogg de alta qualidade para download (720 P)',
1824		~~- 'timedmedia-derivative-desc-480_600kbs.webm' => 'WebM para web streaming (480P)',~~
	1826	+ 'timedmedia-derivative-desc-480_900kbs.webm' => 'WebM para web streaming (480P)',
1825	1827	'timedmedia-derivative-desc-720_VBR.webm' => 'WebM de alta qualidade para download (720P)',
1826	1828	'timedmedia-subtitle-language' => 'Legendas em $1 ($2)',
1827	1829	);
—	—	@@ -2027,10 +2029,10 @@
2028	2030	'timedmedia-source-file-desc' => 'Izvirnik $1, $2 × $3 ($4)',
2029	2031	'timedmedia-derivative-220_200kbs.ogv' => 'Ogg 200P',
2030	2032	'timedmedia-derivative-desc-220_200kbs.ogv' => 'Video Ogg za majhno pasovno širino (200P)',
2031		~~- 'timedmedia-derivative-desc-360_400kbs.ogv' => 'Video Ogg za pretakanje preko spleta (360P)',~~
2032		~~- 'timedmedia-derivative-desc-480_600kbs.ogv' => 'Video Ogg za pretakanje preko spleta (480P)',~~
	2033	+ 'timedmedia-derivative-desc-360_560kbs.ogv' => 'Video Ogg za pretakanje preko spleta (360P)',
	2034	+ 'timedmedia-derivative-desc-480_880kbs.ogv' => 'Video Ogg za pretakanje preko spleta (480P)',
2033	2035	'timedmedia-derivative-desc-720_VBR.ogv' => 'Visoko ločljivostni video Ogg za prenos (720P)',
2034		~~- 'timedmedia-derivative-desc-480_600kbs.webm' => 'WebM za pretakanje preko spleta (480P)',~~
	2036	+ 'timedmedia-derivative-desc-480_900kbs.webm' => 'WebM za pretakanje preko spleta (480P)',
2035	2037	'timedmedia-derivative-desc-720_VBR.webm' => 'Visokokakovostni WebM za prenos (720P)',
2036	2038	'timedmedia-subtitle-language' => 'podnapisi v jeziku $1 ($2)',
2037	2039	);
Index: trunk/extensions/TimedMediaHandler/TimedMediaHandler.php
—	—	@@ -71,14 +71,14 @@
72	72	// Cover accessibility for low bandwidth / low resources clients:
73	73	WebVideoTranscode::ENC_OGV_2MBS,
74	74
75		~~- // A standard web streamable ogg video~~
76		~~- WebVideoTranscode::ENC_OGV_6MBS,~~
	75	+ // A high end web streamable ogg video
	76	+ WebVideoTranscode::ENC_OGV_9MBS,
77	77
78	78	// High quality 720P ogg video:
79	79	WebVideoTranscode::ENC_OGV_HQ_VBR,
80	80
81		~~- // A standard web streamable WebM video~~
82		~~- WebVideoTranscode::ENC_WEBM_6MBS,~~
	81	+ // A web streamable WebM video
	82	+ WebVideoTranscode::ENC_WEBM_9MBS,
83	83
84	84	// A high quality WebM stream
85	85	WebVideoTranscode::ENC_WEBM_HQ_VBR,
Index: trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscode.php
—	—	@@ -30,12 +30,13 @@
31	31
32	32	// Ogg Profiles
33	33	const ENC_OGV_2MBS = '220_200kbs.ogv';
34		~~- const ENC_OGV_4MBS = '360_400kbs.ogv';~~
35		~~- const ENC_OGV_6MBS = '480_600kbs.ogv';~~
	34	+ const ENC_OGV_5MBS = '360_560kbs.ogv';
	35	+ const ENC_OGV_9MBS = '480_880kbs.ogv';
36	36	const ENC_OGV_HQ_VBR = '720_VBR.ogv';
37	37
38	38	// WebM profiles:
39		~~- const ENC_WEBM_6MBS = '480_600kbs.webm';~~
	39	+ const ENC_WEBM_5MBS = '360_560kbs.webm';
	40	+ const ENC_WEBM_9MBS = '480_900kbs.webm';
40	41	const ENC_WEBM_HQ_VBR = '720_VBR.webm';
41	42
42	43	/**
—	—	@@ -49,7 +50,7 @@
50	51	public static $derivativeSettings = array(
51	52	WebVideoTranscode::ENC_OGV_2MBS =>
52	53	array(
53		~~- 'maxSize' => '220',~~
	54	+ 'maxSize' => '220', // 160P or around there
54	55	'videoBitrate' => '160',
55	56	'audioBitrate' => '32',
56	57	'samplerate' => '22050',
—	—	@@ -61,9 +62,9 @@
62	63	'bufDelay' => '128',
63	64	'videoCodec' => 'theora',
64	65	),
65		~~- WebVideoTranscode::ENC_OGV_4MBS =>~~
	66	+ WebVideoTranscode::ENC_OGV_5MBS =>
66	67	array(
67		~~- 'maxSize' => '480',~~
	68	+ 'maxSize' => '480', // 360P
68	69	'videoBitrate' => '512',
69	70	'audioBitrate' => '48',
70	71	'noUpscaling' => 'true',
—	—	@@ -72,33 +73,44 @@
73	74	'bufDelay' => '256',
74	75	'videoCodec' => 'theora',
75	76	),
76		~~- WebVideoTranscode::ENC_OGV_6MBS =>~~
	77	+ WebVideoTranscode::ENC_OGV_9MBS =>
77	78	array(
78		~~- 'maxSize' => '640',~~
	79	+ 'maxSize' => '640', // 480P
79	80	'videoBitrate' => '786',
80	81	'audioBitrate' => '96',
81	82	'noUpscaling' => 'true',
82	83	'twopass' => 'true',
83	84	'keyframeInterval' => '128',
84	85	'bufDelay' => '256',
85		~~- 'videoCodec' => 'theora',~~
	86	+ 'videoCodec' => 'theora',
86	87	),
87	88
88	89	WebVideoTranscode::ENC_OGV_HQ_VBR =>
89	90	array(
90		~~- 'maxSize' => '1280',~~
	91	+ 'maxSize' => '1280', // 720P
91	92	'videoQuality' => 6,
92	93	'audioQuality' => 3,
93	94	'noUpscaling' => 'true',
94	95	'keyframeInterval' => '128',
95		~~- 'videoCodec' => 'theora',~~
	96	+ 'videoCodec' => 'theora',
96	97	),
97	98
98	99
99	100	// WebM transcode:
100		~~- WebVideoTranscode::ENC_WEBM_6MBS =>~~
	101	+ WebVideoTranscode::ENC_WEBM_5MBS =>
101	102	array(
102		~~- 'maxSize' => '640',~~
	103	+ 'maxSize' => '480', // 380P
	104	+ 'videoBitrate' => '512',
	105	+ 'audioBitrate' => '48',
	106	+ 'noUpscaling' => 'true',
	107	+ 'twopass' => 'true',
	108	+ 'keyframeInterval' => '128',
	109	+ 'bufDelay' => '256',
	110	+ 'videoCodec' => 'vp8',
	111	+ ),
	112	+ WebVideoTranscode::ENC_WEBM_9MBS =>
	113	+ array(
	114	+ 'maxSize' => '640', // 480P
103	115	'videoBitrate' => '786',
104	116	'audioBitrate' => '96',
105	117	'noUpscaling' => 'true',
—	—	@@ -109,7 +121,7 @@
110	122	),
111	123	WebVideoTranscode::ENC_WEBM_HQ_VBR =>
112	124	array(
113		~~- 'maxSize' => '1280',~~
	125	+ 'maxSize' => '1280', // 720P
114	126	'videoQuality' => 7,
115	127	'audioQuality' => 3,
116	128	'noUpscaling' => 'true',
Index: trunk/extensions/TimedMediaHandler/README
—	—	@@ -18,7 +18,10 @@
19	19	// TimedMediaHandler
20	20	require( "$IP/extensions/TimedMediaHandler/TimedMediaHandler.php" );
21	21
	22	+ // For boxes doing transcoding you should increase the allocated shell memmory:
	23	+ $wgMaxShellMemory = 102400*64;
22	24
	25	+
23	26	Kaltura html5 player library
24	27	-----
25	28	TimedMediaHandler uses the Kaltura html5 player library for video playback.
Index: trunk/extensions/TimedMediaHandler/TimedMediaIframeOutput.php
—	—	@@ -75,8 +75,11 @@
76	76	<?php echo $thumbnail->toHtml(); ?>
77	77	</div
78	78	<?php echo $wgOut->getHeadScripts($skin); ?>
79		~~- <script type="text/javascript">~~
80		~~- mw.ready(function(){~~
	79	+ <script type="text/javascript">
	80	+ // Set the fullscreen property inline to avoid poluting the player cache
	81	+ mw.setConfig('EmbedPlayer.EnableFullscreen', false );
	82	+
	83	+ mw.ready(function(){
81	84	var fitPlayer = function(){
82	85	$( '#<?php echo TimedMediaTransformOutput::PLAYER_ID_PREFIX . '0' ?>' )
83	86	.get(0).resizePlayer({

Follow-up revisions

Revision	Commit summary	Author	Date
r85056	Follow-up r85054 for Translatewiki	raymond	06:33, 31 March 2011

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r84988	* tweaked encode settings to match their names ( ie 720P = 1280x720 )...	dale	23:02, 29 March 2011

Status & tagging log

18:00, 26 May 2011 Reedy (talk | contribs) changed the status of r85054 [removed: new added: deferred]