Merge branch 'master' into stable24

README.md

@@ -7,6 +7,7 @@
 [![Demo](https://img.shields.io/badge/demo-online-blue)](https://memories-demo.radialapps.com/apps/memories/)
 [![Gitter](https://img.shields.io/gitter/room/pulsejet/memories)](https://gitter.im/pulsejet/memories)
 [![GitHub issues](https://img.shields.io/github/issues/pulsejet/memories)](https://github.com/pulsejet/memories/issues)
+[![GitHub Sponsor](https://img.shields.io/github/sponsors/pulsejet?logo=GitHub)](https://github.com/sponsors/pulsejet)
 
 Memories is a _batteries-included_ photo management solution for Nextcloud with advanced features including:
 
@@ -42,12 +43,16 @@ Memories is a _batteries-included_ photo management solution for Nextcloud with
 1. ✅ Enable the app through the app management of your Nextcloud.
 1. ⚒️ (Strongly recommended) use VS Code and install Vetur and Prettier.
 
-## How to support development
+## Support the project
 
-1. **🌟 Star this repository**: This is the easiest way to support the project and costs nothing.
+1. **🌟 Star this repository**: This is the easiest way to support Memories and costs nothing.
-1. **🪲 Report bugs**: If you find a bug, please report it on the issue tracker.
+1. **🪲 Report bugs**: Report any bugs you find on the issue tracker.
-1. **📝 Contribute**: If you want to contribute, please read file / comment on an issue and ask for guidance.
+1. **📝 Contribute**: Read and file or comment on an issue and ask for guidance.
-1. **🪙 Sponsorship**: If you want to support the project financially, you can donate to the project on [GitHub](https://github.com/sponsors/pulsejet).
+1. **🪙 Sponsorship**: You can support the project financially at [GitHub Sponsors](https://github.com/sponsors/pulsejet).
+
+A shout out to the current and past financial backers of Memories! See the sponsors page for a full list.
+
+[<img src="https://github.com/mpodshivalin.png" width="42" />](https://github.com/mpodshivalin)
 
 ## Special Thanks
 

lib/Controller/VideoController.php

@@ -90,6 +90,11 @@ class VideoController extends ApiBase
                 return new JSONResponse(['message' => 'Transcoder not configured'], Http::STATUS_INTERNAL_SERVER_ERROR);
             }
 
+            // Make transcoder executable
+            if (!is_executable($transcoder)) {
+                chmod($transcoder, 0755);
+            }
+
             // Check for environment variables
             $vaapi = $this->config->getSystemValue('memories.qsv', false);
             $env = '';

scripts/get-exiftool.sh

@@ -17,7 +17,7 @@ mv "exiftool-$exifver" exiftool
 rm -rf *.zip exiftool/t exiftool/html
 chmod 755 exiftool/exiftool
 
-govod="0.0.9"
+govod="0.0.11"
 wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-amd64"
 wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-aarch64"
 chmod 755 go-vod-*

src/components/PsVideo.ts

@@ -215,6 +215,12 @@ class VideoContentSetup {
       this.initPlyr(content);
     });
 
+    content.videojs.qualityLevels()?.on("addqualitylevel", (e) => {
+      window.setTimeout(() => {
+        this.initPlyr(content);
+      }, 0);
+    });
+
     // Get correct orientation
     axios
       .get<any>(
@@ -251,6 +257,9 @@ class VideoContentSetup {
   initPlyr(content: any) {
     if (content.plyr) return;
 
+    content.videoElement = content.videojs?.el()?.querySelector("video");
+    if (!content.videoElement) return;
+
     // Retain original parent for video element
     const origParent = content.videoElement.parentElement;
 

src/components/Viewer.vue

@@ -534,10 +534,21 @@ export default class Viewer extends Mixins(GlobalMixin) {
       previewUrl = generateUrl(getDownloadLink(photo));
     }
 
+    // Get height and width
+    let w = photo.w;
+    let h = photo.h;
+
+    if (isvideo && w && h) {
+      // For videos, make sure the screen is filled up,
+      // by scaling up the video by a maximum of 4x
+      w *= 4;
+      h *= 4;
+    }
+
     return {
       src: previewUrl,
-      width: photo.w || undefined,
+      width: w || undefined,
-      height: photo.h || undefined,
+      height: h || undefined,
       thumbCropped: true,
       photo: photo,
       type: isvideo ? "video" : "image",