diff --git a/daemon/redis.c b/daemon/redis.c index 0656563fd..c720f5e04 100644 --- a/daemon/redis.c +++ b/daemon/redis.c @@ -2736,10 +2736,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); for (__auto_type m = media->codecs.codec_prefs.head; m; m = m->next) { 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->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)); } } // --- for medias.head diff --git a/t/auto-daemon-tests-redis-json.pl b/t/auto-daemon-tests-redis-json.pl index b957e6867..7dcf80ed2 100755 --- a/t/auto-daemon-tests-redis-json.pl +++ b/t/auto-daemon-tests-redis-json.pl @@ -172,12 +172,12 @@ $json_exp = { '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' => [ - '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-1' => [ @@ -432,10 +432,10 @@ $json_exp = { '0' ], 'payload_types-0' => [ - '8/PCMA/8000///0/20' + '8/PCMA/8000//0/20//' ], 'payload_types-1' => [ - '8/PCMA/8000///0/20' + '8/PCMA/8000//0/20//' ], 'rtcp_sinks-0' => [], 'rtcp_sinks-1' => [ @@ -697,12 +697,12 @@ $json_exp = { '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' => [ - '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-1' => [ @@ -958,12 +958,12 @@ $json_exp = { '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' => [ - '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-1' => [ @@ -1277,20 +1277,20 @@ $json_exp = { '3' ], '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' => [ - '0/PCMU/8000///0/20', - '8/PCMA/8000///0/20' + '0/PCMU/8000//0/20//', + '8/PCMA/8000//0/20//' ], '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' => [ - '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-1' => [ @@ -1596,9 +1596,9 @@ $json_exp->{'media-2'}{format_str} = '8'; $json_exp->{'media-2'}{media_flags} = '2162692'; $json_exp->{'media-3'}{format_str} = '8'; $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-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->{'stream-1'}{ps_flags} = '1179649'; $json_exp->{'stream-3'}{ps_flags} = '1179649'; @@ -1687,7 +1687,7 @@ $json_exp = { '0' ], 'payload_types-0' => [ - '0/PCMU/8000///0/20' + '0/PCMU/8000//0/20//' ], 'rtcp_sinks-0' => [], 'rtcp_sinks-1' => [], @@ -1860,10 +1860,10 @@ $json_exp = { '1' ], 'payload_types-0' => [ - '0/PCMU/8000///0/20' + '0/PCMU/8000//0/20//' ], 'payload_types-1' => [ - '0/PCMU/8000///0/20' + '0/PCMU/8000//0/20//' ], 'rtcp_sinks-0' => [], 'rtcp_sinks-1' => [ @@ -2101,10 +2101,10 @@ $json_exp = { '1' ], 'payload_types-0' => [ - '0/PCMU/8000///0/20' + '0/PCMU/8000//0/20//' ], 'payload_types-1' => [ - '0/PCMU/8000///0/20' + '0/PCMU/8000//0/20//' ], 'rtcp_sinks-0' => [], 'rtcp_sinks-1' => [ @@ -2370,13 +2370,13 @@ $json_exp = { '2' ], 'payload_types-0' => [ - '0/PCMU/8000///0/20' + '0/PCMU/8000//0/20//' ], 'payload_types-1' => [ - '0/PCMU/8000///0/20' + '0/PCMU/8000//0/20//' ], 'payload_types-2' => [ - '0/PCMU/8000///0/20' + '0/PCMU/8000//0/20//' ], 'rtcp_sinks-0' => [], 'rtcp_sinks-1' => [ diff --git a/t/auto-daemon-tests-redis.pl b/t/auto-daemon-tests-redis.pl index 19cc31f5e..7db14a34c 100755 --- a/t/auto-daemon-tests-redis.pl +++ b/t/auto-daemon-tests-redis.pl @@ -171,12 +171,12 @@ $json_exp = { '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' => [ - '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-1' => [ @@ -433,10 +433,10 @@ $json_exp = { '0' ], 'payload_types-0' => [ - '8/PCMA/8000///0/20' + '8/PCMA/8000//0/20//' ], 'payload_types-1' => [ - '8/PCMA/8000///0/20' + '8/PCMA/8000//0/20//' ], 'rtcp_sinks-0' => [], 'rtcp_sinks-1' => [ @@ -698,10 +698,10 @@ $json_exp = { '0' ], 'payload_types-0' => [ - '8/PCMA/8000///0/20' + '8/PCMA/8000//0/20//' ], 'payload_types-1' => [ - '8/PCMA/8000///0/20' + '8/PCMA/8000//0/20//' ], 'rtcp_sinks-0' => [], 'rtcp_sinks-1' => [ @@ -963,12 +963,12 @@ $json_exp = { '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' => [ - '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-1' => [ @@ -1224,12 +1224,12 @@ $json_exp = { '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' => [ - '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-1' => [ @@ -1543,20 +1543,20 @@ $json_exp = { '3' ], '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' => [ - '0/PCMU/8000///0/20', - '8/PCMA/8000///0/20' + '0/PCMU/8000//0/20//', + '8/PCMA/8000//0/20//' ], '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' => [ - '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-1' => [ @@ -1862,9 +1862,9 @@ $json_exp->{'media-2'}{format_str} = '8'; $json_exp->{'media-2'}{media_flags} = '2162692'; $json_exp->{'media-3'}{format_str} = '8'; $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-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->{'stream-1'}{ps_flags} = '1179649'; $json_exp->{'stream-3'}{ps_flags} = '1179649'; @@ -1952,7 +1952,7 @@ $json_exp = { '0' ], 'payload_types-0' => [ - '0/PCMU/8000///0/20' + '0/PCMU/8000//0/20//' ], 'rtcp_sinks-0' => [], 'rtcp_sinks-1' => [], @@ -2125,10 +2125,10 @@ $json_exp = { '1' ], 'payload_types-0' => [ - '0/PCMU/8000///0/20' + '0/PCMU/8000//0/20//' ], 'payload_types-1' => [ - '0/PCMU/8000///0/20' + '0/PCMU/8000//0/20//' ], 'rtcp_sinks-0' => [], 'rtcp_sinks-1' => [ @@ -2366,10 +2366,10 @@ $json_exp = { '1' ], 'payload_types-0' => [ - '0/PCMU/8000///0/20' + '0/PCMU/8000//0/20//' ], 'payload_types-1' => [ - '0/PCMU/8000///0/20' + '0/PCMU/8000//0/20//' ], 'rtcp_sinks-0' => [], 'rtcp_sinks-1' => [ @@ -2635,13 +2635,13 @@ $json_exp = { '2' ], 'payload_types-0' => [ - '0/PCMU/8000///0/20' + '0/PCMU/8000//0/20//' ], 'payload_types-1' => [ - '0/PCMU/8000///0/20' + '0/PCMU/8000//0/20//' ], 'payload_types-2' => [ - '0/PCMU/8000///0/20' + '0/PCMU/8000//0/20//' ], 'rtcp_sinks-0' => [], 'rtcp_sinks-1' => [