[asterisk-commits] dvossel: branch dvossel/hd_confbridge r314547 - in /team/dvossel/hd_confbridg...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Wed Apr 20 16:29:33 2011
New Revision: 314547

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=314547
Log:
Addition of the 'jitterbuffer' confbridge.conf user profile option

Modified:
    team/dvossel/hd_confbridge/apps/app_confbridge.c
    team/dvossel/hd_confbridge/apps/confbridge/conf_config_parser.c
    team/dvossel/hd_confbridge/apps/confbridge/include/confbridge.h
    team/dvossel/hd_confbridge/configs/confbridge.conf.sample

Modified: team/dvossel/hd_confbridge/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/hd_confbridge/apps/app_confbridge.c?view=diff&rev=314547&r1=314546&r2=314547
==============================================================================
--- team/dvossel/hd_confbridge/apps/app_confbridge.c (original)
+++ team/dvossel/hd_confbridge/apps/app_confbridge.c Wed Apr 20 16:29:33 2011
@@ -1269,6 +1269,14 @@
 		conference_bridge_user.tech_args.drop_silence = 1;
 	}
 
+	if (ast_test_flag(&conference_bridge_user.u_profile, USER_OPT_JITTERBUFFER)) {
+		char *func_jb;
+		if ((func_jb = ast_module_helper("", "func_jitterbuffer", 0, 0, 0, 0))) {
+			ast_free(func_jb);
+			ast_func_write(chan, "JITTERBUFFER(adaptive)", "default");
+		}
+	}
+
 	if (ast_test_flag(&conference_bridge_user.u_profile, USER_OPT_DENOISE)) {
 		char *mod_speex;
 		/* Reduce background noise from each participant */

Modified: team/dvossel/hd_confbridge/apps/confbridge/conf_config_parser.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/hd_confbridge/apps/confbridge/conf_config_parser.c?view=diff&rev=314547&r1=314546&r2=314547
==============================================================================
--- team/dvossel/hd_confbridge/apps/confbridge/conf_config_parser.c (original)
+++ team/dvossel/hd_confbridge/apps/confbridge/conf_config_parser.c Wed Apr 20 16:29:33 2011
@@ -203,6 +203,8 @@
 		if (!(conf_find_user_profile(NULL, value, u_profile))) {
 			return -1;
 		}
+	} else if (!strcasecmp(name, "jitterbuffer")) {
+		ast_set2_flag(u_profile, ast_true(value), USER_OPT_JITTERBUFFER);
 	} else {
 		return -1;
 	}
@@ -798,6 +800,9 @@
 		u_profile.talking_threshold);
 	ast_cli(a->fd,"Denoise:                 %s\n",
 		u_profile.flags & USER_OPT_DENOISE ?
+		"enabled" : "disabled");
+	ast_cli(a->fd,"Jitterbuffer:            %s\n",
+		u_profile.flags & USER_OPT_JITTERBUFFER ?
 		"enabled" : "disabled");
 	ast_cli(a->fd,"Talk Detect Events:      %s\n",
 		u_profile.flags & USER_OPT_TALKER_DETECT ?

Modified: team/dvossel/hd_confbridge/apps/confbridge/include/confbridge.h
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/hd_confbridge/apps/confbridge/include/confbridge.h?view=diff&rev=314547&r1=314546&r2=314547
==============================================================================
--- team/dvossel/hd_confbridge/apps/confbridge/include/confbridge.h (original)
+++ team/dvossel/hd_confbridge/apps/confbridge/include/confbridge.h Wed Apr 20 16:29:33 2011
@@ -56,6 +56,7 @@
 	USER_OPT_DROP_SILENCE =  (1 << 12), /*!< Sets if silence should be dropped from the mix or not. */
 	USER_OPT_DTMF_PASS    =  (1 << 13), /*!< Sets if dtmf should be passed into the conference or not */
 	USER_OPT_ANNOUNCEUSERCOUNTALL = (1 << 14), /*!< Sets if the number of users should be announced to everyone. */
+	USER_OPT_JITTERBUFFER =  (1 << 15), /*!< Places a jitterbuffer on the user. */
 };
 
 enum bridge_profile_flags {

Modified: team/dvossel/hd_confbridge/configs/confbridge.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/hd_confbridge/configs/confbridge.conf.sample?view=diff&rev=314547&r1=314546&r2=314547
==============================================================================
--- team/dvossel/hd_confbridge/configs/confbridge.conf.sample (original)
+++ team/dvossel/hd_confbridge/configs/confbridge.conf.sample Wed Apr 20 16:29:33 2011
@@ -110,6 +110,14 @@
              ; noise for a user as it attempts to remove the noise while preserving
              ; the speech.  This option does NOT remove silence from being mixed into
              ; the conference and does come at the cost of a slight performance hit.
+
+;jitterbuffer=yes  ; Enabling this option places a jitterbuffer on the user's audio stream
+                   ; before audio mixing is performed.  This is highly recommended but will
+                   ; add a slight delay to the audio.  This option is using the JITTERBUFFER
+                   ; dialplan function's default adaptive jitterbuffer.  For a more fine tuned
+                   ; jitterbuffer, disable this option and use the JITTERBUFFER dialplan function
+                   ; on the user before entering the ConfBridge application.
+
 ;pin=1234  ; Sets if this user must enter a PIN number before entering
            ; the conference.  The PIN will be prompted for.
 ;announce_join_leave=yes ; When enabled, this option will prompt the user for a