support recording to MPEG-TS (#2505)

README.md

@@ -47,6 +47,7 @@ And can be recorded with:
 |format|video codecs|audio codecs|
 |------|------------|------------|
 |[fMP4](#record-streams-to-disk)|AV1, VP9, H265, H264, MPEG-4 Video (H263, Xvid), MPEG-1/2 Video, M-JPEG|Opus, MPEG-4 Audio (AAC), MPEG-1/2 Audio (MP3), AC-3, LPCM|
+|[MPEG-TS](#record-streams-to-disk)|H265, H264, MPEG-4 Video (H263, Xvid), MPEG-1/2 Video|Opus, MPEG-4 Audio (AAC), MPEG-1/2 Audio (MP3), AC-3|
 
 **Features**
 

internal/conf/conf.go

@@ -165,7 +165,7 @@ type Conf struct {
 	// Record
 	Record                *bool           `json:"record,omitempty"`                // deprecated
 	RecordPath            *string         `json:"recordPath,omitempty"`            // deprecated
-	RecordFormat          *string         `json:"recordFormat,omitempty"`          // deprecated
+	RecordFormat          *RecordFormat   `json:"recordFormat,omitempty"`          // deprecated
 	RecordPartDuration    *StringDuration `json:"recordPartDuration,omitempty"`    // deprecated
 	RecordSegmentDuration *StringDuration `json:"recordSegmentDuration,omitempty"` // deprecated
 	RecordDeleteAfter     *StringDuration `json:"recordDeleteAfter,omitempty"`     // deprecated

internal/conf/conf_test.go

@@ -52,7 +52,7 @@ func TestConfFromFile(t *testing.T) {
 			SourceOnDemandStartTimeout: 10 * StringDuration(time.Second),
 			SourceOnDemandCloseAfter:   10 * StringDuration(time.Second),
 			RecordPath:                 "./recordings/%path/%Y-%m-%d_%H-%M-%S-%f",
-			RecordFormat:               "fmp4",
+			RecordFormat:               RecordFormatFMP4,
 			RecordPartDuration:         100000000,
 			RecordSegmentDuration:      3600000000000,
 			RecordDeleteAfter:          86400000000000,

internal/conf/path.go

@@ -63,7 +63,7 @@ type Path struct {
 	// Record
 	Record                bool           `json:"record"`
 	RecordPath            string         `json:"recordPath"`
-	RecordFormat          string         `json:"recordFormat"`
+	RecordFormat          RecordFormat   `json:"recordFormat"`
 	RecordPartDuration    StringDuration `json:"recordPartDuration"`
 	RecordSegmentDuration StringDuration `json:"recordSegmentDuration"`
 	RecordDeleteAfter     StringDuration `json:"recordDeleteAfter"`
@@ -150,7 +150,7 @@ func (pconf *Path) setDefaults() {
 
 	// Record
 	pconf.RecordPath = "./recordings/%path/%Y-%m-%d_%H-%M-%S-%f"
-	pconf.RecordFormat = "fmp4"
+	pconf.RecordFormat = RecordFormatFMP4
 	pconf.RecordPartDuration = 100 * StringDuration(time.Millisecond)
 	pconf.RecordSegmentDuration = 3600 * StringDuration(time.Second)
 	pconf.RecordDeleteAfter = 24 * 3600 * StringDuration(time.Second)
@@ -400,12 +400,6 @@ func (pconf *Path) check(conf *Conf, name string) error {
 		}
 	}
 
-	// Record
-
-	if pconf.RecordFormat != "fmp4" {
-		return fmt.Errorf("unsupported record format '%s'", pconf.RecordFormat)
-	}
-
 	// Publisher
 
 	if pconf.DisablePublisherOverride != nil {

internal/conf/record_format.go

@@ -0,0 +1,56 @@
+package conf
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// RecordFormat is the recordFormat parameter.
+type RecordFormat int
+
+// supported values.
+const (
+	RecordFormatFMP4 RecordFormat = iota
+	RecordFormatMPEGTS
+)
+
+// MarshalJSON implements json.Marshaler.
+func (d RecordFormat) MarshalJSON() ([]byte, error) {
+	var out string
+
+	switch d {
+	case RecordFormatMPEGTS:
+		out = "mpegts"
+
+	default:
+		out = "fmp4"
+	}
+
+	return json.Marshal(out)
+}
+
+// UnmarshalJSON implements json.Unmarshaler.
+func (d *RecordFormat) UnmarshalJSON(b []byte) error {
+	var in string
+	if err := json.Unmarshal(b, &in); err != nil {
+		return err
+	}
+
+	switch in {
+	case "mpegts":
+		*d = RecordFormatMPEGTS
+
+	case "fmp4":
+		*d = RecordFormatFMP4
+
+	default:
+		return fmt.Errorf("invalid record format '%s'", in)
+	}
+
+	return nil
+}
+
+// UnmarshalEnv implements env.Unmarshaler.
+func (d *RecordFormat) UnmarshalEnv(_ string, v string) error {
+	return d.UnmarshalJSON([]byte(`"` + v + `"`))
+}

internal/conf/rtsp_range_type.go

@@ -8,7 +8,7 @@ import (
 // RTSPRangeType is the type used in the Range header.
 type RTSPRangeType int
 
-// supported rtsp range types.
+// supported values.
 const (
 	RTSPRangeTypeUndefined RTSPRangeType = iota
 	RTSPRangeTypeClock

internal/core/core.go

@@ -41,6 +41,7 @@ func gatherCleanerEntries(paths map[string]*conf.Path) []record.CleanerEntry {
 		if pa.Record {
 			entry := record.CleanerEntry{
 				RecordPath:        pa.RecordPath,
+				RecordFormat:      pa.RecordFormat,
 				RecordDeleteAfter: time.Duration(pa.RecordDeleteAfter),
 			}
 			out[entry] = struct{}{}

internal/core/hls_muxer.go

@@ -302,7 +302,7 @@ func (m *hlsMuxer) runInner(innerCtx context.Context, innerReady chan struct{})
 	innerReady <- struct{}{}
 
 	m.Log(logger.Info, "is converting into HLS, %s",
-		sourceMediaInfo(medias))
+		mediaInfo(medias))
 
 	m.writer.Start()