[asterisk-commits] mmichelson: branch mmichelson/issue11259 r135744 - /team/mmichelson/issue1125...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Aug  5 15:53:26 2008
New Revision: 135744

URL: http://svn.digium.com/view/asterisk?view=rev&rev=135744
Log:
Filled in the fixed_jb empty and reset method, but
left the actual reset method as a stub for now.

Next step will be to write the handler for the source
update in ast_generic_bridge


Modified:
    team/mmichelson/issue11259/main/abstract_jb.c
    team/mmichelson/issue11259/main/fixedjitterbuf.c
    team/mmichelson/issue11259/main/fixedjitterbuf.h

Modified: team/mmichelson/issue11259/main/abstract_jb.c
URL: http://svn.digium.com/view/asterisk/team/mmichelson/issue11259/main/abstract_jb.c?view=diff&rev=135744&r1=135743&r2=135744
==============================================================================
--- team/mmichelson/issue11259/main/abstract_jb.c (original)
+++ team/mmichelson/issue11259/main/abstract_jb.c Tue Aug  5 15:53:26 2008
@@ -719,7 +719,14 @@
 
 static void jb_empty_and_reset_fixed(void *jb)
 {
-	/* XXX Todo: Actually do this... */
+	struct fixed_jb *fixedjb = jb;
+	struct fixed_jb_frame *f = NULL;
+
+	while (fixed_jb_remove(fixedjb, f) == FIXED_JB_OK) {
+		ast_frfree(f->data);
+	}
+
+	fixed_jb_reset(fixedjb);
 }
 
 /* adaptive */

Modified: team/mmichelson/issue11259/main/fixedjitterbuf.c
URL: http://svn.digium.com/view/asterisk/team/mmichelson/issue11259/main/fixedjitterbuf.c?view=diff&rev=135744&r1=135743&r2=135744
==============================================================================
--- team/mmichelson/issue11259/main/fixedjitterbuf.c (original)
+++ team/mmichelson/issue11259/main/fixedjitterbuf.c Tue Aug  5 15:53:26 2008
@@ -349,3 +349,7 @@
 	
 	return FIXED_JB_OK;
 }
+
+void fixed_jb_reset(struct fixed_jb *jb)
+{
+}

Modified: team/mmichelson/issue11259/main/fixedjitterbuf.h
URL: http://svn.digium.com/view/asterisk/team/mmichelson/issue11259/main/fixedjitterbuf.h?view=diff&rev=135744&r1=135743&r2=135744
==============================================================================
--- team/mmichelson/issue11259/main/fixedjitterbuf.h (original)
+++ team/mmichelson/issue11259/main/fixedjitterbuf.h Tue Aug  5 15:53:26 2008
@@ -85,6 +85,7 @@
 
 void fixed_jb_set_force_resynch(struct fixed_jb *jb);
 
+void fixed_jb_reset(struct fixed_jb *jb);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }