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

Move encoder

Browse Source
This commit is contained in:
Milan Nikolic
2018-01-27 01:47:04 +01:00
parent f65a7cf1aa
commit 1c9dfcb84c
7 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
handlers/jpeg.go
View File

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

5
handlers/mjpeg.go
View File

@@ -10,6 +10,7 @@ import (
"time"
"github.com/gen2brain/cam2ip/camera"
"github.com/gen2brain/cam2ip/encoder"
)
// MJPEG handler.
@@ -61,9 +62,7 @@ loop:
continue
}
enc := camera.NewEncoder(partWriter)
err = enc.Encode(img)
err = encoder.New(partWriter).Encode(img)
if err != nil {
log.Printf("mjpeg: encode: %v", err)
continue

4
handlers/socket.go
View File

@@ -9,6 +9,7 @@ import (
"golang.org/x/net/websocket"
"github.com/gen2brain/cam2ip/camera"
"github.com/gen2brain/cam2ip/encoder"
)
// Socket handler.
@@ -33,9 +34,8 @@ func (s *Socket) write(ws *websocket.Conn) {
}
w := new(bytes.Buffer)
enc := camera.NewEncoder(w)
err = enc.Encode(img)
err = encoder.New(w).Encode(img)
if err != nil {
log.Printf("socket: encode: %v", err)
continue