Simplified the slot selection logic

Simplified the slot selection logic, by incrementing the mix index *after* index selection! Also added some checks on the slots and slot passed - they will default to mix_num_inputs if a higher value is passed.
sipwise · Sep 6, 2024 · b1a7eeb · b1a7eeb
1 parent 1be5b3c
commit b1a7eeb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/recording-daemon/mix.c b/recording-daemon/mix.c
@@ -78,7 +78,12 @@ void mix_destroy(mix_t *mix) {
 void mix_set_channel_slots(mix_t *mix, unsigned int channel_slots) {
 	if(!mix)
 		return;
-	mix->channel_slots = channel_slots < 1 ? 1 : channel_slots;
+
+	if(channel_slots > mix_num_inputs) {
+		ilog(LOG_ERR, "channel_slots specified %u is higher than the maximum available %u", channel_slots, mix_num_inputs);
+	}
+	//ensures that mix->channel_slots will always be within the range of 1 to mix_max_inputs
+	mix->channel_slots = channel_slots < 1 ? 1 : (channel_slots > mix_num_inputs ? mix_num_inputs : channel_slots);
 	ilog(LOG_DEBUG, "setting slots %i", mix->channel_slots);
 }
 
@@ -92,25 +97,18 @@ static void mix_input_reset(mix_t *mix, unsigned int idx) {
 
 unsigned int mix_get_index(mix_t *mix, void *ptr, unsigned int stream_channel_slot) {
 
-	ilog(LOG_DEBUG, "next index is set to %u for slot %u. channel slots for this mix are %u", mix->next_idx[stream_channel_slot], stream_channel_slot, mix->channel_slots);
-
-	if(mix->next_idx[stream_channel_slot] == mix_num_inputs+1) {
-		mix->next_idx[stream_channel_slot] = stream_channel_slot;
-		ilog(LOG_DEBUG, "first time use of slot %u - mix input index chosen is %u", stream_channel_slot, mix->next_idx[stream_channel_slot]);
-	} else {
-		mix->next_idx[stream_channel_slot] += mix->channel_slots;
-		ilog(LOG_DEBUG, "subsequent use of slot %u - mix input index chosen is %u", stream_channel_slot, mix->next_idx[stream_channel_slot]);
-	}
-
+	ilog(LOG_DEBUG, "getting mix input index for slot %u. channel slots for this mix are %u", stream_channel_slot, mix->channel_slots);
 	unsigned int next = mix->next_idx[stream_channel_slot];
+	mix->next_idx[stream_channel_slot] += mix->channel_slots;
+	ilog(LOG_DEBUG, "mix input index chosen is #%u", next);
 
 	if (next < mix_num_inputs) {
 		// must be unused
 		mix->input_ref[next] = ptr;
 		return next;
 	}
 
-	ilog(LOG_DEBUG, "mix input index %u too high, cycling to find one to re-use", next);
+	ilog(LOG_DEBUG, "mix input index #%u too high, cycling to find one to re-use", next);
 
 	// too many inputs - find one to re-use
 	struct timeval earliest = {0,};
@@ -250,7 +248,8 @@ mix_t *mix_new(void) {
 	for (unsigned int i = 0; i < mix_num_inputs; i++) {
 		// initialise with the first mixer channel to use for each slot. This is set to mix_num_inputs+1
 		// so that we can detect first use and also if the maximum use has been reached.
-		mix->next_idx[i] = mix_num_inputs+1;
+		//mix->next_idx[i] = mix_num_inputs+1;
+		mix->next_idx[i] = i;
 	}
 
 	return mix;

diff --git a/recording-daemon/stream.c b/recording-daemon/stream.c
@@ -141,7 +141,11 @@ void stream_open(metafile_t *mf, unsigned long id, char *name) {
 void stream_details(metafile_t *mf, unsigned long id, unsigned int tag, unsigned int channel_slot) {
 	stream_t *stream = stream_get(mf, id);
 	stream->tag = tag;
-	stream->channel_slot = channel_slot;
+
+	if(channel_slot > mix_num_inputs) {
+		ilog(LOG_ERR, "Channel slot %u is greater than the maximum number of inputs %u, setting to %u", channel_slot, mix_num_inputs, mix_num_inputs);
+	}
+	stream->channel_slot = channel_slot > mix_num_inputs ? mix_num_inputs : channel_slot;
 }
 
 void stream_forwarding_on(metafile_t *mf, unsigned long id, unsigned int on) {