From a4678342ee718ddbb1e1d36e9ae0d47aeda9c56c Mon Sep 17 00:00:00 2001
From: Sergey Petrov <psa@insit.ru>
Date: Tue, 25 Mar 2025 16:19:46 +0500
Subject: [PATCH] Refactoring.

---
 writer/internal/ingest/rtsp/rtsp.go | 16 ++++++++--------
 writer/pkg/storage/file.go          | 10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/writer/internal/ingest/rtsp/rtsp.go b/writer/internal/ingest/rtsp/rtsp.go
index a5b8ca2..2c30179 100644
--- a/writer/internal/ingest/rtsp/rtsp.go
+++ b/writer/internal/ingest/rtsp/rtsp.go
@@ -442,7 +442,7 @@ func RTSP(dir string, period int, link string) error {
 		seg := storage.Segment{
 			Date:     time.Now().Format("15-04-05_02-01-2006"),
 			Duration: strconv.Itoa(period),
-			Packets:  storage.InterleavedPacket{},
+			Packet:   storage.InterleavedPacket{},
 		}
 
 		// Write StreamID.
@@ -472,9 +472,9 @@ func RTSP(dir string, period int, link string) error {
 
 				if au != nil {
 					// Add appropriate lines to the interleaved packet.
-					seg.Packets.Type = storage.PacketTypeH264
-					seg.Packets.Pts = pts
-					seg.Packets.H264AUs = au
+					seg.Packet.Type = storage.PacketTypeH264
+					seg.Packet.Pts = pts
+					seg.Packet.H264AUs = au
 
 					// Write segment with interleaved packets.
 					if err := storage.WriteInterleavedPacket(file, seg); err != nil {
@@ -502,9 +502,9 @@ func RTSP(dir string, period int, link string) error {
 					lpcmSamples := formats.ConvertG711ToLPCM(au, f.MULaw)
 
 					// Add appropriate lines to the interleaved packet.
-					seg.Packets.Type = storage.PacketTypeLPCM
-					seg.Packets.Pts = pts
-					seg.Packets.LPCMSamples = lpcmSamples
+					seg.Packet.Type = storage.PacketTypeLPCM
+					seg.Packet.Pts = pts
+					seg.Packet.LPCMSamples = lpcmSamples
 
 					// Write segment with interleaved packets.
 					if err := storage.WriteInterleavedPacket(file, seg); err != nil {
@@ -562,7 +562,7 @@ func RTSP(dir string, period int, link string) error {
 				seg = storage.Segment{
 					Date:     time.Now().Format("15-04-05_02-01-2006"),
 					Duration: strconv.Itoa(period),
-					Packets:  storage.InterleavedPacket{},
+					Packet:   storage.InterleavedPacket{},
 				}
 
 				// Write StreamID.
diff --git a/writer/pkg/storage/file.go b/writer/pkg/storage/file.go
index ac41257..cd1699f 100644
--- a/writer/pkg/storage/file.go
+++ b/writer/pkg/storage/file.go
@@ -26,9 +26,8 @@ const (
 type InterleavedPacket struct {
 	Type byte
 	Pts  int64
-	// Для H264 – access units как [][]byte.
-	H264AUs [][]byte
-	// Для LPCM (из G711) – samples.
+
+	H264AUs     [][]byte
 	LPCMSamples []byte
 }
 
@@ -36,7 +35,8 @@ type InterleavedPacket struct {
 type Segment struct {
 	Date     string
 	Duration string
-	Packets  InterleavedPacket
+	Packet   InterleavedPacket
+	Packets  []InterleavedPacket
 }
 
 // writeString записывает строку: сначала int32 длина, затем данные.
@@ -113,7 +113,7 @@ func WriteInterleavedPacket(w io.Writer, seg Segment) error {
 		return err
 	}
 	// Записываем каждый пакет.
-	if err := WritePacket(&buf, seg.Packets); err != nil {
+	if err := WritePacket(&buf, seg.Packet); err != nil {
 		return err
 	}