jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391346 )
Change subject: Final adjust to Ogg Theora transcode settings
......................................................................
Final adjust to Ogg Theora transcode settings
Apply some final tweaks to Ogg Theora transcode settings:
* use --soft-target on ffmpeg2theora
* use a bandwidth target instead of quality target on HD targets
* include 1440p and 2160p defs for comparison testing
* don't force super-low frame rate on 15fps
(Note that Theora output is not in use in production anymore, and
will probably be removed later entirely.)
Change-Id: I51c02ba68cea452eb6f393f894018b852b34fc31
---
M WebVideoTranscode/WebVideoTranscode.php
M WebVideoTranscode/WebVideoTranscodeJob.php
2 files changed, 43 insertions(+), 4 deletions(-)
Approvals:
Brion VIBBER: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WebVideoTranscode/WebVideoTranscode.php
b/WebVideoTranscode/WebVideoTranscode.php
index 8e21edd..c8125ab 100644
--- a/WebVideoTranscode/WebVideoTranscode.php
+++ b/WebVideoTranscode/WebVideoTranscode.php
@@ -32,6 +32,8 @@
const ENC_OGV_480P = '480p.ogv';
const ENC_OGV_720P = '720p.ogv';
const ENC_OGV_1080P = '1080p.ogv';
+ const ENC_OGV_1440P = '1440p.ogv';
+ const ENC_OGV_2160P = '2160p.ogv';
// WebM VP8/Vorbis profiles:
const ENC_WEBM_160P = '160p.webm';
@@ -84,8 +86,9 @@
self::ENC_OGV_160P =>
[
'maxSize' => '288x160',
- 'videoBitrate' => '160',
- 'framerate' => '15',
+ 'videoBitrate' => '256',
+ 'softTarget' => 'true',
+ 'framerate' => '60', // max to
reduce "1000fps bug" problems
'audioQuality' => '-1',
'channels' => '2',
'noUpscaling' => 'true', // also
caps to source frame rate
@@ -100,6 +103,7 @@
[
'maxSize' => '426x240',
'videoBitrate' => '512',
+ 'softTarget' => 'true',
'framerate' => '60', // max to
reduce "1000fps bug" problems
'audioQuality' => '0',
'channels' => '2',
@@ -115,6 +119,7 @@
[
'maxSize' => '640x360',
'videoBitrate' => '1024',
+ 'softTarget' => 'true',
'framerate' => '60', // max to
reduce "1000fps bug" problems
'audioQuality' => '1',
'channels' => '2',
@@ -130,6 +135,7 @@
[
'maxSize' => '854x480',
'videoBitrate' => '2048',
+ 'softTarget' => 'true',
'framerate' => '60', // max to
reduce "1000fps bug" problems
'audioQuality' => '2',
'channels' => '2',
@@ -145,7 +151,8 @@
self::ENC_OGV_720P =>
[
'maxSize' => '1280x720',
- 'videoQuality' => 6,
+ 'videoBitrate' => '4096',
+ 'softTarget' => 'true',
'framerate' => '60', // max to
reduce "1000fps bug" problems
'audioQuality' => 3,
'noUpscaling' => 'true', // also
caps to source frame rate
@@ -159,7 +166,38 @@
self::ENC_OGV_1080P =>
[
'maxSize' => '1920x1080',
- 'videoQuality' => 6,
+ 'videoBitrate' => '8192',
+ 'softTarget' => 'true',
+ 'framerate' => '60', // max to
reduce "1000fps bug" problems
+ 'audioQuality' => 3,
+ 'noUpscaling' => 'true', // also
caps to source frame rate
+ 'twopass' => 'false', //
will be overridden by $wgTmhTheoraTwoPassEncoding
+ 'optimize' => 'true',
+ 'keyframeInterval' => '128',
+ 'videoCodec' => 'theora',
+ 'type' => 'video/ogg;
codecs="theora, vorbis"',
+ ],
+
+ self::ENC_OGV_1440P =>
+ [
+ 'maxSize' => '2560x1440',
+ 'videoBitrate' => '16384',
+ 'softTarget' => 'true',
+ 'framerate' => '60', // max to
reduce "1000fps bug" problems
+ 'audioQuality' => 3,
+ 'noUpscaling' => 'true', // also
caps to source frame rate
+ 'twopass' => 'false', //
will be overridden by $wgTmhTheoraTwoPassEncoding
+ 'optimize' => 'true',
+ 'keyframeInterval' => '128',
+ 'videoCodec' => 'theora',
+ 'type' => 'video/ogg;
codecs="theora, vorbis"',
+ ],
+
+ self::ENC_OGV_2160P =>
+ [
+ 'maxSize' => '3840x2160',
+ 'videoBitrate' => '32768',
+ 'softTarget' => 'true',
'framerate' => '60', // max to
reduce "1000fps bug" problems
'audioQuality' => 3,
'noUpscaling' => 'true', // also
caps to source frame rate
diff --git a/WebVideoTranscode/WebVideoTranscodeJob.php
b/WebVideoTranscode/WebVideoTranscodeJob.php
index b25f4d4..ae02e25 100644
--- a/WebVideoTranscode/WebVideoTranscodeJob.php
+++ b/WebVideoTranscode/WebVideoTranscodeJob.php
@@ -1007,6 +1007,7 @@
'deinterlace' => "--deinterlace",
'novideo' => [ "--novideo", "--no-skeleton" ],
'bufDelay' => "--buf-delay",
+ 'softTarget' => "--soft-target",
// audio
'audioQuality' => "-a",
'audioBitrate' => "-A",
--
To view, visit https://gerrit.wikimedia.org/r/391346
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I51c02ba68cea452eb6f393f894018b852b34fc31
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
