diff options
-rw-r--r-- | apps/app_chanspy.c | 2 | ||||
-rw-r--r-- | include/asterisk/audiohook.h | 4 | ||||
-rw-r--r-- | main/audiohook.c | 12 |
3 files changed, 17 insertions, 1 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 18e4972a5..d95991f8a 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -215,6 +215,8 @@ static int start_spying(struct ast_channel *chan, const char *spychan_name, stru ast_log(LOG_NOTICE, "Attaching %s to %s\n", spychan_name, chan->name); + ast_set_flag(audiohook, AST_AUDIOHOOK_TRIGGER_SYNC | AST_AUDIOHOOK_SMALL_QUEUE); + res = ast_audiohook_attach(chan, audiohook); if (!res && ast_test_flag(chan, AST_FLAG_NBRIDGE) && (peer = ast_bridged_channel(chan))) { diff --git a/include/asterisk/audiohook.h b/include/asterisk/audiohook.h index 8839cbde4..5d4ec996c 100644 --- a/include/asterisk/audiohook.h +++ b/include/asterisk/audiohook.h @@ -54,6 +54,10 @@ enum ast_audiohook_flags { AST_AUDIOHOOK_TRIGGER_WRITE = (2 << 0), /*!< Audiohook wants to be triggered when writing audio out */ AST_AUDIOHOOK_WANTS_DTMF = (1 << 1), /*!< Audiohook also wants to receive DTMF frames */ AST_AUDIOHOOK_TRIGGER_SYNC = (1 << 2), /*!< Audiohook wants to be triggered when both sides have combined audio available */ + /*! Audiohooks with this flag set will not allow for a large amount of samples to build up on its + * slinfactories. We will flush the factories if they contain too many samples. + */ + AST_AUDIOHOOK_SMALL_QUEUE = (1 << 3), }; #define AST_AUDIOHOOK_SYNC_TOLERANCE 100 /*< Tolerance in milliseconds for audiohooks synchronization */ diff --git a/main/audiohook.c b/main/audiohook.c index d055a73f1..ec6f0f316 100644 --- a/main/audiohook.c +++ b/main/audiohook.c @@ -130,6 +130,7 @@ int ast_audiohook_write_frame(struct ast_audiohook *audiohook, enum ast_audiohoo struct ast_slinfactory *factory = (direction == AST_AUDIOHOOK_DIRECTION_READ ? &audiohook->read_factory : &audiohook->write_factory); 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; + int our_factory_samples; int our_factory_ms; int other_factory_samples; int other_factory_ms; @@ -137,7 +138,8 @@ int ast_audiohook_write_frame(struct ast_audiohook *audiohook, enum ast_audiohoo /* Update last feeding time to be current */ *time = ast_tvnow(); - our_factory_ms = ast_tvdiff_ms(*time, previous_time) + (ast_slinfactory_available(factory) / 8); + our_factory_samples = ast_slinfactory_available(factory); + our_factory_ms = ast_tvdiff_ms(*time, previous_time) + (our_factory_samples / 8); other_factory_samples = ast_slinfactory_available(other_factory); other_factory_ms = other_factory_samples / 8; @@ -149,6 +151,14 @@ int ast_audiohook_write_frame(struct ast_audiohook *audiohook, enum ast_audiohoo ast_slinfactory_flush(other_factory); } + if (ast_test_flag(audiohook, AST_AUDIOHOOK_SMALL_QUEUE) && (our_factory_samples > 640 || other_factory_samples > 640)) { + if (option_debug) { + ast_log(LOG_DEBUG, "Audiohook %p has stale audio in its factories. Flushing them both\n", audiohook); + } + ast_slinfactory_flush(factory); + ast_slinfactory_flush(other_factory); + } + /* Write frame out to respective factory */ ast_slinfactory_feed(factory, frame); |