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

multiplex: Remove function map_rtcp_to_rec in reception_flow

This commit is contained in:
Heikki Tampio 2023-06-15 11:13:09 +03:00
parent e503eab693
commit d426d92e37
3 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/media_stream.cc
View File

@ -392,7 +392,6 @@ rtp_error_t uvgrtp::media_stream::init(std::shared_ptr<uvgrtp::zrtp> zrtp)
reception_flow_->install_aux_handler(rtp_handler_key_, srtp_.get(), srtp_->recv_packet_handler, nullptr); reception_flow_->install_aux_handler(rtp_handler_key_, srtp_.get(), srtp_->recv_packet_handler, nullptr);
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) { if (rce_flags_ & RCE_RTCP_MUX) {
reception_flow_->map_rtcp_to_rec(remote_ssrc_, rtcp_);
rtcp_->set_socket(socket_); rtcp_->set_socket(socket_);
} }
return start_components(); return start_components();
@ -445,7 +444,6 @@ rtp_error_t uvgrtp::media_stream::add_srtp_ctx(uint8_t *key, uint8_t *salt)
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);
reception_flow_->install_aux_handler(rtp_handler_key_, srtp_.get(), srtp_->recv_packet_handler, nullptr); reception_flow_->install_aux_handler(rtp_handler_key_, srtp_.get(), srtp_->recv_packet_handler, nullptr);
if (rce_flags_ & RCE_RTCP_MUX) { if (rce_flags_ & RCE_RTCP_MUX) {
reception_flow_->map_rtcp_to_rec(remote_ssrc_, rtcp_);
rtcp_->set_socket(socket_); rtcp_->set_socket(socket_);
} }
return start_components(); return start_components();

12
src/reception_flow.cc
View File

@ -727,18 +727,6 @@ bool uvgrtp::reception_flow::map_handler_key(uint32_t key, std::shared_ptr<std::
return false; return false;
} }
rtp_error_t uvgrtp::reception_flow::map_rtcp_to_rec(std::shared_ptr<std::atomic<uint32_t>> ssrc, std::shared_ptr<uvgrtp::rtcp> rtcp)
{
rtp_error_t ret = RTP_GENERIC_ERROR;
rtcp_map_mutex_.lock();
if (rtcps_map_.find(ssrc) == rtcps_map_.end()) {
rtcps_map_[ssrc] = rtcp;
ret = RTP_OK;
}
rtcp_map_mutex_.unlock();
return ret;
}
int uvgrtp::reception_flow::clear_stream_from_flow(std::shared_ptr<std::atomic<std::uint32_t>> remote_ssrc, uint32_t handler_key) int uvgrtp::reception_flow::clear_stream_from_flow(std::shared_ptr<std::atomic<std::uint32_t>> remote_ssrc, uint32_t handler_key)
{ {
// Clear all the data structures // Clear all the data structures

7
src/reception_flow.hh
View File

@ -205,13 +205,6 @@ namespace uvgrtp {
* Return false if there is no handler with this key -> no mapping is done */ * Return false if there is no handler with this key -> no mapping is done */
bool map_handler_key(uint32_t key, std::shared_ptr<std::atomic<std::uint32_t>> remote_ssrc); bool map_handler_key(uint32_t key, std::shared_ptr<std::atomic<std::uint32_t>> remote_ssrc);
/* Map a new RTCP object into a remote SSRC
*
* Param ssrc SSRC of the REMOTE stream that the given RTCP will receive from
* Param rtcp RTCP object
* Return RTP_OK on success */
rtp_error_t map_rtcp_to_rec(std::shared_ptr<std::atomic<uint32_t>> ssrc, std::shared_ptr<uvgrtp::rtcp> rtcp);
rtp_error_t clear_rtcp_from_rec(std::shared_ptr<std::atomic<std::uint32_t>> remote_ssrc); rtp_error_t clear_rtcp_from_rec(std::shared_ptr<std::atomic<std::uint32_t>> remote_ssrc);
/* Clear the packet handlers associated with this handler key from the reception_flow /* Clear the packet handlers associated with this handler key from the reception_flow