sipwise
/
rtpengine
mirror of https://github.com/sipwise/rtpengine.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#56447 don't return details of inactive/disabled

Browse Source 
Janus reports inactive and disabled streams only as being disabled and
doesn't report the codec in use. Mirror this behaviour.

Change-Id: Icf193f60a054b803afea02f048dcd8d26632bc47
pull/1729/head
Richard Fuchs 2 years ago
parent a54f638707
commit 1ef2e94d4b
2 changed files with 21 additions and 34 deletions
Show Stats Download Patch File Download Diff File

37
daemon/janus.c
Unescape View File

@ -335,38 +335,41 @@ static void janus_add_publisher_details(JsonBuilder *builder, struct call_monolo
json_builder_add_string_value(builder, media->type.s);
json_builder_set_member_name(builder, "mindex");
json_builder_add_int_value(builder, media->index - 1);
json_builder_set_member_name(builder, "mid");
if (media->media_id.s)
json_builder_add_string_value(builder, media->media_id.s);
else
json_builder_add_null_value(builder);
json_builder_set_member_name(builder, "codec");
if (codec)
if (!MEDIA_ISSET2(media, SEND, RECV)) {
json_builder_set_member_name(builder, "disabled");
json_builder_add_boolean_value(builder, true);
}
else if (codec) {
json_builder_set_member_name(builder, "codec");
json_builder_add_string_value(builder, codec);
else
json_builder_add_null_value(builder);
json_builder_end_object(builder);
if (media->type_id == MT_AUDIO && !a_codec)
a_codec = codec;
else if (media->type_id == MT_VIDEO && !v_codec)
v_codec = codec;
}
if (media->type_id == MT_AUDIO)
a_codec = codec;
else if (media->type_id == MT_VIDEO)
v_codec = codec;
json_builder_end_object(builder);
}
json_builder_end_array(builder);
json_builder_set_member_name(builder, "audio_codec");
if (a_codec)
if (a_codec) {
json_builder_set_member_name(builder, "audio_codec");
json_builder_add_string_value(builder, a_codec);
else
json_builder_add_null_value(builder);
}
json_builder_set_member_name(builder, "video_codec");
if (v_codec)
if (v_codec) {
json_builder_set_member_name(builder, "video_codec");
json_builder_add_string_value(builder, v_codec);
else
json_builder_add_null_value(builder);
}
// TODO add "display"
}

18
t/auto-daemon-tests-websocket.py
Unescape View File

@ -525,7 +525,6 @@ class TestVideoroom(unittest.TestCase):
"room": room,
"configured": "ok",
"audio_codec": "PCMA",
"video_codec": None,
"streams": [
{
"codec": "PCMA",
@ -811,7 +810,6 @@ class TestVideoroom(unittest.TestCase):
"room": room,
"configured": "ok",
"audio_codec": "PCMA",
"video_codec": None,
"streams": [
{
"codec": "PCMA",
@ -1081,7 +1079,6 @@ class TestVideoroom(unittest.TestCase):
"room": room,
"configured": "ok",
"audio_codec": "PCMA",
"video_codec": None,
"streams": [
{
"codec": "PCMA",
@ -1179,7 +1176,6 @@ class TestVideoroom(unittest.TestCase):
"room": room,
"configured": "ok",
"audio_codec": "PCMA",
"video_codec": None,
"streams": [
{
"codec": "PCMA",
@ -1279,7 +1275,6 @@ class TestVideoroom(unittest.TestCase):
"room": room,
"configured": "ok",
"audio_codec": "PCMA",
"video_codec": None,
"streams": [
{
"codec": "PCMA",
@ -1374,7 +1369,6 @@ class TestVideoroom(unittest.TestCase):
"room": room,
"configured": "ok",
"audio_codec": "PCMA",
"video_codec": None,
"streams": [
{
"codec": "PCMA",
@ -1906,7 +1900,6 @@ class TestVideoroom(unittest.TestCase):
"room": room,
"configured": "ok",
"audio_codec": "PCMA",
"video_codec": None,
"streams": [
{
"codec": "PCMA",
@ -2239,7 +2232,6 @@ class TestVideoroom(unittest.TestCase):
"room": room,
"configured": "ok",
"audio_codec": "opus",
"video_codec": None,
"streams": [
{
"codec": "opus",
@ -2366,7 +2358,6 @@ class TestVideoroom(unittest.TestCase):
{
"id": feed_1,
"audio_codec": "opus",
"video_codec": None,
"streams": [
{
"codec": "opus",
@ -2433,7 +2424,6 @@ class TestVideoroom(unittest.TestCase):
{
"id": feed_2,
"audio_codec": "PCMA",
"video_codec": None,
"streams": [
{
"codec": "PCMA",
@ -2467,7 +2457,6 @@ class TestVideoroom(unittest.TestCase):
"room": room,
"configured": "ok",
"audio_codec": "PCMA",
"video_codec": None,
"streams": [
{
"codec": "PCMA",
@ -2633,7 +2622,6 @@ class TestVideoroom(unittest.TestCase):
"room": room,
"configured": "ok",
"audio_codec": "opus",
"video_codec": None,
"streams": [
{
"codec": "opus",
@ -2669,7 +2657,6 @@ class TestVideoroom(unittest.TestCase):
{
"id": feed_1,
"audio_codec": "opus",
"video_codec": None,
"streams": [
{
"codec": "opus",
@ -2759,7 +2746,6 @@ class TestVideoroom(unittest.TestCase):
"room": room,
"configured": "ok",
"audio_codec": "opus",
"video_codec": None,
"streams": [
{
"codec": "opus",
@ -2796,7 +2782,6 @@ class TestVideoroom(unittest.TestCase):
"type": "audio",
}
],
"video_codec": None,
}
],
"room": room,
@ -3282,11 +3267,10 @@ class TestVideoroom(unittest.TestCase):
"videoroom": "event",
"room": room,
"configured": "ok",
"audio_codec": "opus",
"video_codec": "VP9",
"streams": [
{
"codec": "opus",
"disabled": True,
"mid": "a",
"mindex": 0,
"type": "audio",

Write Preview
Loading…
Cancel
Save