psa/rtsp_reader-writer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring.

Browse Source
This commit is contained in:
Сергей Петров 2025-03-31 14:55:02 +05:00
parent 3dc656b6a2
commit 790a292b0b
9 changed files with 184 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
reader/cmd/main.go
View File

@ -1,14 +1,10 @@
package main
import (
"fmt"
"go.uber.org/zap"
"reader/internal/config"
"reader/internal/unpacker"
"time"
log2 "git.insit.tech/sas/rtsp_proxy/core/log"
logger "reader/internal/log"
"reader/internal/unpacker"
)
func main() {
@ -22,9 +18,7 @@ func main() {
//
//log.Fatal(http.ListenAndServe(fmt.Sprintf(":%d", port), nil))
config.LogsDirectory = log2.DirCreator(config.Local, "logs")
logger.Log = log2.MainLogging(
fmt.Sprintf("%s/reader-main_%s.log", config.LogsDirectory, time.Now().Format("15-04-05_02-01-2006")))
logger.StartMainLogger(config.Local, "reader")
err := unpacker.CreateVideo(config.Local)
if err != nil {

2
reader/go.mod
View File

@ -3,7 +3,7 @@ module reader
go 1.24.1
require (
git.insit.tech/psa/rtsp_reader-writer/writer v0.0.0-20250327060836-29e7a51f8c5e
git.insit.tech/psa/rtsp_reader-writer/writer v0.0.0-20250328095722-6d9cef974261
git.insit.tech/sas/rtsp_proxy v0.0.0-20250326124321-cb817660066c
github.com/bluenviron/gortsplib/v4 v4.12.3
github.com/bluenviron/mediacommon v1.14.0

6
reader/go.sum
View File

@ -1,7 +1,5 @@
git.insit.tech/psa/rtsp_reader-writer/writer v0.0.0-20250327043613-6b15e0f4ae74 h1:g2g1TM0aHNwo9no0WWucqxRIaUzku1lfFGOdKxbt4Uk=
git.insit.tech/psa/rtsp_reader-writer/writer v0.0.0-20250327043613-6b15e0f4ae74/go.mod h1:jXcr5WE8GwhuGdtVjHRyWIemXJJ6GL8QK1M7r4F3cz0=
git.insit.tech/psa/rtsp_reader-writer/writer v0.0.0-20250327060836-29e7a51f8c5e h1:xcc9QLroFdHuabwtuYHrYgQxqa6hcsu5xH860dD8RFE=
git.insit.tech/psa/rtsp_reader-writer/writer v0.0.0-20250327060836-29e7a51f8c5e/go.mod h1:jXcr5WE8GwhuGdtVjHRyWIemXJJ6GL8QK1M7r4F3cz0=
git.insit.tech/psa/rtsp_reader-writer/writer v0.0.0-20250328095722-6d9cef974261 h1:oYqTZakNnU7efuuPAbHQAXY0WXkw9eRvdQxnsALz6b8=
git.insit.tech/psa/rtsp_reader-writer/writer v0.0.0-20250328095722-6d9cef974261/go.mod h1:vFg2FZ/v01qLRLionpgocR5MaznCijzUiCSrPou45Ts=
git.insit.tech/sas/rtsp_proxy v0.0.0-20250326124321-cb817660066c h1:A/D1INKJI/jkgy4TRamf7HTvQVqGy7qPBdTlZmYWIm0=
git.insit.tech/sas/rtsp_proxy v0.0.0-20250326124321-cb817660066c/go.mod h1:/AHWd1Otr+ikOLWzpXtoozzifEx9ZKou+R6DgwaEzr0=
github.com/asticode/go-astikit v0.30.0/go.mod h1:h4ly7idim1tNhaVkdVBeXQZEE3L0xblP7fCWbgwipF0=

19
reader/internal/log/logger.go
View File

@ -1,7 +1,24 @@
package log
import "go.uber.org/zap"
import (
"fmt"
"time"
log2 "git.insit.tech/sas/rtsp_proxy/core/log"
"go.uber.org/zap"
"reader/internal/config"
)
var (
Log *zap.Logger
)
// StartMainLogger establishes main logger.
func StartMainLogger(local, program string) {
config.LogsDirectory = log2.DirCreator(local, "logs")
Log = log2.MainLogging(
fmt.Sprintf("%s/%s-main_%s.log",
config.LogsDirectory,
program,
time.Now().Format("15-04-05_02-01-2006")))
}

12
reader/internal/processor/h264-aac_muxer.go
View File

@ -2,6 +2,7 @@ package processor
import (
"bufio"
"fmt"
"github.com/bluenviron/mediacommon/pkg/codecs/mpeg4audio"
"log"
"os"
@ -12,6 +13,12 @@ import (
"github.com/bluenviron/mediacommon/pkg/formats/mpegts"
)
var (
i = 0
f = 0
j = 0
)
func multiplyAndDivide(v, m, d int64) int64 {
secs := v / d
dec := v % d
@ -74,7 +81,9 @@ func (e *MpegtsMuxer) WriteH264(pts int64, au [][]byte) error {
idrPresent := false
for _, nalu := range au {
i++
typ := h264.NALUType(nalu[0] & 0x1F)
f++
switch typ {
case h264.NALUTypeSPS:
e.H264Format.SPS = nalu
@ -89,6 +98,7 @@ func (e *MpegtsMuxer) WriteH264(pts int64, au [][]byte) error {
case h264.NALUTypeIDR:
idrPresent = true
j++
case h264.NALUTypeNonIDR:
nonIDRPresent = true
@ -97,6 +107,8 @@ func (e *MpegtsMuxer) WriteH264(pts int64, au [][]byte) error {
filteredAU = append(filteredAU, nalu)
}
fmt.Println(i, f, j)
au = filteredAU
if au == nil || (!nonIDRPresent && !idrPresent) {

28
reader/internal/unpacker/proc.go
View File

@ -21,8 +21,6 @@ import (
"reader/internal/processor"
)
// dir
// CreateVideo generate TS files and M3U8 playlists.
func CreateVideo(dir string) error {
// Check if the data folder in the directory.
@ -70,6 +68,7 @@ func CreateVideo(dir string) error {
// Create M3U8 playlist.
go gen.MediaPlaylistGenerator(dirData, file.Name(), float64(period), resolutions, cam)
go func() {
for {
for _, resolution := range resolutions {
filenames := gen.StringDirEntryList(
@ -86,7 +85,7 @@ func CreateVideo(dir string) error {
if err != nil {
cam.Error(
"opening file error for file:", zap.String("filename", filenames[i]), zap.Error(err))
return err
return
}
defer f.Close()
@ -95,12 +94,12 @@ func CreateVideo(dir string) error {
if err := binary.Read(f, binary.LittleEndian, &streamIDLen); err != nil {
cam.Error(
"reading StreamID length error:", zap.String("filename", filenames[i]), zap.Error(err))
return err
return
}
streamIDBytes := make([]byte, streamIDLen)
if _, err := io.ReadFull(f, streamIDBytes); err != nil {
cam.Error("reading StreamID error:", zap.String("filename", filenames[i]), zap.Error(err))
return err
return
}
streamID := string(streamIDBytes)
cam.Info(
@ -113,26 +112,26 @@ func CreateVideo(dir string) error {
if err := binary.Read(f, binary.LittleEndian, &segLen); err != nil {
cam.Error(
"reading header length error:", zap.String("filename", filenames[i]), zap.Error(err))
return err
return
}
segData := make([]byte, segLen)
if _, err := io.ReadFull(f, segData); err != nil {
cam.Error("reading header error:", zap.String("filename", filenames[i]), zap.Error(err))
return err
return
}
headerReader := bytes.NewReader(segData)
headerSeg, err := readHeaderSegment(headerReader)
if err != nil {
cam.Error(
"func readHeaderSegment error:", zap.String("filename", filenames[i]), zap.Error(err))
return err
return
}
// Parse duration of a segment.
per, err = strconv.Atoi(headerSeg.Duration)
if err != nil {
cam.Error("parsing duration error:", zap.String("filename", filenames[i]), zap.Error(err))
return err
return
}
// Setup MPEG-TS muxer.
@ -151,7 +150,7 @@ func CreateVideo(dir string) error {
err = currentMpegtsMuxer.Initialize()
if err != nil {
cam.Error("init muxer error:", zap.String("filename", filenames[i]), zap.Error(err))
return err
return
}
// Read segments.
@ -165,21 +164,21 @@ func CreateVideo(dir string) error {
}
cam.Error(
"read segments length error:", zap.String("filename", filenames[i]), zap.Error(err))
return err
return
}
// Read segments data.
segData = make([]byte, segLen)
if _, err := io.ReadFull(f, segData); err != nil {
cam.Error(
"read segments error:", zap.String("filename", filenames[i]), zap.Error(err))
return err
return
}
packetReader := bytes.NewReader(segData)
packets, err := readPacketSegment(packetReader)
if err != nil {
cam.Error(
"func readPacketSegment error:", zap.String("filename", filenames[i]), zap.Error(err))
return err
return
}
segment.Packets = append(segment.Packets, packets...)
@ -218,6 +217,7 @@ func CreateVideo(dir string) error {
}
}
}
}()
}
return errors.New("func CreateVideo downed")
select {}
}

11
writer/cmd/main.go
View File

@ -1,22 +1,15 @@
package main
import (
"fmt"
"git.insit.tech/psa/rtsp_reader-writer/writer/internal/metrics"
"time"
"git.insit.tech/psa/rtsp_reader-writer/writer/internal/config"
"git.insit.tech/psa/rtsp_reader-writer/writer/internal/ingest/rtsp"
logger "git.insit.tech/psa/rtsp_reader-writer/writer/internal/log"
log2 "git.insit.tech/sas/rtsp_proxy/core/log"
"git.insit.tech/psa/rtsp_reader-writer/writer/internal/metrics"
)
func main() {
go metrics.Metrics()
config.LogsDirectory = log2.DirCreator(config.Local, "logs")
logger.Log = log2.MainLogging(
fmt.Sprintf("%s/writer-main_%s.log", config.LogsDirectory, time.Now().Format("15-04-05_02-01-2006")))
logger.StartMainLogger(config.Local, "writer")
rtsp.StartWriter()

2
writer/internal/ingest/rtsp/rtsp.go
View File

@ -56,7 +56,7 @@ func rtsp(dir string, period int, link string, number int) error {
// Create data folder in the directory.
dirData := log2.DirCreator(dir, "data")
// Create logger.
// Create cam logger.
cutURI := LastPartURI(link)
cam := log2.CamLogging(fmt.Sprintf("%s/%s/writer-cam_%s.log", dirData, cutURI, time.Now().Format("15-04-05_02-01-2006")))

19
writer/internal/log/logger.go
View File

@ -1,7 +1,24 @@
package log
import "go.uber.org/zap"
import (
"fmt"
"time"
"git.insit.tech/psa/rtsp_reader-writer/writer/internal/config"
log2 "git.insit.tech/sas/rtsp_proxy/core/log"
"go.uber.org/zap"
)
var (
Log *zap.Logger
)
// StartMainLogger establishes main logger.
func StartMainLogger(local, program string) {
config.LogsDirectory = log2.DirCreator(local, "logs")
Log = log2.MainLogging(
fmt.Sprintf("%s/%s-main_%s.log",
config.LogsDirectory,
program,
time.Now().Format("15-04-05_02-01-2006")))
}