From 54ba727c0cf460775c12d7a4b17b4118dd6a349f Mon Sep 17 00:00:00 2001 From: Aaro Altonen Date: Tue, 18 Jun 2019 09:15:59 +0300 Subject: [PATCH] Give shorter names for Report Block fields --- src/frame.hh | 12 ++++++------ src/rtcp.cc | 31 +++++++++++++++---------------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/frame.hh b/src/frame.hh index 90713f9..aca2a72 100644 --- a/src/frame.hh +++ b/src/frame.hh @@ -64,12 +64,12 @@ namespace kvz_rtp { PACKED_STRUCT(rtcp_report_block) { uint32_t ssrc; - uint8_t fraction_lost; - uint32_t cumulative_pkt_lost:24; - uint32_t highest_seq_recved; - uint32_t interraival_jitter; - uint32_t last_sr; - uint32_t delay_since_last_sr; + uint8_t fraction; + int32_t lost:24; + uint32_t last_seq; + uint32_t jitter; + uint32_t lsr; /* last Sender Report */ + uint32_t dlsr; /* delay since last Sender Report */ }; PACKED_STRUCT(rtcp_sender_frame) { diff --git a/src/rtcp.cc b/src/rtcp.cc index ef73957..a38e82c 100644 --- a/src/rtcp.cc +++ b/src/rtcp.cc @@ -217,15 +217,15 @@ rtp_error_t kvz_rtp::rtcp::generate_sender_report() frame->blocks[ptr].ssrc = receiver.first; if (receiver.second->dropped_pkts) { - frame->blocks[ptr].fraction_lost = + frame->blocks[ptr].fraction = receiver.second->processed_pkts / receiver.second->dropped_pkts; } - frame->blocks[ptr].cumulative_pkt_lost = receiver.second->dropped_pkts; - frame->blocks[ptr].highest_seq_recved = 222; // TODO ??? - frame->blocks[ptr].interraival_jitter = 333; // TODO ??? - frame->blocks[ptr].delay_since_last_sr = 555; // TODO ??? - frame->blocks[ptr].last_sr = 444; // TODO ??? + frame->blocks[ptr].lost = receiver.second->dropped_pkts; + frame->blocks[ptr].last_seq = 222; // TODO ??? + frame->blocks[ptr].dlsr = 555; // TODO jitter + frame->blocks[ptr].jitter = 333; // TODO ??? + frame->blocks[ptr].lsr = 444; // TODO ??? ptr++; } @@ -247,22 +247,21 @@ rtp_error_t kvz_rtp::rtcp::generate_receiver_report() return rtp_errno; } - rtp_error_t ret = RTP_OK; - size_t ptr = 0; + size_t ptr = 0; for (auto& receiver : receiver_stats_) { frame->blocks[ptr].ssrc = receiver.first; if (receiver.second->dropped_pkts) { - frame->blocks[ptr].fraction_lost = + frame->blocks[ptr].fraction = receiver.second->processed_pkts / receiver.second->dropped_pkts; } - frame->blocks[ptr].cumulative_pkt_lost = receiver.second->dropped_pkts; - frame->blocks[ptr].highest_seq_recved = 222; // TODO ??? - frame->blocks[ptr].interraival_jitter = 333; // TODO ??? - frame->blocks[ptr].delay_since_last_sr = 555; // TODO ??? - frame->blocks[ptr].last_sr = 444; // TODO ??? + frame->blocks[ptr].lost = receiver.second->dropped_pkts; + frame->blocks[ptr].last_seq = 222; // TODO ??? + frame->blocks[ptr].dlsr = 555; // TODO jitter + frame->blocks[ptr].jitter = 333; // TODO ??? + frame->blocks[ptr].lsr = 444; // TODO ??? ptr++; } @@ -290,7 +289,7 @@ rtp_error_t kvz_rtp::rtcp::handle_sender_report_packet(kvz_rtp::frame::rtcp_send return RTP_INVALID_VALUE; } - /* TODO: what are we supposed to with this report? */ + /* TODO: 6.4.4 Analyzing Sender and Receiver Reports */ return RTP_OK; } @@ -305,7 +304,7 @@ rtp_error_t kvz_rtp::rtcp::handle_receiver_report_packet(kvz_rtp::frame::rtcp_re return RTP_INVALID_VALUE; } - /* TODO: what are we supposed to with this report? */ + /* TODO: 6.4.4 Analyzing Sender and Receiver Reports */ return RTP_OK; }