From 7dedd2f388da6e8253449ff6b503dc9bd10f5299 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sun, 13 Nov 2022 21:33:54 +0000 Subject: [PATCH] refactor(modules): remove the use of a macro to create a module --- .../modules/AbsoluteFrameDifferenceExample.h | 4 +--- examples/modules/FrameBinarizationAPIv1.h | 4 +--- lib/CalypModuleIf.h | 19 ++----------------- modules/AbsoluteFrameDifference.h | 5 ++--- modules/DisparityStereoBM.h | 4 +--- modules/DisparityStereoSGBM.h | 4 +--- modules/DisparityStereoVar.h | 4 +--- modules/DummyOpencvModule.h | 3 +-- modules/EightBitsSampling.h | 4 +--- modules/FilterComponent.h | 9 +++------ modules/FrameBinarization.h | 4 +--- modules/FrameConcatenation.h | 4 +--- modules/FrameCrop.h | 4 +--- modules/FrameDifference.h | 4 +--- modules/FrameMask.h | 4 +--- modules/FrameResampling.h | 3 +-- modules/FrameRotate.h | 4 +--- modules/FrameShift.h | 4 +--- modules/HEVCIntraPrediction.h | 4 +--- modules/InterFrameVariance.h | 4 +--- modules/LumaAverage.h | 4 +--- modules/MeasureOpticalFlowDualTVL1.h | 4 +--- modules/OpticalFlow.h | 12 ++++-------- modules/OptimiseDisplay.h | 4 +--- modules/SaliencyBasedFiltering.h | 4 +--- modules/SaliencyDetection.h | 7 +++---- modules/SetChromaHalfScale.h | 4 +--- modules/ShapeDetection.h | 3 +-- modules/ThreeSixtyDownsampling.h | 3 +-- modules/ThreeSixtyDynamicDownsampling.h | 4 +--- modules/ThreeSixtyFaceConcatenation.h | 4 +--- modules/ThreeSixtyFaceExtraction.h | 4 +--- modules/ThreeSixtyNxN.h | 3 +-- modules/ThreeSixtySpatialtoTemporal.h | 4 +--- modules/WeightedPSNR.h | 4 +--- 35 files changed, 44 insertions(+), 123 deletions(-) diff --git a/examples/modules/AbsoluteFrameDifferenceExample.h b/examples/modules/AbsoluteFrameDifferenceExample.h index aafc3be..babe055 100644 --- a/examples/modules/AbsoluteFrameDifferenceExample.h +++ b/examples/modules/AbsoluteFrameDifferenceExample.h @@ -29,10 +29,8 @@ #include "CalypModuleIf.h" -class AbsoluteFrameDifferenceExample : public CalypModuleIf +class AbsoluteFrameDifferenceExample : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( AbsoluteFrameDifferenceExample ) - private: CalypFrame* m_pcFrameDifference; diff --git a/examples/modules/FrameBinarizationAPIv1.h b/examples/modules/FrameBinarizationAPIv1.h index d3eb4b3..76eb8f9 100644 --- a/examples/modules/FrameBinarizationAPIv1.h +++ b/examples/modules/FrameBinarizationAPIv1.h @@ -27,10 +27,8 @@ #include "CalypModuleIf.h" -class FrameBinarizationAPIv1 : public CalypModuleIf +class FrameBinarizationAPIv1 : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( FrameBinarizationAPIv1 ) - private: CalypFrame* m_pcBinFrame; unsigned int m_uiThreshold; diff --git a/lib/CalypModuleIf.h b/lib/CalypModuleIf.h index 78912e3..a05af91 100644 --- a/lib/CalypModuleIf.h +++ b/lib/CalypModuleIf.h @@ -40,18 +40,6 @@ #include "CalypFrame.h" #include "CalypOptions.h" -#define REGISTER_CLASS_MAKER( X ) \ - extern "C" CalypModulePtr Maker() { return std::make_unique(); } -#define REGISTER_CLASS_FACTORY( X ) \ -public: \ - X( const X& buffer ) \ - noexcept = delete; \ - X( X&& buffer ) \ - noexcept = delete; \ - auto operator=( const X& buffer )->X& = delete; \ - auto operator=( X&& buffer ) noexcept->X& = delete; \ - static CalypModulePtr Create() { return std::make_unique(); } - #define _BASIC_MODULE_API_2_CHECK_ \ if( apcFrameList.size() != m_uiNumberOfFrames ) \ return false; \ @@ -204,10 +192,7 @@ public: void destroy(); // API using OpenCV - virtual cv::Mat* create_using_opencv( const std::vector& apcFrameList ) - { - return nullptr; - }; + virtual cv::Mat* create_using_opencv( const std::vector& apcFrameList ) { return nullptr; }; virtual Mat* process_using_opencv( const std::vector& apcFrameList ) = 0; virtual void destroy_using_opencv(){}; @@ -220,7 +205,7 @@ protected: using CalypModulePtr = std::unique_ptr; template -class CalypModuleInstace +class CalypModuleInstance { public: static CalypModulePtr Create() { return std::make_unique(); } diff --git a/modules/AbsoluteFrameDifference.h b/modules/AbsoluteFrameDifference.h index 69704b3..c80e931 100644 --- a/modules/AbsoluteFrameDifference.h +++ b/modules/AbsoluteFrameDifference.h @@ -28,8 +28,7 @@ // CalypLib #include "lib/CalypModuleIf.h" -class AbsoluteFrameDifference : public CalypModuleIf, - public CalypModuleInstace +class AbsoluteFrameDifference : public CalypModuleIf, public CalypModuleInstance { private: std::unique_ptr m_pcFrameDifference; @@ -40,4 +39,4 @@ public: CalypFrame* process( std::vector apcFrameList ); }; -#endif // __FRAMEDIFFERENCE_H__ +#endif // __ABSOLUTEFRAMEDIFFERENCE_H__ diff --git a/modules/DisparityStereoBM.h b/modules/DisparityStereoBM.h index c501eb7..1467a44 100644 --- a/modules/DisparityStereoBM.h +++ b/modules/DisparityStereoBM.h @@ -32,10 +32,8 @@ // CalypLib #include "lib/CalypModuleIf.h" -class DisparityStereoBM : public CalypModuleIf +class DisparityStereoBM : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( DisparityStereoBM ) - private: CalypFrame* m_pcDisparityFrame; int m_uiNumberOfDisparities; diff --git a/modules/DisparityStereoSGBM.h b/modules/DisparityStereoSGBM.h index a3ed06b..61e2843 100644 --- a/modules/DisparityStereoSGBM.h +++ b/modules/DisparityStereoSGBM.h @@ -51,10 +51,8 @@ // CalypLib #include "lib/CalypModuleIf.h" -class DisparityStereoSGBM : public CalypModuleIf +class DisparityStereoSGBM : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( DisparityStereoSGBM ) - private: CalypFrame* m_pcDisparityFrame; bool m_bUseHH; diff --git a/modules/DisparityStereoVar.h b/modules/DisparityStereoVar.h index 72e3678..544615d 100644 --- a/modules/DisparityStereoVar.h +++ b/modules/DisparityStereoVar.h @@ -32,10 +32,8 @@ // CalypLib #include "CalypModuleIf.h" -class DisparityStereoVar : public CalypModuleIf +class DisparityStereoVar : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( DisparityStereoVar ) - private: CalypFrame* m_pcDisparityFrame; cv::StereoVar m_cStereoVar; diff --git a/modules/DummyOpencvModule.h b/modules/DummyOpencvModule.h index 44d3f7a..a8f2c90 100644 --- a/modules/DummyOpencvModule.h +++ b/modules/DummyOpencvModule.h @@ -32,8 +32,7 @@ #include #include -class DummyOpencvModule : public CalypOpenCVModuleIf, - public CalypModuleInstace +class DummyOpencvModule : public CalypOpenCVModuleIf, public CalypModuleInstance { using Mat = cv::Mat; diff --git a/modules/EightBitsSampling.h b/modules/EightBitsSampling.h index 953c148..7eda6c2 100644 --- a/modules/EightBitsSampling.h +++ b/modules/EightBitsSampling.h @@ -28,10 +28,8 @@ // CalypLib #include "lib/CalypModuleIf.h" -class EightBitsSampling : public CalypModuleIf +class EightBitsSampling : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( EightBitsSampling ) - private: int m_iNumberOfBits; int m_iBitSifting; diff --git a/modules/FilterComponent.h b/modules/FilterComponent.h index 2cb1ff7..ef69394 100644 --- a/modules/FilterComponent.h +++ b/modules/FilterComponent.h @@ -44,8 +44,7 @@ public: CalypFrame* filterComponent( CalypFrame* InputFrame, int Component ); }; -class FilterComponentLuma : public FilterComponentModule, - public CalypModuleInstace +class FilterComponentLuma : public FilterComponentModule, public CalypModuleInstance { public: FilterComponentLuma(); @@ -54,8 +53,7 @@ public: CalypFrame* process( std::vector apcFrameList ); }; -class FilterComponentChromaU : public FilterComponentModule, - public CalypModuleInstace +class FilterComponentChromaU : public FilterComponentModule, public CalypModuleInstance { public: FilterComponentChromaU(); @@ -64,8 +62,7 @@ public: CalypFrame* process( std::vector apcFrameList ); }; -class FilterComponentChromaV : public FilterComponentModule, - public CalypModuleInstace +class FilterComponentChromaV : public FilterComponentModule, public CalypModuleInstance { public: FilterComponentChromaV(); diff --git a/modules/FrameBinarization.h b/modules/FrameBinarization.h index ba4f213..4c8df15 100644 --- a/modules/FrameBinarization.h +++ b/modules/FrameBinarization.h @@ -28,10 +28,8 @@ // CalypLib #include "lib/CalypModuleIf.h" -class FrameBinarization : public CalypModuleIf +class FrameBinarization : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( FrameBinarization ) - private: CalypFrame* m_pcBinFrame; unsigned int m_uiThreshold; diff --git a/modules/FrameConcatenation.h b/modules/FrameConcatenation.h index e0933d9..0292b3e 100644 --- a/modules/FrameConcatenation.h +++ b/modules/FrameConcatenation.h @@ -28,10 +28,8 @@ // CalypLib #include "lib/CalypModuleIf.h" -class FrameConcatenation : public CalypModuleIf +class FrameConcatenation : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( FrameConcatenation ) - private: CalypFrame* m_pcProcessedFrame; int m_iShiftHor; diff --git a/modules/FrameCrop.h b/modules/FrameCrop.h index 7eaaed3..cee6749 100644 --- a/modules/FrameCrop.h +++ b/modules/FrameCrop.h @@ -28,10 +28,8 @@ // CalypLib #include "lib/CalypModuleIf.h" -class FrameCrop : public CalypModuleIf +class FrameCrop : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( FrameCrop ) - private: CalypFrame* m_pcCropedFrame; unsigned int m_uiXPosition; diff --git a/modules/FrameDifference.h b/modules/FrameDifference.h index d0b8fc9..2242b0e 100644 --- a/modules/FrameDifference.h +++ b/modules/FrameDifference.h @@ -28,10 +28,8 @@ // CalypLib #include "lib/CalypModuleIf.h" -class FrameDifference : public CalypModuleIf +class FrameDifference : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( FrameDifference ) - private: unsigned int m_uiBitsPixel; unsigned int m_uiSumOperation; diff --git a/modules/FrameMask.h b/modules/FrameMask.h index 27f5e62..ffa6a6c 100644 --- a/modules/FrameMask.h +++ b/modules/FrameMask.h @@ -28,10 +28,8 @@ // CalypLib #include "lib/CalypModuleIf.h" -class FrameMask : public CalypModuleIf +class FrameMask : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( FrameMask ) - private: int m_iWeight; CalypFrame* m_pcFrameProcessed; diff --git a/modules/FrameResampling.h b/modules/FrameResampling.h index a66c1d0..4ed3f84 100644 --- a/modules/FrameResampling.h +++ b/modules/FrameResampling.h @@ -36,9 +36,8 @@ * @} */ -class FrameResampling : public CalypModuleIf +class FrameResampling : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( FrameResampling ) private: int m_iWidth; int m_iHeight; diff --git a/modules/FrameRotate.h b/modules/FrameRotate.h index fdf2a97..e5f485a 100644 --- a/modules/FrameRotate.h +++ b/modules/FrameRotate.h @@ -28,10 +28,8 @@ // CalypLib #include "lib/CalypModuleIf.h" -class FrameRotate : public CalypModuleIf +class FrameRotate : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( FrameRotate ) - private: int m_iAngle; CalypFrame* m_pcFrameProcessed; diff --git a/modules/FrameShift.h b/modules/FrameShift.h index 2afa3bc..b40476c 100644 --- a/modules/FrameShift.h +++ b/modules/FrameShift.h @@ -28,10 +28,8 @@ // CalypLib #include "lib/CalypModuleIf.h" -class FrameShift : public CalypModuleIf +class FrameShift : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( FrameShift ) - private: CalypFrame* m_pcProcessedFrame; int m_iShiftHor; diff --git a/modules/HEVCIntraPrediction.h b/modules/HEVCIntraPrediction.h index 8d6455c..727cbd7 100644 --- a/modules/HEVCIntraPrediction.h +++ b/modules/HEVCIntraPrediction.h @@ -28,10 +28,8 @@ // CalypLib #include "lib/CalypModuleIf.h" -class HEVCIntraPrediction : public CalypModuleIf +class HEVCIntraPrediction : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( HEVCIntraPrediction ) - private: CalypFrame* m_pcPredBlock; unsigned int m_uiMode; diff --git a/modules/InterFrameVariance.h b/modules/InterFrameVariance.h index 013794a..348478e 100644 --- a/modules/InterFrameVariance.h +++ b/modules/InterFrameVariance.h @@ -29,10 +29,8 @@ #include "lib/CalypFrame.h" #include "lib/CalypModuleIf.h" -class InterFrameVariance : public CalypModuleIf +class InterFrameVariance : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( InterFrameVariance ) - private: CalypFrame* m_pcFrameVariance; CalypPlane m_pVariance; diff --git a/modules/LumaAverage.h b/modules/LumaAverage.h index beebb90..442599d 100644 --- a/modules/LumaAverage.h +++ b/modules/LumaAverage.h @@ -28,10 +28,8 @@ // CalypLib #include "lib/CalypModuleIf.h" -class LumaAverage : public CalypModuleIf +class LumaAverage : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( LumaAverage ) - private: public: LumaAverage(); diff --git a/modules/MeasureOpticalFlowDualTVL1.h b/modules/MeasureOpticalFlowDualTVL1.h index a594e6e..43e5de0 100644 --- a/modules/MeasureOpticalFlowDualTVL1.h +++ b/modules/MeasureOpticalFlowDualTVL1.h @@ -31,10 +31,8 @@ // CalypLib #include "lib/CalypModuleIf.h" -class MeasureOpticalFlowDualTVL1 : public CalypModuleIf +class MeasureOpticalFlowDualTVL1 : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( MeasureOpticalFlowDualTVL1 ) - private: bool m_bShowReconstruction; int m_iStep; diff --git a/modules/OpticalFlow.h b/modules/OpticalFlow.h index f1ea5f6..41e0cb7 100644 --- a/modules/OpticalFlow.h +++ b/modules/OpticalFlow.h @@ -53,36 +53,32 @@ public: void destroy(); }; -class OpticalFlowDualTVL1 : public OpticalFlowModule +class OpticalFlowDualTVL1 : public OpticalFlowModule, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( OpticalFlowDualTVL1 ) public: OpticalFlowDualTVL1(); virtual ~OpticalFlowDualTVL1() {} bool create( std::vector apcFrameList ); }; -class OpticalFlowSparseToDense : public OpticalFlowModule +class OpticalFlowSparseToDense : public OpticalFlowModule, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( OpticalFlowSparseToDense ) public: OpticalFlowSparseToDense(); virtual ~OpticalFlowSparseToDense() {} bool create( std::vector apcFrameList ); }; -class OpticalFlowFarneback : public OpticalFlowModule +class OpticalFlowFarneback : public OpticalFlowModule, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( OpticalFlowFarneback ) public: OpticalFlowFarneback(); virtual ~OpticalFlowFarneback() {} bool create( std::vector apcFrameList ); }; -class OpticalDeepFlow : public OpticalFlowModule +class OpticalDeepFlow : public OpticalFlowModule, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( OpticalDeepFlow ) public: OpticalDeepFlow(); virtual ~OpticalDeepFlow() {} diff --git a/modules/OptimiseDisplay.h b/modules/OptimiseDisplay.h index b0d18e1..a56b288 100644 --- a/modules/OptimiseDisplay.h +++ b/modules/OptimiseDisplay.h @@ -29,10 +29,8 @@ // CalypLib #include "lib/CalypModuleIf.h" -class OptimiseDisplay : public CalypModuleIf +class OptimiseDisplay : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( OptimiseDisplay ) - private: std::unique_ptr m_pcOptimisedFrame; diff --git a/modules/SaliencyBasedFiltering.h b/modules/SaliencyBasedFiltering.h index 470c075..6e218e5 100644 --- a/modules/SaliencyBasedFiltering.h +++ b/modules/SaliencyBasedFiltering.h @@ -26,10 +26,8 @@ #include "lib/CalypModuleIf.h" -class SaliencyBasedFiltering : public CalypModuleIf +class SaliencyBasedFiltering : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( SaliencyBasedFiltering ) - private: std::unique_ptr m_pcProcessedFrame; diff --git a/modules/SaliencyDetection.h b/modules/SaliencyDetection.h index 408f88f..f255998 100644 --- a/modules/SaliencyDetection.h +++ b/modules/SaliencyDetection.h @@ -65,8 +65,7 @@ public: * approach. In Computer Vision and Pattern Recognition, 2007. * CVPR'07. IEEE Conference on, pages 1–8. IEEE, 2007. */ -class SaliencyDetectionSpectral : public SaliencyDetectionModule, - public CalypModuleInstace +class SaliencyDetectionSpectral : public SaliencyDetectionModule, public CalypModuleInstance { using Mat = cv::Mat; @@ -91,7 +90,7 @@ public: * In Image and Vision Computing, Vol. 28 Issue 3, pages 391–402. Elsevier, 2010. */ class SaliencyDetectionFineGrained : public SaliencyDetectionModule, - public CalypModuleInstace + public CalypModuleInstance { using Mat = cv::Mat; @@ -110,7 +109,7 @@ public: * in proc of IEEE Workshop on Change Detection, 2014 */ class SaliencyDetectionBinWangApr2014 : public SaliencyDetectionModule, - public CalypModuleInstace + public CalypModuleInstance { using Mat = cv::Mat; diff --git a/modules/SetChromaHalfScale.h b/modules/SetChromaHalfScale.h index 3a7ec9d..233ceec 100644 --- a/modules/SetChromaHalfScale.h +++ b/modules/SetChromaHalfScale.h @@ -28,10 +28,8 @@ // CalypLib #include "lib/CalypModuleIf.h" -class SetChromaHalfScale : public CalypModuleIf +class SetChromaHalfScale : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( SetChromaHalfScale ) - private: CalypFrame* m_pcProcessedFrame; diff --git a/modules/ShapeDetection.h b/modules/ShapeDetection.h index f10ea3e..6e89894 100644 --- a/modules/ShapeDetection.h +++ b/modules/ShapeDetection.h @@ -31,8 +31,7 @@ // OpenCV #include -class ShapeDetection : public CalypOpenCVModuleIf, - public CalypModuleInstace +class ShapeDetection : public CalypOpenCVModuleIf, public CalypModuleInstance { using Mat = cv::Mat; diff --git a/modules/ThreeSixtyDownsampling.h b/modules/ThreeSixtyDownsampling.h index 809c428..9960bb0 100644 --- a/modules/ThreeSixtyDownsampling.h +++ b/modules/ThreeSixtyDownsampling.h @@ -34,9 +34,8 @@ using cv::Mat; using cv::Mat_; using cv::Point; -class ThreeSixtyDownsampling : public CalypModuleIf +class ThreeSixtyDownsampling : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( ThreeSixtyDownsampling ) private: unsigned m_uiDownsampling; unsigned m_uiX0; diff --git a/modules/ThreeSixtyDynamicDownsampling.h b/modules/ThreeSixtyDynamicDownsampling.h index b79a422..c22433b 100644 --- a/modules/ThreeSixtyDynamicDownsampling.h +++ b/modules/ThreeSixtyDynamicDownsampling.h @@ -43,10 +43,8 @@ struct ClpVideoFPStruct ClpFaceProperty faces[60]; }; -class ThreeSixtyDynamicDownsampling : public CalypModuleIf +class ThreeSixtyDynamicDownsampling : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( ThreeSixtyDynamicDownsampling ) - private: std::string m_arrayInputDefinitionString; std::string m_arrayOutputDefinitionString; diff --git a/modules/ThreeSixtyFaceConcatenation.h b/modules/ThreeSixtyFaceConcatenation.h index 480e98f..507509a 100644 --- a/modules/ThreeSixtyFaceConcatenation.h +++ b/modules/ThreeSixtyFaceConcatenation.h @@ -27,10 +27,8 @@ // CalypLib #include "lib/CalypModuleIf.h" -class ThreeSixtyFaceConcatenation : public CalypModuleIf +class ThreeSixtyFaceConcatenation : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( ThreeSixtyFaceConcatenation ) - private: std::unique_ptr m_pcConcatenatedFaces; unsigned m_uiProjectionType; diff --git a/modules/ThreeSixtyFaceExtraction.h b/modules/ThreeSixtyFaceExtraction.h index 9a40d44..e83f73d 100644 --- a/modules/ThreeSixtyFaceExtraction.h +++ b/modules/ThreeSixtyFaceExtraction.h @@ -27,10 +27,8 @@ // CalypLib #include "lib/CalypModuleIf.h" -class ThreeSixtyFaceExtraction : public CalypModuleIf +class ThreeSixtyFaceExtraction : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( ThreeSixtyFaceExtraction ) - private: std::unique_ptr m_pcFrameExtractionFrame; std::unique_ptr m_pcTmpFrame; diff --git a/modules/ThreeSixtyNxN.h b/modules/ThreeSixtyNxN.h index 204b369..6c2f735 100644 --- a/modules/ThreeSixtyNxN.h +++ b/modules/ThreeSixtyNxN.h @@ -34,9 +34,8 @@ using cv::Mat; using cv::Mat_; using cv::Point; -class ThreeSixtyNxN : public CalypModuleIf +class ThreeSixtyNxN : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( ThreeSixtyNxN ) private: unsigned m_uiDownsampling; CalypFrame* m_pcOutputFrame; diff --git a/modules/ThreeSixtySpatialtoTemporal.h b/modules/ThreeSixtySpatialtoTemporal.h index c83d455..f65bb21 100644 --- a/modules/ThreeSixtySpatialtoTemporal.h +++ b/modules/ThreeSixtySpatialtoTemporal.h @@ -28,10 +28,8 @@ // CalypLib #include "lib/CalypModuleIf.h" -class ThreeSixtySpatialtoTemporal : public CalypModuleIf +class ThreeSixtySpatialtoTemporal : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( ThreeSixtySpatialtoTemporal ) - private: std::unique_ptr m_pcTempSpatialFrame; std::unique_ptr m_pcTmpInputFrame; diff --git a/modules/WeightedPSNR.h b/modules/WeightedPSNR.h index ba44355..7cebefc 100644 --- a/modules/WeightedPSNR.h +++ b/modules/WeightedPSNR.h @@ -28,10 +28,8 @@ // CalypLib #include "lib/CalypModuleIf.h" -class WeightedPSNR : public CalypModuleIf +class WeightedPSNR : public CalypModuleIf, public CalypModuleInstance { - REGISTER_CLASS_FACTORY( WeightedPSNR ) - private: unsigned int m_uiComponent;