From 66d02411182bec7871a6cb53e4476042f31f72c0 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 29 Jan 2014 15:50:17 -0500 Subject: [PATCH] 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(-) 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++) {