diff --git a/daemon/media_player.c b/daemon/media_player.c index 251d175bb..42d87f19e 100644 --- a/daemon/media_player.c +++ b/daemon/media_player.c @@ -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); diff --git a/daemon/media_socket.c b/daemon/media_socket.c index edf1e40c3..4dcfafae4 100644 --- a/daemon/media_socket.c +++ b/daemon/media_socket.c @@ -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);