refactor(cef): remove bootstrap/runtime transcoder startup plumbing
- commit
- e49694e3df8f7429f1c92e357700e7c9fcc18542
- author
- brice · · 2026-04-28 03:54 UTC
- parent
- 669a894
- signature
- GPG Verified
CD88F9E564E0102646FB6077A1A07C7C7C3E349D· arch-gpg Verified for the committer email
5 files · +5 -146
M internal/bootstrap/engine.go +1 -16
| @@ -15,7 +15,6 @@ import ( | |||
| 15 | 15 | "github.com/bnema/dumber/internal/infrastructure/env" | |
| 16 | 16 | "github.com/bnema/dumber/internal/infrastructure/handlers" | |
| 17 | 17 | "github.com/bnema/dumber/internal/infrastructure/runtimeprofile" | |
| 18 | - | "github.com/bnema/dumber/internal/infrastructure/transcoder" | |
| 19 | 18 | "github.com/bnema/dumber/internal/infrastructure/webkit" | |
| 20 | 19 | "github.com/bnema/dumber/internal/ui/theme" | |
| 21 | 20 | "github.com/rs/zerolog" | |
| @@ -84,12 +83,6 @@ func BuildEngine(input EngineInput) (port.Engine, error) { | |||
| 84 | 83 | EnableAudioHandler: cfg.Engine.CEF.EnableAudioHandler, | |
| 85 | 84 | TraceHandlers: cfg.Engine.CEF.TraceHandlers, | |
| 86 | 85 | } | |
| 87 | - | transcodingCfg := cef.TranscodingRuntimeConfig{ | |
| 88 | - | Enabled: cfg.Transcoding.Enabled, | |
| 89 | - | HWAccel: cfg.Transcoding.HWAccel, | |
| 90 | - | MaxConcurrent: cfg.Transcoding.MaxConcurrent, | |
| 91 | - | Quality: cfg.Transcoding.Quality, | |
| 92 | - | } | |
| 93 | 86 | deps := cef.EngineDependencies{ | |
| 94 | 87 | RegisterHandlers: handlers.RegisterAll, | |
| 95 | 88 | RegisterAccentHandlers: handlers.RegisterAccentHandlers, | |
| @@ -99,20 +92,12 @@ func BuildEngine(input EngineInput) (port.Engine, error) { | |||
| 99 | 92 | ContextMenuExecutorFactory: contextMenuExecutorFactory, | |
| 100 | 93 | Clipboard: clipboardinfra.New(), | |
| 101 | 94 | ImageDataResolver: webkit.NewContextMenuResolver(), | |
| 102 | - | MediaClassifier: cef.MediaClassifier{ | |
| 103 | - | IsProprietaryVideoMIME: transcoder.IsProprietaryVideoMIME, | |
| 104 | - | IsOpenVideoMIME: transcoder.IsOpenVideoMIME, | |
| 105 | - | IsStreamingManifestMIME: transcoder.IsStreamingManifestMIME, | |
| 106 | - | IsStreamingManifestURL: transcoder.IsStreamingManifestURL, | |
| 107 | - | IsEagerTranscodeURL: transcoder.IsEagerTranscodeURL, | |
| 108 | - | ParseSyntheticTranscodeURL: transcoder.ParseSyntheticTranscodeURL, | |
| 109 | - | }, | |
| 110 | 95 | } | |
| 111 | 96 | audioFactory := audiofactory.NewAudioOutputFactory() | |
| 112 | 97 | return cef.NewEngine(input.Ctx, opts, cef.RuntimePaths{ | |
| 113 | 98 | StateRoot: profile.CEFUserDataDir(), | |
| 114 | 99 | LogFile: profile.CEFLogFile(), | |
| 115 | - | }, cefCfg, transcodingCfg, audioFactory, deps) | |
| 100 | + | }, cefCfg, audioFactory, deps) | |
| 116 | 101 | default: | |
| 117 | 102 | return nil, fmt.Errorf("unknown engine type: %q", engineType) | |
| 118 | 103 | } | |
| @@ -15,7 +15,6 @@ import ( | |||||
| 15 | "github.com/bnema/dumber/internal/infrastructure/env" | 15 | "github.com/bnema/dumber/internal/infrastructure/env" | ||
| 16 | "github.com/bnema/dumber/internal/infrastructure/handlers" | 16 | "github.com/bnema/dumber/internal/infrastructure/handlers" | ||
| 17 | "github.com/bnema/dumber/internal/infrastructure/runtimeprofile" | 17 | "github.com/bnema/dumber/internal/infrastructure/runtimeprofile" | ||
| 18 | - | "github.com/bnema/dumber/internal/infrastructure/transcoder" | |||
| 19 | "github.com/bnema/dumber/internal/infrastructure/webkit" | 18 | "github.com/bnema/dumber/internal/infrastructure/webkit" | ||
| 20 | "github.com/bnema/dumber/internal/ui/theme" | 19 | "github.com/bnema/dumber/internal/ui/theme" | ||
| 21 | "github.com/rs/zerolog" | 20 | "github.com/rs/zerolog" | ||
| @@ -84,12 +83,6 @@ func BuildEngine(input EngineInput) (port.Engine, error) { | |||||
| 84 | EnableAudioHandler: cfg.Engine.CEF.EnableAudioHandler, | 83 | EnableAudioHandler: cfg.Engine.CEF.EnableAudioHandler, | ||
| 85 | TraceHandlers: cfg.Engine.CEF.TraceHandlers, | 84 | TraceHandlers: cfg.Engine.CEF.TraceHandlers, | ||
| 86 | } | 85 | } | ||
| 87 | - | transcodingCfg := cef.TranscodingRuntimeConfig{ | |||
| 88 | - | Enabled: cfg.Transcoding.Enabled, | |||
| 89 | - | HWAccel: cfg.Transcoding.HWAccel, | |||
| 90 | - | MaxConcurrent: cfg.Transcoding.MaxConcurrent, | |||
| 91 | - | Quality: cfg.Transcoding.Quality, | |||
| 92 | - | } | |||
| 93 | deps := cef.EngineDependencies{ | 86 | deps := cef.EngineDependencies{ | ||
| 94 | RegisterHandlers: handlers.RegisterAll, | 87 | RegisterHandlers: handlers.RegisterAll, | ||
| 95 | RegisterAccentHandlers: handlers.RegisterAccentHandlers, | 88 | RegisterAccentHandlers: handlers.RegisterAccentHandlers, | ||
| @@ -99,20 +92,12 @@ func BuildEngine(input EngineInput) (port.Engine, error) { | |||||
| 99 | ContextMenuExecutorFactory: contextMenuExecutorFactory, | 92 | ContextMenuExecutorFactory: contextMenuExecutorFactory, | ||
| 100 | Clipboard: clipboardinfra.New(), | 93 | Clipboard: clipboardinfra.New(), | ||
| 101 | ImageDataResolver: webkit.NewContextMenuResolver(), | 94 | ImageDataResolver: webkit.NewContextMenuResolver(), | ||
| 102 | - | MediaClassifier: cef.MediaClassifier{ | |||
| 103 | - | IsProprietaryVideoMIME: transcoder.IsProprietaryVideoMIME, | |||
| 104 | - | IsOpenVideoMIME: transcoder.IsOpenVideoMIME, | |||
| 105 | - | IsStreamingManifestMIME: transcoder.IsStreamingManifestMIME, | |||
| 106 | - | IsStreamingManifestURL: transcoder.IsStreamingManifestURL, | |||
| 107 | - | IsEagerTranscodeURL: transcoder.IsEagerTranscodeURL, | |||
| 108 | - | ParseSyntheticTranscodeURL: transcoder.ParseSyntheticTranscodeURL, | |||
| 109 | - | }, | |||
| 110 | } | 95 | } | ||
| 111 | audioFactory := audiofactory.NewAudioOutputFactory() | 96 | audioFactory := audiofactory.NewAudioOutputFactory() | ||
| 112 | return cef.NewEngine(input.Ctx, opts, cef.RuntimePaths{ | 97 | return cef.NewEngine(input.Ctx, opts, cef.RuntimePaths{ | ||
| 113 | StateRoot: profile.CEFUserDataDir(), | 98 | StateRoot: profile.CEFUserDataDir(), | ||
| 114 | LogFile: profile.CEFLogFile(), | 99 | LogFile: profile.CEFLogFile(), | ||
| 115 | - | }, cefCfg, transcodingCfg, audioFactory, deps) | 100 | + | }, cefCfg, audioFactory, deps) |
| 116 | default: | 101 | default: | ||
| 117 | return nil, fmt.Errorf("unknown engine type: %q", engineType) | 102 | return nil, fmt.Errorf("unknown engine type: %q", engineType) | ||
| 118 | } | 103 | } | ||
M internal/infrastructure/cef/engine.go +0 -44
| @@ -42,7 +42,6 @@ type Engine struct { | |||
| 42 | 42 | clipboardTextOrchestrator port.ClipboardTextOrchestrator | |
| 43 | 43 | onClipboardCopied func(textLen int) | |
| 44 | 44 | resolver port.ImageDataResolver | |
| 45 | - | mediaClassifier MediaClassifier | |
| 46 | 45 | downloadMu sync.RWMutex | |
| 47 | 46 | downloadHandler *downloadHandler | |
| 48 | 47 | alreadyRunningAppRelaunchMu sync.RWMutex | |
| @@ -71,20 +70,6 @@ type Engine struct { | |||
| 71 | 70 | browserCreateLastHeight atomic.Int32 | |
| 72 | 71 | browserCreateComplete atomic.Bool | |
| 73 | 72 | ||
| 74 | - | transcoderState transcoderStartupState | |
| 75 | - | transcoderStateLogged atomic.Bool | |
| 76 | - | } | |
| 77 | - | ||
| 78 | - | type transcoderStartupState struct { | |
| 79 | - | ConfigEnabled bool | |
| 80 | - | ProbeAttempted bool | |
| 81 | - | HWAccel string | |
| 82 | - | MaxConcurrent int | |
| 83 | - | Quality string | |
| 84 | - | Status string | |
| 85 | - | API string | |
| 86 | - | Encoders []string | |
| 87 | - | Decoders []string | |
| 88 | 73 | } | |
| 89 | 74 | ||
| 90 | 75 | func (e *Engine) Factory() port.WebViewFactory { | |
| @@ -387,7 +372,6 @@ func (e *Engine) SetHandlerContext(ctx context.Context) { | |||
| 387 | 372 | if e.messageRouter != nil { | |
| 388 | 373 | e.messageRouter.SetBaseContext(ctx) | |
| 389 | 374 | } | |
| 390 | - | e.logTranscoderStartupState() | |
| 391 | 375 | } | |
| 392 | 376 | ||
| 393 | 377 | func (e *Engine) recordContextInitialized() { | |
| @@ -492,31 +476,3 @@ func (e *Engine) currentDownloadHandler() *downloadHandler { | |||
| 492 | 476 | return e.downloadHandler | |
| 493 | 477 | } | |
| 494 | 478 | ||
| 495 | - | func (e *Engine) logTranscoderStartupState() { | |
| 496 | - | if e == nil || !e.transcoderStateLogged.CompareAndSwap(false, true) { | |
| 497 | - | return | |
| 498 | - | } | |
| 499 | - | ||
| 500 | - | state := e.transcoderState | |
| 501 | - | log := logging.FromContext(e.currentContext()) | |
| 502 | - | event := log.Info(). | |
| 503 | - | Str("component", "cef-transcoder"). | |
| 504 | - | Bool("config_enabled", state.ConfigEnabled). | |
| 505 | - | Bool("probe_attempted", state.ProbeAttempted). | |
| 506 | - | Str("hwaccel", state.HWAccel). | |
| 507 | - | Int("max_concurrent", state.MaxConcurrent). | |
| 508 | - | Str("quality", state.Quality). | |
| 509 | - | Str("status", state.Status) | |
| 510 | - | ||
| 511 | - | if state.API != "" { | |
| 512 | - | event = event.Str("api", state.API) | |
| 513 | - | } | |
| 514 | - | if len(state.Encoders) > 0 { | |
| 515 | - | event = event.Strs("encoders", state.Encoders) | |
| 516 | - | } | |
| 517 | - | if len(state.Decoders) > 0 { | |
| 518 | - | event = event.Strs("decoders", state.Decoders) | |
| 519 | - | } | |
| 520 | - | ||
| 521 | - | event.Msg("cef: transcoder startup state") | |
| 522 | - | } | |
| @@ -42,7 +42,6 @@ type Engine struct { | |||||
| 42 | clipboardTextOrchestrator port.ClipboardTextOrchestrator | 42 | clipboardTextOrchestrator port.ClipboardTextOrchestrator | ||
| 43 | onClipboardCopied func(textLen int) | 43 | onClipboardCopied func(textLen int) | ||
| 44 | resolver port.ImageDataResolver | 44 | resolver port.ImageDataResolver | ||
| 45 | - | mediaClassifier MediaClassifier | |||
| 46 | downloadMu sync.RWMutex | 45 | downloadMu sync.RWMutex | ||
| 47 | downloadHandler *downloadHandler | 46 | downloadHandler *downloadHandler | ||
| 48 | alreadyRunningAppRelaunchMu sync.RWMutex | 47 | alreadyRunningAppRelaunchMu sync.RWMutex | ||
| @@ -71,20 +70,6 @@ type Engine struct { | |||||
| 71 | browserCreateLastHeight atomic.Int32 | 70 | browserCreateLastHeight atomic.Int32 | ||
| 72 | browserCreateComplete atomic.Bool | 71 | browserCreateComplete atomic.Bool | ||
| 73 | 72 | ||||
| 74 | - | transcoderState transcoderStartupState | |||
| 75 | - | transcoderStateLogged atomic.Bool | |||
| 76 | - | } | |||
| 77 | - | ||||
| 78 | - | type transcoderStartupState struct { | |||
| 79 | - | ConfigEnabled bool | |||
| 80 | - | ProbeAttempted bool | |||
| 81 | - | HWAccel string | |||
| 82 | - | MaxConcurrent int | |||
| 83 | - | Quality string | |||
| 84 | - | Status string | |||
| 85 | - | API string | |||
| 86 | - | Encoders []string | |||
| 87 | - | Decoders []string | |||
| 88 | } | 73 | } | ||
| 89 | 74 | ||||
| 90 | func (e *Engine) Factory() port.WebViewFactory { | 75 | func (e *Engine) Factory() port.WebViewFactory { | ||
| @@ -387,7 +372,6 @@ func (e *Engine) SetHandlerContext(ctx context.Context) { | |||||
| 387 | if e.messageRouter != nil { | 372 | if e.messageRouter != nil { | ||
| 388 | e.messageRouter.SetBaseContext(ctx) | 373 | e.messageRouter.SetBaseContext(ctx) | ||
| 389 | } | 374 | } | ||
| 390 | - | e.logTranscoderStartupState() | |||
| 391 | } | 375 | } | ||
| 392 | 376 | ||||
| 393 | func (e *Engine) recordContextInitialized() { | 377 | func (e *Engine) recordContextInitialized() { | ||
| @@ -492,31 +476,3 @@ func (e *Engine) currentDownloadHandler() *downloadHandler { | |||||
| 492 | return e.downloadHandler | 476 | return e.downloadHandler | ||
| 493 | } | 477 | } | ||
| 494 | 478 | ||||
| 495 | - | func (e *Engine) logTranscoderStartupState() { | |||
| 496 | - | if e == nil || !e.transcoderStateLogged.CompareAndSwap(false, true) { | |||
| 497 | - | return | |||
| 498 | - | } | |||
| 499 | - | ||||
| 500 | - | state := e.transcoderState | |||
| 501 | - | log := logging.FromContext(e.currentContext()) | |||
| 502 | - | event := log.Info(). | |||
| 503 | - | Str("component", "cef-transcoder"). | |||
| 504 | - | Bool("config_enabled", state.ConfigEnabled). | |||
| 505 | - | Bool("probe_attempted", state.ProbeAttempted). | |||
| 506 | - | Str("hwaccel", state.HWAccel). | |||
| 507 | - | Int("max_concurrent", state.MaxConcurrent). | |||
| 508 | - | Str("quality", state.Quality). | |||
| 509 | - | Str("status", state.Status) | |||
| 510 | - | ||||
| 511 | - | if state.API != "" { | |||
| 512 | - | event = event.Str("api", state.API) | |||
| 513 | - | } | |||
| 514 | - | if len(state.Encoders) > 0 { | |||
| 515 | - | event = event.Strs("encoders", state.Encoders) | |||
| 516 | - | } | |||
| 517 | - | if len(state.Decoders) > 0 { | |||
| 518 | - | event = event.Strs("decoders", state.Decoders) | |||
| 519 | - | } | |||
| 520 | - | ||||
| 521 | - | event.Msg("cef: transcoder startup state") | |||
| 522 | - | } | |||
M internal/infrastructure/cef/engine_init.go +2 -73
| @@ -18,7 +18,6 @@ import ( | |||
| 18 | 18 | "github.com/bnema/dumber/assets" | |
| 19 | 19 | "github.com/bnema/dumber/internal/application/port" | |
| 20 | 20 | "github.com/bnema/dumber/internal/infrastructure/config" | |
| 21 | - | transcoderpkg "github.com/bnema/dumber/internal/infrastructure/transcoder" | |
| 22 | 21 | "github.com/bnema/dumber/internal/logging" | |
| 23 | 22 | ) | |
| 24 | 23 | ||
| @@ -37,12 +36,10 @@ func NewEngine( | |||
| 37 | 36 | opts port.EngineOptions, | |
| 38 | 37 | paths RuntimePaths, | |
| 39 | 38 | cfg RuntimeConfig, | |
| 40 | - | transcodingCfg TranscodingRuntimeConfig, | |
| 41 | 39 | audioFactory port.AudioOutputFactory, | |
| 42 | 40 | deps EngineDependencies, | |
| 43 | 41 | ) (*Engine, error) { | |
| 44 | 42 | logger := logging.FromContext(ctx) | |
| 45 | - | deps.MediaClassifier = deps.MediaClassifier.normalize() | |
| 46 | 43 | stateRoot := resolvedStateRoot(paths.StateRoot, opts) | |
| 47 | 44 | cleanStaleSingletonLocks(logger, stateRoot) | |
| 48 | 45 | windowlessFrameRate := config.CEFEngineConfig{WindowlessFrameRate: cfg.WindowlessFrameRate}.CEFWindowlessFrameRate() | |
| @@ -67,7 +64,6 @@ func NewEngine( | |||
| 67 | 64 | ctxMenuExecutorFactory: deps.ContextMenuExecutorFactory, | |
| 68 | 65 | clipboard: deps.Clipboard, | |
| 69 | 66 | resolver: deps.ImageDataResolver, | |
| 70 | - | mediaClassifier: deps.MediaClassifier, | |
| 71 | 67 | } | |
| 72 | 68 | ||
| 73 | 69 | logger.Info(). | |
| @@ -87,11 +83,9 @@ func NewEngine( | |||
| 87 | 83 | ctx, | |
| 88 | 84 | eng, | |
| 89 | 85 | cfg, | |
| 90 | - | transcodingCfg, | |
| 91 | 86 | windowlessFrameRate, | |
| 92 | 87 | audioFactory, | |
| 93 | 88 | logger, | |
| 94 | - | deps.MediaClassifier, | |
| 95 | 89 | deps.CurrentConfigPayload, | |
| 96 | 90 | deps.DefaultConfigPayload, | |
| 97 | 91 | ) | |
| @@ -168,9 +162,8 @@ func initializeCEF(eng *Engine, settings purecef.Settings, logger *zerolog.Logge | |||
| 168 | 162 | ||
| 169 | 163 | // wireEngine creates GL loader, factory, pool, and scheme handler after CEF init. | |
| 170 | 164 | func wireEngine( | |
| 171 | - | ctx context.Context, eng *Engine, _ RuntimeConfig, transcodingCfg TranscodingRuntimeConfig, | |
| 165 | + | ctx context.Context, eng *Engine, _ RuntimeConfig, | |
| 172 | 166 | windowlessFrameRate int32, audioFactory port.AudioOutputFactory, logger *zerolog.Logger, | |
| 173 | - | mediaClassifier MediaClassifier, | |
| 174 | 167 | currentConfigPayload func() ([]byte, error), defaultConfigPayload func() ([]byte, error), | |
| 175 | 168 | ) (*Engine, error) { | |
| 176 | 169 | gl, err := newGLLoader() | |
| @@ -179,18 +172,16 @@ func wireEngine( | |||
| 179 | 172 | return nil, fmt.Errorf("GL loader: %w", err) | |
| 180 | 173 | } | |
| 181 | 174 | ||
| 182 | - | mediaTranscoder, transcoderState := initializeEngineTranscoder(transcodingCfg, logger) | |
| 175 | + | var mediaTranscoder port.MediaTranscoder | |
| 183 | 176 | eng.gl = gl | |
| 184 | 177 | eng.factory = newWebViewFactory(eng, gl, webViewFactoryOptions{ | |
| 185 | 178 | scale: detectHiDPIScale(logger), | |
| 186 | 179 | windowlessFrameRate: windowlessFrameRate, | |
| 187 | 180 | transcoder: mediaTranscoder, | |
| 188 | - | mediaClassifier: mediaClassifier, | |
| 189 | 181 | audioOutputFactory: audioFactory, | |
| 190 | 182 | }) | |
| 191 | 183 | eng.pool = newWebViewPool(eng.factory) | |
| 192 | 184 | eng.contentInj = newContentInjector(eng, nil) | |
| 193 | - | eng.transcoderState = transcoderState | |
| 194 | 185 | ||
| 195 | 186 | messageRouter, schemeHandler, err := newEngineSchemeHandler( | |
| 196 | 187 | ctx, | |
| @@ -211,39 +202,6 @@ func wireEngine( | |||
| 211 | 202 | return eng, nil | |
| 212 | 203 | } | |
| 213 | 204 | ||
| 214 | - | func initializeEngineTranscoder( | |
| 215 | - | transcodingCfg TranscodingRuntimeConfig, | |
| 216 | - | logger *zerolog.Logger, | |
| 217 | - | ) (port.MediaTranscoder, transcoderStartupState) { | |
| 218 | - | transcoderState := buildTranscoderStartupState(transcodingCfg) | |
| 219 | - | if !transcodingCfg.Enabled { | |
| 220 | - | return nil, transcoderState | |
| 221 | - | } | |
| 222 | - | ||
| 223 | - | transcoderState.ProbeAttempted = true | |
| 224 | - | tc := transcoderpkg.New(config.TranscodingConfig{ | |
| 225 | - | Enabled: transcodingCfg.Enabled, | |
| 226 | - | HWAccel: transcodingCfg.HWAccel, | |
| 227 | - | MaxConcurrent: transcodingCfg.MaxConcurrent, | |
| 228 | - | Quality: transcodingCfg.Quality, | |
| 229 | - | }, logger) | |
| 230 | - | caps := tc.Capabilities() | |
| 231 | - | transcoderState.API = caps.API | |
| 232 | - | transcoderState.Encoders = append([]string(nil), caps.Encoders...) | |
| 233 | - | transcoderState.Decoders = append([]string(nil), caps.Decoders...) | |
| 234 | - | if !tc.Available() { | |
| 235 | - | transcoderState.Status = "unavailable_no_compatible_gpu" | |
| 236 | - | logger.Warn().Msg("cef: GPU transcoding enabled but no compatible GPU found — feature disabled") | |
| 237 | - | return nil, transcoderState | |
| 238 | - | } | |
| 239 | - | ||
| 240 | - | transcoderState.Status = "available" | |
| 241 | - | logger.Info(). | |
| 242 | - | Str("api", caps.API). | |
| 243 | - | Strs("encoders", caps.Encoders). | |
| 244 | - | Msg("cef: GPU transcoding available") | |
| 245 | - | return tc, transcoderState | |
| 246 | - | } | |
| 247 | 205 | ||
| 248 | 206 | func newEngineSchemeHandler( | |
| 249 | 207 | ctx context.Context, | |
| @@ -328,35 +286,6 @@ func registerEngineSchemeFactory( | |||
| 328 | 286 | Msg("cef: registered internal https handler factory") | |
| 329 | 287 | } | |
| 330 | 288 | ||
| 331 | - | func buildTranscoderStartupState(cfg TranscodingRuntimeConfig) transcoderStartupState { | |
| 332 | - | hwaccel := cfg.HWAccel | |
| 333 | - | if hwaccel == "" { | |
| 334 | - | hwaccel = "auto" | |
| 335 | - | } | |
| 336 | - | ||
| 337 | - | maxConcurrent := cfg.MaxConcurrent | |
| 338 | - | if maxConcurrent <= 0 { | |
| 339 | - | maxConcurrent = 2 | |
| 340 | - | } | |
| 341 | - | ||
| 342 | - | quality := cfg.Quality | |
| 343 | - | if quality == "" { | |
| 344 | - | quality = "medium" | |
| 345 | - | } | |
| 346 | - | ||
| 347 | - | status := "disabled_in_config" | |
| 348 | - | if cfg.Enabled { | |
| 349 | - | status = "configured_enabled" | |
| 350 | - | } | |
| 351 | - | ||
| 352 | - | return transcoderStartupState{ | |
| 353 | - | ConfigEnabled: cfg.Enabled, | |
| 354 | - | HWAccel: hwaccel, | |
| 355 | - | MaxConcurrent: maxConcurrent, | |
| 356 | - | Quality: quality, | |
| 357 | - | Status: status, | |
| 358 | - | } | |
| 359 | - | } | |
| 360 | 289 | ||
| 361 | 290 | // getPrimaryMonitor returns the primary GDK monitor, or nil if unavailable. | |
| 362 | 291 | func getPrimaryMonitor() *gdk.Monitor { | |
| @@ -18,7 +18,6 @@ import ( | |||||
| 18 | "github.com/bnema/dumber/assets" | 18 | "github.com/bnema/dumber/assets" | ||
| 19 | "github.com/bnema/dumber/internal/application/port" | 19 | "github.com/bnema/dumber/internal/application/port" | ||
| 20 | "github.com/bnema/dumber/internal/infrastructure/config" | 20 | "github.com/bnema/dumber/internal/infrastructure/config" | ||
| 21 | - | transcoderpkg "github.com/bnema/dumber/internal/infrastructure/transcoder" | |||
| 22 | "github.com/bnema/dumber/internal/logging" | 21 | "github.com/bnema/dumber/internal/logging" | ||
| 23 | ) | 22 | ) | ||
| 24 | 23 | ||||
| @@ -37,12 +36,10 @@ func NewEngine( | |||||
| 37 | opts port.EngineOptions, | 36 | opts port.EngineOptions, | ||
| 38 | paths RuntimePaths, | 37 | paths RuntimePaths, | ||
| 39 | cfg RuntimeConfig, | 38 | cfg RuntimeConfig, | ||
| 40 | - | transcodingCfg TranscodingRuntimeConfig, | |||
| 41 | audioFactory port.AudioOutputFactory, | 39 | audioFactory port.AudioOutputFactory, | ||
| 42 | deps EngineDependencies, | 40 | deps EngineDependencies, | ||
| 43 | ) (*Engine, error) { | 41 | ) (*Engine, error) { | ||
| 44 | logger := logging.FromContext(ctx) | 42 | logger := logging.FromContext(ctx) | ||
| 45 | - | deps.MediaClassifier = deps.MediaClassifier.normalize() | |||
| 46 | stateRoot := resolvedStateRoot(paths.StateRoot, opts) | 43 | stateRoot := resolvedStateRoot(paths.StateRoot, opts) | ||
| 47 | cleanStaleSingletonLocks(logger, stateRoot) | 44 | cleanStaleSingletonLocks(logger, stateRoot) | ||
| 48 | windowlessFrameRate := config.CEFEngineConfig{WindowlessFrameRate: cfg.WindowlessFrameRate}.CEFWindowlessFrameRate() | 45 | windowlessFrameRate := config.CEFEngineConfig{WindowlessFrameRate: cfg.WindowlessFrameRate}.CEFWindowlessFrameRate() | ||
| @@ -67,7 +64,6 @@ func NewEngine( | |||||
| 67 | ctxMenuExecutorFactory: deps.ContextMenuExecutorFactory, | 64 | ctxMenuExecutorFactory: deps.ContextMenuExecutorFactory, | ||
| 68 | clipboard: deps.Clipboard, | 65 | clipboard: deps.Clipboard, | ||
| 69 | resolver: deps.ImageDataResolver, | 66 | resolver: deps.ImageDataResolver, | ||
| 70 | - | mediaClassifier: deps.MediaClassifier, | |||
| 71 | } | 67 | } | ||
| 72 | 68 | ||||
| 73 | logger.Info(). | 69 | logger.Info(). | ||
| @@ -87,11 +83,9 @@ func NewEngine( | |||||
| 87 | ctx, | 83 | ctx, | ||
| 88 | eng, | 84 | eng, | ||
| 89 | cfg, | 85 | cfg, | ||
| 90 | - | transcodingCfg, | |||
| 91 | windowlessFrameRate, | 86 | windowlessFrameRate, | ||
| 92 | audioFactory, | 87 | audioFactory, | ||
| 93 | logger, | 88 | logger, | ||
| 94 | - | deps.MediaClassifier, | |||
| 95 | deps.CurrentConfigPayload, | 89 | deps.CurrentConfigPayload, | ||
| 96 | deps.DefaultConfigPayload, | 90 | deps.DefaultConfigPayload, | ||
| 97 | ) | 91 | ) | ||
| @@ -168,9 +162,8 @@ func initializeCEF(eng *Engine, settings purecef.Settings, logger *zerolog.Logge | |||||
| 168 | 162 | ||||
| 169 | // wireEngine creates GL loader, factory, pool, and scheme handler after CEF init. | 163 | // wireEngine creates GL loader, factory, pool, and scheme handler after CEF init. | ||
| 170 | func wireEngine( | 164 | func wireEngine( | ||
| 171 | - | ctx context.Context, eng *Engine, _ RuntimeConfig, transcodingCfg TranscodingRuntimeConfig, | 165 | + | ctx context.Context, eng *Engine, _ RuntimeConfig, |
| 172 | windowlessFrameRate int32, audioFactory port.AudioOutputFactory, logger *zerolog.Logger, | 166 | windowlessFrameRate int32, audioFactory port.AudioOutputFactory, logger *zerolog.Logger, | ||
| 173 | - | mediaClassifier MediaClassifier, | |||
| 174 | currentConfigPayload func() ([]byte, error), defaultConfigPayload func() ([]byte, error), | 167 | currentConfigPayload func() ([]byte, error), defaultConfigPayload func() ([]byte, error), | ||
| 175 | ) (*Engine, error) { | 168 | ) (*Engine, error) { | ||
| 176 | gl, err := newGLLoader() | 169 | gl, err := newGLLoader() | ||
| @@ -179,18 +172,16 @@ func wireEngine( | |||||
| 179 | return nil, fmt.Errorf("GL loader: %w", err) | 172 | return nil, fmt.Errorf("GL loader: %w", err) | ||
| 180 | } | 173 | } | ||
| 181 | 174 | ||||
| 182 | - | mediaTranscoder, transcoderState := initializeEngineTranscoder(transcodingCfg, logger) | 175 | + | var mediaTranscoder port.MediaTranscoder |
| 183 | eng.gl = gl | 176 | eng.gl = gl | ||
| 184 | eng.factory = newWebViewFactory(eng, gl, webViewFactoryOptions{ | 177 | eng.factory = newWebViewFactory(eng, gl, webViewFactoryOptions{ | ||
| 185 | scale: detectHiDPIScale(logger), | 178 | scale: detectHiDPIScale(logger), | ||
| 186 | windowlessFrameRate: windowlessFrameRate, | 179 | windowlessFrameRate: windowlessFrameRate, | ||
| 187 | transcoder: mediaTranscoder, | 180 | transcoder: mediaTranscoder, | ||
| 188 | - | mediaClassifier: mediaClassifier, | |||
| 189 | audioOutputFactory: audioFactory, | 181 | audioOutputFactory: audioFactory, | ||
| 190 | }) | 182 | }) | ||
| 191 | eng.pool = newWebViewPool(eng.factory) | 183 | eng.pool = newWebViewPool(eng.factory) | ||
| 192 | eng.contentInj = newContentInjector(eng, nil) | 184 | eng.contentInj = newContentInjector(eng, nil) | ||
| 193 | - | eng.transcoderState = transcoderState | |||
| 194 | 185 | ||||
| 195 | messageRouter, schemeHandler, err := newEngineSchemeHandler( | 186 | messageRouter, schemeHandler, err := newEngineSchemeHandler( | ||
| 196 | ctx, | 187 | ctx, | ||
| @@ -211,39 +202,6 @@ func wireEngine( | |||||
| 211 | return eng, nil | 202 | return eng, nil | ||
| 212 | } | 203 | } | ||
| 213 | 204 | ||||
| 214 | - | func initializeEngineTranscoder( | |||
| 215 | - | transcodingCfg TranscodingRuntimeConfig, | |||
| 216 | - | logger *zerolog.Logger, | |||
| 217 | - | ) (port.MediaTranscoder, transcoderStartupState) { | |||
| 218 | - | transcoderState := buildTranscoderStartupState(transcodingCfg) | |||
| 219 | - | if !transcodingCfg.Enabled { | |||
| 220 | - | return nil, transcoderState | |||
| 221 | - | } | |||
| 222 | - | ||||
| 223 | - | transcoderState.ProbeAttempted = true | |||
| 224 | - | tc := transcoderpkg.New(config.TranscodingConfig{ | |||
| 225 | - | Enabled: transcodingCfg.Enabled, | |||
| 226 | - | HWAccel: transcodingCfg.HWAccel, | |||
| 227 | - | MaxConcurrent: transcodingCfg.MaxConcurrent, | |||
| 228 | - | Quality: transcodingCfg.Quality, | |||
| 229 | - | }, logger) | |||
| 230 | - | caps := tc.Capabilities() | |||
| 231 | - | transcoderState.API = caps.API | |||
| 232 | - | transcoderState.Encoders = append([]string(nil), caps.Encoders...) | |||
| 233 | - | transcoderState.Decoders = append([]string(nil), caps.Decoders...) | |||
| 234 | - | if !tc.Available() { | |||
| 235 | - | transcoderState.Status = "unavailable_no_compatible_gpu" | |||
| 236 | - | logger.Warn().Msg("cef: GPU transcoding enabled but no compatible GPU found — feature disabled") | |||
| 237 | - | return nil, transcoderState | |||
| 238 | - | } | |||
| 239 | - | ||||
| 240 | - | transcoderState.Status = "available" | |||
| 241 | - | logger.Info(). | |||
| 242 | - | Str("api", caps.API). | |||
| 243 | - | Strs("encoders", caps.Encoders). | |||
| 244 | - | Msg("cef: GPU transcoding available") | |||
| 245 | - | return tc, transcoderState | |||
| 246 | - | } | |||
| 247 | 205 | ||||
| 248 | func newEngineSchemeHandler( | 206 | func newEngineSchemeHandler( | ||
| 249 | ctx context.Context, | 207 | ctx context.Context, | ||
| @@ -328,35 +286,6 @@ func registerEngineSchemeFactory( | |||||
| 328 | Msg("cef: registered internal https handler factory") | 286 | Msg("cef: registered internal https handler factory") | ||
| 329 | } | 287 | } | ||
| 330 | 288 | ||||
| 331 | - | func buildTranscoderStartupState(cfg TranscodingRuntimeConfig) transcoderStartupState { | |||
| 332 | - | hwaccel := cfg.HWAccel | |||
| 333 | - | if hwaccel == "" { | |||
| 334 | - | hwaccel = "auto" | |||
| 335 | - | } | |||
| 336 | - | ||||
| 337 | - | maxConcurrent := cfg.MaxConcurrent | |||
| 338 | - | if maxConcurrent <= 0 { | |||
| 339 | - | maxConcurrent = 2 | |||
| 340 | - | } | |||
| 341 | - | ||||
| 342 | - | quality := cfg.Quality | |||
| 343 | - | if quality == "" { | |||
| 344 | - | quality = "medium" | |||
| 345 | - | } | |||
| 346 | - | ||||
| 347 | - | status := "disabled_in_config" | |||
| 348 | - | if cfg.Enabled { | |||
| 349 | - | status = "configured_enabled" | |||
| 350 | - | } | |||
| 351 | - | ||||
| 352 | - | return transcoderStartupState{ | |||
| 353 | - | ConfigEnabled: cfg.Enabled, | |||
| 354 | - | HWAccel: hwaccel, | |||
| 355 | - | MaxConcurrent: maxConcurrent, | |||
| 356 | - | Quality: quality, | |||
| 357 | - | Status: status, | |||
| 358 | - | } | |||
| 359 | - | } | |||
| 360 | 289 | ||||
| 361 | // getPrimaryMonitor returns the primary GDK monitor, or nil if unavailable. | 290 | // getPrimaryMonitor returns the primary GDK monitor, or nil if unavailable. | ||
| 362 | func getPrimaryMonitor() *gdk.Monitor { | 291 | func getPrimaryMonitor() *gdk.Monitor { | ||
M internal/infrastructure/cef/factory.go +2 -5
| @@ -26,7 +26,6 @@ type WebViewFactory struct { | |||
| 26 | 26 | windowlessFrameRate int32 | |
| 27 | 27 | bgColor atomic.Uint32 // packed ARGB for BrowserSettings.BackgroundColor | |
| 28 | 28 | transcoder port.MediaTranscoder | |
| 29 | - | mediaClassifier MediaClassifier | |
| 30 | 29 | audioOutputFactory port.AudioOutputFactory | |
| 31 | 30 | } | |
| 32 | 31 | ||
| @@ -34,7 +33,6 @@ type webViewFactoryOptions struct { | |||
| 34 | 33 | scale int32 | |
| 35 | 34 | windowlessFrameRate int32 | |
| 36 | 35 | transcoder port.MediaTranscoder | |
| 37 | - | mediaClassifier MediaClassifier | |
| 38 | 36 | audioOutputFactory port.AudioOutputFactory | |
| 39 | 37 | } | |
| 40 | 38 | ||
| @@ -64,9 +62,8 @@ func newWebViewFactory(engine *Engine, gl *glLoader, opts webViewFactoryOptions) | |||
| 64 | 62 | gl: gl, | |
| 65 | 63 | scale: opts.scale, | |
| 66 | 64 | windowlessFrameRate: opts.windowlessFrameRate, | |
| 67 | - | transcoder: opts.transcoder, | |
| 68 | - | mediaClassifier: opts.mediaClassifier, | |
| 69 | - | audioOutputFactory: opts.audioOutputFactory, | |
| 65 | + | transcoder: opts.transcoder, | |
| 66 | + | audioOutputFactory: opts.audioOutputFactory, | |
| 70 | 67 | } | |
| 71 | 68 | } | |
| 72 | 69 | ||
| @@ -26,7 +26,6 @@ type WebViewFactory struct { | |||||
| 26 | windowlessFrameRate int32 | 26 | windowlessFrameRate int32 | ||
| 27 | bgColor atomic.Uint32 // packed ARGB for BrowserSettings.BackgroundColor | 27 | bgColor atomic.Uint32 // packed ARGB for BrowserSettings.BackgroundColor | ||
| 28 | transcoder port.MediaTranscoder | 28 | transcoder port.MediaTranscoder | ||
| 29 | - | mediaClassifier MediaClassifier | |||
| 30 | audioOutputFactory port.AudioOutputFactory | 29 | audioOutputFactory port.AudioOutputFactory | ||
| 31 | } | 30 | } | ||
| 32 | 31 | ||||
| @@ -34,7 +33,6 @@ type webViewFactoryOptions struct { | |||||
| 34 | scale int32 | 33 | scale int32 | ||
| 35 | windowlessFrameRate int32 | 34 | windowlessFrameRate int32 | ||
| 36 | transcoder port.MediaTranscoder | 35 | transcoder port.MediaTranscoder | ||
| 37 | - | mediaClassifier MediaClassifier | |||
| 38 | audioOutputFactory port.AudioOutputFactory | 36 | audioOutputFactory port.AudioOutputFactory | ||
| 39 | } | 37 | } | ||
| 40 | 38 | ||||
| @@ -64,9 +62,8 @@ func newWebViewFactory(engine *Engine, gl *glLoader, opts webViewFactoryOptions) | |||||
| 64 | gl: gl, | 62 | gl: gl, | ||
| 65 | scale: opts.scale, | 63 | scale: opts.scale, | ||
| 66 | windowlessFrameRate: opts.windowlessFrameRate, | 64 | windowlessFrameRate: opts.windowlessFrameRate, | ||
| 67 | - | transcoder: opts.transcoder, | 65 | + | transcoder: opts.transcoder, |
| 68 | - | mediaClassifier: opts.mediaClassifier, | 66 | + | audioOutputFactory: opts.audioOutputFactory, |
| 69 | - | audioOutputFactory: opts.audioOutputFactory, | |||
| 70 | } | 67 | } | ||
| 71 | } | 68 | } | ||
| 72 | 69 | ||||
M internal/infrastructure/cef/runtime_config.go +0 -8
| @@ -23,13 +23,6 @@ type RuntimeConfig struct { | |||
| 23 | 23 | TraceHandlers bool | |
| 24 | 24 | } | |
| 25 | 25 | ||
| 26 | - | type TranscodingRuntimeConfig struct { | |
| 27 | - | Enabled bool | |
| 28 | - | HWAccel string | |
| 29 | - | MaxConcurrent int | |
| 30 | - | Quality string | |
| 31 | - | } | |
| 32 | - | ||
| 33 | 26 | type HandlerRegistrar func(context.Context, port.WebUIHandlerRouter, port.HandlerDependencies) error | |
| 34 | 27 | ||
| 35 | 28 | type AccentHandlerRegistrar func(context.Context, port.WebUIHandlerRouter, port.AccentKeyHandler) error | |
| @@ -74,5 +67,4 @@ type EngineDependencies struct { | |||
| 74 | 67 | ContextMenuExecutorFactory port.ContextMenuActionExecutorFactory | |
| 75 | 68 | Clipboard port.Clipboard | |
| 76 | 69 | ImageDataResolver port.ImageDataResolver | |
| 77 | - | MediaClassifier MediaClassifier | |
| 78 | 70 | } | |
| @@ -23,13 +23,6 @@ type RuntimeConfig struct { | |||||
| 23 | TraceHandlers bool | 23 | TraceHandlers bool | ||
| 24 | } | 24 | } | ||
| 25 | 25 | ||||
| 26 | - | type TranscodingRuntimeConfig struct { | |||
| 27 | - | Enabled bool | |||
| 28 | - | HWAccel string | |||
| 29 | - | MaxConcurrent int | |||
| 30 | - | Quality string | |||
| 31 | - | } | |||
| 32 | - | ||||
| 33 | type HandlerRegistrar func(context.Context, port.WebUIHandlerRouter, port.HandlerDependencies) error | 26 | type HandlerRegistrar func(context.Context, port.WebUIHandlerRouter, port.HandlerDependencies) error | ||
| 34 | 27 | ||||
| 35 | type AccentHandlerRegistrar func(context.Context, port.WebUIHandlerRouter, port.AccentKeyHandler) error | 28 | type AccentHandlerRegistrar func(context.Context, port.WebUIHandlerRouter, port.AccentKeyHandler) error | ||
| @@ -74,5 +67,4 @@ type EngineDependencies struct { | |||||
| 74 | ContextMenuExecutorFactory port.ContextMenuActionExecutorFactory | 67 | ContextMenuExecutorFactory port.ContextMenuActionExecutorFactory | ||
| 75 | Clipboard port.Clipboard | 68 | Clipboard port.Clipboard | ||
| 76 | ImageDataResolver port.ImageDataResolver | 69 | ImageDataResolver port.ImageDataResolver | ||
| 77 | - | MediaClassifier MediaClassifier | |||
| 78 | } | 70 | } | ||