fix: align spider vectorscope with CbCr scope and separate trace from controls
这个提交包含在:
1 父节点
01efcc8a29
当前提交
b16a6326a4
17 个文件已更改
+411
-114
没有与搜索条件相匹配的文件
+28
-23
@@ -5,7 +5,7 @@
|
||||
#include <cstdint>
|
||||
#include <span>
|
||||
#include <vector>
|
||||
#include "SpiderCore/DYColorMath.h"
|
||||
#include "../../ColorManagement/Core/DYPremultiplied.h"
|
||||
|
||||
// Display-reference measurements only. Values remain unclipped; the plot
|
||||
// covers -10%...110% and explicitly counts samples beyond that range.
|
||||
@@ -13,9 +13,8 @@ namespace dyscope {
|
||||
inline constexpr unsigned Width=320,Height=180,Bins=256;
|
||||
inline constexpr float Low=-.1f,High=1.1f;
|
||||
// Conventional positive-I flesh-tone reference: 33 degrees left of +Cr.
|
||||
inline constexpr double SkinToneAngle=123.0*3.14159265358979323846/180.0;
|
||||
inline constexpr double SkinToneCb=-0.5446390350150271,SkinToneCr=0.8386705679454240;
|
||||
struct RGBA { float r,g,b,a; };
|
||||
using RGBA=DYCompositeRGBA;
|
||||
struct Result {
|
||||
std::vector<uint32_t> wave=std::vector<uint32_t>(Width*Bins),parade=std::vector<uint32_t>(3*Width*Bins),vectors=std::vector<uint32_t>(Bins*Bins);
|
||||
std::array<uint32_t,4*Bins> histogram{};
|
||||
@@ -25,15 +24,32 @@ struct Result {
|
||||
inline unsigned bin(float v){if(!(v>Low))return 0;if(v>=High)return Bins-1;return unsigned(std::clamp(std::lround((v-Low)/(High-Low)*(Bins-1)),0l,long(Bins-1)));}
|
||||
// BT.709 colour-difference coordinates on the same encoded display-reference
|
||||
// RGB used by the existing scopes (ITU-R BT.709-6 section 3.3). Not an IRE meter.
|
||||
inline unsigned chromaBin(float v){if(!(v>-.6f))return 0;if(v>=.6f)return Bins-1;return unsigned(std::clamp(std::lround((v+.6f)/1.2f*(Bins-1)),0l,long(Bins-1)));}
|
||||
inline constexpr float Kr=.2126f,Kg=.7152f,Kb=.0722f;
|
||||
inline constexpr float ChromaLimit=.6f;
|
||||
struct Chroma {float cb,cr;};
|
||||
inline float luminance(const RGBA &p){return Kr*p.r+Kg*p.g+Kb*p.b;}
|
||||
inline Chroma chroma(const RGBA &p,float y){return {(p.b-y)/(2*(1-Kb)),(p.r-y)/(2*(1-Kr))};}
|
||||
inline RGBA chromaRGB(Chroma c){
|
||||
float r=2*(1-Kr)*c.cr,b=2*(1-Kb)*c.cb;
|
||||
return {r,-(Kr*r+Kb*b)/Kg,b,1};
|
||||
}
|
||||
inline unsigned chromaBin(float v){
|
||||
if(!(v>-ChromaLimit))return 0;
|
||||
if(v>=ChromaLimit)return Bins-1;
|
||||
return unsigned(std::clamp(std::lround((v+ChromaLimit)/(2*ChromaLimit)*(Bins-1)),0l,long(Bins-1)));
|
||||
}
|
||||
inline size_t vectorIndex(Chroma c){return (Bins-1-chromaBin(c.cr))*Bins+chromaBin(c.cb);}
|
||||
inline bool visible(const RGBA &p){
|
||||
return std::isfinite(p.r)&&std::isfinite(p.g)&&std::isfinite(p.b)&&std::isfinite(p.a)&&p.a>1e-6f;
|
||||
}
|
||||
inline Result measure(std::span<const RGBA> pixels,unsigned width=Width,unsigned height=Height){
|
||||
Result r;if(!width||!height||pixels.size()!=size_t(width)*height)return r;bool first=true;
|
||||
for(unsigned y=0;y<height;y++)for(unsigned x=0;x<width;x++){
|
||||
const auto&p=pixels[size_t(y)*width+x];
|
||||
if(!(std::isfinite(p.r)&&std::isfinite(p.g)&&std::isfinite(p.b)&&std::isfinite(p.a))){r.nonfinite++;continue;}
|
||||
if(p.a<=1e-6f){r.transparent++;continue;}
|
||||
float values[4]={.2126f*p.r+.7152f*p.g+.0722f*p.b,p.r,p.g,p.b};unsigned column=std::min(Width-1,unsigned(uint64_t(x)*Width/width));
|
||||
float cb=(p.b-values[0])/1.8556f,cr=(p.r-values[0])/1.5748f;r.vectors[(Bins-1-chromaBin(cr))*Bins+chromaBin(cb)]++;
|
||||
float values[4]={luminance(p),p.r,p.g,p.b};unsigned column=std::min(Width-1,unsigned(uint64_t(x)*Width/width));
|
||||
r.vectors[vectorIndex(chroma(p,values[0]))]++;
|
||||
for(unsigned c=0;c<4;c++){
|
||||
float v=values[c];unsigned b=bin(v);r.histogram[c*Bins+b]++;
|
||||
if(!c)r.wave[(Bins-1-b)*Width+column]++;
|
||||
@@ -58,30 +74,19 @@ inline std::vector<uint8_t> vectorImage(std::span<const uint32_t> counts){
|
||||
if(counts.size()!=Bins*Bins)return {};std::vector<uint8_t> out(counts.size()*4);uint32_t maximum=0;for(uint32_t n:counts)maximum=std::max(maximum,n);float divisor=std::log1p(float(maximum));
|
||||
for(size_t i=0;i<counts.size();i++){float cb=float(i%Bins)/(Bins-1)*1.2f-.6f,cr=.6f-float(i/Bins)/(Bins-1)*1.2f;float intensity=counts[i]&&divisor>0?std::pow(std::log1p(float(counts[i]))/divisor,.65f):0;float colors[]={.5f+1.5748f*cr,.5f-.187324f*cb-.468124f*cr,.5f+1.8556f*cb};float peak=std::max({colors[0],colors[1],colors[2],.001f});for(int c=0;c<3;c++)out[i*4+c]=uint8_t(std::lround(std::clamp(colors[c]/peak,0.f,1.f)*intensity*255));out[i*4+3]=255;}return out;
|
||||
}
|
||||
inline constexpr unsigned SpiderBins=192;
|
||||
inline constexpr float SpiderSkinAngle=28.f*3.14159265358979323846f/180.f;
|
||||
// Transparent rendering of the same Cb/Cr bins used by the full scope.
|
||||
inline std::vector<uint8_t> spiderVectorImage(std::span<const RGBA> pixels) {
|
||||
std::vector<uint32_t> density(SpiderBins*SpiderBins);
|
||||
constexpr float radius=(SpiderBins-1)*.5f;
|
||||
constexpr float tau=6.28318530718f;
|
||||
std::vector<uint32_t> density(Bins*Bins);
|
||||
uint32_t peak=0;
|
||||
for(const auto &pixel:pixels){
|
||||
if(!std::isfinite(pixel.a)||pixel.a<=1e-6f||
|
||||
!std::isfinite(pixel.r)||!std::isfinite(pixel.g)||!std::isfinite(pixel.b))continue;
|
||||
auto hsv=dyRGBHSV(float3{pixel.r/pixel.a,pixel.g/pixel.a,pixel.b/pixel.a});
|
||||
if(!std::isfinite(hsv.x)||!std::isfinite(hsv.y))continue;
|
||||
float distance=radius*std::clamp(hsv.y,0.f,1.f),angle=hsv.x*tau;
|
||||
unsigned x=std::lround(radius+std::cos(angle)*distance);
|
||||
unsigned y=std::lround(radius+std::sin(angle)*distance);
|
||||
peak=std::max(peak,++density[y*SpiderBins+x]);
|
||||
}
|
||||
for(const auto &pixel:pixels)if(visible(pixel))
|
||||
peak=std::max(peak,++density[vectorIndex(chroma(pixel,luminance(pixel)))]);
|
||||
std::vector<uint8_t> raster(density.size()*4);
|
||||
if(!peak)return raster;
|
||||
float maximum=std::log1p(float(peak));
|
||||
for(size_t i=0;i<density.size();i++){
|
||||
if(!density[i])continue;
|
||||
float intensity=std::sqrt(std::log1p(float(density[i]))/maximum);
|
||||
uint8_t alpha=std::lround(255.f*(.24f+.76f*intensity));
|
||||
float intensity=std::pow(std::log1p(float(density[i]))/maximum,1.15f);
|
||||
uint8_t alpha=std::lround(255.f*(.035f+.68f*intensity));
|
||||
std::fill_n(raster.data()+4*i,4,alpha); // premultiplied white
|
||||
}
|
||||
return raster;
|
||||
|
||||
在新工单中引用
屏蔽一个用户