Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 16 additions & 3 deletions packages/trace-viewer/src/ui/filmStrip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ export const FilmStrip: React.FunctionComponent<{
const [measure, ref] = useMeasure<HTMLDivElement>();
const lanesRef = React.useRef<HTMLDivElement>(null);

const video = model?.videos?.[0];
const videoThumbnails = useVideoThumbnails(video, video && model ? model.createRelativeUrl(`file/${video.file}`) : undefined);
const videos = (model?.videos ?? []).map(video => ({ video, url: model!.createRelativeUrl(`file/${video.file}`) }));
const videoThumbnails = useVideoThumbnails(videos);

let laneIndex = 0;
if (lanesRef.current && previewPoint) {
Expand All @@ -50,7 +50,7 @@ export const FilmStrip: React.FunctionComponent<{
}

const pageLanes = (model?.pages ?? []).filter(page => page.screencastFrames.length);
const videoLanes: VideoThumbnail[][] = videoThumbnails.length ? [videoThumbnails] : [];
const videoLanes = videoLanesByPage(videos.map(({ video }) => video.pageId), videoThumbnails);

let previewFrames: { timestamp: number, width: number, height: number, url: string }[] | undefined;
if (laneIndex < pageLanes.length)
Expand Down Expand Up @@ -98,6 +98,19 @@ export const FilmStrip: React.FunctionComponent<{
</div>;
};

function videoLanesByPage(pageIds: string[], thumbnails: VideoThumbnail[][]): VideoThumbnail[][] {
const lanes = new Map<string, VideoThumbnail[]>();
pageIds.forEach((pageId, index) => {
let lane = lanes.get(pageId);
if (!lane) {
lane = [];
lanes.set(pageId, lane);
}
lane.push(...thumbnails[index]);
});
return [...lanes.values()].filter(lane => lane.length).map(lane => lane.sort((a, b) => a.timestamp - b.timestamp));
}

const VideoFilmStripLane: React.FunctionComponent<{
boundaries: Boundaries,
thumbnails: VideoThumbnail[],
Expand Down
18 changes: 10 additions & 8 deletions packages/trace-viewer/src/ui/videoThumbnails.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,21 @@ const cache = new Map<string, CacheEntry>();
const maxThumbnails = 120;
const thumbnailsPerSecond = 2;

export function useVideoThumbnails(video: trace.VideoTraceEvent | undefined, videoUrl: string | undefined): VideoThumbnail[] {
export function useVideoThumbnails(videos: { video: trace.VideoTraceEvent, url: string }[]): VideoThumbnail[][] {
const [, setVersion] = React.useState(0);
const entry = video && videoUrl ? ensureEntry(video, videoUrl) : undefined;
const entries = videos.map(({ video, url }) => ensureEntry(video, url));
const urls = videos.map(({ url }) => url).join('\n');
React.useEffect(() => {
if (!entry)
return;
const listener = () => setVersion(version => version + 1);
entry.listeners.add(listener);
const subscribed = urls ? urls.split('\n').map(url => cache.get(url)!) : [];
for (const entry of subscribed)
entry.listeners.add(listener);
return () => {
entry.listeners.delete(listener);
for (const entry of subscribed)
entry.listeners.delete(listener);
};
}, [entry]);
return entry?.thumbnails ?? [];
}, [urls]);
return entries.map(entry => entry.thumbnails);
}

function ensureEntry(video: trace.VideoTraceEvent, videoUrl: string): CacheEntry {
Expand Down
Loading