If audio suddenly gets fed into one side of a channel after a lapse of frames flush...

(closes issue #12296)
Reported by: jvandal

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

diff --git a/include/asterisk/slinfactory.h b/include/asterisk/slinfactory.h
index a65558bbb6c11bc9aa020129cfaab1a90f4c092c..939384efd13f75bd0ce71075fc201fd80b51bb3d 100644 (file)
--- a/include/asterisk/slinfactory.h
+++ b/include/asterisk/slinfactory.h
@@ -48,6 +48,7 @@ void ast_slinfactory_destroy(struct ast_slinfactory *sf);
 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)
 }

diff --git a/main/audiohook.c b/main/audiohook.c
index 8fd1501c9bcc75c1cbc953a09060ecca4960d486..c6f1abec8aee275594fe3997a970b942e16d9d1e 100644 (file)
--- a/main/audiohook.c
+++ b/main/audiohook.c
@@ -128,14 +128,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);

diff --git a/main/slinfactory.c b/main/slinfactory.c
index 0022c62deff71bd2d1a07cf79bfe0d6cc1c4be24..bd5b8de4f19d55cd8c0bddf6af2013885b011ff2 100644 (file)
--- a/main/slinfactory.c
+++ b/main/slinfactory.c
@@ -157,3 +157,21 @@ unsigned int ast_slinfactory_available(const struct ast_slinfactory *sf)
 {
        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;
+}