qiurui
/
uvgrtp-base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

multiplex: Remove now unnecessary helper function

This commit is contained in:
Heikki Tampio 2023-07-24 12:53:23 +03:00
parent 743f160d27
commit 3adc6d41d6
4 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/uvgrtp/rtcp.hh
View File

@ -144,7 +144,7 @@ namespace uvgrtp {
* This function will call one of the above functions internally
*
* Return RTP_OK on success and RTP_ERROR on error */
rtp_error_t handle_incoming_packet(uint8_t *buffer, size_t size);
rtp_error_t handle_incoming_packet(void* args, int rce_flags, uint8_t* buffer, size_t size, frame::rtp_frame** out);
/// \endcond
/* Send "frame" to all participants
@ -417,7 +417,6 @@ namespace uvgrtp {
/* Update RTCP-related receiver statistics */
static rtp_error_t recv_packet_handler(void *arg, int rce_flags, frame::rtp_frame **out);
rtp_error_t new_recv_packet_handler(void* args, int rce_flags, uint8_t* read_ptr, size_t size, frame::rtp_frame** out);
rtp_error_t new_recv_packet_handler_common(void* args, int rce_flags, uint8_t* read_ptr, size_t size, frame::rtp_frame** out);
/* Update RTCP-related sender statistics */

2
src/media_stream.cc
View File

@ -308,7 +308,7 @@ rtp_error_t uvgrtp::media_stream::install_packet_handlers()
if (rce_flags_ & RCE_RTCP_MUX) {
reception_flow_->install_handler(
2, remote_ssrc_,
std::bind(&uvgrtp::rtcp::new_recv_packet_handler, rtcp_, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3,
std::bind(&uvgrtp::rtcp::handle_incoming_packet, rtcp_, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3,
std::placeholders::_4, std::placeholders::_5), nullptr);
}
if (rce_flags_ & RCE_SRTP) {

14
src/rtcp.cc
View File

@ -1033,15 +1033,6 @@ void uvgrtp::rtcp::update_session_statistics(const uvgrtp::frame::rtp_frame *fra
((double)trans_difference - participants_[frame->header.ssrc]->stats.jitter);
}
rtp_error_t uvgrtp::rtcp::new_recv_packet_handler(void* args, int rce_flags, uint8_t* read_ptr, size_t size, frame::rtp_frame** out)
{
//UVG_LOG_DEBUG("RTCP packet handled from %u", remote_ssrc_.get()->load());
(void)args;
(void)rce_flags;
(void)out;
return handle_incoming_packet(read_ptr, size);
}
rtp_error_t uvgrtp::rtcp::new_recv_packet_handler_common(void* args, int rce_flags, uint8_t* read_ptr, size_t size, frame::rtp_frame** out)
{
(void)size;
@ -1123,8 +1114,11 @@ size_t uvgrtp::rtcp::rtcp_length_in_bytes(uint16_t length)
return (expanded_length + 1)* sizeof(uint32_t);
}
rtp_error_t uvgrtp::rtcp::handle_incoming_packet(uint8_t *buffer, size_t size)
rtp_error_t uvgrtp::rtcp::handle_incoming_packet(void* args, int rce_flags, uint8_t* buffer, size_t size, frame::rtp_frame** out)
{
(void)args;
(void)rce_flags;
(void)out;
if (!buffer || !size)
{
return RTP_INVALID_VALUE;

4
src/rtcp_reader.cc
View File

@ -78,10 +78,10 @@ void uvgrtp::rtcp_reader::rtcp_report_reader() {
for (auto& p : rtcps_map_) {
std::shared_ptr<uvgrtp::rtcp> rtcp_ptr = p.second;
if (sender_ssrc == p.first.get()->load()) {
(void)rtcp_ptr->handle_incoming_packet(buffer.get(), (size_t)nread);
(void)rtcp_ptr->handle_incoming_packet(nullptr, 0, buffer.get(), (size_t)nread, nullptr);
}
else if (p.first.get()->load() == 0) {
(void)rtcp_ptr->handle_incoming_packet(buffer.get(), (size_t)nread);
(void)rtcp_ptr->handle_incoming_packet(nullptr, 0, buffer.get(), (size_t)nread, nullptr);
}
}
map_mutex_.unlock();