libobs: mix scene-item audio when item canvas is unset#738
Merged
Conversation
scene_audio_render_do gated each scene item's audio on an exact canvas match, but a scene item whose canvas is NULL (the default until obs_sceneitem_set_canvas is called) matched no canvas, so its audio was dropped on every canvas while its video still rendered. Add the item->canvas != NULL escape hatch that the video path (scene_video_render) already has, so a NULL item canvas means "mix into every canvas". Ref: streamlabs/obs-studio-node#1493 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Author
|
Regression test for this fix: streamlabs/obs-studio-node#1724 |
aleksandr-voitenko
approved these changes
Jun 12, 2026
aleksandr-voitenko
added a commit
that referenced
this pull request
Jun 30, 2026
* libobs-winrt: Guard WGC capture against removed graphics device (#733) * Guard DirectShow filter activation (#740) * libobs: append message/get_messages to obs_source_info (#735) * libobs: bound volmeter plane index against MAX_AV_PLANES (#737) * libobs: mix scene-item audio when item canvas is unset (#738) * libobs: Fix use-after-free of canvas view in audio thread (#736) * Add structured module load failures (#741) * Fix NDI 6 runtime loading on macOS --------- Co-authored-by: Vladimir <summeroff@gmail.com>
sandboxcoder
added a commit
that referenced
this pull request
Jul 16, 2026
* Guard DirectShow filter activation (#740) * libobs: append message/get_messages to obs_source_info (#735) * libobs: bound volmeter plane index against MAX_AV_PLANES (#737) * libobs: mix scene-item audio when item canvas is unset (#738) * libobs: Fix use-after-free of canvas view in audio thread (#736) * Add structured module load failures (#741) * Fix macOS Xcode 26.4 build (#748) * Fix macOS Xcode 26.4 build * Windows build fix for spout2 * Fix NDI 6 runtime loading on macOS (#746) * obs-browser: re-check validity under graphics lock in OnAcceleratedPaint Bump plugins/obs-browser to 5b30996 to pull in the OnAcceleratedPaint teardown-race guard (streamlabs/obs-browser#54), which fixes the libcef crash on BrowserManagerThread seen in dual-output sessions with browser sources. Branched from 31.1.2sl19. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * obs-browser: bump for GPU-process crash-limit flag Bump plugins/obs-browser 5b30996 -> 9d18953 to add --disable-gpu-process-crash-limit (streamlabs/obs-browser#54), so a transient GPU reset (TDR) no longer escalates to Chromium's fatal 'GPU process isn't usable' abort. Combines with the OnAcceleratedPaint teardown guard already in this bump. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * obs-browser: re-point submodule to merged #54 squash commit Bump plugins/obs-browser 9d18953 -> 4002dac, the squash-merge of streamlabs/obs-browser#54 on streamlabs (GPU-process crash-limit flag + OnAcceleratedPaint teardown guard). Replaces the pre-merge PR-branch pointer. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * Fix NDI 6 runtime loading on macOS --------- Co-authored-by: Vladimir Sumarov <summeroff@gmail.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * update mediaconnector to streamlabs branch (#750) * reset texrender->rendered flag when canvas switches (#751) * reset texrender->rendered flag when canvas switches * call gs_texrender_reset() when rendering_mode changes * [MacOS] fix mediasoup-connector compile error on Clang 21 * free module after initialization fails * fix merge mistake - call module->load() once * set NULL to avoid heap alloc * update mediasoup-connector (Clang 21 fix) * update obs-browser * set obs-ndi submodule --------- Co-authored-by: Aleksandr Voitenko <aleksandr.voitenko1986@gmail.com> Co-authored-by: Vladimir <summeroff@gmail.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
A source's audio plays when the source is set directly as an output channel, but goes silent once the source is wrapped in a scene and the scene is the output source. Reported in streamlabs/obs-studio-node#1493.
Root cause
scene_audio_render_do(libobs/obs-scene.c) mixes each scene item's audio only into a canvas whose pointer exactly matchesitem->canvas:A scene item's
canvasdefaults toNULL(scene items are zero-allocated; it is only set viaobs_sceneitem_set_canvas, e.g. osn'ssceneItem.video). With a NULL canvas the comparison never matches, so the item's audio is dropped on every canvas — while its video still renders, because the video path (scene_video_render) already special-cases NULL:The asymmetry dates to the video path gaining its
!= NULLguard ("Fix video mix canvas identity", #720) while the audio path — rewritten separately inda3255b9— did not.Fix
Give the audio path the same escape hatch: a NULL item canvas means "mix into every canvas".
Test
Regression test mirroring the exact obsproject#1493 repro (scene-wrapped
ffmpeg_sourcewith the item canvas left unset must record non-silent audio): streamlabs/obs-studio-node PR — link added below.Notes
🤖 Generated with Claude Code