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-04-09 16:36:09 +05:00
parent ba39c3a9fd
commit a11ba13ae8
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
writer/pkg/storage/file.go
View File

@ -190,8 +190,8 @@ func CreateTXT(path, date, startTime, endTime string) (string, error) {
return fileNameTXT, nil return fileNameTXT, nil
} }
// mergeFiles merges the collected files into one MP4 file. // MergeFiles merges the collected files into one MP4 file.
func mergeFiles(path, fileNamesTXT string) (string, error) { func MergeFiles(path, fileNamesTXT string) (string, error) {
fileNameRes := time.Now().Format("15-04-05") + "_video.mp4" fileNameRes := time.Now().Format("15-04-05") + "_video.mp4"
cmd := exec.Command("ffmpeg", cmd := exec.Command("ffmpeg",
@ -427,12 +427,11 @@ func GetHeader(id, res, file string) ([]string, error) {
if _, err := io.ReadFull(f, segData); err != nil { if _, err := io.ReadFull(f, segData); err != nil {
return nil, errors.New("reading header error: " + err.Error()) return nil, errors.New("reading header error: " + err.Error())
} }
//headerReader := bytes.NewReader(segData) headerReader := bytes.NewReader(segData)
//headerSeg, err := ReadHeaderSegment(headerReader) headerSeg, err := ReadHeaderSegment(headerReader)
if err != nil { if err != nil {
return nil, errors.New("reading header error: " + err.Error()) return nil, errors.New("reading header error: " + err.Error())
} }
return strings.Split(string(segData), "\n"), nil
} }
// readString reads string length and then reads string data. // readString reads string length and then reads string data.