Merged revisions 113296 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Tue, 8 Apr 2008 15:05:35 +0000 (15:05 +0000)
committerJoshua Colp <jcolp@digium.com>
Tue, 8 Apr 2008 15:05:35 +0000 (15:05 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r113296 | file | 2008-04-08 12:03:43 -0300 (Tue, 08 Apr 2008) | 4 lines

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

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@113297 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/audiohook.c

index 61834aa..1f5bcff 100644 (file)
@@ -121,14 +121,23 @@ int ast_audiohook_destroy(struct ast_audiohook *audiohook)
 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)) {
                ast_cond_signal(&audiohook->trigger);