Format code

This commit is contained in:
2016-05-04 17:42:15 +01:00
parent 501e24fc5d
commit 404e58e0ce
109 changed files with 494 additions and 593 deletions
+2 -4
View File
@@ -31,7 +31,6 @@
using cv::Mat;
using cv::VideoCapture;
std::vector<PlaYUVerSupportedFormat> StreamHandlerOpenCV::supportedReadFormats()
{
INI_REGIST_PLAYUVER_SUPPORTED_FMT;
@@ -68,13 +67,13 @@ Bool StreamHandlerOpenCV::openHandler( String strFilename, Bool bInput )
m_strFormatName = "DEV";
m_strCodecName = "Raw Video";
pcVideoCapture = new VideoCapture( 0 );
m_uiWidth = pcVideoCapture->get( CV_CAP_PROP_FRAME_WIDTH );
m_uiWidth = pcVideoCapture->get( CV_CAP_PROP_FRAME_WIDTH );
m_uiHeight = pcVideoCapture->get( CV_CAP_PROP_FRAME_HEIGHT );
m_dFrameRate = 25;
}
else
{
m_strCodecName = m_strFormatName = uppercase (strFilename.substr( strFilename.find_last_of( "." ) + 1 ) );
m_strCodecName = m_strFormatName = uppercase( strFilename.substr( strFilename.find_last_of( "." ) + 1 ) );
Mat cvMat = cv::imread( m_cFilename );
m_uiWidth = cvMat.cols;
m_uiHeight = cvMat.rows;
@@ -146,4 +145,3 @@ Bool StreamHandlerOpenCV::write( PlaYUVerFrame* pcFrame )
return bRet;
}