Skip to content

Reapply "fix: video drive the timeline (#640)" (#665) #667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stefpi wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Reapply "fix: video drive the timeline (#640)" (#665) #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b8156b3
reset desired speed
stefpi Jul 21, 2026
71ea49e
track and cancel raf() loop on exit
stefpi Jul 21, 2026
b6d2292
better error surfacing and stale audio indicator
stefpi Jul 21, 2026
162e81a
Reapply "fix: video drive the timeline (#640)" (#665)
stefpi Jul 21, 2026
c9cb2c1
Merge branch 'video-playback-edgecases' into reapply-video-fix
stefpi Jul 21, 2026
10fd7bc
Merge branch 'master' into reapply-video-fix
stefpi Jul 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/actions/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { athena as Athena, billing as Billing, devices as Devices, drives as Dri
import MyCommaAuth from '@commaai/my-comma-auth';

import * as Types from './types';
import { resetPlayback, selectLoop } from '../timeline/playback';
import { selectLoop } from '../timeline/playback';
import {hasRoutesData } from '../timeline/segments';
import { getDeviceFromState, deviceVersionAtLeast, deviceIsOnline } from '../utils';
import { webrtcConnectionManager } from '../utils/webrtc';
Expand Down Expand Up @@ -163,7 +163,6 @@ export function urlForState(dongleId, log_id, start, end, prime) {
function updateTimeline(state, dispatch, log_id, start, end, allowPathChange) {
if (!state.loop || !state.loop.startTime || !state.loop.duration || state.loop.startTime < start
|| state.loop.startTime + state.loop.duration > end || state.loop.duration < end - start) {
dispatch(resetPlayback());
dispatch(selectLoop(start, end));
}

Expand Down
4 changes: 3 additions & 1 deletion src/actions/types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export const ACTION_STARTUP_DATA = 'ACTION_STARTUP_DATA';
// global state management
export const ACTION_SELECT_DEVICE = 'ACTION_SELECT_DEVICE';
export const ACTION_SELECT_TIME_FILTER = 'ACTION_SELECT_TIME_FILTER';
export const ACTION_UPDATE_ROUTE_LIMIT = 'ACTION_UPDATE_ROUTE_LIMIT'
export const ACTION_UPDATE_ROUTE_LIMIT = 'ACTION_UPDATE_ROUTE_LIMIT';
export const ACTION_UPDATE_DEVICES = 'ACTION_UPDATE_DEVICES';
export const ACTION_UPDATE_DEVICE = 'ACTION_UPDATE_DEVICE';
export const ACTION_UPDATE_ROUTE = 'ACTION_UPDATE_ROUTE';
Expand All @@ -26,9 +26,11 @@ export const ACTION_PRIME_SUBSCRIBE_INFO = 'ACTION_PRIME_SUBSCRIBE_INFO';
export const ACTION_SEEK = 'action_seek';
export const ACTION_PAUSE = 'action_pause';
export const ACTION_PLAY = 'action_play';
export const ACTION_PLAYBACK_SPEED = 'action_playback_speed';
export const ACTION_LOOP = 'action_loop';
export const ACTION_BUFFER_VIDEO = 'action_buffer_video';
export const ACTION_RESET = 'action_reset';
export const ACTION_HAS_AUDIO = 'action_has_audio';

// segments
export const ACTION_UPDATE_SEGMENT_RANGE = 'update_segment_range';
Expand Down
10 changes: 2 additions & 8 deletions src/components/DriveMap/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import raf from 'raf';
import ReactMapGL, { LinearInterpolator } from 'react-map-gl';

import { fetchDriveCoords } from '../../actions/cached';
import { currentOffset } from '../../timeline';
import { DEFAULT_LOCATION, MAPBOX_STYLE, MAPBOX_TOKEN } from '../../utils/geocode';

const INTERACTION_TIMEOUT = 5000;
Expand Down Expand Up @@ -46,7 +45,7 @@ class DriveMap extends Component {
}

componentDidUpdate(prevProps) {
const { dispatch, currentRoute, startTime } = this.props;
const { dispatch, currentRoute } = this.props;

const prevRoute = prevProps.currentRoute?.fullname || null;
const route = currentRoute?.fullname || null;
Expand All @@ -57,10 +56,6 @@ class DriveMap extends Component {
}
}

if (prevProps.startTime && prevProps.startTime !== startTime) {
this.shouldFlyTo = true;
}

if (currentRoute && prevProps.currentRoute && currentRoute.driveCoords
&& prevProps.currentRoute.driveCoords !== currentRoute.driveCoords) {
this.shouldFlyTo = false;
Expand Down Expand Up @@ -99,7 +94,7 @@ class DriveMap extends Component {
const markerSource = this.map && this.map.getMap().getSource('seekPoint');
if (markerSource) {
if (this.props.currentRoute && this.props.currentRoute.driveCoords) {
const pos = this.posAtOffset(currentOffset());
const pos = this.posAtOffset(this.props.offset);
if (pos && pos.some((coordinate, index) => coordinate != this.lastMapPos[index])) {
this.lastMapPos = pos;
markerSource.setData({
Expand Down Expand Up @@ -310,7 +305,6 @@ class DriveMap extends Component {
const stateToProps = Obstruction({
offset: 'offset',
currentRoute: 'currentRoute',
startTime: 'startTime',
});

export default connect(stateToProps)(DriveMap);
Loading
Loading