opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-17 07:04:18 +08:00
Code Issues Releases Wiki Activity

Replace internal raw pointer with vect.

Browse Source
This commit is contained in:
James Bowley
2022-09-12 14:54:54 +03:00
parent 66809ea929
commit 657335352a
3 changed files with 10 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
modules/cudacodec/src/frame_queue.cpp
View File

@@ -45,32 +45,8 @@
#ifdef HAVE_NVCUVID
RawPacket::RawPacket(const unsigned char* _data, const size_t _size, const bool _containsKeyFrame) : size(_size), containsKeyFrame(_containsKeyFrame) {
data = new unsigned char[size];
memcpy(data, _data, size);
};
RawPacket::~RawPacket() {
if (data) delete[] data;
}
RawPacket::RawPacket(const RawPacket& other) : RawPacket(other.data, other.size, other.containsKeyFrame) {
}
RawPacket::RawPacket(RawPacket&& other) noexcept : data(std::exchange(other.data, nullptr)), size(std::exchange(other.size, 0)),
containsKeyFrame(std::exchange(other.containsKeyFrame, false)) {
}
RawPacket& RawPacket::operator=(const RawPacket& other) {
return *this = RawPacket(other);
}
RawPacket& RawPacket::operator=(RawPacket&& other) noexcept {
std::swap(data, other.data);
size = other.size;
containsKeyFrame = other.containsKeyFrame;
return *this;
}
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_)

14
modules/cudacodec/src/frame_queue.hpp
View File

@@ -50,16 +50,12 @@
class RawPacket {
public:
RawPacket(const unsigned char* _data, const size_t _size = 0, const bool _containsKeyFrame = false);
~RawPacket();
RawPacket(const RawPacket& other);
RawPacket(RawPacket&& other) noexcept;
RawPacket& operator=(const RawPacket& other);
RawPacket& operator=(RawPacket&& other) noexcept;
unsigned char* Data() const { return data; }
size_t size = 0;
bool containsKeyFrame = false;
const unsigned char* Data() const noexcept { return data.data(); }
size_t Size() const noexcept { return data.size(); }
bool ContainsKeyFrame() const noexcept { return containsKeyFrame; }
private:
unsigned char* data = 0;
std::vector<unsigned char> data;
bool containsKeyFrame = false;
};
namespace cv { namespace cudacodec { namespace detail {

5
modules/cudacodec/src/video_reader.cpp
View File

@@ -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;
}
}
@@ -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