Recording scrubbing fixes (#10439)

* use a single source of truth for scrubbing

* simplify controller state

* Cleanup scrubbing logic

* Apply same logic to mobile

---------

Co-authored-by: Nicolas Mowen <nickmowen213@gmail.com>
This commit is contained in:
Josh Hawkins
2024-03-14 09:28:06 -05:00
committed by GitHub
parent 2decdeadb4
commit 39a29d148e
3 changed files with 63 additions and 50 deletions

View File

@@ -89,13 +89,16 @@ export function DesktopRecordingView({
const [playerTime, setPlayerTime] = useState(startTime);
const updateSelectedSegment = useCallback(
(currentTime: number) => {
(currentTime: number, updateStartTime: boolean) => {
const index = timeRange.ranges.findIndex(
(seg) => seg.start <= currentTime && seg.end >= currentTime,
);
if (index != -1) {
setPlaybackStart(currentTime);
if (updateStartTime) {
setPlaybackStart(currentTime);
}
setSelectedRangeIdx(index);
}
},
@@ -108,7 +111,7 @@ export function DesktopRecordingView({
currentTime > currentTimeRange.end + 60 ||
currentTime < currentTimeRange.start - 60
) {
updateSelectedSegment(currentTime);
updateSelectedSegment(currentTime, false);
return;
}
@@ -126,40 +129,22 @@ export function DesktopRecordingView({
updateSelectedSegment,
]);
useEffect(() => {
if (!scrubbing) {
if (
currentTimeRange.start <= currentTime &&
currentTimeRange.end >= currentTime
) {
mainControllerRef.current?.seekToTimestamp(currentTime, true);
} else {
updateSelectedSegment(currentTime);
}
}
// we only want to seek when user stops scrubbing
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [scrubbing]);
useEffect(() => {
if (!scrubbing) {
if (Math.abs(currentTime - playerTime) > 10) {
mainControllerRef.current?.pause();
if (
currentTimeRange.start <= currentTime &&
currentTimeRange.end >= currentTime
) {
mainControllerRef.current?.seekToTimestamp(currentTime, true);
} else {
updateSelectedSegment(currentTime);
updateSelectedSegment(currentTime, true);
}
}
}
// we only want to seek when current time doesn't match the player update time
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [currentTime]);
}, [currentTime, scrubbing]);
const onSelectCamera = useCallback(
(newCam: string) => {
@@ -234,6 +219,7 @@ export function DesktopRecordingView({
onControllerReady={(controller) => {
mainControllerRef.current = controller;
}}
isScrubbing={scrubbing}
/>
</div>
<div className="w-full flex justify-center gap-2 overflow-x-auto">
@@ -357,8 +343,24 @@ export function MobileRecordingView({
// scrubbing and timeline state
const [scrubbing, setScrubbing] = useState(false);
const [currentTime, setCurrentTime] = useState<number>(
startTime || Date.now() / 1000,
const [currentTime, setCurrentTime] = useState<number>(startTime);
const [playerTime, setPlayerTime] = useState(startTime);
const updateSelectedSegment = useCallback(
(currentTime: number, updateStartTime: boolean) => {
const index = timeRange.ranges.findIndex(
(seg) => seg.start <= currentTime && seg.end >= currentTime,
);
if (index != -1) {
if (updateStartTime) {
setPlaybackStart(currentTime);
}
setSelectedRangeIdx(index);
}
},
[timeRange],
);
useEffect(() => {
@@ -367,28 +369,36 @@ export function MobileRecordingView({
currentTime > currentTimeRange.end + 60 ||
currentTime < currentTimeRange.start - 60
) {
const index = timeRange.ranges.findIndex(
(seg) => seg.start <= currentTime && seg.end >= currentTime,
);
if (index != -1) {
setSelectedRangeIdx(index);
}
updateSelectedSegment(currentTime, false);
return;
}
controllerRef.current?.scrubToTimestamp(currentTime);
}
}, [currentTime, scrubbing, currentTimeRange, timeRange]);
}, [
currentTime,
scrubbing,
timeRange,
currentTimeRange,
updateSelectedSegment,
]);
useEffect(() => {
if (!scrubbing) {
controllerRef.current?.seekToTimestamp(currentTime, true);
if (Math.abs(currentTime - playerTime) > 10) {
if (
currentTimeRange.start <= currentTime &&
currentTimeRange.end >= currentTime
) {
controllerRef.current?.seekToTimestamp(currentTime, true);
} else {
updateSelectedSegment(currentTime, true);
}
}
}
// we only want to seek when user stops scrubbing
// we only want to seek when current time doesn't match the player update time
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [scrubbing]);
}, [currentTime, scrubbing]);
// motion timeline data
@@ -450,8 +460,12 @@ export function MobileRecordingView({
onControllerReady={(controller) => {
controllerRef.current = controller;
}}
onTimestampUpdate={setCurrentTime}
onTimestampUpdate={(timestamp) => {
setPlayerTime(timestamp);
setCurrentTime(timestamp);
}}
onClipEnded={onClipEnded}
isScrubbing={scrubbing}
/>
</div>