Merge pull request 'feat(ai): 分析结果按素材指纹缓存,跨项目复用无需重新分析' (#11) from feat/analysis-cache into main
This commit was merged in pull request #11.
This commit is contained in:
commit
8ef3c83ea5
3 files changed
+30
-3
No files matched your search
+16
-1
@@ -19,6 +19,20 @@ export function run(bin,args,{signal,onData,onStderr}={}){
|
||||
export async function probe(file,signal){const {out}=await run(ffprobe,['-v','error','-show_format','-show_streams','-of','json',file],{signal});return JSON.parse(out);}
|
||||
const extensions=new Set('mp4 mov mkv avi webm wmv m4v jpg jpeg png webp bmp gif mp3 wav flac aac m4a ogg'.split(' '));
|
||||
export async function collect(paths,signal){const found=[];for(const p of paths){signal?.throwIfAborted();const st=await fs.lstat(p);if(st.isSymbolicLink())continue;if(st.isDirectory()){const entries=await fs.readdir(p);found.push(...await collect(entries.map(x=>path.join(p,x)),signal));}else if(extensions.has(path.extname(p).slice(1).toLowerCase()))found.push(p);}return found;}
|
||||
// —— 分析结果缓存:按素材指纹持久化,跨项目复用,无需重复分析 ——
|
||||
const ANALYSIS_CACHE_VERSION=1;
|
||||
function analysisCacheFile(cache,m){return path.join(cache,'analysis',m.fingerprint+'.json');}
|
||||
export async function loadCachedAnalysis(cache,m){
|
||||
try{const raw=JSON.parse(await fs.readFile(analysisCacheFile(cache,m),'utf8'));
|
||||
if(raw&&raw.version===ANALYSIS_CACHE_VERSION&&raw.fingerprint===m.fingerprint&&raw.analysis&&Array.isArray(raw.analysis.segments))return raw.analysis;
|
||||
}catch{}
|
||||
return null;
|
||||
}
|
||||
export async function saveCachedAnalysis(cache,m,analysis){
|
||||
try{await fs.mkdir(path.join(cache,'analysis'),{recursive:true});
|
||||
await fs.writeFile(analysisCacheFile(cache,m),JSON.stringify({version:ANALYSIS_CACHE_VERSION,fingerprint:m.fingerprint,savedAt:new Date().toISOString(),analysis}));
|
||||
}catch{}
|
||||
}
|
||||
export async function importMedia(file,cache,signal,options={}){
|
||||
const st=await fs.stat(file),meta=await probe(file,signal),v=meta.streams.find(s=>s.codec_type==='video'),a=meta.streams.find(s=>s.codec_type==='audio');
|
||||
const type=/\.(jpg|jpeg|png|webp|bmp|gif)$/i.test(file)?'image':v?'video':a?'audio':null;if(!type)throw Error('无法识别媒体流');
|
||||
@@ -26,6 +40,7 @@ export async function importMedia(file,cache,signal,options={}){
|
||||
const item={id:randomUUID(),path:file,name:path.basename(file),type,duration:type==='image'?5:Number(meta.format.duration||v?.duration||a?.duration||0),width:v?.width||0,height:v?.height||0,fps:v?parseRate(v.avg_frame_rate):0,codec:v?.codec_name||a?.codec_name,hasAudio:!!a,size:st.size,fingerprint,tags:[],favorite:false,imported:new Date().toISOString()};
|
||||
if(!Number.isFinite(item.duration)||item.duration<=0)throw Error('素材时长无效');await fs.mkdir(cache,{recursive:true});
|
||||
if(v){item.thumbnail=path.join(cache,fingerprint+'.jpg');try{await fs.access(item.thumbnail);}catch{await run(ffmpeg,['-y','-v','error',...(type==='video'&&options.acceleration==='gpu'?['-hwaccel','cuda']:[]),'-ss',String(Math.min(1,item.duration/3)),'-i',file,'-frames:v','1','-vf','scale=360:-2',item.thumbnail],{signal});}}
|
||||
const cached=await loadCachedAnalysis(cache,item);if(cached)item.analysis=cached;
|
||||
return item;
|
||||
}
|
||||
function parseRate(s){const [a,b]=String(s).split('/').map(Number);return b?a/b:0;}
|
||||
@@ -47,7 +62,7 @@ export async function analyzeTechnical(media,cache,signal,progress,options={}){
|
||||
const boundaries=[];for(let i=0;i<times.length;i++){const end=times[i+1]??media.duration;for(let t=times[i];t<end-0.05;t+=8)boundaries.push(t);}boundaries.push(media.duration);
|
||||
const segments=[];await fs.mkdir(cache,{recursive:true});
|
||||
for(let i=0;i<boundaries.length-1;i++){signal?.throwIfAborted();const start=boundaries[i],end=boundaries[i+1],frames=[];
|
||||
for(const t of [start+(end-start)*.15,start+(end-start)*.5,start+(end-start)*.85]){const file=path.join(cache,`${media.fingerprint}-${t.toFixed(3)}.jpg`);await run(ffmpeg,['-y','-v','error',...decode,'-ss',t.toFixed(3),'-i',media.path,'-frames:v','1','-vf','scale=640:-2',file],{signal});frames.push({time:t,path:file});}
|
||||
for(const t of [start+(end-start)*.15,start+(end-start)*.5,start+(end-start)*.85]){const file=path.join(cache,`${media.fingerprint}-${t.toFixed(3)}.jpg`);try{await fs.access(file);}catch{await run(ffmpeg,['-y','-v','error',...decode,'-ss',t.toFixed(3),'-i',media.path,'-frames:v','1','-vf','scale=640:-2',file],{signal});}frames.push({time:t,path:file});}
|
||||
segments.push({start,end,frames,description:'已检测镜头 / 时间采样窗口,尚未进行语义或动作识别',score:null});progress?.(0.5+0.5*(i+1)/(boundaries.length-1),'提取带时间戳的多帧序列');
|
||||
}
|
||||
return {method:'FFmpeg 场景切分 + 每窗口三帧;不等同于目标跟踪或完整动作识别',segments,analyzed:new Date().toISOString()};
|
||||
|
||||
+1
-1
@@ -68,7 +68,7 @@ async function init(){
|
||||
handle('analyze',(ids,vision)=>{const selected=project.media.filter(m=>ids.includes(m.id)),pid=project.id,c=vision?forTask('vision'):null;return task(vision?'AI 多帧素材分析':'镜头 / 音频技术分析',async(signal,progress)=>{for(let i=0;i<selected.length;i++){const m=selected[i];sameProject(pid);let analysis=m.analysis;
|
||||
if(!analysis)analysis=await media.analyzeTechnical(m,cache,signal,(v,d)=>progress((i+v*.5)/selected.length,d),{acceleration:config.processingMode});
|
||||
if(vision&&m.type!=='audio'){if(!c.visionVerified)throw Error('请先在模型管理中通过视觉能力测试');if(!analysis.model||analysis.model!==c.model)analysis=await providers.visionAnalyze(c,m,analysis,signal,(v,d)=>progress((i+.5+v*.5)/selected.length,d));}
|
||||
signal.throwIfAborted();sameProject(pid);m.analysis=analysis;m.tags=[...new Set([...(m.tags||[]),...analysis.segments.flatMap(s=>s.tags||[])])];changed();progress((i+1)/selected.length,`已分析 ${i+1}/${selected.length}`);}return {count:selected.length};});});
|
||||
signal.throwIfAborted();sameProject(pid);m.analysis=analysis;m.tags=[...new Set([...(m.tags||[]),...analysis.segments.flatMap(s=>s.tags||[])])];await media.saveCachedAnalysis(cache,m,analysis);changed();progress((i+1)/selected.length,`已分析 ${i+1}/${selected.length}`);}return {count:selected.length};});});
|
||||
handle('plan',(instruction,options={})=>{const snapshot=structuredClone(project),c=forTask('text');if(!c.model)throw Error('请先在模型管理中为剪辑规划选择模型');return task('AI 规划时间轴',async(signal,progress)=>{progress(.1,'读取项目和片段分析,调用规划模型');
|
||||
const hasVideo=snapshot.clips.some(x=>x.track==='video');
|
||||
const createIntent=/(制作|创建|新建|生成|剪一?个|做一?个|重新[剪做]|从头).{0,12}(视频|短片|vlog|混剪|宣传片|片子|作品|成片)/i.test(instruction)||/(重新|重做|重剪|重来|全[部都]?删|清空.{0,4}(时间轴|时间线|片段)|删掉.{0,4}重[新做剪])/.test(instruction)||/(^|[^a-z])(make|create|build)[^a-z].{0,15}video/i.test(instruction);
|
||||
|
||||
+13
-1
@@ -3,7 +3,7 @@ import assert from 'node:assert/strict';
|
||||
import fs from 'node:fs/promises';
|
||||
import path from 'node:path';
|
||||
import {newProject,commit,undo,saveProject,loadProject,applyOperations,validateProject,projectDuration,splitClip,sanitizeOperations} from '../desktop/core/project.mjs';
|
||||
import {run,ffmpeg,probe,importMedia,analyzeTechnical,exportVideo,makeProxy} from '../desktop/core/media.mjs';
|
||||
import {run,ffmpeg,probe,importMedia,analyzeTechnical,exportVideo,makeProxy,loadCachedAnalysis,saveCachedAnalysis} from '../desktop/core/media.mjs';
|
||||
import {Tasks} from '../desktop/core/tasks.mjs';
|
||||
import {assemble} from '../desktop/core/styles.mjs';
|
||||
const out=path.resolve('.test-output','中文 空格素材');await fs.mkdir(out,{recursive:true});
|
||||
@@ -27,6 +27,18 @@ test('真实 FFmpeg:导入、场景时间戳、编辑、SQLite 恢复、代理
|
||||
await assert.rejects(importMedia(path.join(out,'不存在.mp4'),cache));
|
||||
});
|
||||
test('任务队列限流、错误和取消',async()=>{let latest;const queue=new Tasks(x=>latest=x);let release;const block=new Promise(r=>release=r);queue.add('第一任务',async()=>{await block;return {ok:true};});const id=queue.add('取消任务',async()=>{throw Error('不得执行');});queue.cancel(id);queue.add('失败任务',async()=>{throw Error('真实失败');});release();for(let i=0;i<100&&queue.running;i++)await new Promise(r=>setTimeout(r,10));assert.equal(latest.find(i=>i.id===id).status,'cancelled');assert.equal(latest.find(i=>i.label==='失败任务').status,'error');});
|
||||
test('分析结果按素材指纹缓存,跨项目复用无需重新分析',async()=>{
|
||||
const cache=path.join(out,'analysis-cache');
|
||||
const m={fingerprint:'fp-'+Date.now(),name:'复用素材.mp4'};
|
||||
assert.equal(await loadCachedAnalysis(cache,m),null);
|
||||
const analysis={method:'测试分析',segments:[{start:0,end:5,description:'海滩日落',tags:['海边'],score:90}]};
|
||||
await saveCachedAnalysis(cache,m,analysis);
|
||||
const loaded=await loadCachedAnalysis(cache,m);
|
||||
assert.equal(loaded.segments[0].description,'海滩日落');
|
||||
assert.equal(loaded.segments[0].score,90);
|
||||
const other={fingerprint:'other-fp',name:'其他.mp4'};
|
||||
assert.equal(await loadCachedAnalysis(cache,other),null);
|
||||
});
|
||||
test('AI 操作净化:越界数值截断、无效引用忽略、视频轨重叠自动平移',()=>{
|
||||
const p=newProject('净化测试');p.media=[
|
||||
{id:'v',type:'video',duration:30,name:'v',tags:[],path:'x'},
|
||||
|
||||
Reference in new issue
Block a user