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

common: Use unique_ptr for managing reception_flow memory

This commit is contained in:
Joni Räsänen 2022-03-03 11:43:26 +02:00
parent e62e59af9f
commit 737898d5dc
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/uvgrtp/media_stream.hh
View File

@ -342,8 +342,8 @@ namespace uvgrtp {
uint32_t rtp_handler_key_; uint32_t rtp_handler_key_;
uint32_t zrtp_handler_key_; uint32_t zrtp_handler_key_;
/* RTP packet reception flow */ /* RTP packet reception flow. Dispatches packets to other components */
uvgrtp::reception_flow *reception_flow_; std::unique_ptr<uvgrtp::reception_flow> reception_flow_;
/* Media object associated with this media stream. */ /* Media object associated with this media stream. */
uvgrtp::formats::media *media_; uvgrtp::formats::media *media_;

7
src/media_stream.cc
View File

@ -201,7 +201,6 @@ rtp_error_t uvgrtp::media_stream::free_resources(rtp_error_t ret)
} }
if (reception_flow_) if (reception_flow_)
{ {
delete reception_flow_;
reception_flow_ = nullptr; reception_flow_ = nullptr;
} }
if (holepuncher_) if (holepuncher_)
@ -230,7 +229,7 @@ rtp_error_t uvgrtp::media_stream::init()
return free_resources(RTP_GENERIC_ERROR); return free_resources(RTP_GENERIC_ERROR);
} }
reception_flow_ = new uvgrtp::reception_flow(); reception_flow_ = std::unique_ptr<uvgrtp::reception_flow> (new uvgrtp::reception_flow());
rtp_ = std::shared_ptr<uvgrtp::rtp> (new uvgrtp::rtp(fmt_)); rtp_ = std::shared_ptr<uvgrtp::rtp> (new uvgrtp::rtp(fmt_));
rtcp_ = std::shared_ptr<uvgrtp::rtcp> (new uvgrtp::rtcp(rtp_, ctx_config_.flags)); rtcp_ = std::shared_ptr<uvgrtp::rtcp> (new uvgrtp::rtcp(rtp_, ctx_config_.flags));
@ -252,7 +251,7 @@ rtp_error_t uvgrtp::media_stream::init(std::shared_ptr<uvgrtp::zrtp> zrtp)
return RTP_GENERIC_ERROR; return RTP_GENERIC_ERROR;
} }
reception_flow_ = new uvgrtp::reception_flow(); reception_flow_ = std::unique_ptr<uvgrtp::reception_flow> (new uvgrtp::reception_flow());
rtp_ = std::shared_ptr<uvgrtp::rtp> (new uvgrtp::rtp(fmt_)); rtp_ = std::shared_ptr<uvgrtp::rtp> (new uvgrtp::rtp(fmt_));
@ -299,7 +298,7 @@ rtp_error_t uvgrtp::media_stream::add_srtp_ctx(uint8_t *key, uint8_t *salt)
if ((flags_ & srtp_flags) != srtp_flags) if ((flags_ & srtp_flags) != srtp_flags)
return free_resources(RTP_NOT_SUPPORTED); return free_resources(RTP_NOT_SUPPORTED);
reception_flow_ = new uvgrtp::reception_flow(); reception_flow_ = std::unique_ptr<uvgrtp::reception_flow> (new uvgrtp::reception_flow());
rtp_ = std::shared_ptr<uvgrtp::rtp> (new uvgrtp::rtp(fmt_)); rtp_ = std::shared_ptr<uvgrtp::rtp> (new uvgrtp::rtp(fmt_));