jfmcarreira/calyp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor Playuver into Calyp

Browse Source 
commit 1fd9cf34f06ba2a156919b5c9b73c31d4c6c6257
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Mon Mar 12 18:06:39 2018 +0000

    Remove code style

commit 165588840126a7ab35b32e5be47f00c613829ef3
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Mon Mar 12 18:06:25 2018 +0000

    Update Mainpage.dox

commit 5b1a2773c48697346c7b0b64519b81a5aecc0150
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Mon Feb 19 03:46:24 2018 +0000

    Re-add CalypPixel.cpp but keep include with frame class

commit 2343be49ff4906c3171d2df7791e3cf34494eb21
Author: Joao Santos <joaompssantos@gmail.com>
Date:   Sun Feb 18 21:06:57 2018 +0000

    Fixed several things:
    - Removed unused define
    - Added: #include <cassert> to MainWindow.cpp
    - Fixed compilation issue when USE_FFMPEG is OFF on CalypStream.cpp

commit 8d1d64bac828a6bcdfa6af977a5d17d0792acb69
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Thu Feb 15 02:14:13 2018 +0000

    Fix several things:
    - Fix examples
    - Improve code formatting script
    - Change generated cmake config file

commit ea1d0265f1e9300f76fd3f0c8ca03d110ec13eaa
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Thu Feb 15 01:28:50 2018 +0000

    Fix dump of the module list: remove the use of char arrays

commit b4d19dda169715113a74713ca62d05f5a18fd0b5
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Wed Feb 14 23:20:56 2018 +0000

    Increase linesize of tools help

commit 8b3eab54e376863276b0d7e032f9e1de8aaf90e5
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Wed Feb 14 23:20:35 2018 +0000

    Fix CalypPixel

commit 1c6ba03c379518acf5fc6f1fdf328ca740a8851d
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Wed Feb 14 22:24:10 2018 +0000

    Enums CalypPixelFormats and CalypColorSpace are now class independent

commit 5dcc35e1716a70095e1720b01823c2e3a3980576
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Wed Feb 14 02:04:31 2018 +0000

    Change functions input and return types

commit 5514e3e24f9b428d5db71156561b2d8b6f61dd23
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Wed Feb 14 02:04:31 2018 +0000

    Change functions input and return types

commit fae7a9a91e1899e7a2833c634221f970d44b8fb6
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Wed Feb 14 01:39:14 2018 +0000

    Replace custom types with std ones

commit 0c3b62b8ea01903e213d9e8dd73a5b49c7c8c36e
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Wed Feb 14 00:37:18 2018 +0000

    Refactoring entries with Playuver name with Calyp
    Replace number of frames and add CLP tag into public definitions

commit e8cd8d7a219446513a5dda2c183dd892ec25a6f1
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Sat Feb 10 14:42:15 2018 +0000

    Fix min opencv version and missing ffmpeg module

commit 1233598af8ac15c88fa84569942cc6f865325452
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Sat Feb 10 03:10:12 2018 +0000

    Change version to 0.999.0 untill finishing refactoring

commit 1fe0cac8f0e70f352bf6c63b8cb2e06ab43fb633
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Sat Feb 10 00:21:47 2018 +0000

    Change project library

commit 44e9d330bc63b8b8a1687a14ff0be05af0bf2eb5
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Fri Feb 9 01:42:58 2018 +0000

    Change doxygen files and upload new ico

commit 0d6f3408a2682cfac1533a57a2f1b4e2cc1f0f29
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Thu Feb 8 21:25:31 2018 +0000

    Fix logos - different when it is icon or the full logo

commit 9f3561acd4b51c7de5f21d63d7e8f2b43c253148
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Thu Feb 8 01:25:39 2018 +0000

    fix install files

commit 832154e3e40f17a863898a77c929a6c6850ffded
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Thu Feb 8 01:21:23 2018 +0000

    rename calip to calyp

commit 341b32bfcc0133fdbceea9b8390d59190e495b79
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Thu Feb 8 00:58:29 2018 +0000

    Refactor lib, modules and tools

commit b4b988cf80052fdcfe0e1f9099d5435ef7945584
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Thu Feb 8 00:02:33 2018 +0000

    Refactor classes and filename in app

commit 6b4ab728202531ad00db1e6299ee69a01f3594ba
Author: Joao Carreira <jfmcarreira@gmail.com>
Date:   Wed Feb 7 17:49:53 2018 +0000

    Refactor about dialog and background logo

commit d5c954d39fb89d735c4feddf62f529077840ab6c
Author: João Santos <joaompssantos@gmail.com>
Date:   Wed Feb 7 15:05:19 2018 +0000

    Added the misteriously missing new logo.

