mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-16 22:38:38 +00:00
update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5093 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
1 parent
8048656f99
commit
da80e53f02
5 files changed
+50
-23
No files matched your search
+23
-7
@@ -90,6 +90,21 @@ stfu_instance_t *stfu_n_init(uint32_t qlen)
|
||||
return i;
|
||||
}
|
||||
|
||||
void stfu_n_reset(stfu_instance_t *i)
|
||||
{
|
||||
i->in_queue = &i->a_queue;
|
||||
i->out_queue = &i->b_queue;
|
||||
i->in_queue->array_len = 0;
|
||||
i->out_queue->array_len = 0;
|
||||
i->out_queue->wr_len = 0;
|
||||
i->out_queue->last_index = 0;
|
||||
i->miss_count = 0;
|
||||
i->last_ts = 0;
|
||||
i->running = 0;
|
||||
i->miss_count = 0;
|
||||
i->interval = 0;
|
||||
}
|
||||
|
||||
static int32_t stfu_n_measure_interval(stfu_queue_t *queue)
|
||||
{
|
||||
uint32_t index;
|
||||
@@ -148,7 +163,7 @@ stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, void *data, size_
|
||||
i->out_queue->wr_len = 0;
|
||||
i->out_queue->last_index = 0;
|
||||
i->miss_count = 0;
|
||||
|
||||
|
||||
if (stfu_n_process(i, i->out_queue) < 0) {
|
||||
return STFU_IT_FAILED;
|
||||
}
|
||||
@@ -183,7 +198,7 @@ stfu_frame_t *stfu_n_read_a_frame(stfu_instance_t *i)
|
||||
stfu_frame_t *frame = NULL, *rframe = NULL;
|
||||
|
||||
|
||||
if ((i->out_queue->wr_len == i->out_queue->array_len) || !i->out_queue->array_len) {
|
||||
if (((i->out_queue->wr_len == i->out_queue->array_len) || !i->out_queue->array_len)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -199,7 +214,7 @@ stfu_frame_t *stfu_n_read_a_frame(stfu_instance_t *i)
|
||||
}
|
||||
|
||||
frame = &i->out_queue->array[index];
|
||||
|
||||
|
||||
if (frame->ts != should_have) {
|
||||
int tried = 0;
|
||||
for (index2 = 0; index2 < i->out_queue->array_len; index2++) {
|
||||
@@ -226,12 +241,13 @@ stfu_frame_t *stfu_n_read_a_frame(stfu_instance_t *i)
|
||||
|
||||
i->miss_count++;
|
||||
|
||||
if (i->miss_count > 10 || i->in_queue->array_len == i->in_queue->array_size ) {
|
||||
i->out_queue->wr_len = i->out_queue->array_len;
|
||||
i->last_ts = should_have = frame->ts;
|
||||
if (i->miss_count > 10 || (i->in_queue->array_len == i->in_queue->array_size) || tried >= i->in_queue->array_size) {
|
||||
i->running = 0;
|
||||
i->interval = 0;
|
||||
i->out_queue->wr_len = i->out_queue->array_size;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
i->last_ts = should_have;
|
||||
rframe = &i->out_queue->int_frame;
|
||||
rframe->dlen = i->out_queue->array[i->out_queue->last_index].dlen;
|
||||
|
||||
+3
-1
@@ -88,7 +88,9 @@ void stfu_n_destroy(stfu_instance_t **i);
|
||||
stfu_instance_t *stfu_n_init(uint32_t qlen);
|
||||
stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, void *data, size_t datalen, int last);
|
||||
stfu_frame_t *stfu_n_read_a_frame(stfu_instance_t *i);
|
||||
#define stfu_im_done() stfu_n_add_data(i, 0, NULL, 0, 1)
|
||||
void stfu_n_reset(stfu_instance_t *i);
|
||||
|
||||
#define stfu_im_done(i) stfu_n_add_data(i, 0, NULL, 0, 1)
|
||||
#define stfu_n_eat(i,t,d,l) stfu_n_add_data(i, t, d, l, 0)
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
Reference in new issue
Block a user