andre/cam2ip
1
0
Fork 0
mirror of https://github.com/gen2brain/cam2ip.git synced 2026-01-09 16:18:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reuse frame

Browse Source
This commit is contained in:
Milan Nikolic
2018-03-14 14:33:01 +01:00
parent 3c0c949f31
commit e1f03b55a1
4 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
camera/camera.go
View File

@@ -13,6 +13,7 @@ import (
// Camera represents camera.
type Camera struct {
camera *opencv.Capture
frame *opencv.IplImage
}
// New returns new Camera for given camera index.
@@ -30,8 +31,8 @@ func New(index int) (camera *Camera, err error) {
// Read reads next frame from camera and returns image.
func (c *Camera) Read() (img image.Image, err error) {
if c.camera.GrabFrame() {
frame := c.camera.RetrieveFrame(1)
img = frame.ToImage()
c.frame = c.camera.RetrieveFrame(1)
img = c.frame.ToImage()
} else {
err = fmt.Errorf("camera: can not grab frame")
}
@@ -56,6 +57,7 @@ func (c *Camera) Close() (err error) {
return
}
c.frame.Release()
c.camera.Release()
c.camera = nil
return

12
camera/camera_cv3.go
View File

@@ -13,12 +13,16 @@ import (
// Camera represents camera.
type Camera struct {
camera *gocv.VideoCapture
frame *gocv.Mat
}
// New returns new Camera for given camera index.
func New(index int) (camera *Camera, err error) {
camera = &Camera{}
mat := gocv.NewMat()
camera.frame = &mat
camera.camera, err = gocv.VideoCaptureDevice(index)
if err != nil {
err = fmt.Errorf("camera: can not open camera %d: %s", index, err.Error())
@@ -29,16 +33,13 @@ func New(index int) (camera *Camera, err error) {
// Read reads next frame from camera and returns image.
func (c *Camera) Read() (img image.Image, err error) {
mat := gocv.NewMat()
defer mat.Close()
ok := c.camera.Read(mat)
ok := c.camera.Read(*c.frame)
if !ok {
err = fmt.Errorf("camera: can not grab frame")
return
}
img, e := mat.ToImage()
img, e := c.frame.ToImage()
if e != nil {
err = fmt.Errorf("camera: %v", e)
return
@@ -64,6 +65,7 @@ func (c *Camera) Close() (err error) {
return
}
c.frame.Close()
err = c.camera.Close()
c.camera = nil
return

6
video/video.go
View File

@@ -13,6 +13,7 @@ import (
// Video represents video.
type Video struct {
video *opencv.Capture
frame *opencv.IplImage
}
// New returns new Video for given path.
@@ -30,8 +31,8 @@ func New(filename string) (video *Video, err error) {
// Read reads next frame from video and returns image.
func (v *Video) Read() (img image.Image, err error) {
if v.video.GrabFrame() {
frame := v.video.RetrieveFrame(1)
img = frame.ToImage()
v.frame = v.video.RetrieveFrame(1)
img = v.frame.ToImage()
} else {
err = fmt.Errorf("video: can not grab frame")
}
@@ -46,6 +47,7 @@ func (v *Video) Close() (err error) {
return
}
v.frame.Release()
v.video.Release()
v.video = nil
return

12
video/video_cv3.go
View File

@@ -13,12 +13,16 @@ import (
// Video represents video.
type Video struct {
video *gocv.VideoCapture
frame *gocv.Mat
}
// New returns new Video for given path.
func New(filename string) (video *Video, err error) {
video = &Video{}
mat := gocv.NewMat()
video.frame = &mat
video.video, err = gocv.VideoCaptureFile(filename)
if err != nil {
err = fmt.Errorf("video: can not open video %s: %s", filename, err.Error())
@@ -29,16 +33,13 @@ func New(filename string) (video *Video, err error) {
// Read reads next frame from video and returns image.
func (v *Video) Read() (img image.Image, err error) {
mat := gocv.NewMat()
defer mat.Close()
ok := v.video.Read(mat)
ok := v.video.Read(*v.frame)
if !ok {
err = fmt.Errorf("video: can not grab frame")
return
}
img, e := mat.ToImage()
img, e := v.frame.ToImage()
if e != nil {
err = fmt.Errorf("video: %v", e)
return
@@ -54,6 +55,7 @@ func (v *Video) Close() (err error) {
return
}
v.frame.Close()
err = v.video.Close()
v.video = nil
return