@@ -12,7 +12,6 @@ import (
12
12
"github.com/labstack/echo/v4"
13
13
"github.com/paulbellamy/ratecounter"
14
14
"github.com/pkg/errors"
15
- "github.com/sargassum-world/godest"
16
15
"github.com/sargassum-world/godest/handling"
17
16
18
17
"github.com/sargassum-world/pslive/internal/clients/mjpeg"
@@ -83,10 +82,8 @@ func (h *Handlers) HandleExternalSourceFrameGet() echo.HandlerFunc {
83
82
func externalSourceFrameSender (
84
83
ss * mjpeg.StreamSender , annotated bool , quality int ,
85
84
fpsCounter * ratecounter.RateCounter , fpsPeriod float32 ,
86
- l godest.Logger ,
87
85
) handling.Consumer [videostreams.Frame ] {
88
86
return func (frame videostreams.Frame ) (done bool , err error ) {
89
- l .Debug ("received frame from external source" )
90
87
if err = frame .Error (); err != nil {
91
88
return false , errors .Wrapf (err , "error with video source" )
92
89
}
@@ -113,7 +110,6 @@ func externalSourceFrameSender(
113
110
// TODO: implement image resizing
114
111
115
112
// Send output
116
- l .Debug ("sending frame from external source" )
117
113
if err := handling .Except (
118
114
ss .SendFrame (frame ), context .Canceled , syscall .EPIPE ,
119
115
); err != nil {
@@ -156,7 +152,7 @@ func (h *Handlers) HandleExternalSourceStreamGet() echo.HandlerFunc {
156
152
const quality = 50 // TODO: implement adaptive quality for min FPS
157
153
if err := handling .Except (
158
154
handling .Consume (ctx , frameBuffer , externalSourceFrameSender (
159
- ss , annotated , quality , fpsCounter , fpsPeriod , c . Logger (),
155
+ ss , annotated , quality , fpsCounter , fpsPeriod ,
160
156
)),
161
157
context .Canceled ,
162
158
); err != nil {
@@ -196,7 +192,6 @@ func (h *Handlers) HandleExternalSourcePub() videostreams.HandlerFunc {
196
192
return handling .Except (
197
193
handling .Repeat (ctx , 0 , func () (done bool , err error ) {
198
194
// Load data
199
- c .Logger ().Debugf ("receiving mjpeg frame from %s" , source )
200
195
encodedFrame , err := r .Receive ()
201
196
if errors .Is (err , io .EOF ) {
202
197
c .Logger ().Debugf ("received eof from %s" , source )
@@ -208,7 +203,6 @@ func (h *Handlers) HandleExternalSourcePub() videostreams.HandlerFunc {
208
203
}
209
204
210
205
// Publish data
211
- c .Logger ().Debugf ("received and publishing frame from %s" , source )
212
206
c .Publish (encodedFrame )
213
207
return false , nil
214
208
}),
0 commit comments