a56b47143c
Signal's active-speaker cue is a 3px #ffffff rounded border (saturation ≈ 0), which the saturation-based highlight detector could never see. Per the Signal-Desktop source review: - FrameSampler.thinWhitePoints: grid-sample near-white pixels that sit on a THIN structure (a non-white pixel within edgeGap on some axis) so a border/ ring counts but a solid white blob (face, bright video) does not. - GridCallAnalyzer: combine coloured (saturated) + white (thin) highlight pixels; exclude name-text regions so the white footer name can't be mistaken for the border; estimate the tile UP from the name footer (nameAtBottom); attribute each highlight pixel to exactly one tile by containment (nearest centre as tiebreak) so a border can't bleed into an adjacent tile. - SignalAdapter: white border on, coloured off, name-at-bottom geometry. Synthetic 4-tile harness now isolates each speaker with no adjacent-tile bleed; all 15 XCTest cases pass. Real-screenshot geometry calibration still pending.
115 lines
5.2 KiB
Swift
115 lines
5.2 KiB
Swift
import Foundation
|
|
import CoreGraphics
|
|
|
|
/// Renders a CGImage to an RGBA8 buffer once, then answers cheap colour queries
|
|
/// over pixel regions. Used to score the active-speaker highlight (a saturated
|
|
/// coloured border/ring) around participant tiles.
|
|
struct FrameSampler {
|
|
let width: Int
|
|
let height: Int
|
|
private let pixels: [UInt8] // RGBA8, row-major, top-left origin
|
|
|
|
init?(cgImage: CGImage) {
|
|
let w = cgImage.width, h = cgImage.height
|
|
guard w > 0, h > 0 else { return nil }
|
|
var buffer = [UInt8](repeating: 0, count: w * h * 4)
|
|
let colorSpace = CGColorSpaceCreateDeviceRGB()
|
|
let info = CGImageAlphaInfo.premultipliedLast.rawValue
|
|
guard let ctx = buffer.withUnsafeMutableBytes({ raw -> CGContext? in
|
|
CGContext(data: raw.baseAddress, width: w, height: h, bitsPerComponent: 8,
|
|
bytesPerRow: w * 4, space: colorSpace, bitmapInfo: info)
|
|
}) else { return nil }
|
|
ctx.draw(cgImage, in: CGRect(x: 0, y: 0, width: w, height: h))
|
|
self.width = w
|
|
self.height = h
|
|
self.pixels = buffer
|
|
}
|
|
|
|
/// Mean HSV saturation (0…1) over a pixel rect (top-left origin), sampled on a grid.
|
|
func meanSaturation(inPixelRect rect: CGRect, samples: Int = 24) -> Double {
|
|
let x0 = max(0, Int(rect.minX)), x1 = min(width, Int(rect.maxX))
|
|
let y0 = max(0, Int(rect.minY)), y1 = min(height, Int(rect.maxY))
|
|
guard x1 > x0, y1 > y0 else { return 0 }
|
|
let stepX = max(1, (x1 - x0) / samples)
|
|
let stepY = max(1, (y1 - y0) / samples)
|
|
var sum = 0.0, count = 0
|
|
var y = y0
|
|
while y < y1 {
|
|
var x = x0
|
|
while x < x1 {
|
|
let i = (y * width + x) * 4
|
|
let r = Double(pixels[i]), g = Double(pixels[i + 1]), b = Double(pixels[i + 2])
|
|
let mx = max(r, g, b), mn = min(r, g, b)
|
|
sum += mx > 0 ? (mx - mn) / mx : 0
|
|
count += 1
|
|
x += stepX
|
|
}
|
|
y += stepY
|
|
}
|
|
return count > 0 ? sum / Double(count) : 0
|
|
}
|
|
|
|
/// Mean saturation of a ring just inside `rect`'s edges (the tile border),
|
|
/// excluding the interior — that's where the speaking highlight lives.
|
|
func borderSaturation(inPixelRect rect: CGRect, thicknessFraction: Double = 0.12) -> Double {
|
|
let t = max(2.0, min(rect.width, rect.height) * thicknessFraction)
|
|
let top = CGRect(x: rect.minX, y: rect.minY, width: rect.width, height: t)
|
|
let bottom = CGRect(x: rect.minX, y: rect.maxY - t, width: rect.width, height: t)
|
|
let left = CGRect(x: rect.minX, y: rect.minY, width: t, height: rect.height)
|
|
let right = CGRect(x: rect.maxX - t, y: rect.minY, width: t, height: rect.height)
|
|
return [top, bottom, left, right].map { meanSaturation(inPixelRect: $0) }.max() ?? 0
|
|
}
|
|
|
|
private func isNearWhite(_ x: Int, _ y: Int, minChannel: Double) -> Bool {
|
|
guard x >= 0, x < width, y >= 0, y < height else { return false }
|
|
let i = (y * width + x) * 4
|
|
return Double(pixels[i]) >= minChannel
|
|
&& Double(pixels[i + 1]) >= minChannel
|
|
&& Double(pixels[i + 2]) >= minChannel
|
|
}
|
|
|
|
/// Grid-sampled near-white pixels that lie on a THIN structure (a non-white
|
|
/// pixel within `edgeGap` on some axis) — i.e. a border/ring/audio-bar, not a
|
|
/// solid white blob (face, bright video). This is Signal's white speaking
|
|
/// border (saturation ≈ 0, so `saturatedPoints` can't see it).
|
|
func thinWhitePoints(minChannel: Double = 200, edgeGap: Int = 6, gridStep: Int = 4) -> [CGPoint] {
|
|
var points: [CGPoint] = []
|
|
var y = edgeGap
|
|
while y < height - edgeGap {
|
|
var x = edgeGap
|
|
while x < width - edgeGap {
|
|
if isNearWhite(x, y, minChannel: minChannel) {
|
|
let thin = !isNearWhite(x - edgeGap, y, minChannel: minChannel)
|
|
|| !isNearWhite(x + edgeGap, y, minChannel: minChannel)
|
|
|| !isNearWhite(x, y - edgeGap, minChannel: minChannel)
|
|
|| !isNearWhite(x, y + edgeGap, minChannel: minChannel)
|
|
if thin { points.append(CGPoint(x: x, y: y)) }
|
|
}
|
|
x += gridStep
|
|
}
|
|
y += gridStep
|
|
}
|
|
return points
|
|
}
|
|
|
|
/// Grid-sampled pixel positions (top-left origin) that are strongly saturated
|
|
/// AND bright enough to be a UI highlight — i.e. a coloured speaking ring/border.
|
|
func saturatedPoints(threshold: Double = 0.5, minBrightness: Double = 60, gridStep: Int = 6) -> [CGPoint] {
|
|
var points: [CGPoint] = []
|
|
var y = 0
|
|
while y < height {
|
|
var x = 0
|
|
while x < width {
|
|
let i = (y * width + x) * 4
|
|
let r = Double(pixels[i]), g = Double(pixels[i + 1]), b = Double(pixels[i + 2])
|
|
let mx = max(r, g, b), mn = min(r, g, b)
|
|
let sat = mx > 0 ? (mx - mn) / mx : 0
|
|
if sat > threshold && mx > minBrightness { points.append(CGPoint(x: x, y: y)) }
|
|
x += gridStep
|
|
}
|
|
y += gridStep
|
|
}
|
|
return points
|
|
}
|
|
}
|