diff --git a/.scratch/original-video-time/work.md b/.scratch/original-video-time/work.md new file mode 100644 index 00000000..9a7c3e0d --- /dev/null +++ b/.scratch/original-video-time/work.md @@ -0,0 +1,34 @@ +# #19 原视频时间点 + +Status: resolved + +目标:标注、质检、最终验收同时提供片内和原视频播放时间,供边界调整后定位核对。来源:2026-11-15 程晓明转一线反馈(position 590–591);客户承诺为「让研发加一下」。授权仅本地实现、验证、提交;推送及部署仍需章鸿铭明确授权。 + +基线:统一开发目录 recent-integration,dev / 230491b0。新鲜度脚本确认包含 origin/dev 与线上版本;#18 的 0a60d803、230491b0 已在当前 dev,保留同批交付。未新建分支或 worktree。主目录没有该新鲜度脚本,实际在统一开发目录执行成功。 + +## 方案和兼容范围 + +- 标注、质检共用 CaptureAnnotationWorkbench,片内时间为动作/播放坐标减去当前切片起点,原视频时间沿用已有 Capture 播放坐标。 +- 最终验收播放器使用片内逻辑时钟,原视频时间为当前切片冻结源起点加片内时间。acceptanceFullVideoWindow 是跨来源累计的观看进度,不能作为多来源的原视频时钟。每一来源独立归零;双目解码偏移及硬件 PTS 不替代业务播放时钟。 +- 播放栏、动作列表、编辑/只读动作详情和质检/验收右侧当前画面详情同步显示,使用「片内」「原视频」及毫秒精度。验收切片列表补充原视频范围。窄时间轴不增加会被裁切的第二行,已有悬浮信息补全原视频区间。 +- 对历史缺少映射的记录显示「原视频 —」。直接读取冻结切片的原始边界,避免 null 经 Number 转换后被误显示成零;原有验收检查和时间轴逻辑不变。 +- 仅前端展示,保存/API/Mongo/切片定义、审核意见坐标、送检和审核决定契约不变。无数据迁移、无客户写操作。MaterializedSliceWorkbench 当前无实际渲染入口,不扩展废弃入口。 + +负责文件:src/components/{CaptureAnnotationWorkbench,FinalAcceptanceWorkspace,AcceptanceActionTimeline,ReviewCaptions}.tsx、src/lib/annotation-time.js、scripts/verification-scopes.json、本需求新增测试及 tests/browser/acceptance-playback-rate.mjs。原有 AGENTS/docs/领取池 Go 测试及其他 .scratch 工作保持原样。 + +## 验证范围和证据 + +入口已执行 verify:plan 和 verify:task --plan,基线均为 230491b0。共享树含他人领取池变更,因此 quick 使用同一 scripts/verify-change.py 执行器,显式限定上述负责文件;没有为本需求启动他人的 Go/数据库/生产负载检查。任务级选择显示相关浏览器专项;审核保存、权限和后端边界操作未改,不扩展到这些映射的数据库专项,不能将本报告当作整个平台或发布门禁全通过。 + +- 180 项定向前端/工具 Node 测试通过(含稳定原视频定位、跨来源时钟、空边界、#18 动作/播放和既有审核/保存逻辑);验证工具 Python 测试通过;lint:web 类型/架构检查及改动格式/diff 检查通过。quick 最终报告位置在 local-data/test-results/issue19/quick-final.log 中。 +- 标注/质检真实共享组件、本地合成视频:播放定位、动作列表、编辑/只读详情、当前画面详情;边界 5→3 后片内 1–2→3–4 秒,原视频保持 6–7 秒;无标注写入。日志 workbenches.log;截图 workbenches/{annotation,quality}.png。 +- 最终验收真实整页:native / movi / movi-fractional 三模式,每种 15 次切片变化;第二片片内 0 秒对应原视频 8 秒,列表/右侧详情与播放栏一致;倍速、短动作、舍弃切片、字幕、批注、只读、草稿失败、加载/空/错误状态、普通/深色窄屏和密集列表回归。日志 acceptance.log、acceptance/report.json 及其截图。 +- #18 时间轴鼠标拖动、普通点击、滚轮、独立滚动控件、末条自动可见,normal / focused / focused&readonly 通过;日志 timeline-pan.log。 +- 前端构建通过,保留既有 chunk 大小提示;本次早期 npm run build 全量构建也 exit 0。最终前端构建见 build-web-final.log。 +- 截图人工查看标注、质检和验收显示;夹具初次定位超时来自未实现 HTTP Range,补齐 Range 后实际定位与截图通过。没有因此修改播放器传输逻辑。 + +所有日志和截图位于忽略目录 local-data/test-results/issue19/。公司集群、BOS 及客户数据未写入。生产验证、生产业务接受、正式发布门禁和 120 人容量未执行,本需求不作这些承诺。 + +本地实现和本需求定向验证已就绪。最终 quick 报告:local-data/test-results/verify-1794808129484018000/report.json;180 项 Node 测试通过、22 项验证工具 Python 测试通过。最终浏览器三模式报告及前端构建通过,提交后运行 agent_status --no-fetch 核对分支。 + +下一步仅为授权后的交付:章鸿铭明确批准推送后将 #18 的 0a60d803、230491b0 与本需求提交同批推送;部署仍须独立明确授权及正式发布门禁。当前未推送、未部署,客户尚未使用本次显示变化。 diff --git a/scripts/verification-scopes.json b/scripts/verification-scopes.json index 6794b881..82fc9d4d 100644 --- a/scripts/verification-scopes.json +++ b/scripts/verification-scopes.json @@ -160,16 +160,24 @@ "^src/lib/(review-caption-preferences\\.js|review-navigation\\.js|review-opinions\\.ts)$", "^src/styles/review-captions\\.css$", "^tests/browser/review-caption-recovery\\.mjs$", - "^src/lib/acceptance-workspace\\.js$" + "^src/lib/acceptance-workspace\\.js$", + "^src/lib/annotation-time\\.js$", + "^tests/browser/(fixtures/)?original-video-time\\.(mjs|tsx)$" ], "frontend": [ "tests/frontend/review-target-interaction.test.mjs", "tests/frontend/review-caption-preferences.test.mjs", "tests/frontend/review-captions.test.mjs", - "tests/frontend/acceptance-workspace.test.mjs" + "tests/frontend/acceptance-workspace.test.mjs", + "tests/frontend/original-video-time.test.mjs", + "tests/frontend/oct15-feedback-flows.test.mjs" ], "go": {}, "task": [ + { + "argv": ["node", "tests/browser/original-video-time.mjs"], + "tests": true + }, { "argv": ["node", "tests/browser/acceptance-timeline-pan.mjs"], "env": {}, diff --git a/src/components/AcceptanceActionTimeline.tsx b/src/components/AcceptanceActionTimeline.tsx index 072ad292..5d7bd250 100644 --- a/src/components/AcceptanceActionTimeline.tsx +++ b/src/components/AcceptanceActionTimeline.tsx @@ -1,3 +1,4 @@ +import { formatOriginalVideoTime } from "../lib/annotation-time.js"; import { useEffect, useId, useLayoutEffect, useRef, useState } from "react"; import { cn } from "../lib/utils"; import { annotationTimelineColors as colors } from "../lib/annotation-colors.js"; @@ -7,6 +8,7 @@ const time = (n: number) => `${String(Math.floor(n / 60)).padStart(2, "0")}:${(n export function AcceptanceActionTimeline({ actions, + originalVideoOffset, duration, currentTime, canAct, @@ -20,6 +22,7 @@ export function AcceptanceActionTimeline({ }: { key?: string; actions: Action[]; + originalVideoOffset?: number; hideProblemEditor?: boolean; selectedActionId?: string; onSelectAction?: (id: string) => boolean; @@ -179,7 +182,10 @@ export function AcceptanceActionTimeline({ #{index + 1} {action.description} - {time(action.start)}–{time(action.end)} + 片内 {time(action.start)}–{time(action.end)} + + {formatOriginalVideoTime(action.start, action.end, originalVideoOffset ?? NaN)} + ))} @@ -226,6 +232,9 @@ export function AcceptanceActionTimeline({

