mpegts: emit decode error instead of exiting in case of parse errors (#…

…110)
bluenviron · Feb 14, 2024 · 76fe548 · 76fe548
1 parent 7195bbc
commit 76fe548
Show file tree

Hide file tree

Showing 12 changed files with 419 additions and 49 deletions.
diff --git a/pkg/formats/mpegts/codec_ac3.go b/pkg/formats/mpegts/codec_ac3.go
@@ -19,8 +19,7 @@ func (*CodecAC3) isCodec() {}
 
 func (c CodecAC3) marshal(pid uint16) (*astits.PMTElementaryStream, error) {
 	return &astits.PMTElementaryStream{
-		ElementaryPID:               pid,
-		ElementaryStreamDescriptors: nil,
-		StreamType:                  astits.StreamTypeAC3Audio,
+		ElementaryPID: pid,
+		StreamType:    astits.StreamTypeAC3Audio,
 	}, nil
 }
diff --git a/pkg/formats/mpegts/codec_h264.go b/pkg/formats/mpegts/codec_h264.go
@@ -16,8 +16,7 @@ func (*CodecH264) isCodec() {}
 
 func (c CodecH264) marshal(pid uint16) (*astits.PMTElementaryStream, error) {
 	return &astits.PMTElementaryStream{
-		ElementaryPID:               pid,
-		ElementaryStreamDescriptors: nil,
-		StreamType:                  astits.StreamTypeH264Video,
+		ElementaryPID: pid,
+		StreamType:    astits.StreamTypeH264Video,
 	}, nil
 }
diff --git a/pkg/formats/mpegts/codec_h265.go b/pkg/formats/mpegts/codec_h265.go
@@ -16,8 +16,7 @@ func (*CodecH265) isCodec() {}
 
 func (c CodecH265) marshal(pid uint16) (*astits.PMTElementaryStream, error) {
 	return &astits.PMTElementaryStream{
-		ElementaryPID:               pid,
-		ElementaryStreamDescriptors: nil,
-		StreamType:                  astits.StreamTypeH265Video,
+		ElementaryPID: pid,
+		StreamType:    astits.StreamTypeH265Video,
 	}, nil
 }
diff --git a/pkg/formats/mpegts/codec_mpeg1_audio.go b/pkg/formats/mpegts/codec_mpeg1_audio.go
@@ -16,8 +16,7 @@ func (*CodecMPEG1Audio) isCodec() {}
 
 func (c CodecMPEG1Audio) marshal(pid uint16) (*astits.PMTElementaryStream, error) {
 	return &astits.PMTElementaryStream{
-		ElementaryPID:               pid,
-		ElementaryStreamDescriptors: nil,
-		StreamType:                  astits.StreamTypeMPEG1Audio,
+		ElementaryPID: pid,
+		StreamType:    astits.StreamTypeMPEG1Audio,
 	}, nil
 }
