Minor changes in the modules interface to support modules that just return values

source/app/PlaYUVerModuleIf.h

@@ -39,8 +39,9 @@ namespace plaYUVer
 
 enum // Module type
 {
-  FRAME_LEVEL_MODULE,
-  VIDEO_LEVEL_MODULE,
+  FRAME_PROCESSING_MODULE,
+  VIDEO_PROCESSING_MODULE,
+  FRAME_MEASUREMENT_MODULE,
 };
 
 #define APPLY_WHILE_PLAYING true
@@ -132,8 +133,6 @@ public:
 
   virtual Void destroy() { }
 
-  //PlaYUVerFrame* getProcessedFrame() { return m_pcProcessedFrame; }
-
   Void setModuleDefinition( PlaYUVerModuleDefinition def ) { m_cModuleDef = def; }
 
 protected:

source/modules/DisparityStereoVar.cpp

@@ -32,7 +32,7 @@ namespace plaYUVer
 
 static PlaYUVerModuleDefinition DisparityStereoVarDef =
 {
-    FRAME_LEVEL_MODULE,
+    FRAME_PROCESSING_MODULE,
     "Disparity",
     "StereoVar",
     "Measure the disparity between two images using the Stereo Var method (OpenCV)",

source/modules/FilterFrame.cpp

@@ -31,7 +31,7 @@ namespace plaYUVer
 {
 
 PlaYUVerModuleDefinition FilterFrameDef = {
-    FRAME_LEVEL_MODULE,             // Apply module to the frames or to the whole sequence.
+    FRAME_PROCESSING_MODULE,        // Apply module to the frames or to the whole sequence.
                                     // Currently only support for frame
     "Filters",                      // Category (sub-menu)
     "Y_Filter",                     // Name

source/modules/FilterFrame.h

@@ -53,10 +53,6 @@ public:
   PlaYUVerFrame* process( PlaYUVerFrame* InputFrame );
   Void destroy();
 
-  PlaYUVerFrame* getModImage()
-  {
-    return m_pcFilteredFrame;
-  }
 };
 
 }  // NAMESPACE

source/modules/FrameDifference.cpp

@@ -32,7 +32,7 @@ namespace plaYUVer
 
 static PlaYUVerModuleDefinition FrameDifferenceDef =
 {
-    FRAME_LEVEL_MODULE,
+    FRAME_PROCESSING_MODULE,
     "Measurements",
     "AbsoluteFrameDifference",
     "Measure the difference between two images (Y plane), e. g., abs( Y1 - Y2 )",

source/modules/MeasurePSNR.cpp

@@ -32,8 +32,8 @@ namespace plaYUVer
 
 static PlaYUVerModuleDefinition MeasurePSNRDef =
 {
-    FRAME_LEVEL_MODULE,
-    "Measurements",
+    FRAME_MEASUREMENT_MODULE,
+    "Quality",
     "PSNR",
     "Measure the PSNR between two images",
     MODULE_REQUIRES_TWO_FRAMES,

source/modules/MeasurePSNR.h

@@ -41,7 +41,6 @@ namespace plaYUVer
 class MeasurePSNR: public PlaYUVerModuleIf
 {
 private:
-  PlaYUVerFrame* m_pcFilteredFrame;
 
 public:
   MeasurePSNR();
@@ -54,10 +53,6 @@ public:
   PlaYUVerFrame* process( PlaYUVerFrame* InputFrame );
   Void destroy();
 
-  PlaYUVerFrame* getModImage()
-  {
-    return m_pcFilteredFrame;
-  }
 };
 
 }  // NAMESPACE