diff --git a/README.md b/README.md index 7c6f9a6..cd862a8 100644 --- a/README.md +++ b/README.md @@ -18,10 +18,10 @@ or Binaries are compiled with static OpenCV library: - - [Android 32bit](https://github.com/gen2brain/cam2ip/releases/download/1.2/cam2ip-1.2-android.tar.gz) - - [Linux 64bit](https://github.com/gen2brain/cam2ip/releases/download/1.2/cam2ip-1.2-64bit.tar.gz) - - [RPi 32bit](https://github.com/gen2brain/cam2ip/releases/download/1.2/cam2ip-1.2-RPi.tar.gz) - - [Windows 32bit](https://github.com/gen2brain/cam2ip/releases/download/1.2/cam2ip-1.2.zip) + - [Linux 64bit](https://github.com/gen2brain/cam2ip/releases/download/1.3/cam2ip-1.3-64bit.tar.gz) + - [RPi 32bit](https://github.com/gen2brain/cam2ip/releases/download/1.3/cam2ip-1.3-RPi.tar.gz) + - [RPi3 32bit](https://github.com/gen2brain/cam2ip/releases/download/1.3/cam2ip-1.3-RPi3.tar.gz) + - [Windows 32bit](https://github.com/gen2brain/cam2ip/releases/download/1.3/cam2ip-1.3.zip) ### Installation @@ -48,6 +48,8 @@ Usage of ./cam2ip: Camera index -nowebgl Disable WebGL drawing of images (html handler) + -video-file string + Use video file instead of camera ``` ### Handlers diff --git a/cam2ip.go b/cam2ip.go index 0c15a39..84d8ce1 100644 --- a/cam2ip.go +++ b/cam2ip.go @@ -12,7 +12,7 @@ import ( const ( name = "cam2ip" - version = "1.0" + version = "1.3" ) func main() { diff --git a/make.bash b/make.bash index 206dd5c..d4cbf82 100755 --- a/make.bash +++ b/make.bash @@ -3,7 +3,7 @@ CHROOT="/usr/x86_64-pc-linux-gnu-static" MINGW="/usr/i686-w64-mingw32" RPI="/usr/armv6j-hardfloat-linux-gnueabi" -ANDROID="/opt/android-toolchain-arm7" +RPI3="/usr/armv7a-hardfloat-linux-gnueabi" mkdir -p build @@ -30,11 +30,10 @@ CGO_CFLAGS="-I$RPI/usr/include" \ CC="armv6j-hardfloat-linux-gnueabi-gcc" CXX="armv6j-hardfloat-linux-gnueabi-g++" \ CGO_ENABLED=1 GOOS=linux GOARCH=arm go build -v -x -o build/cam2ip.linux.arm -ldflags "-linkmode external -s -w" github.com/gen2brain/cam2ip -PATH="$PATH:$ANDROID/bin" \ -PKG_CONFIG="$ANDROID/bin/arm-linux-androideabi-pkg-config" \ -PKG_CONFIG_PATH="$ANDROID/lib/pkgconfig" \ -PKG_CONFIG_LIBDIR="$ANDROID/lib/pkgconfig" \ -CGO_LDFLAGS="-L$ANDROID/lib" \ -CGO_CFLAGS="-I$ANDROID/include" \ -CC="arm-linux-androideabi-gcc" CXX="arm-linux-androideabi-g++" \ -CGO_ENABLED=1 GOOS=android GOARCH=arm go build -v -x -o build/cam2ip.android.arm -ldflags "-linkmode external -s -w" github.com/gen2brain/cam2ip +PKG_CONFIG="/usr/bin/armv7a-hardfloat-linux-gnueabi-pkg-config" \ +PKG_CONFIG_PATH="$RPI3/usr/lib/pkgconfig" \ +PKG_CONFIG_LIBDIR="$RPI3/usr/lib/pkgconfig" \ +CGO_LDFLAGS="-L$RPI3/usr/lib" \ +CGO_CFLAGS="-I$RPI3/usr/include" \ +CC="armv7a-hardfloat-linux-gnueabi-gcc" CXX="armv7a-hardfloat-linux-gnueabi-g++" \ +CGO_ENABLED=1 GOOS=linux GOARCH=arm go build -v -x -o build/cam2ip.linux.arm7 -ldflags "-linkmode external -s -w" github.com/gen2brain/cam2ip diff --git a/reader/reader.go b/reader/reader.go index 7ac8999..7fe85b6 100644 --- a/reader/reader.go +++ b/reader/reader.go @@ -7,7 +7,7 @@ import ( // ImageReader interface type ImageReader interface { - // Read reads next frame from video and returns image. + // Read reads next frame from camera/video and returns image. Read() (img image.Image, err error) // Close closes camera/video. diff --git a/video/video_test.go b/video/video_test.go index 865a865..cde1467 100644 --- a/video/video_test.go +++ b/video/video_test.go @@ -11,7 +11,7 @@ import ( ) func TestVideo(t *testing.T) { - video, err := New("ranko.mp4") + video, err := New("test.mp4") if err != nil { t.Fatal(err) }