jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/385371 )
Change subject: Media: Return all video derivatives
......................................................................
Media: Return all video derivatives
Let clients choose the one they can handle best.
Bug: T177430
Change-Id: Iae68e8554ae6415afd0445d8c6eb715a9674b495
---
M lib/gallery.js
1 file changed, 4 insertions(+), 32 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/gallery.js b/lib/gallery.js
index e79722f..629132b 100644
--- a/lib/gallery.js
+++ b/lib/gallery.js
@@ -8,32 +8,8 @@
const MIN_IMAGE_SIZE = 64;
const MAX_IMAGE_WIDTH = 1280;
-// in the case of video, look for a list of transcodings, so that we might
-// find a WebM version, which is playable in Android.
-function getTranscodedVideoUrl(objinfo) {
- let derivative;
- let derivativesArr;
- let key;
- let url;
- if (objinfo.derivatives) {
- derivativesArr = objinfo.derivatives;
- for (key in derivativesArr) {
- if ({}.hasOwnProperty.call(derivativesArr, key)) {
- derivative = derivativesArr[key];
- if (derivative.type && derivative.type.indexOf('webm') > -1) {
- // that's the one!
- url = derivative.src;
- // Note: currently picks the last one
- // TODO: in the future we could have an extra URL that
provides a size
- // parameter for images and videos
- }
- }
- }
- }
- return url;
-}
-function getExtMetadata(extmetadata) {
+function getExtMetadataValues(extmetadata) {
const ext = {};
for (const key in extmetadata) {
if ({}.hasOwnProperty.call(extmetadata, key)) {
@@ -48,25 +24,21 @@
function handleGalleryItems(item) {
let obj;
- let url;
if (item.imageinfo) {
obj = item.imageinfo[0];
} else if (item.videoinfo) {
obj = item.videoinfo[0];
- url = getTranscodedVideoUrl(obj);
- }
- if (!url) {
- url = obj.url;
}
return {
title: item.title,
- url,
+ url: obj.url,
thumbUrl: obj.thumburl,
mime: obj.mime,
width: obj.width,
height: obj.height,
- ext: getExtMetadata(obj.extmetadata)
+ derivatives: obj.derivatives,
+ ext: getExtMetadataValues(obj.extmetadata)
};
}
--
To view, visit https://gerrit.wikimedia.org/r/385371
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iae68e8554ae6415afd0445d8c6eb715a9674b495
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Fjalapeno <cfl...@wikimedia.org>
Gerrit-Reviewer: GWicke <gwi...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: Mhurd <mh...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Ppchelko <ppche...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
