@technotoil/image-video-editor 0.1.4 → 0.1.5

package/lib/module/screens/EditorScreen.js

@@ -2236,10 +2236,9 @@ export function EditorScreen({
             cumulativeMusicOffsetMs += newDuration;
           }
         } else {
-          if (selectedMusic) {
-            let outUri = targetItem.uri;
-            if (targetItem.type === 'image') {
-              outUri = await trimVideo(targetItem.uri, {
+          if (targetItem.type === 'image') {
+            if (selectedMusic) {
+              const outUri = await trimVideo(targetItem.uri, {
                 isImage: true,
                 musicUri: selectedMusic.url,
                 musicOffsetMs: cumulativeMusicOffsetMs,
@@ -2252,9 +2251,17 @@ export function EditorScreen({
                 grayscale: false
               });
               cumulativeMusicOffsetMs += 10000;
-            } else {
-              const safeEndMs = targetItem.durationMs || 10000;
-              outUri = await trimVideo(targetItem.uri, {
+              updatedItems[i] = {
+                ...targetItem,
+                uri: outUri,
+                thumbnailUri: outUri
+              };
+            }
+          } else {
+            const needsTrim = selectedMusic || maxVideoDurationMs && (!targetItem.durationMs || targetItem.durationMs > maxVideoDurationMs);
+            if (needsTrim) {
+              const safeEndMs = maxVideoDurationMs ? Math.min(targetItem.durationMs || 10000, maxVideoDurationMs) : targetItem.durationMs || 10000;
+              const outUri = await trimVideo(targetItem.uri, {
                 startMs: 0,
                 endMs: safeEndMs,
                 mute: isMuted,
@@ -2270,13 +2277,24 @@ export function EditorScreen({
                 saturation: 1,
                 grayscale: false
               });
+              let newThumb = undefined;
+              try {
+                newThumb = await captureFrame(outUri, {
+                  timeMs: 0
+                });
+              } catch (e) {
+                console.warn('Could not generate filtered thumb', e);
+              }
+              updatedItems[i] = {
+                ...targetItem,
+                uri: outUri,
+                thumbnailUri: newThumb ? newThumb : targetItem.thumbnailUri,
+                durationMs: safeEndMs
+              };
               cumulativeMusicOffsetMs += safeEndMs;
+            } else {
+              cumulativeMusicOffsetMs += targetItem.durationMs || 10000;
             }
-            updatedItems[i] = {
-              ...targetItem,
-              uri: outUri,
-              thumbnailUri: targetItem.type === 'image' ? outUri : targetItem.thumbnailUri
-            };
           }
         }
       }