Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226443
Change subject: Add defs for 240p transcodes for 3G streaming and slow devices
......................................................................
Add defs for 240p transcodes for 3G streaming and slow devices
Bug: T104063
Change-Id: Id6e76f48c4d01465e90e814bbd48e89748bf20ea
---
M WebVideoTranscode/WebVideoTranscode.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 53 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/43/226443/1
diff --git a/WebVideoTranscode/WebVideoTranscode.php
b/WebVideoTranscode/WebVideoTranscode.php
index 226e811..d540332 100644
--- a/WebVideoTranscode/WebVideoTranscode.php
+++ b/WebVideoTranscode/WebVideoTranscode.php
@@ -27,6 +27,7 @@
// Ogg Profiles
const ENC_OGV_160P = '160p.ogv';
+ const ENC_OGV_240P = '240p.ogv';
const ENC_OGV_360P = '360p.ogv';
const ENC_OGV_480P = '480p.ogv';
const ENC_OGV_720P = '720p.ogv';
@@ -34,12 +35,14 @@
// WebM profiles:
const ENC_WEBM_160P = '160p.webm';
+ const ENC_WEBM_240P = '240p.webm';
const ENC_WEBM_360P = '360p.webm';
const ENC_WEBM_480P = '480p.webm';
const ENC_WEBM_720P = '720p.webm';
const ENC_WEBM_1080P = '1080p.webm';
// mp4 profiles:
+ const ENC_H264_240P = '240p.mp4';
const ENC_H264_320P = '320p.mp4';
const ENC_H264_480P = '480p.mp4';
const ENC_H264_720P = '720p.mp4';
@@ -68,6 +71,20 @@
'videoBitrate' => '160',
'framerate' => '15',
'audioQuality' => '-1',
+ 'samplerate' => '44100',
+ 'channels' => '2',
+ 'noUpscaling' => 'true',
+ //'twopass' => 'true',
+ 'keyframeInterval' => '128',
+ 'bufDelay' => '256',
+ 'videoCodec' => 'theora',
+ 'type' => 'video/ogg;
codecs="theora, vorbis"',
+ ),
+ WebVideoTranscode::ENC_OGV_240P =>
+ array(
+ 'maxSize' => '426x240',
+ 'videoBitrate' => '320',
+ 'audioQuality' => '0',
'samplerate' => '44100',
'channels' => '2',
'noUpscaling' => 'true',
@@ -143,6 +160,19 @@
'videoCodec' => 'vp8',
'type' => 'video/webm;
codecs="vp8, vorbis"',
),
+ WebVideoTranscode::ENC_WEBM_240P =>
+ array(
+ 'maxSize' => '426x240',
+ 'videoBitrate' => '320',
+ 'audioQuality' => '0',
+ 'samplerate' => '44100',
+ 'noUpscaling' => 'true',
+ 'twopass' => 'true',
+ 'keyframeInterval' => '128',
+ 'bufDelay' => '256',
+ 'videoCodec' => 'vp8',
+ 'type' => 'video/webm;
codecs="vp8, vorbis"',
+ ),
WebVideoTranscode::ENC_WEBM_360P =>
array(
'maxSize' => '640x360',
@@ -193,6 +223,17 @@
// and apple HLS profile guide:
//
https://developer.apple.com/library/ios/#documentation/networkinginternet/conceptual/streamingmediaguide/UsingHTTPLiveStreaming/UsingHTTPLiveStreaming.html#//apple_ref/doc/uid/TP40008332-CH102-DontLinkElementID_24
+ WebVideoTranscode::ENC_H264_240P =>
+ array(
+ 'maxSize' => '426x240',
+ 'videoCodec' => 'h264',
+ 'videoBitrate' => '320k',
+ 'audioCodec' => 'aac',
+ 'channels' => '2',
+ 'audioBitrate' => '40k',
+ 'type' => 'video/mp4; codecs="avc1.42E01E,
mp4a.40.2"',
+ ),
+
WebVideoTranscode::ENC_H264_320P =>
array(
'maxSize' => '480x320',
diff --git a/i18n/en.json b/i18n/en.json
index 9ca0993..73343df 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -60,6 +60,8 @@
"timedmedia-source-audio-file-desc": "Original $1 file ($2)",
"timedmedia-derivative-160p.ogv": "Ogg 160P",
"timedmedia-derivative-desc-160p.ogv": "Low bandwidth Ogg video (160P)",
+ "timedmedia-derivative-240p.ogv": "Ogg 240P",
+ "timedmedia-derivative-desc-240p.ogv": "Mobile streamable Ogg video
(240P)",
"timedmedia-derivative-360p.ogv": "Ogg 360P",
"timedmedia-derivative-desc-360p.ogv": "Web streamable Ogg video
(360P)",
"timedmedia-derivative-480p.ogv": "Ogg 480P",
@@ -70,6 +72,8 @@
"timedmedia-derivative-desc-1080p.ogv": "Full HD downloadable Ogg video
(1080P)",
"timedmedia-derivative-160p.webm": "WebM 160P",
"timedmedia-derivative-desc-160p.webm": "Web streamable WebM (160P)",
+ "timedmedia-derivative-240p.webm": "WebM 240P",
+ "timedmedia-derivative-desc-240p.webm": "Mobile streamable WebM (240P)",
"timedmedia-derivative-360p.webm": "WebM 360P",
"timedmedia-derivative-desc-360p.webm": "Web streamable WebM (360P)",
"timedmedia-derivative-480p.webm": "WebM 480P",
@@ -78,6 +82,8 @@
"timedmedia-derivative-desc-720p.webm": "High quality downloadable WebM
(720P)",
"timedmedia-derivative-1080p.webm": "WebM 1080P",
"timedmedia-derivative-desc-1080p.webm": "Full HD downloadable WebM
(1080P)",
+ "timedmedia-derivative-240p.mp4": "H264 240P",
+ "timedmedia-derivative-desc-240p.mp4": "Mobile streamable MP4 (240P)",
"timedmedia-derivative-320p.mp4": "H264 320P",
"timedmedia-derivative-desc-320p.mp4": "Device-friendly MP4 (320P)",
"timedmedia-derivative-480p.mp4": "H264 480P",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 40034b5..32dd0ab 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -76,6 +76,8 @@
"timedmedia-source-audio-file-desc": "Source file description.
Parameters:\n* $1 - file type; any one of the following messages:\n**
{{msg-mw|Timedmedia-ogg}}\n** {{msg-mw|Timedmedia-webm}}\n**
{{msg-mw|Timedmedia-mp4}}\n** {{msg-mw|Timedmedia-flac}}\n**
{{msg-mw|Timedmedia-wav}}\n* $2 - human readable bitrate\nSee also:\n*
{{msg-mw|Timedmedia-source-file-desc}} - for video file",
"timedmedia-derivative-160p.ogv": "{{optional}} A type of media format
encoding",
"timedmedia-derivative-desc-160p.ogv": "{{optional}} A type of media
format encoding",
+ "timedmedia-derivative-240p.ogv": "{{optional}} A type of media format
encoding",
+ "timedmedia-derivative-desc-240p.ogv": "{{optional}} A type of media
format encoding",
"timedmedia-derivative-360p.ogv": "{{optional}} A type of media format
encoding",
"timedmedia-derivative-desc-360p.ogv": "{{optional}} A type of media
format encoding",
"timedmedia-derivative-480p.ogv": "{{optional}} A type of media format
encoding",
@@ -86,6 +88,8 @@
"timedmedia-derivative-desc-1080p.ogv": "{{optional}} A type of media
format encoding",
"timedmedia-derivative-160p.webm": "{{optional}} A type of media
format encoding",
"timedmedia-derivative-desc-160p.webm": "{{optional}} A type of media
format encoding",
+ "timedmedia-derivative-240p.webm": "{{optional}} A type of media
format encoding",
+ "timedmedia-derivative-desc-240p.webm": "{{optional}} A type of media
format encoding",
"timedmedia-derivative-360p.webm": "{{optional}} A type of media
format encoding",
"timedmedia-derivative-desc-360p.webm": "{{optional}} A type of media
format encoding",
"timedmedia-derivative-480p.webm": "{{optional}} A type of media
format encoding",
@@ -94,6 +98,8 @@
"timedmedia-derivative-desc-720p.webm": "{{optional}} A type of media
format encoding",
"timedmedia-derivative-1080p.webm": "{{optional}} A type of media
format encoding",
"timedmedia-derivative-desc-1080p.webm": "{{optional}} A type of media
format encoding",
+ "timedmedia-derivative-240p.mp4": "{{optional}} A type of media format
encoding",
+ "timedmedia-derivative-desc-240p.mp4": "{{optional}} A type of media
format encoding",
"timedmedia-derivative-320p.mp4": "{{optional}} A type of media format
encoding",
"timedmedia-derivative-desc-320p.mp4": "{{optional}} A type of media
format encoding",
"timedmedia-derivative-480p.mp4": "{{optional}} A type of media format
encoding",
--
To view, visit https://gerrit.wikimedia.org/r/226443
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6e76f48c4d01465e90e814bbd48e89748bf20ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER <br...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
