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

jbuf: JBUF_FIXED should also keep min wish size #813

Merged
merged 2 commits into from
May 17, 2023
Merged

jbuf: JBUF_FIXED should also keep min wish size #813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f20f8f2
jbuf: JBUF_FIXED should also keep min wish size
sreimers May 17, 2023
e64a0be
fix tests
sreimers May 17, 2023
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
2 changes: 1 addition & 1 deletion src/jbuf/jbuf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ int jbuf_get(struct jbuf *jb, struct rtp_header *hdr, void **mem)

packet_deref(jb, f);

if (jb->jbtype == JBUF_ADAPTIVE && jb->nf > jb->wish) {
if (jb->nf > jb->wish) {
DEBUG_INFO("reducing jitter buffer "
"(nf=%u min=%u wish=%u max=%u)\n",
jb->nf, jb->min, jb->wish, jb->max);
Expand Down
40 changes: 16 additions & 24 deletions test/jbuf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,11 @@ int test_jbuf(void)
hdr.seq = 160;
hdr.ts = 1;
err = jbuf_put(jb, &hdr, frv[0]);
if (err)
goto out;
TEST_ERR(err);
if ((EALREADY != jbuf_put(jb, &hdr, frv[0]))) {err = EINVAL; goto out;}

err = jbuf_get(jb, &hdr2, &mem);
if (err)
goto out;
TEST_ERR(err);
if (160 != hdr2.seq) {err = EINVAL; goto out;}
if (mem != frv[0]) {err = EINVAL; goto out;}
mem = mem_deref(mem);
Expand All @@ -65,25 +63,23 @@ int test_jbuf(void)

/* Two frames */
DEBUG_INFO("test frame: Two frames\n");

hdr.seq = 320;
err = jbuf_put(jb, &hdr, frv[0]);
if (err)
goto out;
TEST_ERR(err);

hdr.seq = 480;
err = jbuf_put(jb, &hdr, frv[1]);
if (err)
goto out;
TEST_ERR(err);

err = jbuf_get(jb, &hdr2, &mem);
if (err)
goto out;
TEST_EQUALS(EAGAIN, err);
if (320 != hdr2.seq) {err = EINVAL; goto out;}
if (mem != frv[0]) {err = EINVAL; goto out;}
mem = mem_deref(mem);

err = jbuf_get(jb, &hdr2, &mem);
if (err)
goto out;
TEST_ERR(err);
if (480 != hdr2.seq) {err = EINVAL; goto out;}
if (mem != frv[1]) {err = EINVAL; goto out;}
mem = mem_deref(mem);
Expand All @@ -95,34 +91,30 @@ int test_jbuf(void)
DEBUG_INFO("test frame: Three frames\n");
hdr.seq = 800;
err = jbuf_put(jb, &hdr, frv[1]);
if (err)
goto out;
TEST_ERR(err);

hdr.seq = 640;
err = jbuf_put(jb, &hdr, frv[0]);
if (err)
goto out;
TEST_ERR(err);

hdr.seq = 960;
err = jbuf_put(jb, &hdr, frv[2]);
if (err)
goto out;
TEST_ERR(err);

err = jbuf_get(jb, &hdr2, &mem);
if (err)
goto out;
TEST_EQUALS(EAGAIN, err);
if (640 != hdr2.seq) {err = EINVAL; goto out;}
if (mem != frv[0]) {err = EINVAL; goto out;}
mem = mem_deref(mem);

err = jbuf_get(jb, &hdr2, &mem);
if (err)
goto out;
TEST_EQUALS(EAGAIN, err);
if (800 != hdr2.seq) {err = EINVAL; goto out;}
if (mem != frv[1]) {err = EINVAL; goto out;}
mem = mem_deref(mem);

err = jbuf_get(jb, &hdr2, &mem);
if (err)
goto out;
TEST_ERR(err);
if (960 != hdr2.seq) {err = EINVAL; goto out;}
if (mem != frv[2]) {err = EINVAL; goto out;}
mem = mem_deref(mem);
Expand Down