Skip to content

Commit

Permalink
Removed unneeded commented out lines
Browse files Browse the repository at this point in the history
  • Loading branch information
lminiero committed Feb 28, 2024
1 parent 0c8333d commit cd0f7db
Showing 1 changed file with 0 additions and 13 deletions.
13 changes: 0 additions & 13 deletions src/plugins/janus_streaming.c
Original file line number Diff line number Diff line change
Expand Up @@ -9605,7 +9605,6 @@ static void *janus_streaming_relay_thread(void *data) {
continue;
}
stream->last_received[0] = now;
//~ JANUS_LOG(LOG_VERB, "************************\nGot %d bytes on the audio channel...\n", bytes);
/* Do we have a new stream? */
if(ssrc != stream->last_ssrc[0]) {
stream->ssrc = stream->last_ssrc[0] = ssrc;
Expand All @@ -9618,7 +9617,6 @@ static void *janus_streaming_relay_thread(void *data) {
if(source->is_srtp) {
int buflen = bytes;
srtp_err_status_t res = srtp_unprotect(source->srtp_ctx, buffer, &buflen);
//~ if(res != srtp_err_status_ok && res != srtp_err_status_replay_fail && res != srtp_err_status_replay_old) {
if(res != srtp_err_status_ok) {
guint32 timestamp = ntohl(rtp->timestamp);
guint16 seq = ntohs(rtp->seq_number);
Expand All @@ -9628,8 +9626,6 @@ static void *janus_streaming_relay_thread(void *data) {
}
bytes = buflen;
}
//~ JANUS_LOG(LOG_VERB, " ... parsed RTP packet (ssrc=%u, pt=%u, seq=%u, ts=%u)...\n",
//~ ntohl(rtp->ssrc), rtp->type, ntohs(rtp->seq_number), ntohl(rtp->timestamp));
/* Relay on all sessions */
packet.mindex = stream->mindex;
packet.data = rtp;
Expand Down Expand Up @@ -9700,7 +9696,6 @@ static void *janus_streaming_relay_thread(void *data) {
continue;
}
stream->last_received[index] = now;
//~ JANUS_LOG(LOG_VERB, "************************\nGot %d bytes on the video channel...\n", bytes);
/* Do we have a new stream? */
if(ssrc != stream->last_ssrc[index]) {
stream->last_ssrc[index] = ssrc;
Expand All @@ -9713,7 +9708,6 @@ static void *janus_streaming_relay_thread(void *data) {
if(source->is_srtp) {
int buflen = bytes;
srtp_err_status_t res = srtp_unprotect(source->srtp_ctx, buffer, &buflen);
//~ if(res != srtp_err_status_ok && res != srtp_err_status_replay_fail && res != srtp_err_status_replay_old) {
if(res != srtp_err_status_ok) {
guint32 timestamp = ntohl(rtp->timestamp);
guint16 seq = ntohs(rtp->seq_number);
Expand Down Expand Up @@ -9812,8 +9806,6 @@ static void *janus_streaming_relay_thread(void *data) {
/* If paused, ignore this packet */
if(!mountpoint->enabled && !stream->rc)
continue;
//~ JANUS_LOG(LOG_VERB, " ... parsed RTP packet (ssrc=%u, pt=%u, seq=%u, ts=%u)...\n",
//~ ntohl(rtp->ssrc), rtp->type, ntohs(rtp->seq_number), ntohl(rtp->timestamp));
/* Relay on all sessions */
packet.mindex = stream->mindex;
packet.data = rtp;
Expand Down Expand Up @@ -10082,11 +10074,9 @@ static void janus_streaming_relay_rtp_packet(gpointer data, gpointer user_data)
}
janus_streaming_session *session = (janus_streaming_session *)data;
if(!session || !session->handle) {
//~ JANUS_LOG(LOG_ERR, "Invalid session...\n");
return;
}
if(!packet->is_keyframe && (!g_atomic_int_get(&session->started) || g_atomic_int_get(&session->paused))) {
//~ JANUS_LOG(LOG_ERR, "Streaming not started yet for this session...\n");
return;
}
janus_streaming_session_stream *s = g_hash_table_lookup(session->streams_byid, GINT_TO_POINTER(packet->mindex));
Expand Down Expand Up @@ -10416,11 +10406,9 @@ static void janus_streaming_relay_rtcp_packet(gpointer data, gpointer user_data)
}
janus_streaming_session *session = (janus_streaming_session *)data;
if(!session || !session->handle) {
//~ JANUS_LOG(LOG_ERR, "Invalid session...\n");
return;
}
if(!g_atomic_int_get(&session->started) || g_atomic_int_get(&session->paused)) {
//~ JANUS_LOG(LOG_ERR, "Streaming not started yet for this session...\n");
return;
}
janus_streaming_session_stream *s = g_hash_table_lookup(session->streams_byid, GINT_TO_POINTER(packet->mindex));
Expand All @@ -10444,7 +10432,6 @@ static void janus_streaming_helper_rtprtcp_packet(gpointer data, gpointer user_d
}
janus_streaming_helper *helper = (janus_streaming_helper *)data;
if(!helper) {
//~ JANUS_LOG(LOG_ERR, "Invalid session...\n");
return;
}
/* Clone the packet and queue it for delivery on the helper thread */
Expand Down

0 comments on commit cd0f7db

Please sign in to comment.