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

multiplex: Install RTCP handler in media_stream

This commit is contained in:
Heikki Tampio 2023-06-15 09:48:39 +03:00
parent 1675888791
commit f08f178ed3
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/media_stream.cc
View File

@ -316,23 +316,23 @@ rtp_error_t uvgrtp::media_stream::init()
reception_flow_->map_handler_key(rtp_handler_key_, remote_ssrc_); reception_flow_->map_handler_key(rtp_handler_key_, remote_ssrc_);
reception_flow_->install_aux_handler(rtp_handler_key_, rtcp_.get(), rtcp_->recv_packet_handler, nullptr); reception_flow_->install_aux_handler(rtp_handler_key_, rtcp_.get(), rtcp_->recv_packet_handler, nullptr);
if (rce_flags_ & RCE_RTCP_MUX) {
reception_flow_->map_rtcp_to_rec(remote_ssrc_, rtcp_);
rtcp_->set_socket(socket_);
}
reception_flow_->new_install_handler( reception_flow_->new_install_handler(
1, 1,
remote_ssrc_, remote_ssrc_,
std::bind(&uvgrtp::rtp::new_packet_handler, rtp_, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4), std::bind(&uvgrtp::rtp::new_packet_handler, rtp_, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4),
nullptr);/* nullptr);
if (rce_flags_ & RCE_RTCP_MUX) {
rtcp_->set_socket(socket_);
reception_flow_->new_install_handler( reception_flow_->new_install_handler(
2, 2,
remote_ssrc_, remote_ssrc_,
std::bind(&uvgrtp::rtcp::new_recv_packet_handler, rtcp_, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3), std::bind(&uvgrtp::rtcp::new_recv_packet_handler, rtcp_, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3),
nullptr nullptr
);*/ );
}
return start_components(); return start_components();
} }

4
src/rtcp.cc
View File

@ -1033,8 +1033,8 @@ void uvgrtp::rtcp::update_session_statistics(const uvgrtp::frame::rtp_frame *fra
rtp_error_t uvgrtp::rtcp::new_recv_packet_handler(int rce_flags, uint8_t* read_ptr, size_t size) rtp_error_t uvgrtp::rtcp::new_recv_packet_handler(int rce_flags, uint8_t* read_ptr, size_t size)
{ {
UVG_LOG_INFO("RTCP packet handled from %u", remote_ssrc_.get()->load()); //UVG_LOG_INFO("RTCP packet handled from %u", remote_ssrc_.get()->load());
return RTP_OK; return handle_incoming_packet(read_ptr, size);
} }