The swiss army knife of lossless video/audio editing
implement "combine selected segments"
Mikael Finstad59cd930d03f4
diff --git a/public/menu.js b/public/menu.jsindex 569c44ef..0f353004 100644--- a/public/menu.js+++ b/public/menu.js@@ -238,6 +238,12 @@ module.exports = ({ app, mainWindow, newVersion, isStoreBuild }) => {mainWindow.webContents.send('combineOverlappingSegments');},},+ {+ label: esc(t('Combine selected segments')),+ click() {+ mainWindow.webContents.send('combineSelectedSegments');+ },+ },{label: esc(t('Shuffle segments order')),click() {diff --git a/src/App.jsx b/src/App.jsxindex f30c9e05..74930d19 100644--- a/src/App.jsx+++ b/src/App.jsx@@ -344,7 +344,7 @@ const App = memo(() => {}, [isFileOpened]);const {- cutSegments, cutSegmentsHistory, createSegmentsFromKeyframes, shuffleSegments, detectBlackScenes, detectSilentScenes, detectSceneChanges, removeCutSegment, invertAllSegments, fillSegmentsGaps, combineOverlappingSegments, shiftAllSegmentTimes, alignSegmentTimesToKeyframes, onViewSegmentTags, updateSegOrder, updateSegOrders, reorderSegsByStartTime, addSegment, setCutStart, setCutEnd, onLabelSegment, splitCurrentSegment, createNumSegments, createFixedDurationSegments, createRandomSegments, apparentCutSegments, haveInvalidSegs, currentSegIndexSafe, currentCutSeg, currentApparentCutSeg, inverseCutSegments, clearSegments, loadCutSegments, isSegmentSelected, setCutTime, setCurrentSegIndex, onLabelSelectedSegments, deselectAllSegments, selectAllSegments, selectOnlyCurrentSegment, toggleCurrentSegmentSelected, invertSelectedSegments, removeSelectedSegments, setDeselectedSegmentIds, onSelectSegmentsByLabel, toggleSegmentSelected, selectOnlySegment, getApparentCutSegmentById, selectedSegments, selectedSegmentsOrInverse, nonFilteredSegmentsOrInverse, segmentsToExport,+ cutSegments, cutSegmentsHistory, createSegmentsFromKeyframes, shuffleSegments, detectBlackScenes, detectSilentScenes, detectSceneChanges, removeCutSegment, invertAllSegments, fillSegmentsGaps, combineOverlappingSegments, combineSelectedSegments, shiftAllSegmentTimes, alignSegmentTimesToKeyframes, onViewSegmentTags, updateSegOrder, updateSegOrders, reorderSegsByStartTime, addSegment, setCutStart, setCutEnd, onLabelSegment, splitCurrentSegment, createNumSegments, createFixedDurationSegments, createRandomSegments, apparentCutSegments, haveInvalidSegs, currentSegIndexSafe, currentCutSeg, currentApparentCutSeg, inverseCutSegments, clearSegments, loadCutSegments, isSegmentSelected, setCutTime, setCurrentSegIndex, onLabelSelectedSegments, deselectAllSegments, selectAllSegments, selectOnlyCurrentSegment, toggleCurrentSegmentSelected, invertSelectedSegments, removeSelectedSegments, setDeselectedSegmentIds, onSelectSegmentsByLabel, toggleSegmentSelected, selectOnlySegment, getApparentCutSegmentById, selectedSegments, selectedSegmentsOrInverse, nonFilteredSegmentsOrInverse, segmentsToExport,} = useSegments({ filePath, workingRef, setWorking, setCutProgress, mainVideoStream, duration, getRelevantTime, maxLabelLength, checkFileOpened, invertCutSegments, segmentsToChaptersOnly });const jumpSegStart = useCallback((index) => userSeekAbs(apparentCutSegments[index].start), [apparentCutSegments, userSeekAbs]);@@ -1870,6 +1870,7 @@ const App = memo(() => {invertAllSegments,fillSegmentsGaps,combineOverlappingSegments,+ combineSelectedSegments,createFixedDurationSegments,createNumSegments,createRandomSegments,@@ -1939,7 +1940,7 @@ const App = memo(() => {if (match) return bubble;return true; // bubble the event- }, [addSegment, alignSegmentTimesToKeyframes, askSetStartTimeOffset, batchFileJump, batchOpenSelectedFile, captureSnapshot, captureSnapshotAsCoverArt, changePlaybackRate, cleanupFilesDialog, clearSegments, closeBatch, closeExportConfirm, combineOverlappingSegments, concatCurrentBatch, concatDialogVisible, convertFormatBatch, copySegmentsToClipboard, createFixedDurationSegments, createNumSegments, createRandomSegments, currentSegIndexSafe, cutSegmentsHistory, deselectAllSegments, exportConfirmVisible, extractAllStreams, extractCurrentSegmentFramesAsImages, fillSegmentsGaps, goToTimecode, increaseRotation, invertAllSegments, invertSelectedSegments, jumpCutEnd, jumpCutStart, jumpSeg, jumpTimelineEnd, jumpTimelineStart, keyboardNormalSeekSpeed, keyboardSeekAccFactor, keyboardShortcutsVisible, onExportConfirm, onExportPress, onLabelSegment, pause, play, removeCutSegment, removeSelectedSegments, reorderSegsByStartTime, seekClosestKeyframe, seekRel, seekRelPercent, selectAllSegments, selectOnlyCurrentSegment, setCutEnd, setCutStart, setPlaybackVolume, shiftAllSegmentTimes, shortStep, shuffleSegments, splitCurrentSegment, timelineToggleComfortZoom, toggleCaptureFormat, toggleCurrentSegmentSelected, toggleKeyboardShortcuts, toggleKeyframeCut, toggleLastCommands, toggleLoopSelectedSegments, togglePlay, toggleSegmentsList, toggleStreamsSelector, toggleStripAudio, tryFixInvalidDuration, userHtml5ifyCurrentFile, zoomRel]);+ }, [addSegment, alignSegmentTimesToKeyframes, askSetStartTimeOffset, batchFileJump, batchOpenSelectedFile, captureSnapshot, captureSnapshotAsCoverArt, changePlaybackRate, cleanupFilesDialog, clearSegments, closeBatch, closeExportConfirm, combineOverlappingSegments, combineSelectedSegments, concatCurrentBatch, concatDialogVisible, convertFormatBatch, copySegmentsToClipboard, createFixedDurationSegments, createNumSegments, createRandomSegments, currentSegIndexSafe, cutSegmentsHistory, deselectAllSegments, exportConfirmVisible, extractAllStreams, extractCurrentSegmentFramesAsImages, fillSegmentsGaps, goToTimecode, increaseRotation, invertAllSegments, invertSelectedSegments, jumpCutEnd, jumpCutStart, jumpSeg, jumpTimelineEnd, jumpTimelineStart, keyboardNormalSeekSpeed, keyboardSeekAccFactor, keyboardShortcutsVisible, onExportConfirm, onExportPress, onLabelSegment, pause, play, removeCutSegment, removeSelectedSegments, reorderSegsByStartTime, seekClosestKeyframe, seekRel, seekRelPercent, selectAllSegments, selectOnlyCurrentSegment, setCutEnd, setCutStart, setPlaybackVolume, shiftAllSegmentTimes, shortStep, shuffleSegments, splitCurrentSegment, timelineToggleComfortZoom, toggleCaptureFormat, toggleCurrentSegmentSelected, toggleKeyboardShortcuts, toggleKeyframeCut, toggleLastCommands, toggleLoopSelectedSegments, togglePlay, toggleSegmentsList, toggleStreamsSelector, toggleStripAudio, tryFixInvalidDuration, userHtml5ifyCurrentFile, zoomRel]);useKeyboard({ keyBindings, onKeyPress });@@ -2073,6 +2074,7 @@ const App = memo(() => {invertAllSegments,fillSegmentsGaps,combineOverlappingSegments,+ combineSelectedSegments,fixInvalidDuration: tryFixInvalidDuration,reorderSegsByStartTime,concatCurrentBatch,@@ -2097,7 +2099,7 @@ const App = memo(() => {actionsWithCatch.forEach(([key, action]) => electron.ipcRenderer.on(key, action));return () => actionsWithCatch.forEach(([key, action]) => electron.ipcRenderer.removeListener(key, action));- }, [alignSegmentTimesToKeyframes, apparentCutSegments, askSetStartTimeOffset, checkFileOpened, clearSegments, closeBatch, closeFileWithConfirm, combineOverlappingSegments, concatCurrentBatch, createFixedDurationSegments, createNumSegments, createRandomSegments, createSegmentsFromKeyframes, customOutDir, cutSegments, detectBlackScenes, detectSceneChanges, detectSilentScenes, detectedFps, extractAllStreams, fileFormat, filePath, fillSegmentsGaps, getFrameCount, invertAllSegments, loadCutSegments, loadMedia, openFilesDialog, openSendReportDialogWithState, reorderSegsByStartTime, selectedSegments, setWorking, shiftAllSegmentTimes, shuffleSegments, toggleKeyboardShortcuts, toggleLastCommands, toggleSettings, tryFixInvalidDuration, userHtml5ifyCurrentFile, userOpenFiles]);+ }, [alignSegmentTimesToKeyframes, apparentCutSegments, askSetStartTimeOffset, checkFileOpened, clearSegments, closeBatch, closeFileWithConfirm, combineOverlappingSegments, combineSelectedSegments, concatCurrentBatch, createFixedDurationSegments, createNumSegments, createRandomSegments, createSegmentsFromKeyframes, customOutDir, cutSegments, detectBlackScenes, detectSceneChanges, detectSilentScenes, detectedFps, extractAllStreams, fileFormat, filePath, fillSegmentsGaps, getFrameCount, invertAllSegments, loadCutSegments, loadMedia, openFilesDialog, openSendReportDialogWithState, reorderSegsByStartTime, selectedSegments, setWorking, shiftAllSegmentTimes, shuffleSegments, toggleKeyboardShortcuts, toggleLastCommands, toggleSettings, tryFixInvalidDuration, userHtml5ifyCurrentFile, userOpenFiles]);const showAddStreamSourceDialog = useCallback(async () => {try {diff --git a/src/components/KeyboardShortcuts.jsx b/src/components/KeyboardShortcuts.jsxindex 5d103098..551952dc 100644--- a/src/components/KeyboardShortcuts.jsx+++ b/src/components/KeyboardShortcuts.jsx@@ -339,6 +339,9 @@ const KeyboardShortcuts = memo(({name: t('Combine overlapping segments'),category: segmentsAndCutpointsCategory,},+ combineSelectedSegments: {+ name: t('Combine selected segments'),+ },clearSegments: {name: t('Clear all segments'),category: segmentsAndCutpointsCategory,diff --git a/src/hooks/useSegments.js b/src/hooks/useSegments.jsindex 47d82800..58855da8 100644--- a/src/hooks/useSegments.js+++ b/src/hooks/useSegments.js@@ -11,7 +11,7 @@ import { handleError, shuffleArray } from '../util';import { errorToast } from '../swal';import { showParametersDialog } from '../dialogs/parameters';import { createNumSegments as createNumSegmentsDialog, createFixedDurationSegments as createFixedDurationSegmentsDialog, createRandomSegments as createRandomSegmentsDialog, labelSegmentDialog, showEditableJsonDialog, askForShiftSegments, askForAlignSegments, selectSegmentsByLabelDialog } from '../dialogs';-import { createSegment, findSegmentsAtCursor, sortSegments, invertSegments, getSegmentTags, combineOverlappingSegments as combineOverlappingSegments2, isDurationValid, getSegApparentStart, getSegApparentEnd as getSegApparentEnd2 } from '../segments';+import { createSegment, findSegmentsAtCursor, sortSegments, invertSegments, getSegmentTags, combineOverlappingSegments as combineOverlappingSegments2, combineSelectedSegments as combineSelectedSegments2, isDurationValid, getSegApparentStart, getSegApparentEnd as getSegApparentEnd2 } from '../segments';import * as ffmpegParameters from '../ffmpeg-parameters';import { maxSegmentsAllowed } from '../util/constants';@@ -189,6 +189,10 @@ export default ({setCutSegments((existingSegments) => combineOverlappingSegments2(existingSegments, getSegApparentEnd));}, [getSegApparentEnd, setCutSegments]);+ const combineSelectedSegments = useCallback(() => {+ setCutSegments((existingSegments) => combineSelectedSegments2(existingSegments, getSegApparentEnd2, isSegmentSelected));+ }, [isSegmentSelected, setCutSegments]);+const updateSegAtIndex = useCallback((index, newProps) => {if (index < 0) return;const cutSegmentsNew = [...cutSegments];@@ -472,6 +476,7 @@ export default ({invertAllSegments,fillSegmentsGaps,combineOverlappingSegments,+ combineSelectedSegments,shiftAllSegmentTimes,alignSegmentTimesToKeyframes,onViewSegmentTags,diff --git a/src/segments.js b/src/segments.jsindex 2ec6e632..f6eeaaf2 100644--- a/src/segments.js+++ b/src/segments.js@@ -1,5 +1,7 @@import { v4 as uuidv4 } from 'uuid';import sortBy from 'lodash/sortBy';+import minBy from 'lodash/minBy';+import maxBy from 'lodash/maxBy';export const isDurationValid = (duration) => Number.isFinite(duration) && duration > 0;@@ -99,6 +101,24 @@ export function combineOverlappingSegments(existingSegments, getSegApparentEnd2)}).filter((segment) => segment);}+export function combineSelectedSegments(existingSegments, getSegApparentEnd2, isSegmentSelected) {+ const selectedSegments = existingSegments.filter(isSegmentSelected);+ const firstSegment = minBy(selectedSegments, (seg) => getSegApparentStart(seg));+ const lastSegment = maxBy(selectedSegments, (seg) => getSegApparentEnd2(seg));++ return existingSegments.map((existingSegment) => {+ if (existingSegment === firstSegment) {+ return {+ ...firstSegment,+ start: firstSegment.start,+ end: lastSegment.end,+ };+ }+ if (isSegmentSelected(existingSegment)) return undefined; // remove other selected segments+ return existingSegment;+ }).filter((segment) => segment);+}+export function hasAnySegmentOverlap(sortedSegments) {if (sortedSegments.length < 1) return false;