[svn-commits] file: branch 1.4 r113296 - in /branches/1.4: include/asterisk/ main/

[SVN commits to the Digium repositories]

Author: file
Date: Tue Apr  8 10:03:43 2008
New Revision: 113296

URL: http://svn.digium.com/view/asterisk?view=rev&rev=113296
Log:
If audio suddenly gets fed into one side of a channel after a lapse of frames flush the other factory so that old audio does not remain in the factory causing the sync code to not execute.
(closes issue #12296)
Reported by: jvandal

Modified:
    branches/1.4/include/asterisk/slinfactory.h
    branches/1.4/main/audiohook.c
    branches/1.4/main/slinfactory.c

Modified: branches/1.4/include/asterisk/slinfactory.h
URL: http://svn.digium.com/view/asterisk/branches/1.4/include/asterisk/slinfactory.h?view=diff&rev=113296&r1=113295&r2=113296
==============================================================================
--- branches/1.4/include/asterisk/slinfactory.h (original)
+++ branches/1.4/include/asterisk/slinfactory.h Tue Apr  8 10:03:43 2008
@@ -48,6 +48,7 @@
 int ast_slinfactory_feed(struct ast_slinfactory *sf, struct ast_frame *f);
 int ast_slinfactory_read(struct ast_slinfactory *sf, short *buf, size_t samples);
 unsigned int ast_slinfactory_available(const struct ast_slinfactory *sf);
+void ast_slinfactory_flush(struct ast_slinfactory *sf);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }

Modified: branches/1.4/main/audiohook.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/audiohook.c?view=diff&rev=113296&r1=113295&r2=113296
==============================================================================
--- branches/1.4/main/audiohook.c (original)
+++ branches/1.4/main/audiohook.c Tue Apr  8 10:03:43 2008
@@ -128,13 +128,22 @@
 int ast_audiohook_write_frame(struct ast_audiohook *audiohook, enum ast_audiohook_direction direction, struct ast_frame *frame)
 {
 	struct ast_slinfactory *factory = (direction == AST_AUDIOHOOK_DIRECTION_READ ? &audiohook->read_factory : &audiohook->write_factory);
-	struct timeval *time = (direction == AST_AUDIOHOOK_DIRECTION_READ ? &audiohook->read_time : &audiohook->write_time);
+	struct ast_slinfactory *other_factory = (direction == AST_AUDIOHOOK_DIRECTION_READ ? &audiohook->write_factory : &audiohook->read_factory);
+	struct timeval *time = (direction == AST_AUDIOHOOK_DIRECTION_READ ? &audiohook->read_time : &audiohook->write_time), previous_time = *time;
+
+	/* Update last feeding time to be current */
+	*time = ast_tvnow();
+
+	/* If we are using a sync trigger and this factory suddenly got audio fed in after a lapse, then flush both factories to ensure they remain in sync */
+	if (ast_test_flag(audiohook, AST_AUDIOHOOK_TRIGGER_SYNC) && ast_slinfactory_available(other_factory) && (ast_tvdiff_ms(*time, previous_time) > (ast_slinfactory_available(other_factory) / 8))) {
+		if (option_debug)
+			ast_log(LOG_DEBUG, "Flushing audiohook %p so it remains in sync\n", audiohook);
+		ast_slinfactory_flush(factory);
+		ast_slinfactory_flush(other_factory);
+	}
 
 	/* Write frame out to respective factory */
 	ast_slinfactory_feed(factory, frame);
-
-	/* Update last fed time for the above factory */
-	*time = ast_tvnow();
 
 	/* If we need to notify the respective handler of this audiohook, do so */
 	if ((ast_test_flag(audiohook, AST_AUDIOHOOK_TRIGGER_MODE) == AST_AUDIOHOOK_TRIGGER_READ) && (direction == AST_AUDIOHOOK_DIRECTION_READ)) {

Modified: branches/1.4/main/slinfactory.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/slinfactory.c?view=diff&rev=113296&r1=113295&r2=113296
==============================================================================
--- branches/1.4/main/slinfactory.c (original)
+++ branches/1.4/main/slinfactory.c Tue Apr  8 10:03:43 2008
@@ -157,3 +157,21 @@
 {
 	return sf->size;
 }
+
+void ast_slinfactory_flush(struct ast_slinfactory *sf)
+{
+	struct ast_frame *fr = NULL;
+
+	if (sf->trans) {
+		ast_translator_free_path(sf->trans);
+		sf->trans = NULL;
+	}
+
+	while ((fr = AST_LIST_REMOVE_HEAD(&sf->queue, frame_list)))
+		ast_frfree(fr);
+
+	sf->size = sf->holdlen = 0;
+	sf->offset = sf->hold;
+
+	return;
+}