fix: align spider vectorscope with CbCr scope and separate trace from controls

这个提交包含在:
mac 于 2026-11-08 15:23:30 +08:00 提交
1 父节点 01efcc8a29
当前提交 b16a6326a4
17 个文件已更改
+411 -114

没有与搜索条件相匹配的文件

+23 -19
查看文件
@@ -40,8 +40,22 @@
- (NSData *)canvasHistogramAtTime:(CMTime)time {
return [self finalSampleAtTime:time].canvasHistogram;
}
- (DYColorProfile *)scopeProfileForSpace:(CGColorSpaceRef)space {
if(!space)return nil;
@synchronized(_scopeProfileLock){
if(!_scopeProfile||!CFEqual(_scopeProfile.source,space)){
CGColorSpaceRef target=CGColorSpaceCreateWithName(kCGColorSpaceExtendedSRGB);
if(!target)return nil;
[_scopeProfile release];
_scopeProfile=[[DYColorProfile alloc]initWithSource:space target:target error:nil];
CGColorSpaceRelease(target);
}
return [[_scopeProfile retain]autorelease];
}
}
- (NSData *)canvasSpiderScopeAtTime:(CMTime)time {
return [self finalSampleAtTime:time].spiderScope;
DYScopeSample *sample=[self finalSampleAtTime:time];
return sample?[sample spiderScopeWithProfile:[self scopeProfileForSpace:sample.space]]:nil;
}
- (NSData *)outputSpiderScope {
NSData *raster=nil;
@@ -51,10 +65,10 @@
if(!_scopeLatest||_spiderScopeWorkerRunning||_spiderScopeSerial==_scopeLatestSerial)return raster;
_spiderScopeWorkerRunning=YES;
}
dispatch_async(_scopeQueue,^{@autoreleasepool{
dispatch_async(dispatch_get_global_queue(QOS_CLASS_USER_INITIATED,0),^{@autoreleasepool{
DYScopeSample *sample=nil;uint64_t serial;
@synchronized(_previewLock){sample=[_scopeLatest retain];serial=_scopeLatestSerial;}
NSData *measured=sample.spiderScope;
NSData *measured=[sample spiderScopeWithProfile:[self scopeProfileForSpace:sample.space]];
@synchronized(_previewLock){
[_spiderScopeRaster release];_spiderScopeRaster=[measured retain];_spiderScopeSerial=serial;
_spiderScopeWorkerRunning=NO;
@@ -102,25 +116,15 @@
for(;;){@autoreleasepool{
DYScopeSample *sample=nil;@synchronized(_previewLock){sample=_scopePending;_scopePending=nil;if(!sample){_scopeWorkerRunning=NO;return;}}
@synchronized(_previewLock){if(!_scopeEnabled||sample.generation!=_scopeGeneration){[sample release];continue;}}
const auto *raw=(const dyscope::RGBA*)sample.pixels.bytes;size_t count=sample.pixels.length/sizeof(dyscope::RGBA);std::vector<DYCompositeRGBA> pixels(count);uint64_t invalid=0;
for(size_t i=0;i<count;i++){
const auto&p=raw[i];BOOL finite=std::isfinite(p.r)&&std::isfinite(p.g)&&std::isfinite(p.b)&&std::isfinite(p.a);
if(!finite){invalid++;pixels[i]={0,0,0,0};continue;}
if(p.a<=1e-6f){pixels[i]={0,0,0,0};continue;}
pixels[i]={p.r/p.a,p.g/p.a,p.b/p.a,p.a};
if(!(std::isfinite(pixels[i].r)&&std::isfinite(pixels[i].g)&&std::isfinite(pixels[i].b))){invalid++;pixels[i]={0,0,0,0};}
}
NSError *error=nil;BOOL converted=NO;CGColorSpaceRef target=CGColorSpaceCreateWithName(kCGColorSpaceExtendedSRGB);
if(sample.space&&target){
if(!_scopeProfile||!CFEqual(_scopeProfile.source,sample.space)){[_scopeProfile release];_scopeProfile=[[DYColorProfile alloc]initWithSource:sample.space target:target error:&error];}
if(_scopeProfile){auto result=[_scopeProfile convertPixels:pixels alpha:dycm::Alpha::Straight budget:32ull*1024*1024 cancelled:nullptr error:&error];if(result){pixels=std::move(*result);converted=YES;}}
}if(target)CGColorSpaceRelease(target);
std::vector<dyscope::RGBA> reference;reference.reserve(pixels.size());for(const auto&p:pixels)reference.push_back({p.r,p.g,p.b,p.a});
auto measurements=dyscope::measure(reference);measurements.nonfinite+=invalid;
auto reference=[sample displayReferenceWithProfile:[self scopeProfileForSpace:sample.space]];
const auto &pixels=reference->pixels;
uint64_t invalid=reference->invalid;
BOOL converted=reference->converted;
auto measurements=dyscope::measure(pixels);measurements.nonfinite+=invalid;
auto wave=dyscope::densityImage(measurements.wave,false),parade=dyscope::densityImage(measurements.parade,true),vectors=dyscope::vectorImage(measurements.vectors);
NSMutableDictionary *metadata=[[sample.metadata mutableCopy]autorelease];
metadata[@"domain"]=converted?@"sRGB 显示参考":@"宿主 RGB(未换算)";
metadata[@"note"]=converted?@"最终输出 · ICC 转扩展 sRGB · R′G′B′ 百分比;非 HDR / IRE 精密测量":(error?[NSString stringWithFormat:@"RGB 原值参考 · %@;波形按 709 权重参考,非 IRE",error.localizedDescription]:@"最终输出 · 空间未知;RGB 原值 / 709 权重波形参考,非显示 / HDR / IRE 测量");
metadata[@"note"]=converted?@"最终输出 · ICC 转扩展 sRGB · R′G′B′ 百分比;非 HDR / IRE 精密测量":@"最终输出 · 未完成颜色空间换算;RGB 原值 / 709 权重波形参考,非显示 / HDR / IRE 测量";
metadata[@"converted"]=@(converted);metadata[@"minimum"]=@(measurements.minimum);metadata[@"maximum"]=@(measurements.maximum);metadata[@"valid"]=@(measurements.valid);metadata[@"transparent"]=@(measurements.transparent>=invalid?measurements.transparent-invalid:0);metadata[@"nonfinite"]=@(measurements.nonfinite);metadata[@"below"]=@(measurements.below);metadata[@"above"]=@(measurements.above);
metadata[@"waveform"]=[NSData dataWithBytes:wave.data() length:wave.size()];metadata[@"parade"]=[NSData dataWithBytes:parade.data() length:parade.size()];metadata[@"histogram"]=[NSData dataWithBytes:measurements.histogram.data() length:sizeof(measurements.histogram)];metadata[@"vectorscope"]=[NSData dataWithBytes:vectors.data() length:vectors.size()];
BOOL publish=NO;@synchronized(_previewLock){if(_scopeEnabled&&sample.generation==_scopeGeneration){[_scopePreview release];_scopePreview=[[NSData alloc]initWithBytes:pixels.data() length:pixels.size()*sizeof(DYCompositeRGBA)];[_scopeMetadata release];_scopeMetadata=[metadata copy];publish=YES;}}