diff --git a/writer/pkg/storage/file.go b/writer/pkg/storage/file.go index f1de59a..769f04d 100644 --- a/writer/pkg/storage/file.go +++ b/writer/pkg/storage/file.go @@ -190,8 +190,8 @@ func CreateTXT(path, date, startTime, endTime string) (string, error) { return fileNameTXT, nil } -// mergeFiles merges the collected files into one MP4 file. -func mergeFiles(path, fileNamesTXT string) (string, error) { +// MergeFiles merges the collected files into one MP4 file. +func MergeFiles(path, fileNamesTXT string) (string, error) { fileNameRes := time.Now().Format("15-04-05") + "_video.mp4" cmd := exec.Command("ffmpeg", @@ -427,12 +427,11 @@ func GetHeader(id, res, file string) ([]string, error) { if _, err := io.ReadFull(f, segData); err != nil { return nil, errors.New("reading header error: " + err.Error()) } - //headerReader := bytes.NewReader(segData) - //headerSeg, err := ReadHeaderSegment(headerReader) + headerReader := bytes.NewReader(segData) + headerSeg, err := ReadHeaderSegment(headerReader) if err != nil { 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.