Skip to content

Fix memory leak in cudacodec #3339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 26, 2022
Merged

Fix memory leak in cudacodec #3339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66809ea
Fix memory leak caused by incorrect use of smart pointer.
cudawarped Aug 25, 2022
6573353
Replace internal raw pointer with vect.
cudawarped Sep 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions modules/cudacodec/src/frame_queue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,8 @@

#ifdef HAVE_NVCUVID

RawPacket::RawPacket(const unsigned char* _data, const size_t _size, const bool _containsKeyFrame) : size(_size), containsKeyFrame(_containsKeyFrame) {
data = cv::makePtr<unsigned char*>(new unsigned char[size]);
memcpy(*data, _data, size);
};
RawPacket::RawPacket(const unsigned char* data_, const size_t size, const bool containsKeyFrame_) :
data(data_,data_ + size), containsKeyFrame(containsKeyFrame_) {};

cv::cudacodec::detail::FrameQueue::~FrameQueue() {
if (isFrameInUse_)
Expand Down
9 changes: 5 additions & 4 deletions modules/cudacodec/src/frame_queue.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,12 @@
class RawPacket {
public:
RawPacket(const unsigned char* _data, const size_t _size = 0, const bool _containsKeyFrame = false);
unsigned char* Data() const { return *data; }
size_t size;
bool containsKeyFrame;
const unsigned char* Data() const noexcept { return data.data(); }
size_t Size() const noexcept { return data.size(); }
bool ContainsKeyFrame() const noexcept { return containsKeyFrame; }
private:
cv::Ptr<unsigned char*> data = 0;
std::vector<unsigned char> data;
bool containsKeyFrame = false;
};

namespace cv { namespace cudacodec { namespace detail {
Expand Down
5 changes: 3 additions & 2 deletions modules/cudacodec/src/video_reader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,8 @@ namespace
if (idx >= rawPacketsBaseIdx && idx < rawPacketsBaseIdx + rawPackets.size()) {
if (!frame.isMat())
CV_Error(Error::StsUnsupportedFormat, "Raw data is stored on the host and must be retrieved using a cv::Mat");
Mat tmp(1, rawPackets.at(idx - rawPacketsBaseIdx).size, CV_8UC1, rawPackets.at(idx - rawPacketsBaseIdx).Data(), rawPackets.at(idx - rawPacketsBaseIdx).size);
const size_t i = idx - rawPacketsBaseIdx;
Mat tmp(1, rawPackets.at(i).Size(), CV_8UC1, const_cast<unsigned char*>(rawPackets.at(i).Data()), rawPackets.at(i).Size());
frame.getMatRef() = tmp;
}
}
Expand Down Expand Up @@ -299,7 +300,7 @@ namespace
case VideoReaderProps::PROP_LRF_HAS_KEY_FRAME: {
const int iPacket = propertyVal - rawPacketsBaseIdx;
if (videoSource_->RawModeEnabled() && iPacket >= 0 && iPacket < rawPackets.size()) {
propertyVal = rawPackets.at(iPacket).containsKeyFrame;
propertyVal = rawPackets.at(iPacket).ContainsKeyFrame();
return true;
}
else
Expand Down