Archives/v4l2rtspserver
2
0
Fork 0
mirror of https://github.com/mpromonet/v4l2rtspserver synced 2024-11-19 15:25:34 +00:00
Code Issues Projects Releases Wiki Activity

replace delete with delete[]

Browse Source
This commit is contained in:
MPR 2014-10-18 17:50:21 +00:00
parent 4b23730e86
commit 0521316285
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/V4l2DeviceSource.h
View File

@ -36,6 +36,8 @@ class V4L2DeviceSource: public FramedSource
struct Frame struct Frame
{ {
Frame(char* buffer, int size, timeval timestamp) : m_buffer(buffer), m_size(size), m_timestamp(timestamp) {}; Frame(char* buffer, int size, timeval timestamp) : m_buffer(buffer), m_size(size), m_timestamp(timestamp) {};
Frame(const Frame&);
Frame& operator=(const Frame&);
~Frame() { delete m_buffer; }; ~Frame() { delete m_buffer; };
char* m_buffer; char* m_buffer;

11
src/V4l2DeviceSource.cpp
View File

@ -149,7 +149,7 @@ void V4L2DeviceSource::deliverFrame()
} }
fFrameSize -= offset; fFrameSize -= offset;
memcpy(fTo, frame->m_buffer+offset, fFrameSize); memcpy(fTo, frame->m_buffer+offset, fFrameSize);
delete frame; delete [] frame;
} }
// send Frame to the consumer // send Frame to the consumer
@ -168,13 +168,13 @@ void V4L2DeviceSource::getNextFrame()
if (frameSize < 0) if (frameSize < 0)
{ {
envir() << "V4L2DeviceSource::getNextFrame errno:" << errno << " " << strerror(errno) << "\n"; envir() << "V4L2DeviceSource::getNextFrame errno:" << errno << " " << strerror(errno) << "\n";
delete buffer; delete [] buffer;
handleClosure(this); handleClosure(this);
} }
else if (frameSize == 0) else if (frameSize == 0)
{ {
envir() << "V4L2DeviceSource::getNextFrame no data errno:" << errno << " " << strerror(errno) << "\n"; envir() << "V4L2DeviceSource::getNextFrame no data errno:" << errno << " " << strerror(errno) << "\n";
delete buffer; delete [] buffer;
} }
else else
{ {
@ -192,6 +192,10 @@ void V4L2DeviceSource::getNextFrame()
{ {
queueFrame(buffer,frameSize,ref); queueFrame(buffer,frameSize,ref);
} }
else
{
delete [] buffer;
}
} }
} }
@ -263,7 +267,6 @@ bool V4L2DeviceSource::processConfigrationFrame(char * frame, int frameSize)
std::cout << "AuxLine:" << m_auxLine << " \n"; std::cout << "AuxLine:" << m_auxLine << " \n";
} }
ret = true; ret = true;
delete [] frame;
} }
} }