plugins/dac_data_manager.c: dynamically convert data for enabled channels.

Instead of assuming a connected device will only have a maximum of
8 DMA channels, add a mechanism to dynamically convert data for all
enabled channels.

Signed-off-by: AlexandraTrifan <[email protected]>

Author: AlexandraTrifan

Diff for: plugins/dac_data_manager.c

@@ -456,12 +456,19 @@ static int analyse_wavefile(struct dac_data_manager *manager,
 
 			*count = size * tx_channels * 2;
 
-			unsigned long long *sample = *((unsigned long long **) buf);
-			unsigned int *sample_32 = *((unsigned int **) buf);
 			unsigned short *sample_16 = *((unsigned short **) buf);
 
-			struct _complex_ref tx_data[4] = {{NULL, NULL}, {NULL, NULL}, {NULL, NULL}, {NULL, NULL}};
-			mat_complex_split_t *complex_data[4];
+
+			unsigned int tx_data_count = (tx_channels == 1) ? tx_channels : (tx_channels / 2);
+			struct _complex_ref *tx_data = malloc(tx_data_count * sizeof(struct _complex_ref));
+
+			unsigned int tx_i = 0;
+			for (tx_i = 0; tx_i < tx_data_count; tx_i++) {
+				tx_data[tx_i].re = NULL;
+				tx_data[tx_i].im = NULL;
+			}
+
+			mat_complex_split_t *complex_data[64];
 
 			if (complex_format) {
 				for (i = 0; i <= (unsigned int) rep; i++) {
@@ -479,40 +486,18 @@ static int analyse_wavefile(struct dac_data_manager *manager,
 			}
 			replicate_tx_data_channels(tx_data, tx_channels);
 
-			switch (tx_channels) {
-			case 1:
-				for (i = 0 ; i < size; i++) {
-					sample_16[i] = convert(scale, tx_data[0].re[i], offset);
-				}
-				break;
-			case 2:
-				for (i = 0 ; i < size; i++) {
-					sample_32[i] = ((unsigned int) convert(scale, tx_data[0].im[i], offset) << 16) |
-						       ((unsigned int) convert(scale, tx_data[0].re[i], offset) << 0);
-				}
-				break;
-			case 4:
-				for (i = 0 ; i < size; i++) {
-					sample[i] = ((unsigned long long) convert(scale, tx_data[1].im[i], offset) << 48) |
-						    ((unsigned long long) convert(scale, tx_data[1].re[i], offset) << 32) |
-							((unsigned long long) convert(scale, tx_data[0].im[i], offset) << 16) |
-							((unsigned long long) convert(scale, tx_data[0].re[i], offset) << 0);
-				 }
-				break;
-			case 8:
-				for (i = 0, j = 0; i < size; i++) {
-					sample[j++] = ((unsigned long long) convert(scale, tx_data[3].im[i], offset) << 48) |
-						    ((unsigned long long) convert(scale, tx_data[3].re[i], offset) << 32) |
-							((unsigned long long) convert(scale, tx_data[2].im[i], offset) << 16) |
-							((unsigned long long) convert(scale, tx_data[2].re[i], offset) << 0);
-					sample[j++] = ((unsigned long long) convert(scale, tx_data[1].im[i], offset) << 48) |
-						    ((unsigned long long) convert(scale, tx_data[1].re[i], offset) << 32) |
-							((unsigned long long) convert(scale, tx_data[0].im[i], offset) << 16) |
-							((unsigned long long) convert(scale, tx_data[0].re[i], offset) << 0);
+			int ch = 0;
+			for (i = 0 ; i < size; i++) {
+				for (ch = 0; ch < tx_channels; ch++) {
+					if (ch % 2 == 0) {
+						sample_16[i * tx_channels + ch] = ((unsigned int) convert(scale, tx_data[ch / 2].re[i], offset));
+					} else {
+						sample_16[i * tx_channels + ch] = ((unsigned int) convert(scale, tx_data[ch / 2].im[i], offset));
+					}
 				}
-				break;
 			}
 
+			free(tx_data);
 			for (j = 0; j <= (unsigned int) rep; j++) {
 				Mat_VarFree(matvars[j]);
 			}