Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

jbuf: avoid reducing of wish size too early #349

Merged
merged 1 commit into from
May 10, 2022
Merged

jbuf: avoid reducing of wish size too early #349

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions src/jbuf/jbuf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#endif

enum {
JBUF_RDIFF_EMA_COEFF = 512,
JBUF_RDIFF_EMA_COEFF = 1024,
JBUF_RDIFF_UP_SPEED = 512,
};

Expand Down Expand Up @@ -71,6 +71,7 @@ struct jbuf {
int pt; /**< Payload type */
bool running; /**< Jitter buffer is running */
int32_t rdiff; /**< Average out of order reverse diff */
struct tmr tmr; /**< Rdiff down timer */

struct lock *lock; /**< Makes jitter buffer thread safe */
enum jbuf_type jbtype; /**< Jitter buffer type */
Expand Down Expand Up @@ -136,6 +137,7 @@ static void jbuf_destructor(void *data)
{
struct jbuf *jb = data;

tmr_cancel(&jb->tmr);
jbuf_flush(jb);

/* Free all frames in the pool list */
Expand Down Expand Up @@ -179,6 +181,7 @@ int jbuf_alloc(struct jbuf **jbp, uint32_t min, uint32_t max)
jb->min = min;
jb->max = max;
jb->wish = min;
tmr_init(&jb->tmr);

DEBUG_INFO("alloc: delay=%u-%u frames\n", min, max);

Expand Down Expand Up @@ -228,12 +231,25 @@ int jbuf_set_type(struct jbuf *jb, enum jbuf_type jbtype)
}


static void wish_down(void *arg)
{
struct jbuf *jb = arg;

if (jb->wish > jb->min) {
DEBUG_INFO("wish size changed %u --> %u\n", jb->wish,
jb->wish - 1);
--jb->wish;
}
}


static void calc_rdiff(struct jbuf *jb, uint16_t seq)
{
int32_t rdiff;
int32_t adiff;
int32_t s; /**< EMA coefficient */
uint32_t wish;
bool down = false;

if (jb->jbtype != JBUF_ADAPTIVE)
return;
Expand All @@ -255,10 +271,20 @@ static void calc_rdiff(struct jbuf *jb, uint16_t seq)
if (wish >= jb->max)
wish = jb->max - 1;

if (wish != jb->wish) {
DEBUG_INFO("wish size changed %u\n", jb->wish);
if (wish > jb->wish) {
DEBUG_INFO("wish size changed %u --> %u\n", jb->wish, wish);
jb->wish = wish;
}
else if (wish < jb->wish) {
uint32_t dt = wish + 1 == jb->wish ? 6000 : 1000;
if (!tmr_isrunning(&jb->tmr) || tmr_get_expire(&jb->tmr) > dt)
tmr_start(&jb->tmr, dt, wish_down, jb);

down = true;
}

if (!down && tmr_isrunning(&jb->tmr))
tmr_cancel(&jb->tmr);
}


Expand Down