Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/393975 )
Change subject: Remove ability to disable MP3 ingestion
......................................................................
Remove ability to disable MP3 ingestion
Change-Id: I3f1c9f93b2231d5c65c8b2821b6fd29f0e2c8623
---
M TimedMediaHandler.hooks.php
M TimedMediaHandler.php
2 files changed, 1 insertion(+), 12 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/75/393975/1
diff --git a/TimedMediaHandler.hooks.php b/TimedMediaHandler.hooks.php
index 175c5e1..94fec8a 100644
--- a/TimedMediaHandler.hooks.php
+++ b/TimedMediaHandler.hooks.php
@@ -206,7 +206,7 @@
public static function register() {
global $wgHooks, $wgJobClasses,
$wgJobTypesExcludedFromDefaultQueue, $wgMediaHandlers,
$wgResourceModules, $wgExcludeFromThumbnailPurge,
- $wgFileExtensions, $wgTmhEnableMp3Uploads,
$wgTmhEnableMp4Uploads, $wgExtensionAssetsPath,
+ $wgFileExtensions, $wgTmhEnableMp4Uploads,
$wgExtensionAssetsPath,
$wgMwEmbedModuleConfig, $wgEnableLocalTimedText,
$wgTmhFileExtensions,
$wgTmhTheoraTwoPassEncoding, $wgWikimediaJenkinsCI;
@@ -215,14 +215,6 @@
global $wgEnableTranscode, $wgFFmpegLocation;
$wgEnableTranscode = false;
$wgFFmpegLocation = '/usr/bin/ffmpeg';
- }
-
- // Remove mp3 if not enabled:
- if ( $wgTmhEnableMp3Uploads === false ) {
- $index = array_search( 'mp3', $wgFileExtensions );
- if ( $index !== false ) {
- array_splice( $wgFileExtensions, $index, 1 );
- }
}
// Remove mp4 if not enabled:
diff --git a/TimedMediaHandler.php b/TimedMediaHandler.php
index 1f912cc..76a9a88 100644
--- a/TimedMediaHandler.php
+++ b/TimedMediaHandler.php
@@ -231,9 +231,6 @@
// WebVideoTranscode::ENC_AAC,
];
-// If mp3 source assets can be ingested:
-$wgTmhEnableMp3Uploads = true;
-
// If mp4 source assets can be ingested:
$wgTmhEnableMp4Uploads = false;
--
To view, visit https://gerrit.wikimedia.org/r/393975
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f1c9f93b2231d5c65c8b2821b6fd29f0e2c8623
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
