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

common: Use unique_ptr to manage holepuncher memory

This commit is contained in:
Joni Räsänen 2022-03-03 11:52:15 +02:00
parent 468e9d82e5
commit ced9ea4271
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/uvgrtp/media_stream.hh
View File

@ -349,7 +349,7 @@ namespace uvgrtp {
std::unique_ptr<uvgrtp::formats::media> media_;
/* Thread that keeps the holepunched connection open for unidirectional streams */
uvgrtp::holepuncher *holepuncher_;
std::unique_ptr<uvgrtp::holepuncher> holepuncher_;
};
}

9
src/media_stream.cc
View File

@ -66,10 +66,14 @@ uvgrtp::media_stream::~media_stream()
// frame without waiting
if ((ctx_config_.flags & RCE_RTCP) && rtcp_)
{
rtcp_->stop();
}
if (ctx_config_.flags & RCE_HOLEPUNCH_KEEPALIVE)
if ((ctx_config_.flags & RCE_HOLEPUNCH_KEEPALIVE) && holepuncher_)
{
holepuncher_->stop();
}
(void)free_resources(RTP_OK);
}
@ -205,7 +209,6 @@ rtp_error_t uvgrtp::media_stream::free_resources(rtp_error_t ret)
}
if (holepuncher_)
{
delete holepuncher_;
holepuncher_ = nullptr;
}
if (media_)
@ -335,7 +338,7 @@ rtp_error_t uvgrtp::media_stream::start_components()
return free_resources(RTP_MEMORY_ERROR);
if (ctx_config_.flags & RCE_HOLEPUNCH_KEEPALIVE) {
holepuncher_ = new uvgrtp::holepuncher(socket_);
holepuncher_ = std::unique_ptr<uvgrtp::holepuncher> (new uvgrtp::holepuncher(socket_));
holepuncher_->start();
}