diff --git a/pkg/formats/mpegts/codec_mpeg1_video.go b/pkg/formats/mpegts/codec_mpeg1_video.go
@@ -16,8 +16,7 @@ func (*CodecMPEG1Video) isCodec() {}
 
 func (c CodecMPEG1Video) marshal(pid uint16) (*astits.PMTElementaryStream, error) {
 	return &astits.PMTElementaryStream{
-		ElementaryPID:               pid,
-		ElementaryStreamDescriptors: nil,
+		ElementaryPID: pid,
 		// we use MPEG-2 to notify readers that video can be either MPEG-1 or MPEG-2
 		StreamType: astits.StreamTypeMPEG2Video,
 	}, nil

diff --git a/pkg/formats/mpegts/codec_mpeg4_audio.go b/pkg/formats/mpegts/codec_mpeg4_audio.go
@@ -20,8 +20,7 @@ func (*CodecMPEG4Audio) isCodec() {}
 
 func (c CodecMPEG4Audio) marshal(pid uint16) (*astits.PMTElementaryStream, error) {
 	return &astits.PMTElementaryStream{
-		ElementaryPID:               pid,
-		ElementaryStreamDescriptors: nil,
-		StreamType:                  astits.StreamTypeAACAudio,
+		ElementaryPID: pid,
+		StreamType:    astits.StreamTypeAACAudio,
 	}, nil
 }
diff --git a/pkg/formats/mpegts/codec_mpeg4_video.go b/pkg/formats/mpegts/codec_mpeg4_video.go
@@ -16,8 +16,7 @@ func (*CodecMPEG4Video) isCodec() {}
 
 func (c CodecMPEG4Video) marshal(pid uint16) (*astits.PMTElementaryStream, error) {
 	return &astits.PMTElementaryStream{
-		ElementaryPID:               pid,
-		ElementaryStreamDescriptors: nil,
-		StreamType:                  astits.StreamTypeMPEG4Video,
+		ElementaryPID: pid,
+		StreamType:    astits.StreamTypeMPEG4Video,
 	}, nil
 }
diff --git a/pkg/formats/mpegts/codec_opus.go b/pkg/formats/mpegts/codec_opus.go
@@ -19,6 +19,7 @@ func (*CodecOpus) isCodec() {}
 func (c CodecOpus) marshal(pid uint16) (*astits.PMTElementaryStream, error) {
 	return &astits.PMTElementaryStream{
 		ElementaryPID: pid,
+		StreamType:    astits.StreamTypePrivateData,
 		ElementaryStreamDescriptors: []*astits.Descriptor{
 			{
 				Length: 4,
@@ -36,6 +37,5 @@ func (c CodecOpus) marshal(pid uint16) (*astits.PMTElementaryStream, error) {
 				},
 			},
 		},
-		StreamType: astits.StreamTypePrivateData,
 	}, nil
 }
diff --git a/pkg/formats/mpegts/opus_access_unit.go b/pkg/formats/mpegts/opus_access_unit.go
@@ -12,7 +12,7 @@ type opusAccessUnit struct {
 func (au *opusAccessUnit) unmarshal(buf []byte) (int, error) {
 	n, err := au.ControlHeader.unmarshal(buf)
 	if err != nil {
-		return 0, fmt.Errorf("could not decode control header: %w", err)
+		return 0, fmt.Errorf("invalid control header: %w", err)
 	}
 	buf = buf[n:]
 

diff --git a/pkg/formats/mpegts/reader.go b/pkg/formats/mpegts/reader.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"strings"
 
 	"github.com/asticode/go-astits"
 
@@ -175,7 +176,7 @@ func (r *Reader) OnDataMPEG4Audio(track *Track, cb ReaderOnDataMPEG4AudioFunc) {
 		var pkts mpeg4audio.ADTSPackets
 		err := pkts.Unmarshal(data)
 		if err != nil {
-			r.onDecodeError(err)
+			r.onDecodeError(fmt.Errorf("invalid ADTS: %w", err))
 			return nil
 		}
 
@@ -249,35 +250,42 @@ func (r *Reader) OnDataAC3(track *Track, cb ReaderOnDataAC3Func) {
 
 // Read reads data.
 func (r *Reader) Read() error {
-	data, err := r.dem.NextData()
-	if err != nil {
-		return err
-	}
+	for {
+		data, err := r.dem.NextData()
+		if err != nil {
+			// https://github.com/asticode/go-astits/blob/b0b19247aa31633650c32638fb55f597fa6e2468/packet_buffer.go#L133C1-L133C5
+			if errors.Is(err, astits.ErrNoMorePackets) || strings.Contains(err.Error(), "astits: reading ") {
+				return err
+			}
+			r.onDecodeError(err)
+			continue
+		}
 
-	if data.PES == nil {
-		return nil
-	}
+		if data.PES == nil {
+			return nil
+		}
 
-	if data.PES.Header.OptionalHeader == nil ||
-		data.PES.Header.OptionalHeader.PTSDTSIndicator == astits.PTSDTSIndicatorNoPTSOrDTS ||
-		data.PES.Header.OptionalHeader.PTSDTSIndicator == astits.PTSDTSIndicatorIsForbidden {
-		r.onDecodeError(fmt.Errorf("PTS is missing"))
-		return nil
-	}
+		if data.PES.Header.OptionalHeader == nil ||
+			data.PES.Header.OptionalHeader.PTSDTSIndicator == astits.PTSDTSIndicatorNoPTSOrDTS ||
+			data.PES.Header.OptionalHeader.PTSDTSIndicator == astits.PTSDTSIndicatorIsForbidden {
+			r.onDecodeError(fmt.Errorf("PTS is missing"))
+			return nil
+		}
 
-	pts := data.PES.Header.OptionalHeader.PTS.Base
+		pts := data.PES.Header.OptionalHeader.PTS.Base
 
-	var dts int64
-	if data.PES.Header.OptionalHeader.PTSDTSIndicator == astits.PTSDTSIndicatorBothPresent {
-		dts = data.PES.Header.OptionalHeader.DTS.Base
-	} else {
-		dts = pts
-	}
+		var dts int64
+		if data.PES.Header.OptionalHeader.PTSDTSIndicator == astits.PTSDTSIndicatorBothPresent {
+			dts = data.PES.Header.OptionalHeader.DTS.Base
+		} else {
+			dts = pts
+		}
 
-	onData, ok := r.onData[data.PID]
-	if !ok {
-		return nil
-	}
+		onData, ok := r.onData[data.PID]
+		if !ok {
+			return nil
+		}
 
-	return onData(pts, dts, data.PES.Data)
+		return onData(pts, dts, data.PES.Data)
+	}
 }