Merge pull request #1218 from NicoPennec/fix/video-progress

Improve thumbnail in video progress bar
cgwire · Oct 17, 2023 · 5faefd4 · 5faefd4
2 parents c42d010 + ec82918
commit 5faefd4
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 47 deletions.
diff --git a/src/components/pages/Edit.vue b/src/components/pages/Edit.vue
@@ -72,9 +72,10 @@
               :current-preview-index="currentPreviewIndex"
               :muted="isMuted"
               @max-duration-update="onMaxDurationUpdate"
+              @frame-update="onFrameUpdate"
               @metadata-loaded="onMetadataLoaded"
               @repeat="onVideoRepeated"
-              @frame-update="onFrameUpdate"
+              @video-loaded="onVideoLoaded"
               v-show="isCurrentPreviewMovie && !isLoading"
             />
 
@@ -173,9 +174,11 @@
           class="video-progress pull-bottom"
           :annotations="annotations"
           :frame-duration="frameDuration"
+          :movie-dimensions="movieDimensions"
           :nb-frames="nbFrames"
           :handle-in="-1"
           :handle-out="-1"
+          :preview-id="currentPreview ? currentPreview.id : ''"
           @start-scrub="onScrubStart"
           @end-scrub="onScrubEnd"
           @progress-changed="onProgressChanged"
@@ -655,6 +658,7 @@ export default {
       currentSection: 'infos',
       isLoading: true,
       isError: false,
+      movieDimensions: { width: 0, height: 0 },
       previewRoomRef: 'edits-preview-room',
       previewFileMap: new Map(),
       tempMode: false,
@@ -886,6 +890,13 @@ export default {
       })
     },
 
+    onVideoLoaded() {
+      this.movieDimensions = {
+        width: this.currentPreview.width,
+        height: this.currentPreview.height
+      }
+    },
+
     scrollToEntity() {
       // This method in unused here, required by PlaylistPlayer that shares
       // playerMixin.

diff --git a/src/components/previews/VideoProgress.vue b/src/components/previews/VideoProgress.vue
@@ -80,13 +80,12 @@
       </span>
       <span
         class="frame-number"
-        :style="getFrameNumberStyle(hoverFrame)"
+        :style="frameNumberStyle"
         v-show="isFrameNumberVisible && hoverFrame > 0 && !progressDragging"
       >
-        <span>
-          {{ hoverFrame }}
-        </span>
+        {{ hoverFrame }}
         <span
+          class="frame-tile"
           :style="getFrameBackgroundStyle(hoverFrame)"
           v-if="!isTileLoading"
         ></span>
@@ -205,14 +204,41 @@ export default {
       return this.width / this.nbFrames
     },
 
+    frameNumberStyle() {
+      const frameHeight = 100
+      const height = frameHeight + 30
+      const frameWidth = Math.ceil(frameHeight * this.videoRatio)
+      const width = frameWidth + 10
+      const left = Math.min(
+        Math.max(this.frameNumberLeftPosition - frameWidth / 2, 0),
+        this.width - frameWidth - 10
+      )
+      return {
+        height: `${height}px`,
+        width: `${width}px`,
+        top: this.isFullScreen ? `-${height}px` : '30px',
+        left: `${left}px`
+      }
+    },
+
     progress() {
       return this.$refs.progress
     },
 
+    tilePath() {
+      return `/api/movies/tiles/preview-files/${this.previewId}.png`
+    },
+
     videoDuration() {
       return this.nbFrames * this.frameDuration
     },
 
+    videoRatio() {
+      return this.movieDimensions.width
+        ? this.movieDimensions.width / this.movieDimensions.height
+        : 1
+    },
+
     handleInWidth() {
       return Math.max(this.frameSize * this.handleIn, 0) + 'px'
     }
@@ -330,48 +356,22 @@ export default {
     /**
      * Returns the background style for a given frame, calculating the
      * background position depending on the frame number. The tile background is
-     * 5 frames wide.
+     * 8 frames wide.
      * @param {number} frame
      */
     getFrameBackgroundStyle(frame) {
       if (!frame) return {}
       const frameX = frame % 8
       const frameY = Math.floor(frame / 8)
-      const ratio = this.movieDimensions.width / this.movieDimensions.height
       const frameHeight = 100
-      const frameWidth = Math.ceil(frameHeight * ratio)
-      const style = {
-        background: `url(/api/movies/tiles/preview-files/${this.previewId}.png)`,
-        'background-repeat': 'no-repeat',
-        'background-size': `${8 * frameWidth}px auto`,
+      const frameWidth = Math.ceil(frameHeight * this.videoRatio)
+      return {
+        background: `url(${this.tilePath})`,
         'background-position': `-${frameX * frameWidth}px -${
           frameY * frameHeight
         }px`,
-        height: `${frameHeight}px`,
-        width: `${frameWidth}px`,
-        display: 'inline-block'
-      }
-      return style
-    },
-
-    getFrameNumberStyle(frame) {
-      const frameHeight = 100
-      const height = frameHeight + 30
-      const ratio = this.movieDimensions.width
-        ? this.movieDimensions.width / this.movieDimensions.height
-        : 1
-      const frameWidth = Math.ceil(frameHeight * ratio)
-      const width = frameWidth + 10
-      const left = Math.min(
-        Math.max(this.frameNumberLeftPosition - frameWidth / 2, 0),
-        this.width - frameWidth - 10
-      )
-
-      return {
-        height: height + 'px',
-        width: width + 'px',
-        top: this.isFullScreen ? `-${height}px` : '30px',
-        left: left + 'px'
+        // height: `${frameHeight}px`,
+        width: `${frameWidth}px`
       }
     }
   },
@@ -384,14 +384,16 @@ export default {
       this.updateProgressBar(0)
     },
 
-    previewId() {
-      if (this.movieDimensions.width && this.previewId) {
-        const path = `/api/movies/tiles/preview-files/${this.previewId}.png`
-        const img = new Image()
-        this.isTileLoading = true
-        img.src = path
-        img.onload = () => {
-          this.isTileLoading = false
+    previewId: {
+      immediate: true,
+      handler() {
+        if (this.previewId) {
+          this.isTileLoading = true
+          const img = new Image()
+          img.src = this.tilePath
+          img.onload = () => {
+            this.isTileLoading = false
+          }
         }
       }
     }
@@ -463,8 +465,10 @@ progress {
   width: 110px;
   z-index: 800;
 
-  img {
-    width: 100px;
+  .frame-tile {
+    display: inline-block;
+    background-repeat: no-repeat;
+    height: 100px;
   }
 }