jenkins-bot has submitted this change and it was merged.
Change subject: Fix MP4/H.264 transcodes on modern avconv
......................................................................
Fix MP4/H.264 transcodes on modern avconv
* old -vpre option is gone
* old -wpred-dct8x8 option is replaced with -weightb
* 720p transcode whinges about -level 30 with options;
bumped to -level 31
* libvo_aac is not in Ubuntu by default, use aac instead
Bug: T73391
Change-Id: I909a116db2f707c4957c624d48ddb9c36a6e0a6a
(cherry picked from commit 135e138100a9fca7622a9d065f3fe76b59ec6673)
---
M WebVideoTranscode/WebVideoTranscode.php
M WebVideoTranscode/WebVideoTranscodeJob.php
2 files changed, 6 insertions(+), 4 deletions(-)
Approvals:
Brion VIBBER: Looks good to me, approved
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WebVideoTranscode/WebVideoTranscode.php
b/WebVideoTranscode/WebVideoTranscode.php
index 9fccc54..190b5e2 100644
--- a/WebVideoTranscode/WebVideoTranscode.php
+++ b/WebVideoTranscode/WebVideoTranscode.php
@@ -233,7 +233,6 @@
array(
'maxSize' => '1920x1080',
'videoCodec' => 'h264',
- 'preset' => '1080p',
'videoBitrate' => '5000k',
'audioCodec' => 'aac',
'channels' => '2',
diff --git a/WebVideoTranscode/WebVideoTranscodeJob.php
b/WebVideoTranscode/WebVideoTranscodeJob.php
index 44aaaea..9781cf9 100644
--- a/WebVideoTranscode/WebVideoTranscodeJob.php
+++ b/WebVideoTranscode/WebVideoTranscodeJob.php
@@ -409,11 +409,11 @@
// Add the two vpre types:
switch( $options['preset'] ){
case 'ipod320':
- $cmd .= " -profile:v baseline -preset
slow -coder 0 -bf 0 -flags2 -wpred-dct8x8 -level 13 -maxrate 768k -bufsize 3M";
+ $cmd .= " -profile:v baseline -preset
slow -coder 0 -bf 0 -weightb 1 -level 13 -maxrate 768k -bufsize 3M";
break;
case '720p':
case 'ipod640':
- $cmd .= " -profile:v baseline -preset
slow -coder 0 -bf 0 -refs 1 -flags2 -wpred-dct8x8 -level 30 -maxrate 10M
-bufsize 10M";
+ $cmd .= " -profile:v baseline -preset
slow -coder 0 -bf 0 -refs 1 -weightb 1 -level 31 -maxrate 10M -bufsize 10M";
break;
default:
// in the default case just pass along
the preset to ffmpeg
@@ -601,7 +601,6 @@
if( isset( $options['audioCodec'] ) ){
$encoders = array(
- 'aac' => 'libvo_aacenc',
'vorbis' => 'libvorbis',
'opus' => 'libopus',
'mp3' => 'libmp3lame',
@@ -612,6 +611,10 @@
$codec = $options['audioCodec'];
}
$cmd.= " -acodec " . wfEscapeShellArg( $codec );
+ if ( $codec === 'aac' ) {
+ // the aac encoder is currently "experimental"
in libav 9? :P
+ $cmd .= ' -strict experimental';
+ }
} else {
// if no audio codec set use vorbis :
$cmd.= " -acodec libvorbis ";
--
To view, visit https://gerrit.wikimedia.org/r/243370
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I909a116db2f707c4957c624d48ddb9c36a6e0a6a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: REL1_25
Gerrit-Owner: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
