chore: update dependencies

This commit is contained in:
2022-01-03 19:21:35 +01:00
parent 2cc7ee5070
commit d1788152f7
70 changed files with 2459 additions and 9330 deletions

View File

@ -4,10 +4,10 @@ import (
"fmt"
"github.com/cyrilix/robocar-protobuf/go/events"
mqtt "github.com/eclipse/paho.mqtt.golang"
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes/timestamp"
"go.uber.org/zap"
"gocv.io/x/gocv"
"google.golang.org/protobuf/proto"
"image"
"io"
"sync"
@ -20,14 +20,14 @@ type VideoSource interface {
}
type OpencvCameraPart struct {
client mqtt.Client
vc VideoSource
topic string
topicRoi string
client mqtt.Client
vc VideoSource
topic string
topicRoi string
publishFrequency int
muImgBuffered sync.Mutex
imgBuffered *gocv.Mat
horizon int
horizon int
cancel chan interface{}
}
@ -48,7 +48,7 @@ func New(client mqtt.Client, topic string, topicRoi string, publishFrequency int
client: client,
vc: vc,
topic: topic,
topicRoi: topicRoi,
topicRoi: topicRoi,
publishFrequency: publishFrequency,
imgBuffered: &img,
}
@ -109,6 +109,7 @@ func (o *OpencvCameraPart) publishFrame(tickerTime time.Time, topic string, fram
zap.S().With("topic", topic).Errorf("unable to convert image to jpeg: %v", err)
return
}
defer img.Close()
msg := &events.FrameMessage{
Id: &events.FrameRef{
@ -119,7 +120,7 @@ func (o *OpencvCameraPart) publishFrame(tickerTime time.Time, topic string, fram
Nanos: int32(tickerTime.Nanosecond()),
},
},
Frame: img,
Frame: img.GetBytes(),
}
payload, err := proto.Marshal(msg)
@ -130,7 +131,6 @@ func (o *OpencvCameraPart) publishFrame(tickerTime time.Time, topic string, fram
publish(o.client, topic, &payload)
}
var publish = func(client mqtt.Client, topic string, payload *[]byte) {
token := client.Publish(topic, 0, false, *payload)
token.WaitTimeout(10 * time.Millisecond)

View File

@ -4,9 +4,9 @@ import (
"bytes"
"github.com/cyrilix/robocar-protobuf/go/events"
mqtt "github.com/eclipse/paho.mqtt.golang"
"github.com/golang/protobuf/proto"
"go.uber.org/zap"
"gocv.io/x/gocv"
"google.golang.org/protobuf/proto"
"image/jpeg"
"sync"
"testing"
@ -90,12 +90,12 @@ func TestOpencvCameraPart(t *testing.T) {
// Uncomment to debug image cropping
/*
dir, f := path.Split(fmt.Sprintf("/tmp/%s.jpg", tpc))
os.MkdirAll(dir, os.FileMode(0755))
err = ioutil.WriteFile(path.Join(dir, f), frameMsg.GetFrame(), os.FileMode(0644) )
if err != nil {
t.Errorf("unable to write image for topic %s: %v", tpc, err)
}
*/
dir, f := path.Split(fmt.Sprintf("/tmp/%s.jpg", tpc))
os.MkdirAll(dir, os.FileMode(0755))
err = ioutil.WriteFile(path.Join(dir, f), frameMsg.GetFrame(), os.FileMode(0644) )
if err != nil {
t.Errorf("unable to write image for topic %s: %v", tpc, err)
}
*/
}
}