RuhNetConsulting
/
rtpengine
mirror of https://github.com/sipwise/rtpengine
1
1
Fork 0
Code Issues 0 Projects 0 Releases 822 Wiki Activity
Browse Source

MT#55283 fix PT Redis JSON encoding 

Change-Id: I6b358e41b2d00f4e3736593071af84c80e7e8628
rfuchs/1943
Richard Fuchs 6 months ago
parent
849e16de46
commit
c35ee940d0
3 changed files with 70 additions and 68 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +4
    -2
      daemon/redis.c
  2. +32
    -32
      t/auto-daemon-tests-redis-json.pl
  3. +34
    -34
      t/auto-daemon-tests-redis.pl

+ 4
- 2
daemon/redis.c View File

@ -2711,10 +2711,12 @@ static str redis_encode_json(ng_parser_ctx_t *ctx, call_t *c, void **to_free) {
inner = parser->dict_add_list_dup(root, tmp); inner = parser->dict_add_list_dup(root, tmp);
for (__auto_type m = media->codecs.codec_prefs.head; m; m = m->next) { for (__auto_type m = media->codecs.codec_prefs.head; m; m = m->next) {
rtp_payload_type *pt = m->data; rtp_payload_type *pt = m->data;
JSON_ADD_LIST_STRING("%u/" STR_FORMAT "/%u/" STR_FORMAT "/" STR_FORMAT "/%i/%i",
JSON_ADD_LIST_STRING("%u/" STR_FORMAT "/%u/" STR_FORMAT "/%i/%i/"
STR_FORMAT "/" STR_FORMAT,
pt->payload_type, STR_FMT(&pt->encoding), pt->payload_type, STR_FMT(&pt->encoding),
pt->clock_rate, STR_FMT(&pt->encoding_parameters), pt->clock_rate, STR_FMT(&pt->encoding_parameters),
STR_FMT(&pt->format_parameters), pt->bitrate, pt->ptime);
pt->bitrate, pt->ptime, STR_FMT(&pt->format_parameters),
STR_FMT(&pt->codec_opts));
} }
// SSRC table dump // SSRC table dump


+ 32
- 32
t/auto-daemon-tests-redis-json.pl View File

@ -172,12 +172,12 @@ $json_exp = {
'0' '0'
], ],
'payload_types-0' => [ 'payload_types-0' => [
'0/PCMU/8000///0/20',
'8/PCMA/8000///0/20'
'0/PCMU/8000//0/20//',
'8/PCMA/8000//0/20//'
], ],
'payload_types-1' => [ 'payload_types-1' => [
'0/PCMU/8000///0/20',
'8/PCMA/8000///0/20'
'0/PCMU/8000//0/20//',
'8/PCMA/8000//0/20//'
], ],
'rtcp_sinks-0' => [], 'rtcp_sinks-0' => [],
'rtcp_sinks-1' => [ 'rtcp_sinks-1' => [
@ -428,10 +428,10 @@ $json_exp = {
'0' '0'
], ],
'payload_types-0' => [ 'payload_types-0' => [
'8/PCMA/8000///0/20'
'8/PCMA/8000//0/20//'
], ],
'payload_types-1' => [ 'payload_types-1' => [
'8/PCMA/8000///0/20'
'8/PCMA/8000//0/20//'
], ],
'rtcp_sinks-0' => [], 'rtcp_sinks-0' => [],
'rtcp_sinks-1' => [ 'rtcp_sinks-1' => [
@ -689,12 +689,12 @@ $json_exp = {
'0' '0'
], ],
'payload_types-0' => [ 'payload_types-0' => [
'0/PCMU/8000///0/20',
'8/PCMA/8000///0/20'
'0/PCMU/8000//0/20//',
'8/PCMA/8000//0/20//'
], ],
'payload_types-1' => [ 'payload_types-1' => [
'0/PCMU/8000///0/20',
'8/PCMA/8000///0/20'
'0/PCMU/8000//0/20//',
'8/PCMA/8000//0/20//'
], ],
'rtcp_sinks-0' => [], 'rtcp_sinks-0' => [],
'rtcp_sinks-1' => [ 'rtcp_sinks-1' => [
@ -946,12 +946,12 @@ $json_exp = {
'0' '0'
], ],
'payload_types-0' => [ 'payload_types-0' => [
'0/PCMU/8000///0/20',
'8/PCMA/8000///0/20'
'0/PCMU/8000//0/20//',
'8/PCMA/8000//0/20//'
], ],
'payload_types-1' => [ 'payload_types-1' => [
'0/PCMU/8000///0/20',
'8/PCMA/8000///0/20'
'0/PCMU/8000//0/20//',
'8/PCMA/8000//0/20//'
], ],
'rtcp_sinks-0' => [], 'rtcp_sinks-0' => [],
'rtcp_sinks-1' => [ 'rtcp_sinks-1' => [
@ -1261,20 +1261,20 @@ $json_exp = {
'3' '3'
], ],
'payload_types-0' => [ 'payload_types-0' => [
'0/PCMU/8000///0/20',
'8/PCMA/8000///0/20'
'0/PCMU/8000//0/20//',
'8/PCMA/8000//0/20//'
], ],
'payload_types-1' => [ 'payload_types-1' => [
'0/PCMU/8000///0/20',
'8/PCMA/8000///0/20'
'0/PCMU/8000//0/20//',
'8/PCMA/8000//0/20//'
], ],
'payload_types-2' => [ 'payload_types-2' => [
'0/PCMU/8000///0/20',
'8/PCMA/8000///0/20'
'0/PCMU/8000//0/20//',
'8/PCMA/8000//0/20//'
], ],
'payload_types-3' => [ 'payload_types-3' => [
'0/PCMU/8000///0/20',
'8/PCMA/8000///0/20'
'0/PCMU/8000//0/20//',
'8/PCMA/8000//0/20//'
], ],
'rtcp_sinks-0' => [], 'rtcp_sinks-0' => [],
'rtcp_sinks-1' => [ 'rtcp_sinks-1' => [
@ -1572,9 +1572,9 @@ $json_exp->{'media-2'}{format_str} = '8';
$json_exp->{'media-2'}{media_flags} = '2162692'; $json_exp->{'media-2'}{media_flags} = '2162692';
$json_exp->{'media-3'}{format_str} = '8'; $json_exp->{'media-3'}{format_str} = '8';
$json_exp->{'media-3'}{media_flags} = '2162692'; $json_exp->{'media-3'}{media_flags} = '2162692';
$json_exp->{'payload_types-2'}[0] = '8/PCMA/8000///0/20';
$json_exp->{'payload_types-2'}[0] = '8/PCMA/8000//0/20//';
$#{$json_exp->{'payload_types-2'}} = 0; $#{$json_exp->{'payload_types-2'}} = 0;
$json_exp->{'payload_types-3'}[0] = '8/PCMA/8000///0/20';
$json_exp->{'payload_types-3'}[0] = '8/PCMA/8000//0/20//';
$#{$json_exp->{'payload_types-3'}} = 0; $#{$json_exp->{'payload_types-3'}} = 0;
$json_exp->{'stream-1'}{ps_flags} = '1179649'; $json_exp->{'stream-1'}{ps_flags} = '1179649';
$json_exp->{'stream-3'}{ps_flags} = '1179649'; $json_exp->{'stream-3'}{ps_flags} = '1179649';
@ -1663,7 +1663,7 @@ $json_exp = {
'0' '0'
], ],
'payload_types-0' => [ 'payload_types-0' => [
'0/PCMU/8000///0/20'
'0/PCMU/8000//0/20//'
], ],
'rtcp_sinks-0' => [], 'rtcp_sinks-0' => [],
'rtcp_sinks-1' => [], 'rtcp_sinks-1' => [],
@ -1834,10 +1834,10 @@ $json_exp = {
'1' '1'
], ],
'payload_types-0' => [ 'payload_types-0' => [
'0/PCMU/8000///0/20'
'0/PCMU/8000//0/20//'
], ],
'payload_types-1' => [ 'payload_types-1' => [
'0/PCMU/8000///0/20'
'0/PCMU/8000//0/20//'
], ],
'rtcp_sinks-0' => [], 'rtcp_sinks-0' => [],
'rtcp_sinks-1' => [ 'rtcp_sinks-1' => [
@ -2071,10 +2071,10 @@ $json_exp = {
'1' '1'
], ],
'payload_types-0' => [ 'payload_types-0' => [
'0/PCMU/8000///0/20'
'0/PCMU/8000//0/20//'
], ],
'payload_types-1' => [ 'payload_types-1' => [
'0/PCMU/8000///0/20'
'0/PCMU/8000//0/20//'
], ],
'rtcp_sinks-0' => [], 'rtcp_sinks-0' => [],
'rtcp_sinks-1' => [ 'rtcp_sinks-1' => [
@ -2336,13 +2336,13 @@ $json_exp = {
'2' '2'
], ],
'payload_types-0' => [ 'payload_types-0' => [
'0/PCMU/8000///0/20'
'0/PCMU/8000//0/20//'
], ],
'payload_types-1' => [ 'payload_types-1' => [
'0/PCMU/8000///0/20'
'0/PCMU/8000//0/20//'
], ],
'payload_types-2' => [ 'payload_types-2' => [
'0/PCMU/8000///0/20'
'0/PCMU/8000//0/20//'
], ],
'rtcp_sinks-0' => [], 'rtcp_sinks-0' => [],
'rtcp_sinks-1' => [ 'rtcp_sinks-1' => [


+ 34
- 34
t/auto-daemon-tests-redis.pl View File

@ -171,12 +171,12 @@ $json_exp = {
'0' '0'
], ],
'payload_types-0' => [ 'payload_types-0' => [
'0/PCMU/8000///0/20',
'8/PCMA/8000///0/20'
'0/PCMU/8000//0/20//',
'8/PCMA/8000//0/20//'
], ],
'payload_types-1' => [ 'payload_types-1' => [
'0/PCMU/8000///0/20',
'8/PCMA/8000///0/20'
'0/PCMU/8000//0/20//',
'8/PCMA/8000//0/20//'
], ],
'rtcp_sinks-0' => [], 'rtcp_sinks-0' => [],
'rtcp_sinks-1' => [ 'rtcp_sinks-1' => [
@ -429,10 +429,10 @@ $json_exp = {
'0' '0'
], ],
'payload_types-0' => [ 'payload_types-0' => [
'8/PCMA/8000///0/20'
'8/PCMA/8000//0/20//'
], ],
'payload_types-1' => [ 'payload_types-1' => [
'8/PCMA/8000///0/20'
'8/PCMA/8000//0/20//'
], ],
'rtcp_sinks-0' => [], 'rtcp_sinks-0' => [],
'rtcp_sinks-1' => [ 'rtcp_sinks-1' => [
@ -690,10 +690,10 @@ $json_exp = {
'0' '0'
], ],
'payload_types-0' => [ 'payload_types-0' => [
'8/PCMA/8000///0/20'
'8/PCMA/8000//0/20//'
], ],
'payload_types-1' => [ 'payload_types-1' => [
'8/PCMA/8000///0/20'
'8/PCMA/8000//0/20//'
], ],
'rtcp_sinks-0' => [], 'rtcp_sinks-0' => [],
'rtcp_sinks-1' => [ 'rtcp_sinks-1' => [
@ -951,12 +951,12 @@ $json_exp = {
'0' '0'
], ],
'payload_types-0' => [ 'payload_types-0' => [
'0/PCMU/8000///0/20',
'8/PCMA/8000///0/20'
'0/PCMU/8000//0/20//',
'8/PCMA/8000//0/20//'
], ],
'payload_types-1' => [ 'payload_types-1' => [
'0/PCMU/8000///0/20',
'8/PCMA/8000///0/20'
'0/PCMU/8000//0/20//',
'8/PCMA/8000//0/20//'
], ],
'rtcp_sinks-0' => [], 'rtcp_sinks-0' => [],
'rtcp_sinks-1' => [ 'rtcp_sinks-1' => [
@ -1208,12 +1208,12 @@ $json_exp = {
'0' '0'
], ],
'payload_types-0' => [ 'payload_types-0' => [
'0/PCMU/8000///0/20',
'8/PCMA/8000///0/20'
'0/PCMU/8000//0/20//',
'8/PCMA/8000//0/20//'
], ],
'payload_types-1' => [ 'payload_types-1' => [
'0/PCMU/8000///0/20',
'8/PCMA/8000///0/20'
'0/PCMU/8000//0/20//',
'8/PCMA/8000//0/20//'
], ],
'rtcp_sinks-0' => [], 'rtcp_sinks-0' => [],
'rtcp_sinks-1' => [ 'rtcp_sinks-1' => [
@ -1523,20 +1523,20 @@ $json_exp = {
'3' '3'
], ],
'payload_types-0' => [ 'payload_types-0' => [
'0/PCMU/8000///0/20',
'8/PCMA/8000///0/20'
'0/PCMU/8000//0/20//',
'8/PCMA/8000//0/20//'
], ],
'payload_types-1' => [ 'payload_types-1' => [
'0/PCMU/8000///0/20',
'8/PCMA/8000///0/20'
'0/PCMU/8000//0/20//',
'8/PCMA/8000//0/20//'
], ],
'payload_types-2' => [ 'payload_types-2' => [
'0/PCMU/8000///0/20',
'8/PCMA/8000///0/20'
'0/PCMU/8000//0/20//',
'8/PCMA/8000//0/20//'
], ],
'payload_types-3' => [ 'payload_types-3' => [
'0/PCMU/8000///0/20',
'8/PCMA/8000///0/20'
'0/PCMU/8000//0/20//',
'8/PCMA/8000//0/20//'
], ],
'rtcp_sinks-0' => [], 'rtcp_sinks-0' => [],
'rtcp_sinks-1' => [ 'rtcp_sinks-1' => [
@ -1834,9 +1834,9 @@ $json_exp->{'media-2'}{format_str} = '8';
$json_exp->{'media-2'}{media_flags} = '2162692'; $json_exp->{'media-2'}{media_flags} = '2162692';
$json_exp->{'media-3'}{format_str} = '8'; $json_exp->{'media-3'}{format_str} = '8';
$json_exp->{'media-3'}{media_flags} = '2162692'; $json_exp->{'media-3'}{media_flags} = '2162692';
$json_exp->{'payload_types-2'}[0] = '8/PCMA/8000///0/20';
$json_exp->{'payload_types-2'}[0] = '8/PCMA/8000//0/20//';
$#{$json_exp->{'payload_types-2'}} = 0; $#{$json_exp->{'payload_types-2'}} = 0;
$json_exp->{'payload_types-3'}[0] = '8/PCMA/8000///0/20';
$json_exp->{'payload_types-3'}[0] = '8/PCMA/8000//0/20//';
$#{$json_exp->{'payload_types-3'}} = 0; $#{$json_exp->{'payload_types-3'}} = 0;
$json_exp->{'stream-1'}{ps_flags} = '1179649'; $json_exp->{'stream-1'}{ps_flags} = '1179649';
$json_exp->{'stream-3'}{ps_flags} = '1179649'; $json_exp->{'stream-3'}{ps_flags} = '1179649';
@ -1924,7 +1924,7 @@ $json_exp = {
'0' '0'
], ],
'payload_types-0' => [ 'payload_types-0' => [
'0/PCMU/8000///0/20'
'0/PCMU/8000//0/20//'
], ],
'rtcp_sinks-0' => [], 'rtcp_sinks-0' => [],
'rtcp_sinks-1' => [], 'rtcp_sinks-1' => [],
@ -2095,10 +2095,10 @@ $json_exp = {
'1' '1'
], ],
'payload_types-0' => [ 'payload_types-0' => [
'0/PCMU/8000///0/20'
'0/PCMU/8000//0/20//'
], ],
'payload_types-1' => [ 'payload_types-1' => [
'0/PCMU/8000///0/20'
'0/PCMU/8000//0/20//'
], ],
'rtcp_sinks-0' => [], 'rtcp_sinks-0' => [],
'rtcp_sinks-1' => [ 'rtcp_sinks-1' => [
@ -2332,10 +2332,10 @@ $json_exp = {
'1' '1'
], ],
'payload_types-0' => [ 'payload_types-0' => [
'0/PCMU/8000///0/20'
'0/PCMU/8000//0/20//'
], ],
'payload_types-1' => [ 'payload_types-1' => [
'0/PCMU/8000///0/20'
'0/PCMU/8000//0/20//'
], ],
'rtcp_sinks-0' => [], 'rtcp_sinks-0' => [],
'rtcp_sinks-1' => [ 'rtcp_sinks-1' => [
@ -2597,13 +2597,13 @@ $json_exp = {
'2' '2'
], ],
'payload_types-0' => [ 'payload_types-0' => [
'0/PCMU/8000///0/20'
'0/PCMU/8000//0/20//'
], ],
'payload_types-1' => [ 'payload_types-1' => [
'0/PCMU/8000///0/20'
'0/PCMU/8000//0/20//'
], ],
'payload_types-2' => [ 'payload_types-2' => [
'0/PCMU/8000///0/20'
'0/PCMU/8000//0/20//'
], ],
'rtcp_sinks-0' => [], 'rtcp_sinks-0' => [],
'rtcp_sinks-1' => [ 'rtcp_sinks-1' => [


Write Preview
Loading…
Cancel
Save