diff --git a/ci/test_native_b2_portability.py b/ci/test_native_b2_portability.py index 14fdf188d6..2ee3cb275b 100644 --- a/ci/test_native_b2_portability.py +++ b/ci/test_native_b2_portability.py @@ -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): diff --git a/libobs/build/libobs.core-output+.h.c b/libobs/build/libobs.core-output+.h.c index ad5e190aab..6abc60d7eb 100644 --- a/libobs/build/libobs.core-output+.h.c +++ b/libobs/build/libobs.core-output+.h.c @@ -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" diff --git a/libobs/build/libobs.ported-output-starting-queries+.h.c b/libobs/build/libobs.ported-output-starting-queries+.h.c new file mode 100644 index 0000000000..c45c74e122 --- /dev/null +++ b/libobs/build/libobs.ported-output-starting-queries+.h.c @@ -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" diff --git a/libobs/build/ported-source-sets/output-starting-queries.json b/libobs/build/ported-source-sets/output-starting-queries.json new file mode 100644 index 0000000000..75ffbee335 --- /dev/null +++ b/libobs/build/ported-source-sets/output-starting-queries.json @@ -0,0 +1,5 @@ +{ + "LIBOBS_PORTED_SOURCES": [ + "build/libobs.ported-output-starting-queries+.h.c" + ] +} diff --git a/libobs/cmake/rust-hidden.d/obs-output-output_starting_queries.txt b/libobs/cmake/rust-hidden.d/obs-output-output_starting_queries.txt new file mode 100644 index 0000000000..f578d98dc9 --- /dev/null +++ b/libobs/cmake/rust-hidden.d/obs-output-output_starting_queries.txt @@ -0,0 +1,2 @@ +obs_output_needs_encoders +obs_output_starting diff --git a/libobs/obs-output-starting-queries-fields.c.h b/libobs/obs-output-starting-queries-fields.c.h new file mode 100644 index 0000000000..3c0638b345 --- /dev/null +++ b/libobs/obs-output-starting-queries-fields.c.h @@ -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); +} diff --git a/libobs/obs-output-starting-queries-reference-helpers.c.h b/libobs/obs-output-starting-queries-reference-helpers.c.h new file mode 100644 index 0000000000..3c61f76695 --- /dev/null +++ b/libobs/obs-output-starting-queries-reference-helpers.c.h @@ -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); +} diff --git a/rust/README.md b/rust/README.md index e4fd0ca6a2..5467e67628 100644 --- a/rust/README.md +++ b/rust/README.md @@ -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. | diff --git a/rust/obs-build/tests/native/registration/canonical_rust_static_private_steps_are_registered.rs b/rust/obs-build/tests/native/registration/canonical_rust_static_private_steps_are_registered.rs index 35617ea1f4..977f8108ea 100644 --- a/rust/obs-build/tests/native/registration/canonical_rust_static_private_steps_are_registered.rs +++ b/rust/obs-build/tests/native/registration/canonical_rust_static_private_steps_are_registered.rs @@ -8,7 +8,7 @@ static CASES: std::sync::LazyLock> = #[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] { @@ -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 }); } } } diff --git a/rust/obs-build/tests/native/registration/rust-static/cases/private-link-rules/test_graphics_state_stacks.json b/rust/obs-build/tests/native/registration/rust-static/cases/private-link-rules/test_graphics_state_stacks.json index 31414d058c..ee9f033fe3 100644 --- a/rust/obs-build/tests/native/registration/rust-static/cases/private-link-rules/test_graphics_state_stacks.json +++ b/rust/obs-build/tests/native/registration/rust-static/cases/private-link-rules/test_graphics_state_stacks.json @@ -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": [ diff --git a/rust/obs-build/tests/native/registration/rust-static/cases/private-link-rules/test_window_match_steps.json b/rust/obs-build/tests/native/registration/rust-static/cases/private-link-rules/test_window_match_steps.json index 9e3cad8559..1240a9741a 100644 --- a/rust/obs-build/tests/native/registration/rust-static/cases/private-link-rules/test_window_match_steps.json +++ b/rust/obs-build/tests/native/registration/rust-static/cases/private-link-rules/test_window_match_steps.json @@ -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": [ ".", diff --git a/rust/obs-build/tests/native/registration/rust-static/cases/private-steps/test_output_starting_queries.json b/rust/obs-build/tests/native/registration/rust-static/cases/private-steps/test_output_starting_queries.json new file mode 100644 index 0000000000..6208dc6b12 --- /dev/null +++ b/rust/obs-build/tests/native/registration/rust-static/cases/private-steps/test_output_starting_queries.json @@ -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" + } + } +} diff --git a/rust/obs-build/tests/native/registration/rust-static/support/zz-output-starting-queries.json b/rust/obs-build/tests/native/registration/rust-static/support/zz-output-starting-queries.json new file mode 100644 index 0000000000..a47e496438 --- /dev/null +++ b/rust/obs-build/tests/native/registration/rust-static/support/zz-output-starting-queries.json @@ -0,0 +1,317 @@ +{ + "test_async_conversion_plan_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_async_frame_pacing_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_async_upload_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_audio_monitor_delay_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_coreaudio_device_rules_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_coreaudio_pacing_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_deinterlace_draw_plan_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_deinterlace_pacing_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_deinterlace_select_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_effect_param_types_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_effect_parser_blocks_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_effect_parser_compile_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_effect_parser_lifecycle_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_effect_parser_params_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_effect_parser_passes_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_effect_parser_shader_call_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_encoder_video_tex_active_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_graphics_ffmpeg_pq_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_graphics_ffmpeg_route_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_graphics_ffmpeg_wic_checks_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_graphics_immediate_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_graphics_state_stacks_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_monitor_speaker_layout_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_monitor_video_sync_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_monitor_wasapi_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_nsgif_decode_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_pulse_monitor_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_scene_audio_window_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_scene_bounds_place_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_scene_item_crop_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_scene_item_names_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_scene_item_order_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_scene_item_transform_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_scene_render_plan_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_scene_transform_update_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_service_handler_getters_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_source_audio_input_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_source_audio_place_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_source_audio_render_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_source_audio_timing_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_source_color_space_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_source_draw_plan_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_source_duplicate_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_source_filter_chain_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_source_frame_copy_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_source_init_context_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_source_media_admission_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_source_monitoring_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_source_ptm_gate_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_source_render_route_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_source_size_route_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_source_video_tick_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_source_volume_apply_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_sprite_geometry_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_transition_clock_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_transition_load_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_transition_render_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_transition_sample_time_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_transition_start_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_video_info_query_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_video_stop_requested_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_window_match_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + }, + "test_windows_keys_steps_rust": { + "sources": [ + "test/cmocka/output-starting-queries-link-support.c" + ] + } +} diff --git a/rust/obs-c-oracle/oracle.d/output-starting-queries.list b/rust/obs-c-oracle/oracle.d/output-starting-queries.list new file mode 100644 index 0000000000..42db2d02df --- /dev/null +++ b/rust/obs-c-oracle/oracle.d/output-starting-queries.list @@ -0,0 +1 @@ +output-starting-queries.inc|libobs/obs-output-starting-queries.c.h|auto diff --git a/rust/obs-c-oracle/oracle/output_starting_queries.c b/rust/obs-c-oracle/oracle/output_starting_queries.c new file mode 100644 index 0000000000..97c08a5f75 --- /dev/null +++ b/rust/obs-c-oracle/oracle/output_starting_queries.c @@ -0,0 +1,88 @@ +/* Complete original unit and real adapters, with atomic read recording only. */ +#include "obs-internal.h" +#include +#include + +struct starting_trace { + const volatile bool *addresses[4]; + unsigned count; + unsigned flip; + struct obs_output *output; +}; +static _Thread_local struct starting_trace *starting_current; +static bool starting_load(const volatile bool *flag) +{ + struct starting_trace *trace = starting_current; + if (trace->count < 4) + trace->addresses[trace->count] = flag; + trace->count++; + bool result = os_atomic_load_bool(flag); + /* Model another writer changing a later flag after the first read. */ + if (trace->count == 1 && trace->flip) + os_atomic_set_bool(&trace->output->starting, true); + return result; +} +#undef os_atomic_load_bool +#define os_atomic_load_bool starting_load +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); +} +#define obs_output_needs_encoders oracle_obs_output_needs_encoders +#define obs_output_starting oracle_obs_output_starting +bool oracle_obs_output_needs_encoders(const struct obs_output *output); +bool oracle_obs_output_starting(const struct obs_output *output); +#include "output-starting-queries.inc" +#undef obs_output_starting +#undef obs_output_needs_encoders +#include "output_starting_queries_fields.inc" +#undef os_atomic_load_bool + +typedef bool (*starting_query)(const void *); +bool oracle_output_starting_check(starting_query candidate, unsigned mask, bool about_to_start, bool flip); +bool oracle_output_starting_check(starting_query candidate, unsigned mask, bool about_to_start, bool flip) +{ + struct obs_output *output = calloc(1, sizeof(*output)); + struct obs_output *before = malloc(sizeof(*before)); + struct obs_output *after = malloc(sizeof(*after)); + if (!output || !before || !after) { + free(output); + free(before); + free(after); + return false; + } + output->active = (mask & 1) != 0; + output->starting = (mask & 2) != 0; + output->reconnecting = (mask & 4) != 0; + output->delay_active = (mask & 8) != 0; + output->data_active = output->delay_capturing = true; + memcpy(before, output, sizeof(*output)); + struct starting_trace c = {.flip = flip, .output = output}; + starting_current = &c; + bool expected = about_to_start ? oracle_obs_output_starting(output) : oracle_obs_output_needs_encoders(output); + memcpy(after, output, sizeof(*output)); + memcpy(output, before, sizeof(*output)); + struct starting_trace rust = {.flip = flip, .output = output}; + starting_current = &rust; + bool actual = candidate(output); + starting_current = NULL; + bool equal = expected == actual && c.count == rust.count && c.count <= 4 && + memcmp(output, after, sizeof(*output)) == 0; + /* Compare qualified pointers directly rather than converting their arrays for memcmp. */ + for (unsigned i = 0; equal && i < c.count; i++) + equal = c.addresses[i] == rust.addresses[i]; + if (!flip) + equal = equal && memcmp(output, before, sizeof(*output)) == 0; + free(after); + free(before); + free(output); + return equal; +} diff --git a/rust/obs-output/src/ffi/mod.rs b/rust/obs-output/src/ffi/mod.rs index 3f3f982e89..64d8fedcad 100644 --- a/rust/obs-output/src/ffi/mod.rs +++ b/rust/obs-output/src/ffi/mod.rs @@ -68,6 +68,7 @@ pub mod output_service_getter; pub mod output_set_media; pub mod output_slots; pub mod output_start; +pub mod output_starting_queries; pub mod output_stop; pub mod output_stop_stats; pub mod output_supported_codecs; diff --git a/rust/obs-output/src/ffi/output_starting_queries.rs b/rust/obs-output/src/ffi/output_starting_queries.rs new file mode 100644 index 0000000000..bbaacd5d94 --- /dev/null +++ b/rust/obs-output/src/ffi/output_starting_queries.rs @@ -0,0 +1,43 @@ +//! Private C ABI; C owns the output layout and every atomic operation. +use crate::output_starting_queries::{self as decisions, Flag}; +use core::ffi::c_void; + +unsafe extern "C" { + fn obs_output_starting_load_active(output: *const c_void) -> bool; + fn obs_output_starting_load_starting(output: *const c_void) -> bool; + fn obs_output_starting_load_reconnecting(output: *const c_void) -> bool; + fn obs_output_starting_load_delay_active(output: *const c_void) -> bool; +} + +fn load(output: *const c_void, flag: Flag) -> bool { + // SAFETY: shims reject NULL before any adapter; caller keeps output live. + // Each adapter performs exactly one C-owned atomic load when requested. + unsafe { + match flag { + Flag::Active => obs_output_starting_load_active(output), + Flag::Starting => obs_output_starting_load_starting(output), + Flag::Reconnecting => obs_output_starting_load_reconnecting(output), + Flag::DelayActive => obs_output_starting_load_delay_active(output), + } + } +} + +/// # Safety +/// A non-null output must be live throughout the call, with C atomic writers. +#[unsafe(no_mangle)] +pub unsafe extern "C" fn obs_output_needs_encoders(output: *const c_void) -> bool { + if output.is_null() { + return false; + } + decisions::needs_encoders(|flag| load(output, flag)) +} + +/// # Safety +/// A non-null output must be live throughout the call, with C atomic writers. +#[unsafe(no_mangle)] +pub unsafe extern "C" fn obs_output_starting(output: *const c_void) -> bool { + if output.is_null() { + return false; + } + decisions::starting(|flag| load(output, flag)) +} diff --git a/rust/obs-output/src/lib.rs b/rust/obs-output/src/lib.rs index 12b22771ac..6ba4e379f4 100644 --- a/rust/obs-output/src/lib.rs +++ b/rust/obs-output/src/lib.rs @@ -209,6 +209,7 @@ pub mod output_service_getter; pub mod output_set_media; pub mod output_slots; pub mod output_start; +pub mod output_starting_queries; pub mod output_stop; pub mod output_supported_codecs; pub mod output_type_info; diff --git a/rust/obs-output/src/output_starting_queries.rs b/rust/obs-output/src/output_starting_queries.rs new file mode 100644 index 0000000000..e8f6e6b301 --- /dev/null +++ b/rust/obs-output/src/output_starting_queries.rs @@ -0,0 +1,23 @@ +//! Lazy output activity queries; the caller owns each atomic load. + +/// A flag requested in the original C short-circuit order. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum Flag { + Active, + Starting, + Reconnecting, + DelayActive, +} + +/// Whether encoders are in use or about to be used. +pub fn needs_encoders(mut load: impl FnMut(Flag) -> bool) -> bool { + load(Flag::Active) + || load(Flag::Starting) + || load(Flag::Reconnecting) + || load(Flag::DelayActive) +} + +/// Whether encoder use is about to start; does not read active. +pub fn starting(mut load: impl FnMut(Flag) -> bool) -> bool { + load(Flag::Starting) || load(Flag::Reconnecting) || load(Flag::DelayActive) +} diff --git a/rust/obs-output/tests/output/main.rs b/rust/obs-output/tests/output/main.rs index 72f7e872c0..39496e507d 100644 --- a/rust/obs-output/tests/output/main.rs +++ b/rust/obs-output/tests/output/main.rs @@ -130,6 +130,8 @@ mod output_slots; mod output_slots_parity; mod output_start; mod output_start_parity; +mod output_starting_queries; +mod output_starting_queries_parity; mod output_stop; mod output_stop_parity; mod output_supported_codecs; diff --git a/rust/obs-output/tests/output/output_starting_queries.rs b/rust/obs-output/tests/output/output_starting_queries.rs new file mode 100644 index 0000000000..21aaaeb0b2 --- /dev/null +++ b/rust/obs-output/tests/output/output_starting_queries.rs @@ -0,0 +1,59 @@ +//! Tier 1 mirror of test_output_starting_queries.c::flag_matrix. +use obs_output::output_starting_queries::{Flag, needs_encoders, starting}; + +#[test] +fn c_flag_matrix_reads_only_the_ordered_prefix_and_preserves_storage() { + let fields = [ + Flag::Active, + Flag::Starting, + Flag::Reconnecting, + Flag::DelayActive, + ]; + for mask in 0u8..16 { + // The two unrelated true flags mirror delay_capturing and data_active. + let storage = [ + mask & 1 != 0, + mask & 2 != 0, + mask & 4 != 0, + mask & 8 != 0, + true, + true, + ]; + let before = storage; + for first in 0..2 { + let mut reads = Vec::new(); + let load = |flag| { + let index = fields.iter().position(|&field| field == flag).unwrap(); + reads.push(index); + storage[index] + }; + let actual = if first == 0 { + needs_encoders(load) + } else { + starting(load) + }; + let last = (first..4).find(|&i| storage[i]).unwrap_or(3); + assert_eq!(actual, mask & if first == 0 { 15 } else { 14 } != 0); + assert_eq!(reads, (first..=last).collect::>()); + assert_eq!(storage, before); + } + } +} + +#[test] +fn later_loads_observe_changes_after_the_first_load() { + let mut flags = [false; 4]; + let mut reads = Vec::new(); + assert!(needs_encoders(|flag| { + reads.push(flag); + match flag { + Flag::Active => { + flags[1] = true; + false + } + Flag::Starting => flags[1], + _ => panic!("load after true"), + } + })); + assert_eq!(reads, [Flag::Active, Flag::Starting]); +} diff --git a/rust/obs-output/tests/output/output_starting_queries_parity.rs b/rust/obs-output/tests/output/output_starting_queries_parity.rs new file mode 100644 index 0000000000..6b339fa223 --- /dev/null +++ b/rust/obs-output/tests/output/output_starting_queries_parity.rs @@ -0,0 +1,54 @@ +//! Whole-original-C differential coverage for #5233, with no exclusions. +//! No new ABI layout: the output is opaque and adapters return scalar bools. +use core::ffi::{c_uint, c_void}; +use obs_output::ffi::output_starting_queries::{obs_output_needs_encoders, obs_output_starting}; +use proptest::prelude::*; + +type Query = unsafe extern "C" fn(*const c_void) -> bool; +unsafe extern "C" { + fn oracle_output_starting_check( + candidate: Query, + mask: c_uint, + starting: bool, + flip: bool, + ) -> bool; +} +fn check(mask: c_uint, starting: bool, flip: bool) { + let candidate = if starting { + obs_output_starting + } else { + obs_output_needs_encoders + }; + // SAFETY: oracle owns the real initialized output and records each borrowed + // pointer before freeing it; candidate retains no references after returning. + assert!(unsafe { oracle_output_starting_check(candidate, mask, starting, flip) }); +} +#[test] +fn all_states_preserve_real_addresses_read_order_and_storage() { + for mask in 0..16 { + for starting in [false, true] { + for flip in [false, true] { + check(mask, starting, flip); + } + } + } +} +#[test] +fn null_rejected_before_any_c_projection() { + // SAFETY: NULL is rejected by each shim before invoking a C adapter. + unsafe { + assert!(!obs_output_needs_encoders(core::ptr::null())); + assert!(!obs_output_starting(core::ptr::null())); + } +} +proptest! { + #![proptest_config(ProptestConfig { + cases: obs_c_oracle::parity::cases(128), + failure_persistence: None, + ..ProptestConfig::default() + })] + #[test] + fn arbitrary_flags_match_original_c(mask in any::(), starting in any::(), flip in any::()) { + check(mask, starting, flip); + } +} diff --git a/test/cmocka/build/test-graph.json b/test/cmocka/build/test-graph.json index 8b465483e8..8d1e7d282b 100644 --- a/test/cmocka/build/test-graph.json +++ b/test/cmocka/build/test-graph.json @@ -309,7 +309,8 @@ "test/cmocka/weak-encoder-identity-link-stub.c", "test/cmocka/weak-object-identity-link-stub.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -432,7 +433,8 @@ "test/cmocka/weak-encoder-identity-link-stub.c", "test/cmocka/weak-object-identity-link-stub.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -543,7 +545,8 @@ "test/cmocka/weak-encoder-identity-link-stub.c", "test/cmocka/weak-object-identity-link-stub.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "includes": [ "libobs", @@ -723,7 +726,8 @@ "test/cmocka/video-info-query-link-support.c", "test/cmocka/core-state-link-support.c", "test/cmocka/weak-object-identity-link-stub.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": { "all": [ @@ -1645,7 +1649,8 @@ "test/cmocka/video-info-query-link-support.c", "test/cmocka/core-state-link-support.c", "test/cmocka/weak-object-identity-link-stub.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": { "all": [ @@ -1740,7 +1745,8 @@ "test/cmocka/video-info-query-link-support.c", "test/cmocka/core-state-link-support.c", "test/cmocka/weak-object-identity-link-stub.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": { "all": [ @@ -2011,7 +2017,8 @@ "test/cmocka/weak-encoder-identity-link-stub.c", "test/cmocka/weak-object-identity-link-stub.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "includes": [ "libobs", @@ -2108,7 +2115,8 @@ "test/cmocka/weak-encoder-identity-link-stub.c", "test/cmocka/weak-object-identity-link-stub.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -2182,7 +2190,8 @@ "test/cmocka/weak-encoder-identity-link-stub.c", "test/cmocka/weak-object-identity-link-stub.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -2690,7 +2699,8 @@ "libobs/obs-graphics-effect-file-fields.c.h", "test/cmocka/object-validity-query-link-stubs.c", "test/cmocka/source-update-properties-link-support.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -2775,7 +2785,8 @@ }, "libobs/obs-graphics-effect-file-fields.c.h", "test/cmocka/source-update-properties-link-support.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -2860,7 +2871,8 @@ "libobs/graphics/graphics-linear-srgb-fields.c.h", "libobs/obs-graphics-effect-file-fields.c.h", "test/cmocka/source-update-properties-link-support.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -2983,7 +2995,8 @@ "libobs/obs-graphics-effect-file-fields.c.h", "test/cmocka/object-validity-query-link-stubs.c", "test/cmocka/source-update-properties-link-support.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -3050,7 +3063,8 @@ }, "libobs/obs-graphics-effect-file-fields.c.h", "test/cmocka/source-update-properties-link-support.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -3133,7 +3147,8 @@ }, "libobs/obs-graphics-effect-file-fields.c.h", "test/cmocka/source-update-properties-link-support.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -3220,7 +3235,8 @@ }, "libobs/obs-graphics-effect-file-fields.c.h", "test/cmocka/source-update-properties-link-support.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -4127,7 +4143,8 @@ "test_encoder_video_tex_active_rust": { "sources": [ "test/cmocka/test_encoder_video_tex_active.c", - "test/cmocka/encoder-video-tex-active-fields-link-support.c" + "test/cmocka/encoder-video-tex-active-fields-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "definitions": [ "get_mix_for_video=tex_active_recording_mix_lookup", @@ -5041,7 +5058,8 @@ "libobs/obs-graphics-effect-file-fields.c.h", "test/cmocka/object-validity-query-link-stubs.c", "test/cmocka/source-update-properties-link-support.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -5126,7 +5144,8 @@ "libobs/obs-graphics-effect-file-fields.c.h", "test/cmocka/object-validity-query-link-stubs.c", "test/cmocka/source-update-properties-link-support.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -5186,7 +5205,8 @@ "libobs/obs-graphics-effect-file-fields.c.h", "test/cmocka/object-validity-query-link-stubs.c", "test/cmocka/source-update-properties-link-support.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -5284,7 +5304,8 @@ "libobs/graphics/graphics-linear-srgb-fields.c.h", "libobs/obs-graphics-effect-file-fields.c.h", "test/cmocka/source-update-properties-link-support.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -5462,7 +5483,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": [ @@ -8783,7 +8805,8 @@ "test/cmocka/video-info-query-link-support.c", "test/cmocka/core-state-link-support.c", "test/cmocka/weak-object-identity-link-stub.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": { "all": [ @@ -8844,7 +8867,8 @@ "test/cmocka/video-info-query-link-support.c", "test/cmocka/core-state-link-support.c", "test/cmocka/weak-object-identity-link-stub.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": { "all": [ @@ -8906,7 +8930,8 @@ "test/cmocka/video-info-query-link-support.c", "test/cmocka/core-state-link-support.c", "test/cmocka/weak-object-identity-link-stub.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": { "all": [ @@ -9237,7 +9262,8 @@ "libobs/obs-graphics-effect-file-fields.c.h", "test/cmocka/object-validity-query-link-stubs.c", "test/cmocka/source-update-properties-link-support.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -10601,6 +10627,27 @@ } ] }, + "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" + }, "test_output_stop_stats_steps": { "sources": [ "test/cmocka/test_output_stop_stats_steps.c", @@ -12695,7 +12742,8 @@ "test/cmocka/video-info-query-link-support.c", "test/cmocka/core-state-link-support.c", "test/cmocka/weak-object-identity-link-stub.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": { "all": [ @@ -13957,7 +14005,8 @@ "test/cmocka/source-handler-getter-link-support.c", "test/cmocka/source-update-properties-link-support.c", "test/cmocka/weak-object-identity-link-stub.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -14056,7 +14105,8 @@ "test/cmocka/scene-item-visible-link-support.c", "test/cmocka/scene-source-getter-link-stubs.c", "test/cmocka/source-update-properties-link-support.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "libraries": [ @@ -14399,7 +14449,8 @@ "test/cmocka/scene-item-visible-link-support.c", "test/cmocka/scene-source-getter-link-support.c", "test/cmocka/source-update-properties-link-support.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "includes": [ "libobs", @@ -14513,7 +14564,8 @@ "test/cmocka/scene-item-visible-link-support.c", "test/cmocka/scene-source-getter-link-stubs.c", "test/cmocka/source-update-properties-link-support.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "libraries": [ @@ -14571,7 +14623,8 @@ "test/cmocka/scene-item-visible-link-support.c", "test/cmocka/scene-source-getter-link-stubs.c", "test/cmocka/source-update-properties-link-support.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "libraries": [ @@ -14727,7 +14780,8 @@ "test/cmocka/scene-item-visible-link-support.c", "test/cmocka/scene-source-getter-link-stubs.c", "test/cmocka/source-update-properties-link-support.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "libraries": [ @@ -14870,7 +14924,8 @@ "test/cmocka/source-handler-getter-link-support.c", "test/cmocka/source-update-properties-link-support.c", "test/cmocka/weak-object-identity-link-stub.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "includes": [ "libobs", @@ -15004,7 +15059,8 @@ "test/cmocka/scene-item-visible-link-support.c", "test/cmocka/scene-source-getter-link-stubs.c", "test/cmocka/source-update-properties-link-support.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -15270,7 +15326,8 @@ "libobs/util/base-variadic.c.h", "test/cmocka/source-update-properties-link-support.c", "test/cmocka/video-info-query-link-support.c", - "test/cmocka/core-state-link-support.c" + "test/cmocka/core-state-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -15941,7 +15998,8 @@ "test/cmocka/weak-encoder-identity-link-stub.c", "test/cmocka/weak-object-identity-link-stub.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -16028,7 +16086,8 @@ "test/cmocka/weak-encoder-identity-link-stub.c", "test/cmocka/weak-object-identity-link-stub.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "includes": [ "libobs", @@ -16121,7 +16180,8 @@ "test/cmocka/weak-encoder-identity-link-stub.c", "test/cmocka/weak-object-identity-link-stub.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -16227,7 +16287,8 @@ "test/cmocka/weak-encoder-identity-link-stub.c", "test/cmocka/weak-object-identity-link-stub.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -16345,7 +16406,8 @@ "test/cmocka/weak-encoder-identity-link-stub.c", "test/cmocka/weak-object-identity-link-stub.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -16503,7 +16565,8 @@ "test/cmocka/weak-encoder-identity-link-stub.c", "test/cmocka/weak-object-identity-link-stub.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "includes": [ "libobs", @@ -16568,7 +16631,8 @@ "test/cmocka/source-state-getter-link-stubs.c", "test/cmocka/source-update-properties-link-support.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "includes": [ "libobs", @@ -16643,7 +16707,8 @@ "test/cmocka/source-state-getter-link-stubs.c", "test/cmocka/source-update-properties-link-support.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "includes": [ "libobs", @@ -16731,7 +16796,8 @@ "test/cmocka/weak-encoder-identity-link-stub.c", "test/cmocka/weak-object-identity-link-stub.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -16854,7 +16920,8 @@ "test/cmocka/source-identity-getter-link-stubs.c", "test/cmocka/source-push-query-link-stubs.c", "test/cmocka/source-state-getter-link-stubs.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" ], "header_libraries": [ "OBS::source-init-context-rust-headers", @@ -16989,7 +17056,8 @@ "test/cmocka/weak-encoder-identity-link-stub.c", "test/cmocka/weak-object-identity-link-stub.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "includes": [ "libobs", @@ -17116,7 +17184,8 @@ "test/cmocka/weak-encoder-identity-link-stub.c", "test/cmocka/weak-object-identity-link-stub.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "includes": [ "libobs", @@ -17280,7 +17349,8 @@ "test/cmocka/weak-encoder-identity-link-stub.c", "test/cmocka/weak-object-identity-link-stub.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -17395,7 +17465,8 @@ "test/cmocka/weak-encoder-identity-link-stub.c", "test/cmocka/weak-object-identity-link-stub.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "includes": [ "libobs", @@ -17493,7 +17564,8 @@ "test/cmocka/weak-encoder-identity-link-stub.c", "test/cmocka/weak-object-identity-link-stub.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -17871,7 +17943,8 @@ "test/cmocka/weak-encoder-identity-link-stub.c", "test/cmocka/weak-object-identity-link-stub.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "includes": [ "libobs", @@ -17948,7 +18021,8 @@ "test/cmocka/weak-encoder-identity-link-stub.c", "test/cmocka/weak-object-identity-link-stub.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -18089,7 +18163,8 @@ "libobs/graphics/graphics-linear-srgb-fields.c.h", "libobs/obs-graphics-effect-file-fields.c.h", "test/cmocka/source-update-properties-link-support.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -18666,7 +18741,8 @@ "test/cmocka/source-state-getter-link-stubs.c", "test/cmocka/source-update-properties-link-support.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "includes": [ "libobs", @@ -18770,7 +18846,8 @@ "test/cmocka/weak-encoder-identity-link-stub.c", "test/cmocka/weak-object-identity-link-stub.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "includes": [ "libobs", @@ -18888,7 +18965,8 @@ "test/cmocka/weak-encoder-identity-link-stub.c", "test/cmocka/weak-object-identity-link-stub.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "requires": "HAVE_LIBOBS_RUST_STATIC", "includes": [ @@ -18964,7 +19042,8 @@ "test/cmocka/source-state-getter-link-stubs.c", "test/cmocka/source-update-properties-link-support.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "includes": [ "libobs", @@ -19103,7 +19182,8 @@ "test/cmocka/weak-encoder-identity-link-stub.c", "test/cmocka/weak-object-identity-link-stub.c", "libobs/build/libobs.image-decode-adapter+.h.c", - "test/cmocka/source-icon-type-link-support.c" + "test/cmocka/source-icon-type-link-support.c", + "test/cmocka/output-starting-queries-link-support.c" ], "includes": [ "libobs", @@ -20047,7 +20127,8 @@ "test/cmocka/test_video_info_query.c", "test/cmocka/video-info-query-link-support.c", "libobs/util/base-variadic.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" ], "libraries": [ "libobs_rust-static", @@ -20397,7 +20478,8 @@ "test_video_stop_requested_rust": { "sources": [ "test/cmocka/test_video_stop_requested.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" ], "compile_options": [ { @@ -21242,7 +21324,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": [ ".", @@ -21307,7 +21390,8 @@ "test/cmocka/module-name-lookup-link-stubs.c", "test/cmocka/object-validity-query-link-stubs.c", "test/cmocka/source-update-properties-link-support.c", - "libobs/build/libobs.image-decode-adapter+.h.c" + "libobs/build/libobs.image-decode-adapter+.h.c", + "test/cmocka/output-starting-queries-link-support.c" ], "watch_inputs": [ "Cargo.toml" @@ -25536,6 +25620,13 @@ "${target}" ] }, + "test_output_starting_queries_rust": { + "target": "test_output_starting_queries_rust", + "command": [ + "${target}" + ], + "requires": "HAVE_LIBOBS_RUST_STATIC" + }, "test_output_stop_stats_steps": { "target": "test_output_stop_stats_steps", "command": [ diff --git a/test/cmocka/output-starting-queries-link-support.c b/test/cmocka/output-starting-queries-link-support.c new file mode 100644 index 0000000000..4465720054 --- /dev/null +++ b/test/cmocka/output-starting-queries-link-support.c @@ -0,0 +1,2 @@ +/* Real C atomic adapters for standalone Rust-static consumers. */ +#include "libobs/obs-output-starting-queries-fields.c.h" diff --git a/test/cmocka/output-starting-queries-recording-adapter.c b/test/cmocka/output-starting-queries-recording-adapter.c new file mode 100644 index 0000000000..30c868f8bd --- /dev/null +++ b/test/cmocka/output-starting-queries-recording-adapter.c @@ -0,0 +1,7 @@ +/* Only the recording fixture substitutes the atomic operation. */ +#include "libobs/build/libobs.pch.h" +bool output_starting_recording_load_bool(const volatile bool *flag); +#undef os_atomic_load_bool +#define os_atomic_load_bool output_starting_recording_load_bool +#include "libobs/obs-output-starting-queries-fields.c.h" +#undef os_atomic_load_bool diff --git a/test/cmocka/tests.d/output_starting_queries_link_support.cmake b/test/cmocka/tests.d/output_starting_queries_link_support.cmake new file mode 100644 index 0000000000..34446a00e0 --- /dev/null +++ b/test/cmocka/tests.d/output_starting_queries_link_support.cmake @@ -0,0 +1,21 @@ +# A Rust archive member can pull this query into unrelated source-step tests. +# Link the real adapter there as well as in production libobs. +function(_output_starting_queries_link_support) + get_directory_property(_targets BUILDSYSTEM_TARGETS) + foreach(_target IN LISTS _targets) + get_target_property(_links ${_target} LINK_LIBRARIES) + if("libobs_rust-static" IN_LIST _links AND NOT _target STREQUAL "test_output_starting_queries_rust") + get_target_property(_sources ${_target} SOURCES) + set(_adapter "${CMAKE_CURRENT_SOURCE_DIR}/output-starting-queries-link-support.c") + if(NOT _adapter IN_LIST _sources) + target_sources(${_target} PRIVATE "${_adapter}") + target_include_directories(${_target} PRIVATE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/libobs") + target_link_libraries( + ${_target} + PRIVATE OBS::caption Uthash::Uthash $<$:OBS::w32-pthreads> + ) + endif() + endif() + endforeach() +endfunction() +cmake_language(DEFER CALL _output_starting_queries_link_support) diff --git a/test/cmocka/tests.d/test_output_starting_queries_rust.cmake b/test/cmocka/tests.d/test_output_starting_queries_rust.cmake new file mode 100644 index 0000000000..d85a840326 --- /dev/null +++ b/test/cmocka/tests.d/test_output_starting_queries_rust.cmake @@ -0,0 +1 @@ +# Registered in the canonical native test graph (test/cmocka/build/test-graph.json).