jenkins-bot has submitted this change and it was merged.
Change subject: Quick add of full-HD (1080p) transcode configs for TMH
......................................................................
Quick add of full-HD (1080p) transcode configs for TMH
Bug: 71705
Change-Id: I805ddbddda143db43ab7644de81a28014a13022c
---
M TimedMediaHandler.php
M WebVideoTranscode/WebVideoTranscode.php
M i18n/en.json
M i18n/qqq.json
4 files changed, 50 insertions(+), 0 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TimedMediaHandler.php b/TimedMediaHandler.php
index a9762d2..b1e0025 100644
--- a/TimedMediaHandler.php
+++ b/TimedMediaHandler.php
@@ -144,6 +144,9 @@
// A high quality WebM stream
WebVideoTranscode::ENC_WEBM_720P,
+
+ // A full-HD high quality WebM stream
+ WebVideoTranscode::ENC_WEBM_1080P,
/*
// A least common denominator h.264 stream; first gen iPhone, iPods,
early android etc.
WebVideoTranscode::ENC_H264_320P,
@@ -153,6 +156,9 @@
// An high quality HD stream; higher end phones, tablets, smart tvs
WebVideoTranscode::ENC_H264_720P,
+
+ // A full-HD high quality stream; higher end phones, tablets, smart tvs
+ WebVideoTranscode::ENC_H264_1080P,
*/
);
diff --git a/WebVideoTranscode/WebVideoTranscode.php
b/WebVideoTranscode/WebVideoTranscode.php
index 704fd8d..e6b7a7f 100644
--- a/WebVideoTranscode/WebVideoTranscode.php
+++ b/WebVideoTranscode/WebVideoTranscode.php
@@ -30,17 +30,20 @@
const ENC_OGV_360P = '360p.ogv';
const ENC_OGV_480P = '480p.ogv';
const ENC_OGV_720P = '720p.ogv';
+ const ENC_OGV_1080P = '1080p.ogv';
// WebM profiles:
const ENC_WEBM_160P = '160p.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_320P = '320p.mp4';
const ENC_H264_480P = '480p.mp4';
const ENC_H264_720P = '720p.mp4';
+ const ENC_H264_1080P = '1080p.mp4';
const ENC_OGG_VORBIS = 'ogg';
const ENC_OGG_OPUS = 'opus';
@@ -114,6 +117,17 @@
'type' => 'video/ogg;
codecs="theora, vorbis"',
),
+ WebVideoTranscode::ENC_OGV_1080P =>
+ array(
+ 'maxSize' => '1920x1080',
+ 'videoQuality' => 6,
+ 'audioQuality' => 3,
+ 'noUpscaling' => 'true',
+ 'keyframeInterval' => '128',
+ 'videoCodec' => 'theora',
+ 'type' => 'video/ogg;
codecs="theora, vorbis"',
+ ),
+
// WebM transcode:
WebVideoTranscode::ENC_WEBM_160P =>
array(
@@ -164,6 +178,15 @@
'videoCodec' => 'vp8',
'type' => 'video/webm;
codecs="vp8, vorbis"',
),
+ WebVideoTranscode::ENC_WEBM_1080P =>
+ array(
+ 'maxSize' => '1920x1080',
+ 'videoQuality' => 7,
+ 'audioQuality' => 3,
+ 'noUpscaling' => 'true',
+ 'videoCodec' => 'vp8',
+ 'type' => 'video/webm;
codecs="vp8, vorbis"',
+ ),
// Losly defined per PCF guide to mp4 profiles:
//
https://develop.participatoryculture.org/index.php/ConversionMatrix
@@ -206,6 +229,18 @@
'type' => 'video/mp4; codecs="avc1.42E01E,
mp4a.40.2"',
),
+ WebVideoTranscode::ENC_H264_1080P =>
+ array(
+ 'maxSize' => '1920x1080',
+ 'videoCodec' => 'h264',
+ 'preset' => '1080p',
+ 'videoBitrate' => '5000k',
+ 'audioCodec' => 'aac',
+ 'channels' => '2',
+ 'audioBitrate' => '128k',
+ 'type' => 'video/mp4; codecs="avc1.42E01E,
mp4a.40.2"',
+ ),
+
//Audio profiles
WebVideoTranscode::ENC_OGG_VORBIS =>
array(
diff --git a/i18n/en.json b/i18n/en.json
index 63bebfc..191b6cb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -66,6 +66,8 @@
"timedmedia-derivative-desc-480p.ogv": "Web streamable Ogg video (480P)",
"timedmedia-derivative-720p.ogv": "Ogg 720P",
"timedmedia-derivative-desc-720p.ogv": "High quality downloadable Ogg
video (720P)",
+ "timedmedia-derivative-1080p.ogv": "Ogg 1080P",
+ "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-360p.webm": "WebM 360P",
@@ -74,12 +76,16 @@
"timedmedia-derivative-desc-480p.webm": "Web streamable WebM (480P)",
"timedmedia-derivative-720p.webm": "WebM 720P",
"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-320p.mp4": "H264 320P",
"timedmedia-derivative-desc-320p.mp4": "Device-friendly MP4 (320P)",
"timedmedia-derivative-480p.mp4": "H264 480P",
"timedmedia-derivative-desc-480p.mp4": "Web streamable MP4 (480P)",
"timedmedia-derivative-720p.mp4": "H264 720P",
"timedmedia-derivative-desc-720p.mp4": "HD quality MP4 (720P)",
+ "timedmedia-derivative-1080p.mp4": "H264 1080P",
+ "timedmedia-derivative-desc-1080p.mp4": "Full HD quality MP4 (1080P)",
"timedmedia-derivative-ogg": "Ogg Vorbis",
"timedmedia-derivative-desc-ogg": "Ogg Vorbis",
"timedmedia-derivative-opus": "Opus",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 664b3cf..07c3ea5 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -77,13 +77,16 @@
"timedmedia-derivative-360p.ogv": "{{optional}}",
"timedmedia-derivative-480p.ogv": "{{optional}}",
"timedmedia-derivative-720p.ogv": "{{optional}}",
+ "timedmedia-derivative-1080p.ogv": "{{optional}}",
"timedmedia-derivative-160p.webm": "{{optional}}",
"timedmedia-derivative-360p.webm": "{{optional}}",
"timedmedia-derivative-480p.webm": "{{optional}}",
"timedmedia-derivative-720p.webm": "{{optional}}",
+ "timedmedia-derivative-1080p.webm": "{{optional}}",
"timedmedia-derivative-320p.mp4": "{{optional}}",
"timedmedia-derivative-480p.mp4": "{{optional}}",
"timedmedia-derivative-720p.mp4": "{{optional}}",
+ "timedmedia-derivative-1080p.mp4": "{{optional}}",
"timedmedia-derivative-ogg": "{{optional}}",
"timedmedia-derivative-desc-ogg": "{{optional}}",
"timedmedia-derivative-opus": "{{optional}}",
--
To view, visit https://gerrit.wikimedia.org/r/165243
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I805ddbddda143db43ab7644de81a28014a13022c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Brian Wolff <bawolff...@gmail.com>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Gilles <gdu...@wikimedia.org>
Gerrit-Reviewer: Matanya <mata...@foss.co.il>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
