Add support for native VFW implementation on Windows

README.md

@@ -11,27 +11,36 @@ or
 
 ### Requirements
 
-* [OpenCV](http://opencv.org/)
-* [libjpeg-turbo](https://www.libjpeg-turbo.org/)
+* [libjpeg-turbo](https://www.libjpeg-turbo.org/) (use `-tags jpeg` to build without `CGo`)
+
+On Linux/RPi native Go [V4L](https://github.com/korandiz/v4l) implementation is used to capture images.
+On Windows [Video for Windows (VfW)](https://en.wikipedia.org/wiki/Video_for_Windows) framework is used over win32 API.
+
+### Installation
+
+    go get -u github.com/gen2brain/cam2ip
 
 ### Build tags
 
-* `cv3` - build with `OpenCV` 3.x [gocv](https://github.com/hybridgroup/gocv), default is version 2.x via [go-opencv](https://github.com/lazywei/go-opencv)
-* `native` - build with native Go [V4L](https://github.com/korandiz/v4l) implementation on Linux/RPi instead of `OpenCV`
+* `cv2` - build with `OpenCV` 2.x ([go-opencv](https://github.com/lazywei/go-opencv))
+* `cv3` - build with `OpenCV` 3.x ([gocv](https://github.com/hybridgroup/gocv))
 * `jpeg` - build with native Go `image/jpeg` instead of `libjpeg-turbo`
 
 ### Download
 
 Binaries are compiled with static OpenCV/libjpeg-turbo libraries, they should just work:
 
  - [Linux 64bit](https://github.com/gen2brain/cam2ip/releases/download/1.5/cam2ip-1.5-64bit.tar.gz)
- - [Linux 64bit native](https://github.com/gen2brain/cam2ip/releases/download/1.5/cam2ip-1.5-64bit-native.tar.gz)
+ - [Linux 64bit OpenCV](https://github.com/gen2brain/cam2ip/releases/download/1.5/cam2ip-1.5-64bit-cv2.tar.gz)
  - [RPi 32bit](https://github.com/gen2brain/cam2ip/releases/download/1.5/cam2ip-1.5-RPi.tar.gz)
- - [RPi 32bit native](https://github.com/gen2brain/cam2ip/releases/download/1.5/cam2ip-1.5-RPi-native.tar.gz)
+ - [RPi 32bit OpenCV](https://github.com/gen2brain/cam2ip/releases/download/1.5/cam2ip-1.5-RPi-cv2.tar.gz)
+ - [RPi 32bit Static](https://github.com/gen2brain/cam2ip/releases/download/1.5/cam2ip-1.5-RPi-nocgo.tar.gz)
  - [RPi3 32bit](https://github.com/gen2brain/cam2ip/releases/download/1.5/cam2ip-1.5-RPi3.tar.gz)
- - [RPi3 32bit native](https://github.com/gen2brain/cam2ip/releases/download/1.5/cam2ip-1.5-RPi3-native.tar.gz)
- - [Windows 32bit](https://github.com/gen2brain/cam2ip/releases/download/1.5/cam2ip-1.5.zip)
+ - [RPi3 32bit OpenCV](https://github.com/gen2brain/cam2ip/releases/download/1.5/cam2ip-1.5-RPi3-cv2.tar.gz)
+ - [Windows 32bit](https://github.com/gen2brain/cam2ip/releases/download/1.5/cam2ip-1.5-32bit.zip)
+ - [Windows 32bit OpenCV](https://github.com/gen2brain/cam2ip/releases/download/1.5/cam2ip-1.5-32bit-cv2.zip)
  - [Windows 64bit](https://github.com/gen2brain/cam2ip/releases/download/1.5/cam2ip-1.5-64bit.zip)
+ - [Windows 64bit OpenCV](https://github.com/gen2brain/cam2ip/releases/download/1.5/cam2ip-1.5-64bit-cv2.zip)
 
 
 ### Installation

cam2ip.go

@@ -1,5 +1,3 @@
-// +build !native
-
 package main
 
 import (
@@ -9,12 +7,11 @@ import (
 
 	"github.com/gen2brain/cam2ip/camera"
 	"github.com/gen2brain/cam2ip/server"
-	"github.com/gen2brain/cam2ip/video"
 )
 
 const (
 	name    = "cam2ip"
-	version = "1.4"
+	version = "1.5"
 )
 
 func main() {
@@ -28,7 +25,6 @@ func main() {
 	flag.BoolVar(&srv.NoWebGL, "nowebgl", false, "Disable WebGL drawing of images (html handler)")
 	flag.StringVar(&srv.Bind, "bind-addr", ":56000", "Bind address")
 	flag.StringVar(&srv.Htpasswd, "htpasswd-file", "", "Path to htpasswd file, if empty auth is disabled")
-	flag.StringVar(&srv.FileName, "video-file", "", "Use video file instead of camera")
 	flag.Parse()
 
 	srv.Name = name
@@ -50,24 +46,14 @@ func main() {
 		}
 	}
 
-	if srv.FileName != "" {
-		vid, err := video.New(video.Options{srv.FileName, srv.Rotate})
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "%s\n", err.Error())
-			os.Exit(1)
-		}
-
-		srv.Reader = vid
-	} else {
-		cam, err := camera.New(camera.Options{srv.Index, srv.Rotate, srv.FrameWidth, srv.FrameHeight})
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "%s\n", err.Error())
-			os.Exit(1)
-		}
-
-		srv.Reader = cam
+	cam, err := camera.New(camera.Options{srv.Index, srv.Rotate, srv.FrameWidth, srv.FrameHeight})
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "%s\n", err.Error())
+		os.Exit(1)
 	}
 
+	srv.Reader = cam
+
 	defer srv.Reader.Close()
 
 	fmt.Fprintf(os.Stderr, "Listening on %s\n", srv.Bind)

cam2ip_native.go → cam2ip_cv.go

@@ -1,4 +1,4 @@
-// +build native
+// +build cv2,cv3
 
 package main
 
@@ -9,11 +9,12 @@ import (
 
 	"github.com/gen2brain/cam2ip/camera"
 	"github.com/gen2brain/cam2ip/server"
+	"github.com/gen2brain/cam2ip/video"
 )
 
 const (
 	name    = "cam2ip"
-	version = "1.4"
+	version = "1.5"
 )
 
 func main() {
@@ -27,6 +28,7 @@ func main() {
 	flag.BoolVar(&srv.NoWebGL, "nowebgl", false, "Disable WebGL drawing of images (html handler)")
 	flag.StringVar(&srv.Bind, "bind-addr", ":56000", "Bind address")
 	flag.StringVar(&srv.Htpasswd, "htpasswd-file", "", "Path to htpasswd file, if empty auth is disabled")
+	flag.StringVar(&srv.FileName, "video-file", "", "Use video file instead of camera")
 	flag.Parse()
 
 	srv.Name = name
@@ -48,13 +50,23 @@ func main() {
 		}
 	}
 
-	cam, err := camera.New(camera.Options{srv.Index, srv.Rotate, srv.FrameWidth, srv.FrameHeight})
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "%s\n", err.Error())
-		os.Exit(1)
-	}
+	if srv.FileName != "" {
+		vid, err := video.New(video.Options{srv.FileName, srv.Rotate})
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "%s\n", err.Error())
+			os.Exit(1)
+		}
+
+		srv.Reader = vid
+	} else {
+		cam, err := camera.New(camera.Options{srv.Index, srv.Rotate, srv.FrameWidth, srv.FrameHeight})
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "%s\n", err.Error())
+			os.Exit(1)
+		}
 
-	srv.Reader = cam
+		srv.Reader = cam
+	}
 
 	defer srv.Reader.Close()
 

camera/camera_const.go → camera/camera_const_cv.go

@@ -1,4 +1,4 @@
-// +build !native
+// +build cv2 cv3
 
 package camera
 

camera/camera_const_native.go → camera/camera_const_linux.go

@@ -1,4 +1,4 @@
-// +build native
+// +build !cv2,!cv3
 
 package camera
 

camera/camera.go → camera/camera_cv2.go

@@ -1,4 +1,4 @@
-// +build !cv3,!native
+// +build cv2,!cv3
 
 // Package camera.
 package camera

camera/camera_cv3.go

@@ -1,4 +1,4 @@
-// +build cv3,!native
+// +build cv3,!cv2
 
 // Package camera.
 package camera

camera/camera_native_linux.go → camera/camera_linux.go

@@ -1,4 +1,4 @@
-// +build native
+// +build !cv2,!cv3
 
 // Package camera.
 package camera