From 10d577146ae096b89065829f7ea9c5bbbc70a31a Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 27 Jan 2014 13:53:15 -0500 Subject: replace standards-wobbling variable-length-arrays with alloca() --- libs/panners/vbap/vbap_speakers.cc | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'libs/panners') diff --git a/libs/panners/vbap/vbap_speakers.cc b/libs/panners/vbap/vbap_speakers.cc index 313fe7a5cd..6b50e34d5a 100644 --- a/libs/panners/vbap/vbap_speakers.cc +++ b/libs/panners/vbap/vbap_speakers.cc @@ -34,6 +34,7 @@ #include #include #include +#include #include "pbd/cartesian.h" @@ -115,10 +116,14 @@ VBAPSpeakers::choose_speaker_triplets(struct ls_triplet_chain **ls_triplets) int i,j,k,l,table_size; int n_speakers = _speakers.size (); - int connections[n_speakers][n_speakers]; - float distance_table[((n_speakers * (n_speakers - 1)) / 2)]; - int distance_table_i[((n_speakers * (n_speakers - 1)) / 2)]; - int distance_table_j[((n_speakers * (n_speakers - 1)) / 2)]; + /* variable length arrays arrived in C99, became optional in C11, and + are only planned for C++14. Use alloca which is functionally + identical (but uglier to read). + */ + int** connections = (int**) alloca (sizeof (int) * n_speakers * n_speakers); + float* distance_table = (float *) alloca (sizeof (float) * ((n_speakers * (n_speakers - 1)) / 2)); + int* distance_table_i = (int *) alloca (sizeof (int) * ((n_speakers * (n_speakers - 1)) / 2)); + int* distance_table_j = (int *) alloca (sizeof (int) * ((n_speakers * (n_speakers - 1)) / 2)); float distance; struct ls_triplet_chain *trip_ptr, *prev, *tmp_ptr; @@ -527,9 +532,13 @@ VBAPSpeakers::choose_speaker_pairs (){ */ const int n_speakers = _speakers.size(); const double AZIMUTH_DELTA_THRESHOLD_DEGREES = (180.0/M_PI) * (M_PI - 0.175); - int sorted_speakers[n_speakers]; - bool exists[n_speakers]; - double inverse_matrix[n_speakers][4]; + /* variable length arrays arrived in C99, became optional in C11, and + are only planned for C++14. Use alloca which is functionally + identical (but uglier to read). + */ + int* sorted_speakers = (int*) alloca (sizeof (int) * n_speakers); + bool* exists = (bool*) alloca (sizeof(bool) * n_speakers); + double** inverse_matrix = (double**) alloca (sizeof (double) * n_speakers * 4); int expected_pairs = 0; int pair; int speaker; -- cgit v1.2.3 From a754a7cc0df1d8ab2e38d3bf51cbd1ad55c59369 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 27 Jan 2014 20:37:17 -0500 Subject: fix up the abomination caused by moving from variable length (multidimensional) arrays to alloca'ed arrays, specifically access to arr[a][b]. This needs checking by an actual VBAP+multispeaker user. --- libs/panners/vbap/vbap_speakers.cc | 60 +++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'libs/panners') diff --git a/libs/panners/vbap/vbap_speakers.cc b/libs/panners/vbap/vbap_speakers.cc index 6b50e34d5a..af690af32c 100644 --- a/libs/panners/vbap/vbap_speakers.cc +++ b/libs/panners/vbap/vbap_speakers.cc @@ -120,7 +120,7 @@ VBAPSpeakers::choose_speaker_triplets(struct ls_triplet_chain **ls_triplets) are only planned for C++14. Use alloca which is functionally identical (but uglier to read). */ - int** connections = (int**) alloca (sizeof (int) * n_speakers * n_speakers); + int* connections = (int*) alloca (sizeof (int) * n_speakers * n_speakers); float* distance_table = (float *) alloca (sizeof (float) * ((n_speakers * (n_speakers - 1)) / 2)); int* distance_table_i = (int *) alloca (sizeof (int) * ((n_speakers * (n_speakers - 1)) / 2)); int* distance_table_j = (int *) alloca (sizeof (int) * ((n_speakers * (n_speakers - 1)) / 2)); @@ -135,12 +135,12 @@ VBAPSpeakers::choose_speaker_triplets(struct ls_triplet_chain **ls_triplets) for (j = i+1; j < n_speakers; j++) { for(k = j+1; k < n_speakers; k++) { if (vol_p_side_lgth(i, j, k, _speakers) > MIN_VOL_P_SIDE_LGTH) { - connections[i][j]=1; - connections[j][i]=1; - connections[i][k]=1; - connections[k][i]=1; - connections[j][k]=1; - connections[k][j]=1; + connections[(i*n_speakers)+j]=1; + connections[(j*n_speakers)+i]=1; + connections[(i*n_speakers)+k]=1; + connections[(k*n_speakers)+i]=1; + connections[(j*n_speakers)+k]=1; + connections[(k*n_speakers)+j]=1; add_ldsp_triplet(i,j,k,ls_triplets); } } @@ -155,7 +155,7 @@ VBAPSpeakers::choose_speaker_triplets(struct ls_triplet_chain **ls_triplets) for (i = 0;i < n_speakers; i++) { for (j = i+1; j < n_speakers; j++) { - if (connections[i][j] == 1) { + if (connections[(i*n_speakers)+j] == 1) { distance = fabs(vec_angle(_speakers[i].coords(),_speakers[j].coords())); k=0; while(distance_table[k] < distance) { @@ -180,13 +180,13 @@ VBAPSpeakers::choose_speaker_triplets(struct ls_triplet_chain **ls_triplets) for (i = 0; i < table_size; i++) { int fst_ls = distance_table_i[i]; int sec_ls = distance_table_j[i]; - if (connections[fst_ls][sec_ls] == 1) { + if (connections[(fst_ls*n_speakers)+sec_ls] == 1) { for (j = 0; j < n_speakers; j++) { for (k = j+1; k < n_speakers; k++) { if ((j != fst_ls) && (k != sec_ls) && (k != fst_ls) && (j != sec_ls)) { if (lines_intersect(fst_ls, sec_ls, j, k) == 1){ - connections[j][k] = 0; - connections[k][j] = 0; + connections[(j*n_speakers)+k] = 0; + connections[(k*n_speakers)+j] = 0; } } } @@ -202,9 +202,9 @@ VBAPSpeakers::choose_speaker_triplets(struct ls_triplet_chain **ls_triplets) i = trip_ptr->ls_nos[0]; j = trip_ptr->ls_nos[1]; k = trip_ptr->ls_nos[2]; - if (connections[i][j] == 0 || - connections[i][k] == 0 || - connections[j][k] == 0 || + if (connections[(i*n_speakers)+j] == 0 || + connections[(i*n_speakers)+k] == 0 || + connections[(j*n_speakers)+k] == 0 || any_ls_inside_triplet(i,j,k) == 1 ){ if (prev != 0) { prev->next = trip_ptr->next; @@ -531,6 +531,11 @@ VBAPSpeakers::choose_speaker_pairs (){ matrices and stores the data to a global array */ const int n_speakers = _speakers.size(); + + if (n_speakers == 0) { + return; + } + const double AZIMUTH_DELTA_THRESHOLD_DEGREES = (180.0/M_PI) * (M_PI - 0.175); /* variable length arrays arrived in C99, became optional in C11, and are only planned for C++14. Use alloca which is functionally @@ -538,16 +543,11 @@ VBAPSpeakers::choose_speaker_pairs (){ */ int* sorted_speakers = (int*) alloca (sizeof (int) * n_speakers); bool* exists = (bool*) alloca (sizeof(bool) * n_speakers); - double** inverse_matrix = (double**) alloca (sizeof (double) * n_speakers * 4); + double* inverse_matrix = (double*) alloca (sizeof (double) * n_speakers * 4); int expected_pairs = 0; int pair; int speaker; - - if (n_speakers == 0) { - return; - } - for (speaker = 0; speaker < n_speakers; ++speaker) { exists[speaker] = false; } @@ -562,7 +562,7 @@ VBAPSpeakers::choose_speaker_pairs (){ _speakers[sorted_speakers[speaker]].angles().azi) <= AZIMUTH_DELTA_THRESHOLD_DEGREES) { if (calc_2D_inv_tmatrix( _speakers[sorted_speakers[speaker]].angles().azi, _speakers[sorted_speakers[speaker+1]].angles().azi, - inverse_matrix[speaker]) != 0){ + &inverse_matrix[4 * speaker]) != 0){ exists[speaker] = true; expected_pairs++; } @@ -573,7 +573,7 @@ VBAPSpeakers::choose_speaker_pairs (){ +_speakers[sorted_speakers[0]].angles().azi) <= AZIMUTH_DELTA_THRESHOLD_DEGREES) { if (calc_2D_inv_tmatrix(_speakers[sorted_speakers[n_speakers-1]].angles().azi, _speakers[sorted_speakers[0]].angles().azi, - inverse_matrix[n_speakers-1]) != 0) { + &inverse_matrix[(4*n_speakers)-1]) != 0) { exists[n_speakers-1] = true; expected_pairs++; } @@ -591,10 +591,10 @@ VBAPSpeakers::choose_speaker_pairs (){ for (speaker = 0; speaker < n_speakers - 1; speaker++) { if (exists[speaker]) { - _matrices[pair][0] = inverse_matrix[speaker][0]; - _matrices[pair][1] = inverse_matrix[speaker][1]; - _matrices[pair][2] = inverse_matrix[speaker][2]; - _matrices[pair][3] = inverse_matrix[speaker][3]; + _matrices[pair][0] = inverse_matrix[(speaker*n_speakers)+0]; + _matrices[pair][1] = inverse_matrix[(speaker*n_speakers)+1]; + _matrices[pair][2] = inverse_matrix[(speaker*n_speakers)+2]; + _matrices[pair][3] = inverse_matrix[(speaker*n_speakers)+3]; _speaker_tuples[pair][0] = sorted_speakers[speaker]; _speaker_tuples[pair][1] = sorted_speakers[speaker+1]; @@ -604,10 +604,10 @@ VBAPSpeakers::choose_speaker_pairs (){ } if (exists[n_speakers-1]) { - _matrices[pair][0] = inverse_matrix[speaker][0]; - _matrices[pair][1] = inverse_matrix[speaker][1]; - _matrices[pair][2] = inverse_matrix[speaker][2]; - _matrices[pair][3] = inverse_matrix[speaker][3]; + _matrices[pair][0] = inverse_matrix[(speaker*n_speakers)+0]; + _matrices[pair][1] = inverse_matrix[(speaker*n_speakers)+1]; + _matrices[pair][2] = inverse_matrix[(speaker*n_speakers)+2]; + _matrices[pair][3] = inverse_matrix[(speaker*n_speakers)+3]; _speaker_tuples[pair][0] = sorted_speakers[n_speakers-1]; _speaker_tuples[pair][1] = sorted_speakers[0]; -- cgit v1.2.3 From 2d8352123a656bb0478008876340352c158ceacf Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 29 Jan 2014 21:45:13 +0100 Subject: fix vbap-speaker calculations to work with alloca() --- libs/panners/vbap/vbap_speakers.cc | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'libs/panners') diff --git a/libs/panners/vbap/vbap_speakers.cc b/libs/panners/vbap/vbap_speakers.cc index af690af32c..79f5b230f7 100644 --- a/libs/panners/vbap/vbap_speakers.cc +++ b/libs/panners/vbap/vbap_speakers.cc @@ -127,6 +127,10 @@ VBAPSpeakers::choose_speaker_triplets(struct ls_triplet_chain **ls_triplets) float distance; struct ls_triplet_chain *trip_ptr, *prev, *tmp_ptr; + for (i = 0; i < n_speakers * n_speakers; i++) { + connections[i] = 0; + } + if (n_speakers == 0) { return; } @@ -573,7 +577,7 @@ VBAPSpeakers::choose_speaker_pairs (){ +_speakers[sorted_speakers[0]].angles().azi) <= AZIMUTH_DELTA_THRESHOLD_DEGREES) { if (calc_2D_inv_tmatrix(_speakers[sorted_speakers[n_speakers-1]].angles().azi, _speakers[sorted_speakers[0]].angles().azi, - &inverse_matrix[(4*n_speakers)-1]) != 0) { + &inverse_matrix[4*(n_speakers-1)]) != 0) { exists[n_speakers-1] = true; expected_pairs++; } @@ -591,10 +595,10 @@ VBAPSpeakers::choose_speaker_pairs (){ for (speaker = 0; speaker < n_speakers - 1; speaker++) { if (exists[speaker]) { - _matrices[pair][0] = inverse_matrix[(speaker*n_speakers)+0]; - _matrices[pair][1] = inverse_matrix[(speaker*n_speakers)+1]; - _matrices[pair][2] = inverse_matrix[(speaker*n_speakers)+2]; - _matrices[pair][3] = inverse_matrix[(speaker*n_speakers)+3]; + _matrices[pair][0] = inverse_matrix[(speaker*4)+0]; + _matrices[pair][1] = inverse_matrix[(speaker*4)+1]; + _matrices[pair][2] = inverse_matrix[(speaker*4)+2]; + _matrices[pair][3] = inverse_matrix[(speaker*4)+3]; _speaker_tuples[pair][0] = sorted_speakers[speaker]; _speaker_tuples[pair][1] = sorted_speakers[speaker+1]; @@ -604,10 +608,10 @@ VBAPSpeakers::choose_speaker_pairs (){ } if (exists[n_speakers-1]) { - _matrices[pair][0] = inverse_matrix[(speaker*n_speakers)+0]; - _matrices[pair][1] = inverse_matrix[(speaker*n_speakers)+1]; - _matrices[pair][2] = inverse_matrix[(speaker*n_speakers)+2]; - _matrices[pair][3] = inverse_matrix[(speaker*n_speakers)+3]; + _matrices[pair][0] = inverse_matrix[(speaker*4)+0]; + _matrices[pair][1] = inverse_matrix[(speaker*4)+1]; + _matrices[pair][2] = inverse_matrix[(speaker*4)+2]; + _matrices[pair][3] = inverse_matrix[(speaker*4)+3]; _speaker_tuples[pair][0] = sorted_speakers[n_speakers-1]; _speaker_tuples[pair][1] = sorted_speakers[0]; -- cgit v1.2.3 From 66d02411182bec7871a6cb53e4476042f31f72c0 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 29 Jan 2014 15:50:17 -0500 Subject: move check for n_speakers so that we avoid needless work --- libs/panners/vbap/vbap_speakers.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'libs/panners') diff --git a/libs/panners/vbap/vbap_speakers.cc b/libs/panners/vbap/vbap_speakers.cc index 79f5b230f7..1cf78797b7 100644 --- a/libs/panners/vbap/vbap_speakers.cc +++ b/libs/panners/vbap/vbap_speakers.cc @@ -116,6 +116,11 @@ VBAPSpeakers::choose_speaker_triplets(struct ls_triplet_chain **ls_triplets) int i,j,k,l,table_size; int n_speakers = _speakers.size (); + + if (n_speakers == 0) { + return; + } + /* variable length arrays arrived in C99, became optional in C11, and are only planned for C++14. Use alloca which is functionally identical (but uglier to read). @@ -131,10 +136,6 @@ VBAPSpeakers::choose_speaker_triplets(struct ls_triplet_chain **ls_triplets) connections[i] = 0; } - if (n_speakers == 0) { - return; - } - for (i = 0; i < n_speakers; i++) { for (j = i+1; j < n_speakers; j++) { for(k = j+1; k < n_speakers; k++) { -- cgit v1.2.3