Browse Source

TT#14008 Squashed commit of the following:

closes #1134

commit 1cdf8d5084
Merge: 2fc54462 cc4d049f
Author: Richard Fuchs <rfuchs@sipwise.com>
Date:   Mon Feb 1 11:19:43 2021 -0500

    Merge branch 'jb_disable' of https://github.com/balajeesv/rtpengine into balajeesv-jb_disable

    Change-Id: Ic01bbeb776d8ac0f3ebb46ae0a263243828443bb

commit cc4d049fab
Merge: 2f935206 9deedea1
Author: balajeesv <balajee.sv@gmail.com>
Date:   Fri Dec 11 23:15:48 2020 +0530

    Merge branch 'jb_disable' of https://github.com/balajeesv/rtpengine into jb_disable

commit 2f935206de
Merge: f553a9e5 7c3d2e01
Author: Balajee SV <41125423+balajeesv@users.noreply.github.com>
Date:   Fri Dec 11 23:12:27 2020 +0530

    Merge branch 'master' into jb_disable

commit 9deedea1c4
Merge: f553a9e5 7c3d2e01
Author: Balajee SV <41125423+balajeesv@users.noreply.github.com>
Date:   Fri Dec 11 23:12:27 2020 +0530

    Merge branch 'master' into jb_disable

commit f553a9e582
Author: balajeesv <balajee.sv@gmail.com>
Date:   Fri Dec 11 22:47:46 2020 +0530

    rtpengine: Disable jitter-buffer per call in offer

Change-Id: Ib4443a0d66c78749e24f3d2cb48c991e408e21fd
pull/1194/head
balajeesv 5 years ago
committed by Richard Fuchs
parent
commit
ffc9e34e14
5 changed files with 11 additions and 2 deletions
  1. +4
    -1
      daemon/call.c
  2. +3
    -0
      daemon/call_interfaces.c
  3. +1
    -0
      include/call.h
  4. +2
    -1
      include/call_interfaces.h
  5. +1
    -0
      utils/rtpengine-ng-client

+ 4
- 1
daemon/call.c View File

@ -967,7 +967,7 @@ struct packet_stream *__packet_stream_new(struct call *call) {
recording_init_stream(stream);
stream->send_timer = send_timer_new(stream);
if (rtpe_config.jb_length)
if (rtpe_config.jb_length && !call->disable_jb)
stream->jb = jitter_buffer_new(call);
return stream;
@ -2264,6 +2264,9 @@ int monologue_offer_answer(struct call_monologue *other_ml, GQueue *streams,
goto error_ports;
}
if(flags->disable_jb && media->call)
media->call->disable_jb=1;
__num_media_streams(media, num_ports);
__assign_stream_fds(media, &em->intf_sfds);


+ 3
- 0
daemon/call_interfaces.c View File

@ -852,6 +852,9 @@ static void call_ng_flags_flags(struct sdp_ng_flags *out, str *s, void *dummy) {
case CSH_LOOKUP("no-passthrough"):
out->passthrough_off = 1;
break;
case CSH_LOOKUP("no-jitter-buffer"):
out->disable_jb = 1;
break;
default:
// handle values aliases from other dictionaries
if (call_ng_flags_prefix(out, s, "SDES-no-", call_ng_flags_str_ht, &out->sdes_no))


+ 1
- 0
include/call.h View File

@ -417,6 +417,7 @@ struct call {
int rec_forwarding:1;
int drop_traffic:1;
int foreign_call:1; // created_via_redis_notify call
int disable_jb:1;
};


+ 2
- 1
include/call_interfaces.h View File

@ -122,7 +122,8 @@ struct sdp_ng_flags {
drop_traffic_start:1,
drop_traffic_stop:1,
passthrough_on:1,
passthrough_off:1;
passthrough_off:1,
disable_jb:1;
};


+ 1
- 0
utils/rtpengine-ng-client View File

@ -81,6 +81,7 @@ GetOptions(
'inject-DTMF' => \$options{'inject DTMF'},
'DTLS-fingerprint=s' => \$options{'DTLS-fingerprint'},
'ICE-lite=s' => \$options{'ICE-lite'},
'no-jitter-buffer' => \$options{'no jitter buffer'},
'generate-RTCP' => \$options{'generate RTCP'},
'single-codec' => \$options{'single codec'},
) or die;


Loading…
Cancel
Save