Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ci/test_native_b2_portability.py
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ def test_scene_archive_consumers_supply_getter_logging(self):
"test/cmocka/source-update-properties-link-support.c",
"test/cmocka/weak-object-identity-link-stub.c",
"libobs/build/libobs.image-decode-adapter+.h.c",
"test/cmocka/output-starting-queries-link-support.c",
])

def test_portal_app_id_getter_uses_live_hotkey_adapters(self):
Expand Down
2 changes: 1 addition & 1 deletion libobs/build/libobs.core-output+.h.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
#include "libobs/obs-output-set-media-fields.c.h"
#include "libobs/obs-output-settings-fields.c.h"
#include "libobs/obs-output-size-getters-fields.c.h"
#include "libobs/obs-output-starting-queries.c.h"
#include "libobs/obs-output-starting-queries-fields.c.h"
#include "libobs/obs-output-supported-codecs-fields.c.h"
#include "libobs/obs-output-total-bytes-fields.c.h"
#include "libobs/obs-output-total-frames-fields.c.h"
Expand Down
5 changes: 5 additions & 0 deletions libobs/build/libobs.ported-output-starting-queries+.h.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/* Unity group (BUILD.md): original lazy predicates, C reference only. */
#include "libobs/build/libobs.pch.h"

#include "libobs/obs-output-starting-queries-reference-helpers.c.h"
#include "libobs/obs-output-starting-queries.c.h"
5 changes: 5 additions & 0 deletions libobs/build/ported-source-sets/output-starting-queries.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"LIBOBS_PORTED_SOURCES": [
"build/libobs.ported-output-starting-queries+.h.c"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
obs_output_needs_encoders
obs_output_starting
27 changes: 27 additions & 0 deletions libobs/obs-output-starting-queries-fields.c.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#include "libobs/build/libobs.pch.h"

/* Keep C ownership of the real private layout and atomic operations. */
bool obs_output_starting_load_active(const struct obs_output *output);
bool obs_output_starting_load_starting(const struct obs_output *output);
bool obs_output_starting_load_reconnecting(const struct obs_output *output);
bool obs_output_starting_load_delay_active(const struct obs_output *output);

bool obs_output_starting_load_active(const struct obs_output *output)
{
return os_atomic_load_bool(&output->active);
}

bool obs_output_starting_load_starting(const struct obs_output *output)
{
return os_atomic_load_bool(&output->starting);
}

bool obs_output_starting_load_reconnecting(const struct obs_output *output)
{
return os_atomic_load_bool(&output->reconnecting);
}

bool obs_output_starting_load_delay_active(const struct obs_output *output)
{
return os_atomic_load_bool(&output->delay_active);
}
17 changes: 17 additions & 0 deletions libobs/obs-output-starting-queries-reference-helpers.c.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#include "libobs/build/libobs.pch.h"

/* Same atomic helpers used by the original unit in the O group. */
static inline bool active(const struct obs_output *output)
{
return os_atomic_load_bool(&output->active);
}

static inline bool reconnecting(const struct obs_output *output)
{
return os_atomic_load_bool(&output->reconnecting);
}

static inline bool delay_active(const struct obs_output *output)
{
return os_atomic_load_bool(&output->delay_active);
}
2 changes: 2 additions & 0 deletions rust/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ and compares their exported symbols. `OBS_LIBOBS_BACKEND=C` is temporary rollbac

## Ported so far

The private output starting/encoder-demand queries use lazy safe Rust decisions with C-owned atomic loads (`obs-output::output_starting_queries`); the original C unit remains the reference and differential oracle.

| C source | Rust | Notes |
|---|---|---|
| `libobs/obs-enum-modules.c.h` | `obs-core::enum_modules` | Live module enumeration through the existing module-list seam. Preserves absent-core and empty-list no-ops, reverse opening order, exact callback parameter and borrowed module pointers, no lock or snapshot, nested enumeration and callback-time prepending. Reads each successor after the callback. Tier 1 mirrors unchanged `test_enum_modules`; Tier 3 compares the original C and live-link mutation. No private layout mirror or intentional behavior difference. |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ static CASES: std::sync::LazyLock<Vec<String>> =
#[test]
fn canonical_rust_static_private_steps_are_registered() {
let graph = rust_static_entries::assert_family(FAMILY);
assert_eq!(CASES.len(), 6);
assert_eq!(CASES.len(), 7);
for windows in [false, true] {
for msvc in [false, true] {
for available in [false, true] {
Expand All @@ -19,8 +19,8 @@ fn canonical_rust_static_private_steps_are_registered() {
]
.into();
let selected = graph.select(&facts).unwrap();
assert_eq!(selected.targets.len(), if available { 6 } else { 0 });
assert_eq!(selected.tests.len(), if available { 6 } else { 0 });
assert_eq!(selected.targets.len(), if available { 7 } else { 0 });
assert_eq!(selected.tests.len(), if available { 7 } else { 0 });
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"libobs/graphics/graphics-linear-srgb-fields.c.h",
"libobs/build/libobs.image-decode-adapter+.h.c",
"libobs/obs-graphics-effect-file-fields.c.h",
"test/cmocka/source-update-properties-link-support.c"
"test/cmocka/source-update-properties-link-support.c",
"test/cmocka/output-starting-queries-link-support.c"
],
"requires": "HAVE_LIBOBS_RUST_STATIC",
"includes": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"test/cmocka/test_window_match_steps.c",
"libobs/util/base-variadic.c.h",
"libobs/build/libobs.image-decode-adapter+.h.c",
"test/cmocka/source-update-properties-link-support.c"
"test/cmocka/source-update-properties-link-support.c",
"test/cmocka/output-starting-queries-link-support.c"
],
"includes": [
".",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"schema": 1,
"targets": {
"test_output_starting_queries_rust": {
"sources": [
"test/cmocka/test_output_starting_queries.c",
"test/cmocka/output-starting-queries-recording-adapter.c"
],
"libraries": [
"libobs_rust-static",
"OBS::libobs",
"OBS::caption",
"Uthash::Uthash",
"OBS::native-test-cmocka",
{
"name": "OBS::w32-pthreads",
"requires": "OS_WINDOWS"
}
],
"definitions": [
"OUTPUT_STARTING_QUERIES_EXTERNAL"
],
"requires": "HAVE_LIBOBS_RUST_STATIC"
}
},
"tests": {
"test_output_starting_queries_rust": {
"target": "test_output_starting_queries_rust",
"command": [
"${target}"
],
"requires": "HAVE_LIBOBS_RUST_STATIC"
}
}
}
Loading
Loading