andre/cam2ip
1
0
Fork 0
mirror of https://github.com/gen2brain/cam2ip.git synced 2025-12-16 12:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for native V4L implementation on Linux/RPi

Browse Source
This commit is contained in:
Milan Nikolic
2018-10-28 14:23:04 +01:00
parent 0503355005
commit ec60387edf
21 changed files with 348 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
handlers/jpeg.go
View File

@@ -4,7 +4,7 @@ import (
"log"
"net/http"
"github.com/gen2brain/cam2ip/encoder"
"github.com/gen2brain/cam2ip/image"
"github.com/gen2brain/cam2ip/reader"
)
@@ -35,7 +35,7 @@ func (j *JPEG) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return
}
err = encoder.New(w).Encode(img)
err = image.NewEncoder(w).Encode(img)
if err != nil {
log.Printf("jpeg: encode: %v", err)
return

4
handlers/mjpeg.go
View File

@@ -9,7 +9,7 @@ import (
"net/textproto"
"time"
"github.com/gen2brain/cam2ip/encoder"
"github.com/gen2brain/cam2ip/image"
"github.com/gen2brain/cam2ip/reader"
)
@@ -62,7 +62,7 @@ loop:
continue
}
err = encoder.New(partWriter).Encode(img)
err = image.NewEncoder(partWriter).Encode(img)
if err != nil {
log.Printf("mjpeg: encode: %v", err)
continue

4
handlers/socket.go
View File

@@ -10,7 +10,7 @@ import (
"golang.org/x/net/websocket"
"github.com/gen2brain/cam2ip/encoder"
"github.com/gen2brain/cam2ip/image"
"github.com/gen2brain/cam2ip/reader"
)
@@ -37,7 +37,7 @@ func (s *Socket) write(ws *websocket.Conn) {
w := new(bytes.Buffer)
err = encoder.New(w).Encode(img)
err = image.NewEncoder(w).Encode(img)
if err != nil {
log.Printf("socket: encode: %v", err)
continue

4
handlers/socket_amd64.go
View File

@@ -8,7 +8,7 @@ import (
"golang.org/x/net/websocket"
"goost.org/encoding/base64"
"github.com/gen2brain/cam2ip/encoder"
"github.com/gen2brain/cam2ip/image"
"github.com/gen2brain/cam2ip/reader"
)
@@ -35,7 +35,7 @@ func (s *Socket) write(ws *websocket.Conn) {
w := new(bytes.Buffer)
err = encoder.New(w).Encode(img)
err = image.NewEncoder(w).Encode(img)
if err != nil {
log.Printf("socket: encode: %v", err)
continue