Initial code to measure disparity using OpenCV

This commit is contained in:
jfmcarreira committed 2014-05-17 19:06:21 +01:00
1 parent e17539939a
commit edf820c580
2 files changed
+8 -9

No files matched your search

+4 -4
View File
@@ -516,11 +516,11 @@ cv::Mat PlaYUVerFrame::getCvMat()
if( m_iPixelFormat != GRAY )
{
FrametoRGB8();
memcpy( opencvFrame.data, m_pcRGBPelInterlaced, getBytesPerFrame() * sizeof(Pel) );
memcpy( opencvFrame.data, m_pcRGBPelInterlaced, m_uiWidth * m_uiHeight * 3 * sizeof(Pel) );
}
else
{
memcpy( opencvFrame.data, &( m_pppcInputPel[LUMA][0][0] ), getBytesPerFrame() * sizeof(Pel) );
memcpy( opencvFrame.data, &( m_pppcInputPel[LUMA][0][0] ), m_uiWidth * m_uiHeight * sizeof(Pel) );
}
return opencvFrame;
}
@@ -555,7 +555,7 @@ Void PlaYUVerFrame::copyFrom( cv::Mat* opencvFrame )
Pel* pInputPelU = m_pppcInputPel[CHROMA_U][0];
Pel* pInputPelV = m_pppcInputPel[CHROMA_V][0];
Pel* pcRGBPelInterlaced = m_pcRGBPelInterlaced;
memcpy( pcRGBPelInterlaced, opencvFrame->data, getBytesPerFrame() * sizeof(Pel) );
memcpy( pcRGBPelInterlaced, opencvFrame->data, m_uiWidth * m_uiHeight * 3 * sizeof(Pel) );
for( UInt i = 0; i < m_uiHeight * m_uiWidth; i++ )
{
*pInputPelY++ = *pcRGBPelInterlaced++;
@@ -566,7 +566,7 @@ Void PlaYUVerFrame::copyFrom( cv::Mat* opencvFrame )
}
else
{
memcpy( m_pppcInputPel[LUMA][0], opencvFrame->data, getBytesPerFrame() * sizeof(Pel) );
memcpy( m_pppcInputPel[LUMA][0], opencvFrame->data, m_uiWidth * m_uiHeight * sizeof(Pel) );
}
}
#endif
+4 -5
View File
@@ -65,13 +65,12 @@ Void DisparityCVVar::create( PlaYUVerFrame* InputFrame )
PlaYUVerFrame* DisparityCVVar::process( PlaYUVerFrame* InputLeft, PlaYUVerFrame* InputRight )
{
// cv::Mat leftImage = InputLeft->getCvMat();
// cv::Mat rightImage = InputRight->getCvMat();
cv::Mat leftImage = InputLeft->getCvMat();
cv::Mat rightImage = InputRight->getCvMat();
cv::Mat disparityImage, disparityImage8;
// m_cStereoVar(leftImage,rightImage,disparityImage);
// disparityImage.convertTo(disparityImage8,CV_8U);
disparityImage8 = InputLeft->getCvMat();
m_cStereoVar(leftImage,rightImage,disparityImage);
disparityImage.convertTo(disparityImage8,CV_8U);
m_pcDisparityFrame->copyFrom(&disparityImage8);
return m_pcDisparityFrame;