Browse Source

TT#14008 add extra logging for packet recv/send

Change-Id: I4e57de0d116f54929321f55b7921d6cd82c8e5db
(cherry picked from commit 1ac33c2631)
mr10.3
Richard Fuchs 4 years ago
parent
commit
1bce0e52cf
2 changed files with 24 additions and 7 deletions
  1. +9
    -7
      daemon/media_player.c
  2. +15
    -0
      daemon/media_socket.c

+ 9
- 7
daemon/media_player.c View File

@ -189,17 +189,19 @@ static void __send_timer_send_common(struct send_timer *st, struct codec_packet
struct rtp_header *rh = cp->rtp;
if (rh) {
ilog(LOG_DEBUG, "Forward to sink endpoint: %s%s:%d%s (RTP seq %u TS %u)",
FMT_M(sockaddr_print_buf(&st->sink->endpoint.address),
st->sink->endpoint.port),
ilog(LOG_DEBUG, "Forward to sink endpoint: local %s -> remote %s%s%s "
"(RTP seq %u TS %u SSRC %x)",
endpoint_print_buf(&st->sink->selected_sfd->socket.local),
FMT_M(endpoint_print_buf(&st->sink->endpoint)),
ntohs(rh->seq_num),
ntohl(rh->timestamp));
ntohl(rh->timestamp),
ntohl(rh->ssrc));
codec_calc_jitter(cp->ssrc_out, ntohl(rh->timestamp), cp->clockrate, &rtpe_now);
}
else
ilog(LOG_DEBUG, "Forward to sink endpoint: %s%s:%d%s",
FMT_M(sockaddr_print_buf(&st->sink->endpoint.address),
st->sink->endpoint.port));
ilog(LOG_DEBUG, "Forward to sink endpoint: local %s -> remote %s%s%s",
endpoint_print_buf(&st->sink->selected_sfd->socket.local),
FMT_M(endpoint_print_buf(&st->sink->endpoint)));
socket_sendto(&st->sink->selected_sfd->socket,
cp->s.s, cp->s.len, &st->sink->endpoint);


+ 15
- 0
daemon/media_socket.c View File

@ -2340,6 +2340,21 @@ static int stream_packet(struct packet_handler_ctx *phc) {
// this set payload_type, ssrc_in, and mp payloads
media_packet_rtp_in(phc);
if (phc->mp.rtp)
ilog(LOG_DEBUG, "Handling packet: remote %s%s%s (expected: %s%s%s) -> local %s "
"(RTP seq %u TS %u SSRC %s%x%s)",
FMT_M(endpoint_print_buf(&phc->mp.fsin)),
FMT_M(endpoint_print_buf(&phc->mp.stream->endpoint)),
endpoint_print_buf(&phc->mp.sfd->socket.local),
ntohs(phc->mp.rtp->seq_num),
ntohl(phc->mp.rtp->timestamp),
FMT_M(ntohl(phc->mp.rtp->ssrc)));
else
ilog(LOG_DEBUG, "Handling packet: remote %s%s%s (expected: %s%s%s) -> local %s",
FMT_M(endpoint_print_buf(&phc->mp.fsin)),
FMT_M(endpoint_print_buf(&phc->mp.stream->endpoint)),
endpoint_print_buf(&phc->mp.sfd->socket.local));
// SSRC receive stats
if (phc->mp.ssrc_in && phc->mp.rtp) {
atomic64_inc(&phc->mp.ssrc_in->packets);


Loading…
Cancel
Save