keyframe fixes and manually allow users to refresh keyframes if shit gets all fucked up
This commit is contained in:
@@ -645,6 +645,7 @@ func ResetPrevbackstage() {
|
||||
|
||||
func RequestDesktopFullFrame() {
|
||||
requestFullFrames(2)
|
||||
webrtcpub.RequestKeyframe()
|
||||
RequestDesktopH264Keyframe()
|
||||
}
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@ import (
|
||||
|
||||
"overlord-client/cmd/agent/config"
|
||||
rt "overlord-client/cmd/agent/runtime"
|
||||
"overlord-client/cmd/agent/webrtcpub"
|
||||
"overlord-client/cmd/agent/wire"
|
||||
|
||||
"github.com/vmihailenco/msgpack/v5"
|
||||
@@ -476,3 +477,13 @@ func TestSetFrameFlowTargetFPSEnvOverride(t *testing.T) {
|
||||
t.Fatalf("expected env slot limit 12, got %d", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRequestDesktopFullFrameRequestsWebRTCKeyframe(t *testing.T) {
|
||||
_ = webrtcpub.ConsumeKeyframeRequest()
|
||||
|
||||
RequestDesktopFullFrame()
|
||||
|
||||
if !webrtcpub.ConsumeKeyframeRequest() {
|
||||
t.Fatal("expected desktop full-frame request to force the next WebRTC video frame to be a keyframe")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,12 +9,24 @@ import (
|
||||
"overlord-client/cmd/agent/wire"
|
||||
)
|
||||
|
||||
func directVideoKeyframeDue(requested bool, nowNs, lastKeyframeNs int64) bool {
|
||||
if requested || lastKeyframeNs == 0 {
|
||||
return true
|
||||
}
|
||||
return time.Duration(nowNs-lastKeyframeNs) >= keyframeEvery
|
||||
}
|
||||
|
||||
func tryBuildDirectH264Frame(display int) (wire.Frame, time.Duration, time.Duration, bool, error) {
|
||||
codec := blockCodec()
|
||||
if (codec != "h264" && codec != "hevc") || (codec == "h264" && useDesktopSoftwareH264()) || !useDesktopDuplication() {
|
||||
return wire.Frame{}, 0, 0, false, nil
|
||||
}
|
||||
forceKeyframe := webrtcpub.ConsumeKeyframeRequest()
|
||||
now := time.Now()
|
||||
forceKeyframe := directVideoKeyframeDue(
|
||||
webrtcpub.ConsumeKeyframeRequest(),
|
||||
now.UnixNano(),
|
||||
lastKeyframe.Load(),
|
||||
)
|
||||
var data []byte
|
||||
var width, height int
|
||||
var captureDur, encodeDur time.Duration
|
||||
@@ -31,8 +43,9 @@ func tryBuildDirectH264Frame(display int) (wire.Frame, time.Duration, time.Durat
|
||||
if len(data) == 0 {
|
||||
return wire.Frame{}, captureDur, encodeDur, true, nil
|
||||
}
|
||||
now := time.Now()
|
||||
lastKeyframe.Store(now.UnixNano())
|
||||
if forceKeyframe {
|
||||
lastKeyframe.Store(now.UnixNano())
|
||||
}
|
||||
statFullFrames.Add(1)
|
||||
return wire.Frame{Type: "frame", Header: wire.FrameHeader{Monitor: display, FPS: 0, Format: codec, Width: width, Height: height}, Data: data}, captureDur, encodeDur, true, nil
|
||||
}
|
||||
|
||||
@@ -90,3 +90,28 @@ func TestCaptureDisplayDXGI(t *testing.T) {
|
||||
t.Fatalf("invalid capture bounds: %dx%d", bounds.Dx(), bounds.Dy())
|
||||
}
|
||||
}
|
||||
|
||||
func TestDirectVideoKeyframeDue(t *testing.T) {
|
||||
now := (10 * time.Second).Nanoseconds()
|
||||
last := now - keyframeEvery.Nanoseconds()
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
requested bool
|
||||
last int64
|
||||
want bool
|
||||
}{
|
||||
{name: "explicit request", requested: true, last: now, want: true},
|
||||
{name: "first frame", last: 0, want: true},
|
||||
{name: "before periodic interval", last: last + 1, want: false},
|
||||
{name: "at periodic interval", last: last, want: true},
|
||||
}
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
if got := directVideoKeyframeDue(test.requested, now, test.last); got != test.want {
|
||||
t.Fatalf("directVideoKeyframeDue() = %v, want %v", got, test.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user