From 2a721d92b38694bf15392f2f778b7366da56dde6 Mon Sep 17 00:00:00 2001 From: PatTheMav Date: Tue, 20 Sep 2022 16:53:15 +0200 Subject: [PATCH] coreaudio-encoder: Allow fetching source properties without source Per OBS API documentation, `get_properties` can be used to get the properties of a source, but also of a source type. The latter would pass a NULL pointer for a given source. This adds the necessary change to avoid crashing OBS by passing such a null pointer. --- plugins/coreaudio-encoder/encoder.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/plugins/coreaudio-encoder/encoder.cpp b/plugins/coreaudio-encoder/encoder.cpp index 5eed713f1..8c3d22637 100644 --- a/plugins/coreaudio-encoder/encoder.cpp +++ b/plugins/coreaudio-encoder/encoder.cpp @@ -1361,24 +1361,28 @@ static bool samplerate_updated(obs_properties_t *props, obs_property_t *prop, static obs_properties_t *aac_properties(void *data) { - ca_encoder *ca = static_cast(data); obs_properties_t *props = obs_properties_create(); - obs_property_t *p = obs_properties_add_list( + obs_property_t *sample_rates = obs_properties_add_list( props, "samplerate", obs_module_text("OutputSamplerate"), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT); - add_samplerates(p, ca); - obs_property_set_modified_callback(p, samplerate_updated); - p = obs_properties_add_list(props, "bitrate", - obs_module_text("Bitrate"), - OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT); - add_bitrates(p, ca); + obs_property_set_modified_callback(sample_rates, samplerate_updated); + + obs_property_t *bit_rates = obs_properties_add_list( + props, "bitrate", obs_module_text("Bitrate"), + OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT); obs_properties_add_bool(props, "allow he-aac", obs_module_text("AllowHEAAC")); + if (data) { + ca_encoder *ca = static_cast(data); + add_samplerates(sample_rates, ca); + add_bitrates(bit_rates, ca); + } + return props; }