[Asterisk-code-review] bridge softmix: Removed unused parameter from check binaural... (asterisk[15])

Jenkins2 asteriskteam at digium.com
Mon Jan 8 06:18:35 CST 2018


Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/7821 )

Change subject: bridge_softmix: Removed unused parameter from check_binaural_position_change(.).
......................................................................

bridge_softmix: Removed unused parameter from check_binaural_position_change(.).

Found as a result of the function being passed an uninitalized variable by
clang.

ASTERISK-27550

Change-Id: I8af3bd84656b685a956d498459f8db3613f68954
---
M bridges/bridge_softmix.c
M bridges/bridge_softmix/bridge_softmix_binaural.c
M bridges/bridge_softmix/include/bridge_softmix_internal.h
3 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Richard Mudgett: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved
  Jenkins2: Approved for Submit



diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c
index 83b1a83..3343569 100644
--- a/bridges/bridge_softmix.c
+++ b/bridges/bridge_softmix.c
@@ -1404,7 +1404,7 @@
 		}
 
 #ifdef BINAURAL_RENDERING
-		check_binaural_position_change(bridge, softmix_data, bridge_channel);
+		check_binaural_position_change(bridge, softmix_data);
 #endif
 
 		/* Go through pulling audio from each factory that has it available */
diff --git a/bridges/bridge_softmix/bridge_softmix_binaural.c b/bridges/bridge_softmix/bridge_softmix_binaural.c
index 128e464..2a8efd7 100644
--- a/bridges/bridge_softmix/bridge_softmix_binaural.c
+++ b/bridges/bridge_softmix/bridge_softmix_binaural.c
@@ -465,9 +465,10 @@
 }
 
 void check_binaural_position_change(struct ast_bridge *bridge,
-		struct softmix_bridge_data *softmix_data, struct ast_bridge_channel *bridge_channel)
+		struct softmix_bridge_data *softmix_data)
 {
 	unsigned int pos_change;
+	struct ast_bridge_channel *bridge_channel;
 
 	/*
 	 * We only check binaural things if binaural is activated by the config
diff --git a/bridges/bridge_softmix/include/bridge_softmix_internal.h b/bridges/bridge_softmix/include/bridge_softmix_internal.h
index 01e65aa..f842acb 100644
--- a/bridges/bridge_softmix/include/bridge_softmix_internal.h
+++ b/bridges/bridge_softmix/include/bridge_softmix_internal.h
@@ -377,10 +377,9 @@
  *
  * \param bridge The conference bridge.
  * \param softmix_data The data used by the softmix bridge.
- * \param bridge_channel The bridge channel.
  */
 void check_binaural_position_change(struct ast_bridge *bridge,
-		struct softmix_bridge_data *softmix_data, struct ast_bridge_channel *bridge_channel);
+		struct softmix_bridge_data *softmix_data);
 
 /*!
  * \brief Processes audio data with the binaural synthesis and adds the result to the mixing array.

-- 
To view, visit https://gerrit.asterisk.org/7821
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 15
Gerrit-MessageType: merged
Gerrit-Change-Id: I8af3bd84656b685a956d498459f8db3613f68954
Gerrit-Change-Number: 7821
Gerrit-PatchSet: 3
Gerrit-Owner: Alexander Traud <pabstraud at compuserve.com>
Gerrit-Reviewer: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180108/e6a30b8a/attachment-0001.html>


More information about the asterisk-code-review mailing list