MT#55283 fix PT Redis JSON encoding

Change-Id: I6b358e41b2d00f4e3736593071af84c80e7e8628
(cherry picked from commit c35ee940d0)
(cherry picked from commit 63551cbfd6)

daemon/redis.c

@@ -2632,10 +2632,12 @@ char* redis_encode_json(struct call *c) {
 			json_builder_begin_array(builder);
 			for (GList *m = media->codecs.codec_prefs.head; m; m = m->next) {
 				struct rtp_payload_type *pt = m->data;
-				JSON_ADD_STRING("%u/" STR_FORMAT "/%u/" STR_FORMAT "/" STR_FORMAT "/%i/%i",
+				JSON_ADD_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));
 			}
 			json_builder_end_array(builder);
 		}

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' => [
@@ -431,10 +431,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' => [
@@ -696,12 +696,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' => [
@@ -957,12 +957,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' => [
@@ -1276,20 +1276,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' => [