jnohlgard · Sep 1, 2013 · Sep 12, 2013 · Sep 13, 2013 · Oct 17, 2013 · Oct 17, 2013
diff --git a/MANIFEST b/MANIFEST
@@ -3,4 +3,4 @@ capture_picture.py
 capture_picture_delayed.py
 list_devices.py
 setup.py
-v4l2capture.c
+v4l2capture.cpp
diff --git a/README b/README
@@ -1,57 +1,56 @@
-python-v4l2capture 1.4.x
-Python extension to capture video with video4linux2
+libvideolive
+Capture and stream video in python
 
 2009, 2010, 2011 Fredrik Portstrom
 2011 Joakim Gebart
+2013 Tim Sheerman-Chase
 
-I, the copyright holder of this file, hereby release it into the
-public domain. This applies worldwide. In case this is not legally
-possible: I grant anyone the right to use this work for any purpose,
-without any conditions, unless such conditions are required by law.
+This software may be used and redistributed under the terms of the GPL v2 (or later) license.
 
 Introduction
 ============
 
-python-v4l2capture is a slim and easy to use Python extension for
-capturing video with video4linux2. It supports libv4l to convert any
-image format to RGB or YUV420.
+libvideolive is a slim and easy to use Python extension for
+capturing and streaming video. 
 
 this fork of python-v4l2capture: https://github.com/gebart/python-v4l2capture
 
 original python-v4l2capture: http://fredrik.jemla.eu/v4l2capture
 
 libv4l: http://freshmeat.net/projects/libv4l
 
-Installation
-============
+Installation on Linux
+=====================
+
+libvideolive on linux requires libv4l by default. You can do so by erasing ', libraries = ["v4l2"]'
+in setup.py and erasing '#define USE_LIBV4L' in v4l2capture.cpp.
+
+libvideolive uses distutils to compile. For Linux:
+
+./setup.py build
+sudo ./setup.py install
+
+Installation on Windows
+=====================
 
-v4l2capture requires libv4l by default. You can compile v4l2capture
-without libv4l, but that reduces image format support to YUYV input
-and RGB output only. You can do so by erasing ', libraries = ["v4l2"]'
-in setup.py and erasing '#define USE_LIBV4L' in v4l2capture.c.
+Modify setup.py to specify locations of libjpeg and pthread external libraries.
 
-python-v4l2capture uses distutils.
-To build: ./setup.py build
-To build and install: ./setup.py install
+With Visual Studio 2010:
+
+SET VS90COMNTOOLS=%VS100COMNTOOLS%
+python setup.py build -c msvc
+python setup.py install
+
+Remember to put the libjpeg and pthread dlls somewhere appropriate.
 
 Example
 =======
 
-See capture_picture.py, capture_picture_delayed.py and list_devices.py.
+To do
 
 Change log
 ==========
 
 (see git log for latest changes)
 
-1.4 (2011-03-18) - Added support for YUV420 output.
-
-1.3 (2010-07-21) - Added set of capabilities to the return value of
-                   get_info. Updated list_devices.py.
-
-1.2 (2010-04-01) - Forked example script into capture_picture.py and
-    		   capture_picture_delayed.py.
-
-1.1 (2009-11-03) - Updated URL and documentation.
 
-1.0 (2009-02-28) - Initial release.
diff --git a/base.h b/base.h
@@ -0,0 +1,91 @@
+
+#ifndef BASE_H
+#define BASE_H
+
+#include <string>
+
+class FrameMetaData
+{
+public:
+	std::string fmt;
+	int width;
+	int height;
+	unsigned buffLen;
+	unsigned long sequence;
+	unsigned long tv_sec;
+	unsigned long tv_usec;
+
+	FrameMetaData()
+	{
+		width = 0;
+		height = 0;
+		buffLen = 0;
+		sequence = 0;
+		tv_sec = 0;
+		tv_usec = 0;
+	}
+
+	FrameMetaData(const FrameMetaData &in)
+	{
+		FrameMetaData::operator=(in);
+	}	
+
+	const FrameMetaData &operator=(const FrameMetaData &in)
+	{
+		width = in.width;
+		height = in.height;
+		fmt = in.fmt;
+		buffLen = in.buffLen;
+		sequence = in.sequence;
+		tv_sec = in.tv_sec;
+		tv_usec = in.tv_usec;
+		return *this;
+	}
+
+};
+
+class Base_Video_In
+{
+public:
+	Base_Video_In() {};
+	virtual ~Base_Video_In() {};
+
+	virtual void Stop() {};
+	virtual void WaitForStop() {};
+	virtual void OpenDevice() {};
+	virtual void SetFormat(const char *fmt, int width, int height) {};
+	virtual void StartDevice(int buffer_count) {};
+	virtual void StopDevice() {};
+	virtual void CloseDevice() {};
+	virtual int GetFrame(unsigned char **buffOut, class FrameMetaData *metaOut) {return 0;};
+
+	void Run() {};
+};
+
+// **********************************************************************
+
+class Base_Video_Out
+{
+public:
+	Base_Video_Out() {};
+	virtual ~Base_Video_Out() {};
+
+	virtual void SendFrame(const char *imgIn, 
+		unsigned imgLen, 
+		const char *pxFmt, 
+		int width, 
+		int height, 
+		unsigned long tv_sec = 0,
+		unsigned long tv_usec = 0) {};
+	virtual void Stop() {};
+	virtual int WaitForStop() {return 1;};
+	virtual void SetOutputSize(int width, int height) {};
+	virtual void SetOutputPxFmt(const char *fmt) {};
+	virtual void SetFrameRate(unsigned int frameRateIn) {};
+	virtual void SetVideoCodec(const char *codec, unsigned int bitrate) {};
+
+	void Run() {};
+};
+
+#endif //BASE_H
+
diff --git a/capture_picture.py b/capture_picture.py
diff --git a/capture_picture_delayed.py b/capture_picture_delayed.py