{selected.description}

片内 {time(selected.start)}–{time(selected.end)} + + {formatOriginalVideoTime(selected.start, selected.end, originalVideoOffset ?? NaN)} +

diff --git a/src/components/CaptureAnnotationWorkbench.tsx b/src/components/CaptureAnnotationWorkbench.tsx index 24a1f674..bf4d838f 100644 --- a/src/components/CaptureAnnotationWorkbench.tsx +++ b/src/components/CaptureAnnotationWorkbench.tsx @@ -11,7 +11,7 @@ import { import { checkSliceEditResolution } from "../lib/slice-edit-drag-quick-path.js"; import type { DictionaryItem } from "../lib/dictionary-selection"; import type { DictionarySelection } from "../types"; -import { formatAnnotationTime } from "../lib/annotation-time.js"; +import { formatAnnotationTime, formatOriginalVideoTime } from "../lib/annotation-time.js"; import { userErrorMessage } from "../lib/user-error-message.js"; import { reviewCommandRequiresWrite, reviewShortcut, reviewShortcutHelp } from "../lib/review-shortcuts.js"; import type { ReviewViewingProps, ReviewViewingController, ReviewPosition, ReviewNavigation } from "./review-viewing"; @@ -162,6 +162,7 @@ type Props = ReviewViewingProps & { clipEnd: number; sourceIsFullVideo?: boolean; mediaSourceOffsets?: { left: number; right: number }; + originalVideoOffset?: number; slices: SliceSegment[]; segments: AnnotationSegment[]; labels?: SemanticLabelDefinition[]; @@ -366,6 +367,7 @@ export function CaptureAnnotationWorkbench({ clipEnd, sourceIsFullVideo = false, mediaSourceOffsets, + originalVideoOffset, slices, segments: providedSegments, labels = [], @@ -3610,7 +3612,8 @@ export function CaptureAnnotationWorkbench({ : "已描述"} - {formatTime(action.start - selectedSlice.start)}–{formatTime(action.end - selectedSlice.start)} + 片内 {formatTime(action.start - selectedSlice.start)}–{formatTime(action.end - selectedSlice.start)} + {formatOriginalVideoTime(action.start, action.end)} {action.description || "待标注"} @@ -4433,7 +4436,10 @@ export function CaptureAnnotationWorkbench({ {formatTime(selectedSlice.end - selectedSlice.start)} )}{" "} - {!mediaOnly && <> · 原视频 {formatTime(currentTime)}} + ·{" "} + + {formatOriginalVideoTime(currentTime, null, mediaOnly ? (originalVideoOffset ?? NaN) : 0)} + {transport.isPositioning && ( @@ -4486,7 +4492,11 @@ export function CaptureAnnotationWorkbench({ {reviewCaption && isQualityReview && (
{reviewTracePanel} - + {isQualityReview && reviewProblemPanel}
)} @@ -5597,7 +5607,7 @@ export function CaptureAnnotationWorkbench({ )}
- {formatTime(segment.start - lowerAnnotation)}–{formatTime(segment.end - lowerAnnotation)} + 片内 {formatTime(segment.start - lowerAnnotation)}–{formatTime(segment.end - lowerAnnotation)}
{!readOnly && !isQualityReview && @@ -5725,7 +5735,9 @@ export function CaptureAnnotationWorkbench({ {formatTime(hoveredSegment.segment.end - lowerAnnotation)} · - 原视频 {formatTime(hoveredSegment.segment.start)} + + {formatOriginalVideoTime(hoveredSegment.segment.start, hoveredSegment.segment.end)} +
{hoveredSegment.segment.isInvalid || @@ -5854,9 +5866,12 @@ export function CaptureAnnotationWorkbench({ 动作 #{segIndex >= 0 ? segIndex + 1 : 1} 详情 - {formatTime(editingAnnotation.start - lowerAnnotation)} ~{" "} + 片内 {formatTime(editingAnnotation.start - lowerAnnotation)} ~{" "} {formatTime(editingAnnotation.end - lowerAnnotation)} (时长{" "} {formatTime(editingAnnotation.end - editingAnnotation.start)}) + + {formatOriginalVideoTime(editingAnnotation.start, editingAnnotation.end)} +
@@ -5919,9 +5934,12 @@ export function CaptureAnnotationWorkbench({ )} - {formatTime(editingAnnotation.start - lowerAnnotation)} ~{" "} + 片内 {formatTime(editingAnnotation.start - lowerAnnotation)} ~{" "} {formatTime(editingAnnotation.end - lowerAnnotation)} (时长{" "} {formatTime(editingAnnotation.end - editingAnnotation.start)}) + + {formatOriginalVideoTime(editingAnnotation.start, editingAnnotation.end)} + @@ -6075,6 +6093,13 @@ export function CaptureAnnotationWorkbench({
编辑动作 #{segIndex >= 0 ? segIndex + 1 : 1} 描述区间 + + 片内 {formatTime(editingAnnotation.start - lowerAnnotation)}– + {formatTime(editingAnnotation.end - lowerAnnotation)} + + {formatOriginalVideoTime(editingAnnotation.start, editingAnnotation.end)} + +
))} @@ -966,6 +976,7 @@ export function FinalAcceptanceWorkspace({

验收面板

{reviewTracePanel} - + {reviewProblemPanel}
diff --git a/src/components/ReviewCaptions.tsx b/src/components/ReviewCaptions.tsx index cf941392..c3c4b40b 100644 --- a/src/components/ReviewCaptions.tsx +++ b/src/components/ReviewCaptions.tsx @@ -1,3 +1,4 @@ +import { formatAnnotationTime, formatOriginalVideoTime } from "../lib/annotation-time.js"; import { useEffect, useState, type CSSProperties, type RefObject } from "react"; import { reviewCaptionAtTime } from "../lib/review-captions.js"; import "../styles/review-captions.css"; @@ -173,7 +174,15 @@ export function ReviewVideoCaption({ ); } -export function ReviewCaptionDetails({ caption }: { caption: ReviewCaption }) { +export function ReviewCaptionDetails({ + caption, + sliceStart, + originalVideoOffset, +}: { + caption: ReviewCaption; + sliceStart: number; + originalVideoOffset: number; +}) { return ( ); } diff --git a/src/lib/annotation-time.js b/src/lib/annotation-time.js index 0db0b7b0..8785e754 100644 --- a/src/lib/annotation-time.js +++ b/src/lib/annotation-time.js @@ -7,3 +7,10 @@ export function formatAnnotationTime(seconds) { const milliseconds = totalMilliseconds % 1000; return `${String(minutes).padStart(2, "0")}:${String(wholeSeconds).padStart(2, "0")}.${String(milliseconds).padStart(3, "0")}`; } + +/** Source playback clock, never the concatenated acceptance progress or hardware PTS. */ +export function formatOriginalVideoTime(start, end = null, offset = 0) { + const valid = (value) => typeof value === "number" && Number.isFinite(value) && value >= 0; + if (!valid(offset) || !valid(start) || (end !== null && (!valid(end) || end < start))) return "原视频 —"; + return `原视频 ${formatAnnotationTime(offset + start)}${end === null ? "" : `–${formatAnnotationTime(offset + end)}`}`; +} diff --git a/tests/browser/acceptance-playback-rate.mjs b/tests/browser/acceptance-playback-rate.mjs index 9df52bc7..e8e7a77b 100644 --- a/tests/browser/acceptance-playback-rate.mjs +++ b/tests/browser/acceptance-playback-rate.mjs @@ -229,6 +229,10 @@ try { await page.getByLabel("播放速度").waitFor(); const actionList = page.getByRole("listbox", { name: "动作区间", exact: true }); await actionList.getByRole("option").nth(3).waitFor(); + assert.match( + await actionList.getByRole("option").first().innerText(), + /片内 00:00.000–00:02.000.*原视频 00:00.000–00:02.000/s, + ); const brief = actionList.getByRole("option").nth(1); assert.match(await brief.innerText(), /0.500 秒.*短区间/s); assert.match(await actionList.getByRole("option").nth(3).innerText(), /待标注/); @@ -237,6 +241,10 @@ try { await page.waitForFunction(() => document.querySelector('.acceptance-action-list [aria-selected="true"]')?.textContent.includes("短暂有效动作"), ); + assert.match( + await page.getByTestId("review-action-times").innerText(), + /片内 00:02.000–00:02.500.*原视频 00:02.000–00:02.500/s, + ); const assertActionTime = async (value) => { await page.waitForFunction( ({ value, offset }) => { @@ -294,6 +302,10 @@ try { }); await leftCaption.waitFor({ timeout: 8000 }); assert.match(await leftCaption.innerText(), /第二片/); + assert.match(await actionList.getByRole("option").first().innerText(), /原视频 00:08.000–00:10.000/); + await page.waitForFunction( + () => document.querySelector('[data-testid="original-video-position"]')?.textContent === "原视频 00:08.000", + ); await page.getByRole("button", { name: "播放", exact: true }).click(); await page.waitForFunction( (offset) => { diff --git a/tests/browser/fixtures/original-video-time.tsx b/tests/browser/fixtures/original-video-time.tsx new file mode 100644 index 00000000..a4a97af7 --- /dev/null +++ b/tests/browser/fixtures/original-video-time.tsx @@ -0,0 +1,41 @@ +import React, { useState } from "react"; +import { createRoot } from "react-dom/client"; +import { CaptureAnnotationWorkbench } from "/src/components/CaptureAnnotationWorkbench"; +import "/src/index.css"; +import "/src/styles/capture-workspace.css"; +import "/src/styles/review-workspace.css"; + +function App() { + const [boundary, setBoundary] = useState(5); + const quality = new URLSearchParams(location.search).has("quality"); + return ( +
+ + i / 30)} + labels={[]} + statuses={{}} + phase="annotate" + isQualityReview={quality} + onChange={() => { + throw new Error("Unexpected annotation write"); + }} + /> +
+ ); +} +createRoot(document.getElementById("root")!).render(); diff --git a/tests/browser/original-video-time.mjs b/tests/browser/original-video-time.mjs new file mode 100644 index 00000000..d45a2b7e --- /dev/null +++ b/tests/browser/original-video-time.mjs @@ -0,0 +1,99 @@ +// Real shared annotation/quality workbench, local synthetic media and state only. +import assert from "node:assert/strict"; +import fs from "node:fs/promises"; +import { execFileSync } from "node:child_process"; +import { createServer } from "vite"; +import { chromium } from "playwright"; +import { browserExecutableOptions } from "../../scripts/lib/browser-executable.mjs"; +import { closeBrowserFixture } from "../../scripts/lib/browser-test-lifecycle.mjs"; +const out = "local-data/test-results/issue19/workbenches"; +await fs.mkdir(out, { recursive: true }); +execFileSync("ffmpeg", [ + "-nostdin", + "-loglevel", + "error", + "-y", + "-f", + "lavfi", + "-i", + "testsrc2=s=320x240:r=30:d=12", + "-c:v", + "libx264", + "-pix_fmt", + "yuv420p", + `${out}/synthetic.mp4`, +]); +const media = await fs.readFile(`${out}/synthetic.mp4`); +let browser, server; +try { + server = await createServer({ + configFile: "tests/browser/vite.platform-feedback.config.ts", + server: { host: "127.0.0.1", port: 0 }, + }); + await server.listen(); + browser = await chromium.launch({ ...browserExecutableOptions(), headless: true, args: ["--no-proxy-server"] }); + for (const role of ["annotation", "quality"]) { + const page = await browser.newPage({ viewport: { width: 1500, height: 1000 } }); + const errors = []; + page.on("pageerror", (e) => errors.push(e.message)); + await page.route("**/synthetic.mp4", (route) => + (() => { + const range = /bytes=(\d+)-(\d*)/.exec(route.request().headers().range || ""); + const start = range ? Number(range[1]) : 0; + const end = range?.[2] ? Math.min(Number(range[2]), media.length - 1) : media.length - 1; + return route.fulfill({ + status: range ? 206 : 200, + contentType: "video/mp4", + headers: { + "Accept-Ranges": "bytes", + "Content-Length": String(end - start + 1), + ...(range ? { "Content-Range": `bytes ${start}-${end}/${media.length}` } : {}), + }, + body: media.subarray(start, end + 1), + }); + })(), + ); + await page.route("**/__original_time*", (route) => + route.fulfill({ + contentType: "text/html", + body: `
`, + }), + ); + await page.goto(`${server.resolvedUrls.local[0]}__original_time?${role}`); + const row = page.getByRole("option").filter({ hasText: "核对动作" }); + await row.waitFor(); + assert.match(await row.innerText(), /片内 00:01.000–00:02.000.*原视频 00:06.000–00:07.000/s); + await page.waitForFunction(() => { + const video = document.querySelector('[data-camera="left"]'); + return video?.readyState >= 2 && !video.seeking; + }); + await row.click(); + await page.waitForFunction( + () => document.querySelector('[data-testid="original-video-position"]')?.textContent === "原视频 00:06.000", + ); + if (role === "quality") + assert.match( + await page.getByTestId("review-action-times").innerText(), + /片内 00:01.000–00:02.000.*原视频 00:06.000–00:07.000/s, + ); + const detail = page.getByLabel("动作描述编辑区", { exact: true }); + await detail.waitFor(); + assert.match(await detail.innerText(), /原视频 00:06.000–00:07.000/); + await page.getByText("定位中,时间为目标位置…", { exact: true }).waitFor({ state: "hidden", timeout: 10000 }); + await page.getByRole("button", { name: "合成边界更新", exact: true }).click(); + assert.match(await row.innerText(), /片内 00:03.000–00:04.000.*原视频 00:06.000–00:07.000/s); + assert.match(await detail.innerText(), /原视频 00:06.000–00:07.000/); + assert.equal(await page.getByTestId("original-video-position").innerText(), "原视频 00:06.000"); + await page.waitForFunction(() => { + const video = document.querySelector('[data-camera="left"]'); + return video?.readyState >= 2 && !video.seeking; + }); + await page.getByText("定位中,时间为目标位置…", { exact: true }).waitFor({ state: "hidden" }); + await page.screenshot({ path: `${out}/${role}.png`, fullPage: true }); + assert.deepEqual(errors, []); + await page.close(); + } + console.log("PASS annotation/quality: list, detail, source position after boundary update; no annotation writes"); +} finally { + await closeBrowserFixture({ browser, vite: server }); +} diff --git a/tests/frontend/original-video-time.test.mjs b/tests/frontend/original-video-time.test.mjs new file mode 100644 index 00000000..b3dc981d --- /dev/null +++ b/tests/frontend/original-video-time.test.mjs @@ -0,0 +1,37 @@ +import test from "node:test"; +import assert from "node:assert/strict"; +import { formatOriginalVideoTime } from "../../src/lib/annotation-time.js"; +import { acceptanceFullVideoWindow, acceptanceSliceGroups } from "../../src/lib/acceptance-workspace.js"; + +test("original playback position stays fixed when a slice boundary moves", () => { + assert.equal(formatOriginalVideoTime(3.25, null, 60), "原视频 01:03.250"); + assert.equal(formatOriginalVideoTime(5.25, null, 58), "原视频 01:03.250"); + assert.equal(formatOriginalVideoTime(63.25), "原视频 01:03.250"); + assert.equal(formatOriginalVideoTime(2, 4, 60), "原视频 01:02.000–01:04.000"); +}); + +test("source clocks reset per source, independently of acceptance concatenated progress", () => { + const groups = [ + { id: "a", start: 20, end: 40 }, + { id: "b", start: 5, end: 15 }, + ]; + assert.deepEqual(acceptanceFullVideoWindow(groups, "b"), { offset: 20, total: 30 }); + assert.equal(formatOriginalVideoTime(2, null, groups[1].start), "原视频 00:07.000"); +}); + +test("unavailable legacy mappings are not displayed as a plausible zero", () => { + for (const offset of [NaN, null, -1, Infinity]) { + assert.equal(formatOriginalVideoTime(2, null, offset), "原视频 —"); + } + assert.equal(formatOriginalVideoTime(NaN), "原视频 —"); + assert.equal(formatOriginalVideoTime(2, 1), "原视频 —"); +}); + +test("legacy slices with null or absent source bounds preserve an unknown mapping", () => { + for (const slice of [{ start: null, end: 8 }, { end: 8 }, {}]) { + const [group] = acceptanceSliceGroups([{ materialization: { artifactId: "a" }, finalSlices: [slice] }], { + a: { items: [{ group: "slice-000001", name: "annotation.json" }] }, + }); + assert.equal(formatOriginalVideoTime(1, null, group.entry.finalSlices[group.index - 1].start ?? NaN), "原视频 —"); + } +});