commit f40d81f765bfdd2dc89c0647cf5f4a80eef845c7
Author: João Santos <joaompssantos@gmail.com>
Date:   Wed Feb 7 14:45:08 2018 +0000

    Added new logo to resource folder.

commit 52dc6d60d6590995d32de33f8199e954e0a6e120
Author: João Santos <joaompssantos@gmail.com>
Date:   Wed Feb 7 14:41:13 2018 +0000

    Added new logo where it was previously forgotten.

commit 6d8e064c3154e5202f01b1b10ba6ab3637383ecd
Author: João Santos <joaompssantos@gmail.com>
Date:   Tue Feb 6 17:44:11 2018 +0000

    About window no longer resizable. Added new logo.
This commit is contained in:
jfmcarreira
2018-03-12 18:21:07 +00:00
parent 5a701c83e7
commit 0b429a0c34
157 changed files with 16532 additions and 17759 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/OpticalFlow.cpp
+29 -29
View File
@@ -1,4 +1,4 @@
/* This file is a part of PlaYUVer project
/* This file is a part of Calyp project
* Copyright (C) 2014-2018 by Joao Carreira (jfmcarreira@gmail.com)
* Luis Lucas (luisfrlucas@gmail.com)
*
@@ -37,11 +37,11 @@ using cv::Scalar;
OpticalFlowModule::OpticalFlowModule()
{
/* Module Definition */
m_iModuleAPI = MODULE_API_2;
m_iModuleType = FRAME_PROCESSING_MODULE;
m_iModuleAPI = CLP_MODULE_API_2;
m_iModuleType = CLP_FRAME_PROCESSING_MODULE;
m_pchModuleCategory = "OpticalFlow";
m_uiNumberOfFrames = MODULE_REQUIRES_TWO_FRAMES;
m_uiModuleRequirements = MODULE_REQUIRES_SKIP_WHILE_PLAY | MODULE_REQUIRES_NEW_WINDOW | MODULE_REQUIRES_OPTIONS;
m_uiNumberOfFrames = 2;
m_uiModuleRequirements = CLP_MODULE_REQUIRES_SKIP_WHILE_PLAY | CLP_MODULE_REQUIRES_NEW_WINDOW | CLP_MODULE_REQUIRES_OPTIONS;
m_cModuleOptions.addOptions() /**/
( "Show reconstruction", m_bShowReconstruction, "Show reconstructed frame instead of MVs [false]" );
@@ -50,18 +50,18 @@ OpticalFlowModule::OpticalFlowModule()
m_pcOutputFrame = NULL;
}
Bool OpticalFlowModule::commonCreate( std::vector<PlaYUVerFrame*> apcFrameList )
bool OpticalFlowModule::commonCreate( std::vector<CalypFrame*> apcFrameList )
{
_BASIC_MODULE_API_2_CHECK_
for( UInt i = 1; i < apcFrameList.size(); i++ )
if( !apcFrameList[i]->haveSameFmt( apcFrameList[0], PlaYUVerFrame::MATCH_COLOR_SPACE |
PlaYUVerFrame::MATCH_RESOLUTION |
PlaYUVerFrame::MATCH_BITS ) )
for( unsigned int i = 1; i < apcFrameList.size(); i++ )
if( !apcFrameList[i]->haveSameFmt( apcFrameList[0], CalypFrame::MATCH_COLOR_SPACE |
CalypFrame::MATCH_RESOLUTION |
CalypFrame::MATCH_BITS ) )
return false;
m_iStep = 16;
m_pcOutputFrame = new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(), PlaYUVerFrame::GRAY );
m_pcOutputFrame = new CalypFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(), CLP_GRAY );
return true;
}
@@ -71,7 +71,7 @@ static inline bool isFlowCorrect( Point2f u )
return !cvIsNaN( u.x ) && !cvIsNaN( u.y ) && fabs( u.x ) < 1e9 && fabs( u.y ) < 1e9;
}
Void OpticalFlowModule::drawFlow()
void OpticalFlowModule::drawFlow()
{
Mat cvMatAfter;
m_pcFrameAfter->toMat( cvMatAfter, true );
@@ -81,7 +81,7 @@ Void OpticalFlowModule::drawFlow()
for( int x = m_iStep / 2; x < m_cvFlow.cols; x += m_iStep )
{
Point2f u( 0, 0 );
Double count = 0;
double count = 0;
for( int i = ( -m_iStep / 2 ); i < ( m_iStep / 2 ); i++ )
{
for( int j = ( -m_iStep / 2 ); j < ( m_iStep / 2 ); j++ )
@@ -104,16 +104,16 @@ Void OpticalFlowModule::drawFlow()
m_pcOutputFrame->fromMat( cvMatAfter );
}
Void OpticalFlowModule::compensateFlow()
void OpticalFlowModule::compensateFlow()
{
for( UInt c = 0; c < m_pcOutputFrame->getNumberChannels(); c++ )
for( unsigned int c = 0; c < m_pcOutputFrame->getNumberChannels(); c++ )
{
Pel** pPelPrev = m_pcFramePrev->getPelBufferYUV()[c];
Pel* pPelOut = m_pcOutputFrame->getPelBufferYUV()[c][0];
ClpPel** pPelPrev = m_pcFramePrev->getPelBufferYUV()[c];
ClpPel* pPelOut = m_pcOutputFrame->getPelBufferYUV()[c][0];
for( UInt y = 0; y < m_pcOutputFrame->getHeight( c ); y++ )
for( unsigned int y = 0; y < m_pcOutputFrame->getHeight( c ); y++ )
{
for( UInt x = 0; x < m_pcOutputFrame->getWidth( c ); x++ )
for( unsigned int x = 0; x < m_pcOutputFrame->getWidth( c ); x++ )
{
Point2f u = m_cvFlow( y, x );
Point p( x + u.x, y + u.y );
@@ -124,7 +124,7 @@ Void OpticalFlowModule::compensateFlow()
}
}
PlaYUVerFrame* OpticalFlowModule::process( std::vector<PlaYUVerFrame*> apcFrameList )
CalypFrame* OpticalFlowModule::process( std::vector<CalypFrame*> apcFrameList )
{
m_pcFrameAfter = apcFrameList[0];
m_pcFramePrev = apcFrameList[1];
@@ -144,7 +144,7 @@ PlaYUVerFrame* OpticalFlowModule::process( std::vector<PlaYUVerFrame*> apcFrameL
return m_pcOutputFrame;
}
Void OpticalFlowModule::destroy()
void OpticalFlowModule::destroy()
{
if( m_pcOutputFrame )
delete m_pcOutputFrame;
@@ -161,9 +161,9 @@ OpticalFlowDualTVL1::OpticalFlowDualTVL1()
m_pchModuleTooltip = "Measure optical flow using DualTVL1 method";
}
Bool OpticalFlowDualTVL1::create( std::vector<PlaYUVerFrame*> apcFrameList )
bool OpticalFlowDualTVL1::create( std::vector<CalypFrame*> apcFrameList )
{
Bool bRet = commonCreate( apcFrameList );
bool bRet = commonCreate( apcFrameList );
if( !bRet )
return bRet;
m_cOpticalFlow = cv::createOptFlow_DualTVL1();
@@ -178,9 +178,9 @@ OpticalFlowSparseToDense::OpticalFlowSparseToDense()
m_pchModuleTooltip = "Measure optical flow using SparseToDense method";
}
Bool OpticalFlowSparseToDense::create( std::vector<PlaYUVerFrame*> apcFrameList )
bool OpticalFlowSparseToDense::create( std::vector<CalypFrame*> apcFrameList )
{
Bool bRet = commonCreate( apcFrameList );
bool bRet = commonCreate( apcFrameList );
if( !bRet )
return bRet;
m_cOpticalFlow = cv::optflow::createOptFlow_SparseToDense();
@@ -195,9 +195,9 @@ OpticalFlowFarneback::OpticalFlowFarneback()
m_pchModuleTooltip = "Measure optical flow using Farneback method";
}
Bool OpticalFlowFarneback::create( std::vector<PlaYUVerFrame*> apcFrameList )
bool OpticalFlowFarneback::create( std::vector<CalypFrame*> apcFrameList )
{
Bool bRet = commonCreate( apcFrameList );
bool bRet = commonCreate( apcFrameList );
if( !bRet )
return bRet;
m_cOpticalFlow = cv::optflow::createOptFlow_Farneback();
@@ -212,9 +212,9 @@ OpticalDeepFlow::OpticalDeepFlow()
m_pchModuleTooltip = "Measure optical flow using Farneback method";
}
Bool OpticalDeepFlow::create( std::vector<PlaYUVerFrame*> apcFrameList )
bool OpticalDeepFlow::create( std::vector<CalypFrame*> apcFrameList )
{
Bool bRet = commonCreate( apcFrameList );
bool bRet = commonCreate( apcFrameList );
if( !bRet )
return bRet;
m_cOpticalFlow = cv::optflow::createOptFlow_DeepFlow();