Extract ImageResampler from X11Grabber

Author: poljvd

CMakeLists.txt

@@ -57,8 +57,8 @@ include_directories(${CMAKE_SOURCE_DIR}/include)
 # Prefer static linking over dynamic
 #set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.so")
 
-#set(CMAKE_BUILD_TYPE "Debug")
-set(CMAKE_BUILD_TYPE "Release")
+set(CMAKE_BUILD_TYPE "Debug")
+#set(CMAKE_BUILD_TYPE "Release")
 
 # enable C++11
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall")

include/grabber/V4L2Grabber.h

@@ -11,119 +11,119 @@
 // util includes
 #include <utils/Image.h>
 #include <utils/ColorRgb.h>
+#include <utils/PixelFormat.h>
 #include <utils/VideoMode.h>
 
 // grabber includes
 #include <grabber/VideoStandard.h>
-#include <grabber/PixelFormat.h>
 
 /// Capture class for V4L2 devices
 ///
 /// @see http://linuxtv.org/downloads/v4l-dvb-apis/capture-example.html
 class V4L2Grabber : public QObject
 {
-	Q_OBJECT
+    Q_OBJECT
 
 public:
-	V4L2Grabber(const std::string & device,
-			int input,
-			VideoStandard videoStandard, PixelFormat pixelFormat,
-			int width,
-			int height,
-			int frameDecimation,
-			int horizontalPixelDecimation,
-			int verticalPixelDecimation);
-	virtual ~V4L2Grabber();
+    V4L2Grabber(const std::string & device,
+            int input,
+            VideoStandard videoStandard, PixelFormat pixelFormat,
+            int width,
+            int height,
+            int frameDecimation,
+            int horizontalPixelDecimation,
+            int verticalPixelDecimation);
+    virtual ~V4L2Grabber();
 
 public slots:
-	void setCropping(int cropLeft,
-					 int cropRight,
-					 int cropTop,
-					 int cropBottom);
+    void setCropping(int cropLeft,
+                     int cropRight,
+                     int cropTop,
+                     int cropBottom);
 
-	void set3D(VideoMode mode);
+    void set3D(VideoMode mode);
 
-	void setSignalThreshold(double redSignalThreshold,
-					double greenSignalThreshold,
-					double blueSignalThreshold,
-					int noSignalCounterThreshold);
+    void setSignalThreshold(double redSignalThreshold,
+                    double greenSignalThreshold,
+                    double blueSignalThreshold,
+                    int noSignalCounterThreshold);
 
-	void start();
+    void start();
 
-	void stop();
+    void stop();
 
 signals:
-	void newFrame(const Image<ColorRgb> & image);
+    void newFrame(const Image<ColorRgb> & image);
 
 private slots:
-	int read_frame();
+    int read_frame();
 
 private:
-	void open_device();
+    void open_device();
 
-	void close_device();
+    void close_device();
 
-	void init_read(unsigned int buffer_size);
+    void init_read(unsigned int buffer_size);
 
-	void init_mmap();
+    void init_mmap();
 
-	void init_userp(unsigned int buffer_size);
+    void init_userp(unsigned int buffer_size);
 
-	void init_device(VideoStandard videoStandard, int input);
+    void init_device(VideoStandard videoStandard, int input);
 
-	void uninit_device();
+    void uninit_device();
 
-	void start_capturing();
+    void start_capturing();
 
-	void stop_capturing();
+    void stop_capturing();
 
-	bool process_image(const void *p, int size);
+    bool process_image(const void *p, int size);
 
-	void process_image(const uint8_t *p);
+    void process_image(const uint8_t *p);
 
-	int xioctl(int request, void *arg);
+    int xioctl(int request, void *arg);
 
-	void throw_exception(const std::string &error);
+    void throw_exception(const std::string &error);
 
-	void throw_errno_exception(const std::string &error);
+    void throw_errno_exception(const std::string &error);
 
 private:
-	enum io_method {
-			IO_METHOD_READ,
-			IO_METHOD_MMAP,
-			IO_METHOD_USERPTR
-	};
+    enum io_method {
+            IO_METHOD_READ,
+            IO_METHOD_MMAP,
+            IO_METHOD_USERPTR
+    };
 
-	struct buffer {
-			void   *start;
-			size_t  length;
-	};
+    struct buffer {
+            void   *start;
+            size_t  length;
+    };
 
 private:
-	const std::string _deviceName;
-	const io_method _ioMethod;
-	int _fileDescriptor;
-	std::vector<buffer> _buffers;
-
-	PixelFormat _pixelFormat;
-	int _width;
-	int _height;
-	int _frameByteSize;
-	int _cropLeft;
-	int _cropRight;
-	int _cropTop;
-	int _cropBottom;
-	int _frameDecimation;
-	int _horizontalPixelDecimation;
-	int _verticalPixelDecimation;
-	int _noSignalCounterThreshold;
-
-	ColorRgb _noSignalThresholdColor;
-
-	VideoMode _mode3D;
-
-	int _currentFrame;
-	int _noSignalCounter;
-
-	QSocketNotifier * _streamNotifier;
+    const std::string _deviceName;
+    const io_method _ioMethod;
+    int _fileDescriptor;
+    std::vector<buffer> _buffers;
+
+    PixelFormat _pixelFormat;
+    int _width;
+    int _height;
+    int _frameByteSize;
+    int _cropLeft;
+    int _cropRight;
+    int _cropTop;
+    int _cropBottom;
+    int _frameDecimation;
+    int _horizontalPixelDecimation;
+    int _verticalPixelDecimation;
+    int _noSignalCounterThreshold;
+
+    ColorRgb _noSignalThresholdColor;
+
+    VideoMode _mode3D;
+
+    int _currentFrame;
+    int _noSignalCounter;
+
+    QSocketNotifier * _streamNotifier;
 };

include/grabber/X11Grabber.h

@@ -2,6 +2,7 @@
 // Hyperion-utils includes
 #include <utils/Image.h>
 #include <utils/ColorRgb.h>
+#include <utils/ImageResampler.h>
 
 // X11 includes
 #include <X11/Xlib.h>
@@ -10,7 +11,7 @@ class X11Grabber
 {
 public:
 
-	X11Grabber(const unsigned cropHorizontal, const unsigned cropVertical, const unsigned pixelDecimation);
+    X11Grabber(int cropLeft, int cropRight, int cropTop, int cropBottom, int horizontalPixelDecimation, int verticalPixelDecimation);
 
 	virtual ~X11Grabber();
 
@@ -19,11 +20,12 @@ class X11Grabber
 	Image<ColorRgb> & grab();
 
 private:
+    ImageResampler _imageResampler;
 
-	const unsigned _pixelDecimation;
-
-	const unsigned _cropWidth;
-	const unsigned _cropHeight;
+    int _cropLeft;
+    int _cropRight;
+    int _cropTop;
+    int _cropBottom;
 
 	/// Reference to the X11 display (nullptr if not opened)
 	Display * _x11Display;