Merge branch 'dev'

Author: dimtpap

CMakeLists.txt

@@ -1,4 +1,4 @@
-project(scale-to-sound VERSION 1.0.0)
+project(scale-to-sound VERSION 1.1.0)
 
 set(scale-to-sound_SOURCES
   src/main.c)

src/main.c

@@ -22,6 +22,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #define STS_AUDSRC "STS_AUDSRC"
 #define STS_MINLVL "STS_MIN_LVL"
+#define STS_MAXLVL "STS_MAXLVL"
 #define STS_MINPER "STS_MINPER"
 #define STS_MAXPER "STS_MAXPER"
 #define STS_INVSCL "STS_INVSCL"
@@ -40,7 +41,10 @@ struct scale_to_sound_data {
 	obs_source_t *target;
 
 	obs_property_t *sources_list;
+	obs_source_t *audio_source;
 	double minimum_audio_level;
+	double maximum_audio_level;
+	double audio_range;
 	bool invert;
 	long long min;
 	long long max;
@@ -59,7 +63,6 @@ struct scale_to_sound_data {
 	double audio_level;
 
 	gs_effect_t *mover;
-	obs_source_t *audio_source;
 };
 
 static void calculate_audio_level(void *param, obs_source_t *source, const struct audio_data *data, bool muted)
@@ -90,13 +93,10 @@ static void calculate_audio_level(void *param, obs_source_t *source, const struc
 		sum += sample * sample;
 	}
 
-
 	double audio_level = (double)obs_mul_to_db(sqrtf(sum / nr_samples));
 
-	if(smooth) {
-		smooth = 1 - smooth;
-
-	  if(stsf->audio_level < min_audio_level) stsf->audio_level = min_audio_level;
+	if(smooth < 1) {
+		if(stsf->audio_level < min_audio_level) stsf->audio_level = min_audio_level;
 
 		if(stsf->audio_level > audio_level) stsf->audio_level -= smooth;
 		else if(stsf->audio_level < audio_level) stsf->audio_level += smooth;
@@ -147,7 +147,7 @@ static void filter_update(void *data, obs_data_t *settings)
 
 	stsf->invert = obs_data_get_bool(settings, STS_INVSCL);
 
-	stsf->smooth = obs_data_get_double(settings, STS_SMOOTH);
+	stsf->smooth = 1 - obs_data_get_double(settings, STS_SMOOTH);
 
 	stsf->scale_w = obs_data_get_bool(settings, STS_SCALEW);
 	stsf->scale_h = obs_data_get_bool(settings, STS_SCALEH);
@@ -158,6 +158,21 @@ static void filter_update(void *data, obs_data_t *settings)
 	stsf->max_h = h * max / 100;
 
 	stsf->minimum_audio_level = obs_data_get_double(settings, STS_MINLVL);
+	double maximum_audio_level = obs_data_get_double(settings, STS_MAXLVL);
+	if (maximum_audio_level > stsf->minimum_audio_level) {
+		stsf->maximum_audio_level = maximum_audio_level;
+
+		double range = fabs(stsf->maximum_audio_level - stsf->minimum_audio_level);
+		if(range == 0) {
+			stsf->audio_range = 0.5f;
+		}
+		else stsf->audio_range = range;
+	}
+	else {
+		obs_data_set_double(settings, STS_MAXLVL, stsf->minimum_audio_level + 0.5f);
+		stsf->maximum_audio_level = stsf->minimum_audio_level + 0.5f;
+		stsf->audio_range = 0.5f;
+	}
 
 	obs_source_t *audio_source = obs_get_source_by_name(obs_data_get_string(settings, STS_AUDSRC));
 
@@ -204,6 +219,9 @@ static obs_properties_t *filter_properties(void *data)
 	obs_property_t *minlvl = obs_properties_add_float_slider(p, STS_MINLVL, "Audio Threshold", -100, -0.5, 0.5);
 	obs_property_float_set_suffix(minlvl, "dB");
 
+	obs_property_t *maxlvl = obs_properties_add_float_slider(p, STS_MAXLVL, "Audio Ceiling", -99.5, 0, 0.5);
+	obs_property_float_set_suffix(maxlvl, "dB");
+
 	obs_property_t *minper = obs_properties_add_int_slider(p, STS_MINPER, "Minimum Size", 0, 99, 1);
 	obs_property_int_set_suffix(minper, "%");
 
@@ -223,6 +241,7 @@ static obs_properties_t *filter_properties(void *data)
 static void filter_defaults(obs_data_t *settings)
 {
 	obs_data_set_default_double(settings, STS_MINLVL, -40);
+	obs_data_set_default_double(settings, STS_MAXLVL, 0);
 
 	obs_data_set_default_int(settings, STS_MINPER, 90);
 	obs_data_set_default_int(settings, STS_MAXPER, 100);
@@ -252,10 +271,10 @@ static void filter_destroy(void *data)
 static void target_update(void *data, float seconds)
 {
 	UNUSED_PARAMETER(seconds);
-	
-	//!This should really be done using a signal but I could not get those working so here we are...
+
 	struct scale_to_sound_data *stsf = data;
 
+	//!This should really be done using a signal but I could not get those working so here we are...
 	obs_source_t *target = stsf->target;
 
 	uint32_t w = stsf->src_w;
@@ -284,13 +303,17 @@ static void filter_render(void *data, gs_effect_t *effect)
 	uint32_t max_scale_percent = stsf->max;
 
 	double min_audio_level = stsf->minimum_audio_level;
+	double max_audio_level = stsf->maximum_audio_level;
+
+	double range = stsf->audio_range;
+
 	double audio_level = stsf->audio_level;
 
 	if(min_audio_level >= 0) min_audio_level = -0.5f;
 	double scale_percent = fabs(min_audio_level) - fabs(audio_level);
 
 	//Scale the calculated from audio precentage down to the user-set range
-	scale_percent = (scale_percent * (max_scale_percent - min_scale_percent)) / fabs(min_audio_level) + min_scale_percent;
+	scale_percent = (scale_percent * (max_scale_percent - min_scale_percent)) / range + min_scale_percent;
 	if(scale_percent < min_scale_percent || audio_level >= 0) scale_percent = min_scale_percent;
 
 	if(stsf->invert) scale_percent = min_scale_percent + max_scale_percent - scale_percent;