mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-30 12:49:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

motioncells: fully construct MotionCells

Browse source 
Some members of MotionCells were not being initialized in the constructor.
Protect from potential garbage memory usage by fully initializing it.
Moving m_frameSize out of the class because it is only used in
performDetectionMotionCells().

CID 1197704
This commit is contained in:
Luis de Bethencourt 2016-03-31 16:08:12 +01:00
parent 8b310665c5
commit 9d7b525f19
2 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
ext/opencv/MotionCells.cpp
View file

@ -79,6 +79,15 @@ MotionCells::MotionCells ()
m_cellwidth = 0;
m_cellheight = 0;
m_sensitivity = 0;
memset (&m_header, 0, sizeof (MotionCellHeader));
m_header.headersize = GINT32_TO_BE (MC_HEADER);
m_header.type = GINT32_TO_BE (MC_TYPE);
m_header.version = GINT32_TO_BE (MC_VERSION);
m_header.itemsize = 0;
m_header.gridx = 0;
m_header.gridy = 0;
m_header.starttime = 0;
}
MotionCells::~MotionCells ()
@ -116,6 +125,8 @@ MotionCells::performDetectionMotionCells (IplImage * p_frame,
int sumframecnt = 0;
int ret = 0;
CvSize frameSize;
p_framerate >= 1 ? p_framerate <= 5 ? sumframecnt = 1
: p_framerate <= 10 ? sumframecnt = 2
: p_framerate <= 15 ? sumframecnt = 3
@ -135,21 +146,21 @@ MotionCells::performDetectionMotionCells (IplImage * p_frame,
return ret;
}
m_frameSize = cvGetSize (p_frame);
m_frameSize.width /= 2;
m_frameSize.height /= 2;
setMotionCells (m_frameSize.width, m_frameSize.height);
frameSize = cvGetSize (p_frame);
frameSize.width /= 2;
frameSize.height /= 2;
setMotionCells (frameSize.width, frameSize.height);
m_sensitivity = 1 - p_sensitivity;
m_isVisible = p_isVisible;
m_pcurFrame = cvCloneImage (p_frame);
IplImage *m_pcurgreyImage = cvCreateImage (m_frameSize, IPL_DEPTH_8U, 1);
IplImage *m_pprevgreyImage = cvCreateImage (m_frameSize, IPL_DEPTH_8U, 1);
IplImage *m_pgreyImage = cvCreateImage (m_frameSize, IPL_DEPTH_8U, 1);
IplImage *m_pcurgreyImage = cvCreateImage (frameSize, IPL_DEPTH_8U, 1);
IplImage *m_pprevgreyImage = cvCreateImage (frameSize, IPL_DEPTH_8U, 1);
IplImage *m_pgreyImage = cvCreateImage (frameSize, IPL_DEPTH_8U, 1);
IplImage *m_pcurDown =
cvCreateImage (m_frameSize, m_pcurFrame->depth, m_pcurFrame->nChannels);
IplImage *m_pprevDown = cvCreateImage (m_frameSize, m_pprevFrame->depth,
cvCreateImage (frameSize, m_pcurFrame->depth, m_pcurFrame->nChannels);
IplImage *m_pprevDown = cvCreateImage (frameSize, m_pprevFrame->depth,
m_pprevFrame->nChannels);
m_pbwImage = cvCreateImage (m_frameSize, IPL_DEPTH_8U, 1);
m_pbwImage = cvCreateImage (frameSize, IPL_DEPTH_8U, 1);
cvPyrDown (m_pprevFrame, m_pprevDown);
cvCvtColor (m_pprevDown, m_pprevgreyImage, CV_RGB2GRAY);
cvPyrDown (m_pcurFrame, m_pcurDown);
@ -333,10 +344,7 @@ MotionCells::initDataFile (char *p_datafile, gint64 starttime) //p_date is incr
}
} else
mc_savefile = NULL;
memset (&m_header, 0, sizeof (MotionCellHeader));
m_header.headersize = GINT32_TO_BE (MC_HEADER);
m_header.type = GINT32_TO_BE (MC_TYPE);
m_header.version = GINT32_TO_BE (MC_VERSION);
//it needs these bytes
m_header.itemsize =
GINT32_TO_BE ((int) ceil (ceil (m_gridx * m_gridy / 8.0) / 4.0) * 4 +

1
ext/opencv/MotionCells.h
View file

@ -242,7 +242,6 @@ private:
IplImage *m_pcurFrame, *m_pprevFrame, *m_pdifferenceImage,
*m_pbwImage,*transparencyimg;
CvSize m_frameSize;
bool m_isVisible, m_changed_datafile, m_useAlpha, m_saveInDatafile;
Cell **m_pCells;
vector < MotionCellsIdx > m_MotionCells;