Video out code defined in terms of abstract class

Author: TimSC

base.h

@@ -44,11 +44,11 @@ class FrameMetaData
 
 };
 
-// **********************************************************************
-
 class Base_Video_In
 {
 public:
+	Base_Video_In() {};
+	virtual ~Base_Video_In() {};
 	virtual void Stop() {};
 	virtual void WaitForStop() {};
 	virtual void OpenDevice() {};
@@ -59,5 +59,15 @@ class Base_Video_In
 	virtual int GetFrame(unsigned char **buffOut, class FrameMetaData *metaOut) {return 0;};
 };
 
+// **********************************************************************
+
+class Base_Video_Out
+{
+public:
+	virtual void SendFrame(const char *imgIn, unsigned imgLen, const char *pxFmt, int width, int height) {};
+	virtual void Stop() {};
+	virtual int WaitForStop() {return 1;};
+};
+
 #endif //BASE_H
 

libvideolive.cpp

@@ -128,7 +128,6 @@ static PyObject *Device_manager_open(Device_manager *self, PyObject *args)
 	Py_RETURN_NONE;
 }
 
-
 static PyObject *Device_manager_set_format(Device_manager *self, PyObject *args)
 {
 	int size_x;

v4l2capture.cpp

@@ -84,7 +84,7 @@ int my_ioctl(int fd, int request, void *arg, int utimeout = -1)
 
 // **************************************************************************
 
-Video_in_Manager::Video_in_Manager(const char *devNameIn)
+Video_in_Manager::Video_in_Manager(const char *devNameIn) : Base_Video_In()
 {
 	stop = 0;
 	stopped = 1;

v4l2out.cpp

@@ -34,8 +34,6 @@ void print_format(struct v4l2_format*vid_format) {
   printf("	vid_format->fmt.pix.colorspace  =%d\n",	vid_format->fmt.pix.colorspace );
 }
 
-//*******************************************************************
-
 class SendFrameArgs
 {
 public:
@@ -66,7 +64,9 @@ class SendFrameArgs
 	}
 };
 
-Video_out::Video_out(const char *devNameIn)
+//*******************************************************************
+
+Video_out::Video_out(const char *devNameIn) : Base_Video_Out()
 {
 	this->fdwr = 0;
 	framesize = 0;

v4l2out.h

@@ -4,8 +4,9 @@
 #include <map>
 #include <vector>
 #include <string>
+#include "base.h"
 
-class Video_out
+class Video_out : public Base_Video_Out
 {
 public:
 	std::string devName;

videoout.cpp

@@ -5,14 +5,14 @@
 int Video_out_manager_init(Video_out_manager *self, PyObject *args,
 		PyObject *kwargs)
 {
-	self->threads = new std::map<std::string, class Video_out *>;
+	self->threads = new std::map<std::string, class Base_Video_Out *>;
 	return 0;
 }
 
 void Video_out_manager_dealloc(Video_out_manager *self)
 {
 	//Stop high level threads
-	for(std::map<std::string, class Video_out *>::iterator it = self->threads->begin(); 
+	for(std::map<std::string, class Base_Video_Out *>::iterator it = self->threads->begin(); 
 		it != self->threads->end(); it++)
 	{
 		it->second->Stop();
@@ -85,7 +85,7 @@ PyObject *Video_out_manager_Send_frame(Video_out_manager *self, PyObject *args)
 	PyObject *pyHeight = PyTuple_GetItem(args, 4);
 	heightIn = PyInt_AsLong(pyHeight);
 
-	std::map<std::string, class Video_out *>::iterator it = self->threads->find(devarg);
+	std::map<std::string, class Base_Video_Out *>::iterator it = self->threads->find(devarg);
 
 	if(it != self->threads->end())
 	{
@@ -111,7 +111,7 @@ PyObject *Video_out_manager_close(Video_out_manager *self, PyObject *args)
 	}
 
 	//Stop worker thread
-	std::map<std::string, class Video_out *>::iterator it = self->threads->find(devarg);
+	std::map<std::string, class Base_Video_Out *>::iterator it = self->threads->find(devarg);
 
 	if(it != self->threads->end())
 	{

videoout.h

@@ -5,11 +5,12 @@
 #include <Python.h>
 #include <map>
 #include <string>
+#include "base.h"
 
 class Video_out_manager_cl{
 public:
 	PyObject_HEAD
-	std::map<std::string, class Video_out *> *threads;
+	std::map<std::string, class Base_Video_Out *> *threads;
 };
 typedef Video_out_manager_cl Video_out_manager;