jenkins-bot has submitted this change and it was merged.

Change subject: Fix popup video size by ordering transcode settings properly
......................................................................


Fix popup video size by ordering transcode settings properly

Followup to Ib2dd92626 which appended the settings instead of prepending them.
Per Michael Dale this was hitting a bad assumption in the player, which caused
it to size for the smallest size instead of the largest one.

Bug: 61760
Change-Id: I1343f0ec16112eb9d9519f0a9a900a63f157c6d0
---
M wmf-config/CommonSettings.php
1 file changed, 8 insertions(+), 2 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 276cd53..1150302 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -670,8 +670,14 @@
        $wgMinimumVideoPlayerSize = $wmgMinimumVideoPlayerSize;
 
        // Enable low-res Theora transcodes for fallback players on slow 
machines
-       $wgEnabledTranscodeSet[] = WebVideoTranscode::ENC_OGV_360P;
-       $wgEnabledTranscodeSet[] = WebVideoTranscode::ENC_OGV_160P;
+       // Put them at the beginning of the array to keep ordering the way
+       // the popup player expects, so we pick the right WebM size in most
+       // cases.
+       //
+       // See https://bugzilla.wikimedia.org/61760
+       //
+       array_unshift( $wgEnabledTranscodeSet, WebVideoTranscode::ENC_OGV_360P 
);
+       array_unshift( $wgEnabledTranscodeSet, WebVideoTranscode::ENC_OGV_160P 
);
 }
 
 if ( $wgUseContactPageFundraiser ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/115094
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1343f0ec16112eb9d9519f0a9a900a63f157c6d0
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to