[Pkg-voip-commits] [janus] 47/163: Reduced verbosity of a few warnings
Jonas Smedegaard
dr at jones.dk
Sat Oct 28 01:22:08 UTC 2017
This is an automated email from the git hooks/post-receive script.
js pushed a commit to annotated tag debian/0.2.5-1
in repository janus.
commit 96e3cbb624af5a45543dc57413687eb2b9a43fac
Author: Lorenzo Miniero <lminiero at gmail.com>
Date: Fri Jul 28 12:44:48 2017 +0200
Reduced verbosity of a few warnings
---
plugins/janus_echotest.c | 4 ++--
plugins/janus_recordplay.c | 2 +-
plugins/janus_sip.c | 4 ++--
plugins/janus_streaming.c | 4 ++--
plugins/janus_videocall.c | 6 +++---
plugins/janus_videoroom.c | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/plugins/janus_echotest.c b/plugins/janus_echotest.c
index d6e3fe2..bb0a8fd 100644
--- a/plugins/janus_echotest.c
+++ b/plugins/janus_echotest.c
@@ -556,7 +556,7 @@ void janus_echotest_incoming_rtp(janus_plugin_session *handle, int video, char *
uint32_t ssrc_old = 0;
if(session->substream != -1)
ssrc_old = session->ssrc[session->substream];
- JANUS_LOG(LOG_WARN, "Received keyframe on SSRC %"SCNu32", switching (was %"SCNu32")\n", ssrc, ssrc_old);
+ JANUS_LOG(LOG_VERB, "Received keyframe on SSRC %"SCNu32", switching (was %"SCNu32")\n", ssrc, ssrc_old);
session->substream = (ssrc == session->ssrc[session->substream_target] ? session->substream_target : step);
switched = TRUE;
/* Notify the user */
@@ -883,7 +883,7 @@ static void *janus_echotest_handler(void *data) {
const char *msg_sdp = json_string_value(json_object_get(msg->jsep, "sdp"));
json_t *msg_simulcast = json_object_get(msg->jsep, "simulcast");
if(msg_simulcast) {
- JANUS_LOG(LOG_WARN, "EchoTest client is going to do simulcasting\n");
+ JANUS_LOG(LOG_VERB, "EchoTest client is going to do simulcasting\n");
session->ssrc[0] = json_integer_value(json_object_get(msg_simulcast, "ssrc-0"));
session->ssrc[1] = json_integer_value(json_object_get(msg_simulcast, "ssrc-1"));
session->ssrc[2] = json_integer_value(json_object_get(msg_simulcast, "ssrc-2"));
diff --git a/plugins/janus_recordplay.c b/plugins/janus_recordplay.c
index 301302a..19ec3c3 100644
--- a/plugins/janus_recordplay.c
+++ b/plugins/janus_recordplay.c
@@ -1188,7 +1188,7 @@ static void *janus_recordplay_handler(void *data) {
/* If the user negotiated simulcasting, just stick with the base substream */
json_t *msg_simulcast = json_object_get(msg->jsep, "simulcast");
if(msg_simulcast) {
- JANUS_LOG(LOG_WARN, "Recording client negotiated simulcasting, falling back to base substream...\n");
+ JANUS_LOG(LOG_WARN, "Recording client negotiated simulcasting which we don't do here, falling back to base substream...\n");
session->simulcast_ssrc = json_integer_value(json_object_get(msg_simulcast, "ssrc-0"));
}
/* Done! */
diff --git a/plugins/janus_sip.c b/plugins/janus_sip.c
index bfd63e6..2fc2ffb 100644
--- a/plugins/janus_sip.c
+++ b/plugins/janus_sip.c
@@ -1977,7 +1977,7 @@ static void *janus_sip_handler(void *data) {
/* If the user negotiated simulcasting, just stick with the base substream */
json_t *msg_simulcast = json_object_get(msg->jsep, "simulcast");
if(msg_simulcast) {
- JANUS_LOG(LOG_WARN, "Client negotiated simulcasting, falling back to base substream...\n");
+ JANUS_LOG(LOG_WARN, "Client negotiated simulcasting which we don't do here, falling back to base substream...\n");
session->media.simulcast_ssrc = json_integer_value(json_object_get(msg_simulcast, "ssrc-0"));
}
/* Check if there are new credentials to authenticate the INVITE */
@@ -2132,7 +2132,7 @@ static void *janus_sip_handler(void *data) {
/* If the user negotiated simulcasting, just stick with the base substream */
json_t *msg_simulcast = json_object_get(msg->jsep, "simulcast");
if(msg_simulcast) {
- JANUS_LOG(LOG_WARN, "Client negotiated simulcasting, falling back to base substream...\n");
+ JANUS_LOG(LOG_WARN, "Client negotiated simulcasting which we don't do here, falling back to base substream...\n");
session->media.simulcast_ssrc = json_integer_value(json_object_get(msg_simulcast, "ssrc-0"));
}
/* Also notify event handlers */
diff --git a/plugins/janus_streaming.c b/plugins/janus_streaming.c
index c014c77..1963ce2 100644
--- a/plugins/janus_streaming.c
+++ b/plugins/janus_streaming.c
@@ -4105,7 +4105,7 @@ static void *janus_streaming_relay_thread(void *data) {
JANUS_LOG(LOG_WARN, "[%s] RTSP PLAY failed, trying again in a few seconds...\n", name);
} else {
/* Everything should be back to normal, let's update the file descriptors */
- JANUS_LOG(LOG_WARN, "[%s] Reconnected to the RTSP server, streaming again\n", name);
+ JANUS_LOG(LOG_INFO, "[%s] Reconnected to the RTSP server, streaming again\n", name);
audio_fd = source->audio_fd;
video_fd[0] = source->video_fd[0];
data_fd = source->data_fd;
@@ -4507,7 +4507,7 @@ static void janus_streaming_relay_rtp_packet(gpointer data, gpointer user_data)
int step = (session->substream < 1 && session->substream_target == 2);
if(packet->substream == session->substream_target || (step && packet->substream == step)) {
if(janus_vp8_is_keyframe(payload, plen)) {
- JANUS_LOG(LOG_WARN, "Received keyframe on substream %d, switching (was %d)\n",
+ JANUS_LOG(LOG_VERB, "Received keyframe on substream %d, switching (was %d)\n",
packet->substream, session->substream);
session->substream = packet->substream;
switched = TRUE;
diff --git a/plugins/janus_videocall.c b/plugins/janus_videocall.c
index fcd6e45..34a691a 100644
--- a/plugins/janus_videocall.c
+++ b/plugins/janus_videocall.c
@@ -733,7 +733,7 @@ void janus_videocall_incoming_rtp(janus_plugin_session *handle, int video, char
uint32_t ssrc_old = 0;
if(session->peer->substream != -1)
ssrc_old = session->ssrc[session->peer->substream];
- JANUS_LOG(LOG_WARN, "Received keyframe on SSRC %"SCNu32", switching (was %"SCNu32")\n", ssrc, ssrc_old);
+ JANUS_LOG(LOG_VERB, "Received keyframe on SSRC %"SCNu32", switching (was %"SCNu32")\n", ssrc, ssrc_old);
session->peer->substream = (ssrc == session->ssrc[session->peer->substream_target] ? session->peer->substream_target : step);
switched = TRUE;
/* Notify the peer */
@@ -1198,7 +1198,7 @@ static void *janus_videocall_handler(void *data) {
/* Check if this user will simulcast */
json_t *msg_simulcast = json_object_get(msg->jsep, "simulcast");
if(msg_simulcast && janus_get_codec_pt(msg_sdp, "vp8") > 0) {
- JANUS_LOG(LOG_WARN, "VideoCall caller (%s) is going to do simulcasting\n", session->username);
+ JANUS_LOG(LOG_VERB, "VideoCall caller (%s) is going to do simulcasting\n", session->username);
session->ssrc[0] = json_integer_value(json_object_get(msg_simulcast, "ssrc-0"));
session->ssrc[1] = json_integer_value(json_object_get(msg_simulcast, "ssrc-1"));
session->ssrc[2] = json_integer_value(json_object_get(msg_simulcast, "ssrc-2"));
@@ -1249,7 +1249,7 @@ static void *janus_videocall_handler(void *data) {
/* Check if this user will simulcast */
json_t *msg_simulcast = json_object_get(msg->jsep, "simulcast");
if(msg_simulcast && janus_get_codec_pt(msg_sdp, "vp8") > 0) {
- JANUS_LOG(LOG_WARN, "VideoCall callee (%s) is going to do simulcasting\n", session->username);
+ JANUS_LOG(LOG_VERB, "VideoCall callee (%s) is going to do simulcasting\n", session->username);
session->ssrc[0] = json_integer_value(json_object_get(msg_simulcast, "ssrc-0"));
session->ssrc[1] = json_integer_value(json_object_get(msg_simulcast, "ssrc-1"));
session->ssrc[2] = json_integer_value(json_object_get(msg_simulcast, "ssrc-2"));
diff --git a/plugins/janus_videoroom.c b/plugins/janus_videoroom.c
index e8a63dd..f5d93b5 100644
--- a/plugins/janus_videoroom.c
+++ b/plugins/janus_videoroom.c
@@ -4077,7 +4077,7 @@ static void *janus_videoroom_handler(void *data) {
}
/* Is simulcasting involved */
if(msg_simulcast && videoroom->vcodec == JANUS_VIDEOROOM_VP8) {
- JANUS_LOG(LOG_WARN, "Publisher is going to do simulcasting\n");
+ JANUS_LOG(LOG_VERB, "Publisher is going to do simulcasting\n");
participant->ssrc[0] = json_integer_value(json_object_get(msg_simulcast, "ssrc-0"));
participant->ssrc[1] = json_integer_value(json_object_get(msg_simulcast, "ssrc-1"));
participant->ssrc[2] = json_integer_value(json_object_get(msg_simulcast, "ssrc-2"));
@@ -4284,7 +4284,7 @@ static void janus_videoroom_relay_rtp_packet(gpointer data, gpointer user_data)
uint32_t ssrc_old = 0;
if(listener->substream != -1)
ssrc_old = packet->ssrc[listener->substream];
- JANUS_LOG(LOG_WARN, "Received keyframe on SSRC %"SCNu32", switching (was %"SCNu32")\n", ssrc, ssrc_old);
+ JANUS_LOG(LOG_VERB, "Received keyframe on SSRC %"SCNu32", switching (was %"SCNu32")\n", ssrc, ssrc_old);
listener->substream = (ssrc == packet->ssrc[listener->substream_target] ? listener->substream_target : step);;
switched = TRUE;
/* Notify the viewer */
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/janus.git
More information about the Pkg-voip-commits
mailing list