mirror of
https://github.com/kerberos-io/agent.git
synced 2025-10-07 09:01:04 +08:00
Implement live view chunking configuration for HandleLiveStreamSD function
This commit is contained in:
@@ -672,6 +672,7 @@ func HandleLiveStreamSD(livestreamCursor *packets.QueueCursor, configuration *mo
|
|||||||
// Check if we need to enable the live stream
|
// Check if we need to enable the live stream
|
||||||
if config.Capture.Liveview != "false" {
|
if config.Capture.Liveview != "false" {
|
||||||
|
|
||||||
|
deviceId := config.Key
|
||||||
hubKey := ""
|
hubKey := ""
|
||||||
if config.Cloud == "s3" && config.S3 != nil && config.S3.Publickey != "" {
|
if config.Cloud == "s3" && config.S3 != nil && config.S3.Publickey != "" {
|
||||||
hubKey = config.S3.Publickey
|
hubKey = config.S3.Publickey
|
||||||
@@ -706,16 +707,37 @@ func HandleLiveStreamSD(livestreamCursor *packets.QueueCursor, configuration *mo
|
|||||||
img, err := rtspClient.DecodePacket(pkt)
|
img, err := rtspClient.DecodePacket(pkt)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
bytes, _ := utils.ImageToBytes(&img)
|
bytes, _ := utils.ImageToBytes(&img)
|
||||||
//encoded := base64.StdEncoding.EncodeToString(bytes)
|
|
||||||
|
|
||||||
// Split encoded image into chunks of 1kb
|
chunking := config.LiveviewChunking
|
||||||
|
if chunking != "true" {
|
||||||
|
encoded := base64.StdEncoding.EncodeToString(bytes)
|
||||||
|
|
||||||
|
valueMap := make(map[string]interface{})
|
||||||
|
valueMap["image"] = encoded
|
||||||
|
message := models.Message{
|
||||||
|
Payload: models.Payload{
|
||||||
|
Action: "receive-sd-stream",
|
||||||
|
DeviceId: configuration.Config.Key,
|
||||||
|
Value: valueMap,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
payload, err := models.PackageMQTTMessage(configuration, message)
|
||||||
|
if err == nil {
|
||||||
|
mqttClient.Publish("kerberos/hub/"+hubKey, 0, false, payload)
|
||||||
|
} else {
|
||||||
|
log.Log.Info("cloud.HandleLiveStreamSD(): something went wrong while sending acknowledge config to hub: " + string(payload))
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
// Split encoded image into chunks of 2kb
|
||||||
// This is to prevent the MQTT message to be too large.
|
// This is to prevent the MQTT message to be too large.
|
||||||
// By default, bytes are not encoded to base64 here; you are splitting the raw JPEG/PNG bytes.
|
// By default, bytes are not encoded to base64 here; you are splitting the raw JPEG/PNG bytes.
|
||||||
// However, in MQTT and web contexts, binary data may not be handled well, so base64 is often used.
|
// However, in MQTT and web contexts, binary data may not be handled well, so base64 is often used.
|
||||||
// To avoid base64 encoding, just send the raw []byte chunks as you do here.
|
// To avoid base64 encoding, just send the raw []byte chunks as you do here.
|
||||||
// If you want to avoid base64, make sure the receiver can handle binary payloads.
|
// If you want to avoid base64, make sure the receiver can handle binary payloads.
|
||||||
|
|
||||||
chunkSize := 1 * 1024 // 1KB chunks
|
chunkSize := 2 * 1024 // 2KB chunks
|
||||||
var chunks [][]byte
|
var chunks [][]byte
|
||||||
for i := 0; i < len(bytes); i += chunkSize {
|
for i := 0; i < len(bytes); i += chunkSize {
|
||||||
end := i + chunkSize
|
end := i + chunkSize
|
||||||
@@ -740,13 +762,13 @@ func HandleLiveStreamSD(livestreamCursor *packets.QueueCursor, configuration *mo
|
|||||||
Payload: models.Payload{
|
Payload: models.Payload{
|
||||||
Version: "v1.0.0",
|
Version: "v1.0.0",
|
||||||
Action: "receive-sd-stream",
|
Action: "receive-sd-stream",
|
||||||
DeviceId: configuration.Config.Key,
|
DeviceId: deviceId,
|
||||||
Value: valueMap,
|
Value: valueMap,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
payload, err := models.PackageMQTTMessage(configuration, message)
|
payload, err := models.PackageMQTTMessage(configuration, message)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
mqttClient.Publish("kerberos/hub/"+hubKey, 0, false, payload)
|
mqttClient.Publish("kerberos/hub/"+hubKey+"/"+deviceId, 1, false, payload)
|
||||||
log.Log.Infof("cloud.HandleLiveStreamSD(): sent chunk %d/%d to MQTT topic kerberos/hub/%s", i+1, len(chunks), hubKey)
|
log.Log.Infof("cloud.HandleLiveStreamSD(): sent chunk %d/%d to MQTT topic kerberos/hub/%s", i+1, len(chunks), hubKey)
|
||||||
} else {
|
} else {
|
||||||
log.Log.Info("cloud.HandleLiveStreamSD(): something went wrong while sending acknowledge config to hub: " + string(payload))
|
log.Log.Info("cloud.HandleLiveStreamSD(): something went wrong while sending acknowledge config to hub: " + string(payload))
|
||||||
@@ -754,6 +776,7 @@ func HandleLiveStreamSD(livestreamCursor *packets.QueueCursor, configuration *mo
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
log.Log.Debug("cloud.HandleLiveStreamSD(): stopping as Liveview is disabled.")
|
log.Log.Debug("cloud.HandleLiveStreamSD(): stopping as Liveview is disabled.")
|
||||||
|
Reference in New Issue
Block a user