stats window
This commit is contained in:
@@ -13,6 +13,7 @@ type AudioFrame struct {
|
||||
Index uint64
|
||||
SampleCount uint64
|
||||
Channels uint64
|
||||
Label string
|
||||
|
||||
SampleRateNumerator int64
|
||||
SampleRateDenominator int64
|
||||
|
||||
@@ -0,0 +1,136 @@
|
||||
package playback
|
||||
|
||||
import (
|
||||
"context"
|
||||
"sync"
|
||||
"time"
|
||||
)
|
||||
|
||||
type VideoMediaStats struct {
|
||||
Available bool
|
||||
Label string
|
||||
Index uint64
|
||||
Width uint32
|
||||
Height uint32
|
||||
Stride uint32
|
||||
PayloadSize uint32
|
||||
DeclaredFPS float64
|
||||
ReceivedFPS float64
|
||||
FrameDT time.Duration
|
||||
Invalid uint64
|
||||
}
|
||||
|
||||
type AudioMediaStats struct {
|
||||
Available bool
|
||||
Label string
|
||||
Index uint64
|
||||
SampleRateHz float64
|
||||
Channels uint64
|
||||
SampleCount uint64
|
||||
BatchDuration time.Duration
|
||||
}
|
||||
|
||||
type MediaStatsSnapshot struct {
|
||||
Video VideoMediaStats
|
||||
Audio AudioMediaStats
|
||||
}
|
||||
|
||||
type MediaStatsStore struct {
|
||||
mu sync.RWMutex
|
||||
snapshot MediaStatsSnapshot
|
||||
now func() time.Time
|
||||
|
||||
lastVideoAt time.Time
|
||||
videoWindowAt time.Time
|
||||
videoWindowCount uint64
|
||||
}
|
||||
|
||||
func NewMediaStatsStore() *MediaStatsStore {
|
||||
return &MediaStatsStore{now: time.Now}
|
||||
}
|
||||
|
||||
func (s *MediaStatsStore) ObserveVideo(frame VideoFrame) {
|
||||
now := s.now()
|
||||
s.mu.Lock()
|
||||
defer s.mu.Unlock()
|
||||
|
||||
stats := &s.snapshot.Video
|
||||
stats.Available = true
|
||||
stats.Label = frame.Label
|
||||
stats.Index = frame.Index
|
||||
stats.Width = frame.Width
|
||||
stats.Height = frame.Height
|
||||
stats.Stride = frame.Stride
|
||||
stats.PayloadSize = frame.Size
|
||||
if frame.FrameRateDenominator > 0 {
|
||||
stats.DeclaredFPS = float64(frame.FrameRateNumerator) /
|
||||
float64(frame.FrameRateDenominator)
|
||||
}
|
||||
if !s.lastVideoAt.IsZero() {
|
||||
stats.FrameDT = now.Sub(s.lastVideoAt)
|
||||
}
|
||||
s.lastVideoAt = now
|
||||
if frame.Invalid {
|
||||
stats.Invalid++
|
||||
}
|
||||
if s.videoWindowAt.IsZero() {
|
||||
s.videoWindowAt = now
|
||||
}
|
||||
s.videoWindowCount++
|
||||
if elapsed := now.Sub(s.videoWindowAt); elapsed >= time.Second {
|
||||
stats.ReceivedFPS = float64(s.videoWindowCount) / elapsed.Seconds()
|
||||
s.videoWindowAt = now
|
||||
s.videoWindowCount = 0
|
||||
}
|
||||
}
|
||||
|
||||
func (s *MediaStatsStore) ObserveAudio(frame AudioFrame) {
|
||||
s.mu.Lock()
|
||||
defer s.mu.Unlock()
|
||||
|
||||
stats := &s.snapshot.Audio
|
||||
stats.Available = true
|
||||
stats.Label = frame.Label
|
||||
stats.Index = frame.Index
|
||||
stats.Channels = frame.Channels
|
||||
stats.SampleCount = frame.SampleCount
|
||||
if frame.SampleRateDenominator > 0 {
|
||||
stats.SampleRateHz = float64(frame.SampleRateNumerator) /
|
||||
float64(frame.SampleRateDenominator)
|
||||
}
|
||||
if stats.SampleRateHz > 0 {
|
||||
stats.BatchDuration = time.Duration(
|
||||
float64(time.Second) * float64(frame.SampleCount) / stats.SampleRateHz,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
func (s *MediaStatsStore) Snapshot() MediaStatsSnapshot {
|
||||
s.mu.RLock()
|
||||
defer s.mu.RUnlock()
|
||||
return s.snapshot
|
||||
}
|
||||
|
||||
type VideoStatsSink struct {
|
||||
Stats *MediaStatsStore
|
||||
Sink VideoSink
|
||||
}
|
||||
|
||||
func (s VideoStatsSink) ConsumeVideo(ctx context.Context, frame VideoFrame) error {
|
||||
if s.Stats != nil {
|
||||
s.Stats.ObserveVideo(frame)
|
||||
}
|
||||
return s.Sink.ConsumeVideo(ctx, frame)
|
||||
}
|
||||
|
||||
type AudioStatsSink struct {
|
||||
Stats *MediaStatsStore
|
||||
Sink AudioSink
|
||||
}
|
||||
|
||||
func (s AudioStatsSink) ConsumeAudio(ctx context.Context, frame AudioFrame) error {
|
||||
if s.Stats != nil {
|
||||
s.Stats.ObserveAudio(frame)
|
||||
}
|
||||
return s.Sink.ConsumeAudio(ctx, frame)
|
||||
}
|
||||
@@ -0,0 +1,116 @@
|
||||
package playback
|
||||
|
||||
import (
|
||||
"context"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestMediaStatsStoreObservesVideo(t *testing.T) {
|
||||
store := NewMediaStatsStore()
|
||||
now := time.Date(2026, time.September, 1, 12, 0, 0, 0, time.UTC)
|
||||
store.now = func() time.Time { return now }
|
||||
frame := VideoFrame{
|
||||
Index: 10,
|
||||
Width: 1920,
|
||||
Height: 1080,
|
||||
Stride: 5120,
|
||||
Size: 5_529_600,
|
||||
Label: "Main video",
|
||||
FrameRateNumerator: 30000,
|
||||
FrameRateDenominator: 1001,
|
||||
}
|
||||
store.ObserveVideo(frame)
|
||||
now = now.Add(40 * time.Millisecond)
|
||||
frame.Index++
|
||||
frame.Invalid = true
|
||||
store.ObserveVideo(frame)
|
||||
|
||||
got := store.Snapshot().Video
|
||||
if !got.Available || got.Label != "Main video" || got.Index != 11 {
|
||||
t.Fatalf("video stats = %#v", got)
|
||||
}
|
||||
if got.Width != 1920 || got.Height != 1080 || got.Stride != 5120 {
|
||||
t.Fatalf("video dimensions = %#v", got)
|
||||
}
|
||||
if got.DeclaredFPS < 29.96 || got.DeclaredFPS > 29.98 {
|
||||
t.Fatalf("declared FPS = %v", got.DeclaredFPS)
|
||||
}
|
||||
if got.FrameDT != 40*time.Millisecond || got.Invalid != 1 {
|
||||
t.Fatalf("video timing = %#v", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMediaStatsStoreCalculatesReceivedFPS(t *testing.T) {
|
||||
store := NewMediaStatsStore()
|
||||
now := time.Date(2026, time.September, 1, 12, 0, 0, 0, time.UTC)
|
||||
store.now = func() time.Time { return now }
|
||||
store.ObserveVideo(VideoFrame{})
|
||||
now = now.Add(500 * time.Millisecond)
|
||||
store.ObserveVideo(VideoFrame{})
|
||||
now = now.Add(500 * time.Millisecond)
|
||||
store.ObserveVideo(VideoFrame{})
|
||||
|
||||
if got := store.Snapshot().Video.ReceivedFPS; got != 3 {
|
||||
t.Fatalf("received FPS = %v, want 3", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMediaStatsStoreObservesAudio(t *testing.T) {
|
||||
store := NewMediaStatsStore()
|
||||
store.ObserveAudio(AudioFrame{
|
||||
Index: 100,
|
||||
SampleCount: 480,
|
||||
Channels: 2,
|
||||
Label: "Programme audio",
|
||||
SampleRateNumerator: 48_000,
|
||||
SampleRateDenominator: 1,
|
||||
})
|
||||
|
||||
got := store.Snapshot().Audio
|
||||
if !got.Available || got.Label != "Programme audio" || got.Index != 100 {
|
||||
t.Fatalf("audio stats = %#v", got)
|
||||
}
|
||||
if got.SampleRateHz != 48_000 || got.Channels != 2 || got.SampleCount != 480 {
|
||||
t.Fatalf("audio format = %#v", got)
|
||||
}
|
||||
if got.BatchDuration != 10*time.Millisecond {
|
||||
t.Fatalf("batch duration = %v, want 10ms", got.BatchDuration)
|
||||
}
|
||||
}
|
||||
|
||||
type recordingVideoStatsSink struct{ frame VideoFrame }
|
||||
|
||||
func (s *recordingVideoStatsSink) ConsumeVideo(_ context.Context, frame VideoFrame) error {
|
||||
s.frame = frame
|
||||
return nil
|
||||
}
|
||||
|
||||
type recordingAudioStatsSink struct{ frame AudioFrame }
|
||||
|
||||
func (s *recordingAudioStatsSink) ConsumeAudio(_ context.Context, frame AudioFrame) error {
|
||||
s.frame = frame
|
||||
return nil
|
||||
}
|
||||
|
||||
func TestStatsSinksObserveAndForwardFrames(t *testing.T) {
|
||||
store := NewMediaStatsStore()
|
||||
videoDownstream := &recordingVideoStatsSink{}
|
||||
audioDownstream := &recordingAudioStatsSink{}
|
||||
video := VideoFrame{Index: 7, Label: "video"}
|
||||
audio := AudioFrame{Index: 8, Label: "audio"}
|
||||
|
||||
if err := (VideoStatsSink{Stats: store, Sink: videoDownstream}).ConsumeVideo(context.Background(), video); err != nil {
|
||||
t.Fatalf("ConsumeVideo() error = %v", err)
|
||||
}
|
||||
if err := (AudioStatsSink{Stats: store, Sink: audioDownstream}).ConsumeAudio(context.Background(), audio); err != nil {
|
||||
t.Fatalf("ConsumeAudio() error = %v", err)
|
||||
}
|
||||
if videoDownstream.frame.Index != video.Index || audioDownstream.frame.Index != audio.Index {
|
||||
t.Fatalf("forwarded frames = %#v, %#v", videoDownstream.frame, audioDownstream.frame)
|
||||
}
|
||||
snapshot := store.Snapshot()
|
||||
if snapshot.Video.Label != "video" || snapshot.Audio.Label != "audio" {
|
||||
t.Fatalf("stats snapshot = %#v", snapshot)
|
||||
}
|
||||
}
|
||||
@@ -8,13 +8,16 @@ import "context"
|
||||
// reader is closed. Consumers must finish reading Payload before returning
|
||||
// control to the worker
|
||||
type VideoFrame struct {
|
||||
Index uint64
|
||||
Width uint32
|
||||
Height uint32
|
||||
Stride uint32
|
||||
Size uint32
|
||||
Invalid bool
|
||||
Payload []byte
|
||||
Index uint64
|
||||
Width uint32
|
||||
Height uint32
|
||||
Stride uint32
|
||||
Size uint32
|
||||
Invalid bool
|
||||
Label string
|
||||
FrameRateNumerator int64
|
||||
FrameRateDenominator int64
|
||||
Payload []byte
|
||||
}
|
||||
|
||||
// VideoReader reads frames from a video source.
|
||||
|
||||
Reference in New Issue
Block a user