es: Decode MPEG ASC if audio stream

wader · Sep 12, 2021 · 27095b5 · 27095b5
1 parent 6a1fa04
commit 27095b5
Show file tree

Hide file tree

Showing 2 changed files with 95 additions and 41 deletions.
diff --git a/format/default.go b/format/default.go
@@ -206,6 +206,52 @@ var MpegObjectTypeNames = map[uint64]string{
 	MPEGObjectTypeNONE:              "MPEGObjectTypeNONE",
 }
 
+const (
+	MPEGStreamTypeUnknown = iota
+	MPEGStreamTypeVideo
+	MPEGStreamTypeAudio
+	MPEGStreamTypeText
+)
+
+var MpegObjectTypeStreamType = map[uint64]int{
+	MPEGObjectTypeMOV_TEXT:          MPEGStreamTypeText,
+	MPEGObjectTypeMPEG4:             MPEGStreamTypeVideo,
+	MPEGObjectTypeH264:              MPEGStreamTypeVideo,
+	MPEGObjectTypeHEVC:              MPEGStreamTypeVideo,
+	MPEGObjectTypeAAC:               MPEGStreamTypeAudio,
+	MPEGObjectTypeMPEG2VideoMain:    MPEGStreamTypeVideo,
+	MPEGObjectTypeMPEG2VideoSimple:  MPEGStreamTypeVideo,
+	MPEGObjectTypeMPEG2VideoSNR:     MPEGStreamTypeVideo,
+	MPEGObjectTypeMPEG2VideoSpatial: MPEGStreamTypeVideo,
+	MPEGObjectTypeMPEG2VideoHigh:    MPEGStreamTypeVideo,
+	MPEGObjectTypeMPEG2Video422:     MPEGStreamTypeVideo,
+	MPEGObjectTypeAACMain:           MPEGStreamTypeAudio,
+	MPEGObjectTypeAACLow:            MPEGStreamTypeAudio,
+	MPEGObjectTypeAACSSR:            MPEGStreamTypeAudio,
+	MPEGObjectTypeMP32MP3:           MPEGStreamTypeAudio,
+	MPEGObjectTypeMPEG1VIDEO:        MPEGStreamTypeVideo,
+	MPEGObjectTypeMP3:               MPEGStreamTypeAudio,
+	MPEGObjectTypeMJPEG:             MPEGStreamTypeVideo,
+	MPEGObjectTypePNG:               MPEGStreamTypeVideo,
+	MPEGObjectTypeJPEG2000:          MPEGStreamTypeVideo,
+	MPEGObjectTypeVC1:               MPEGStreamTypeVideo,
+	MPEGObjectTypeDIRAC:             MPEGStreamTypeVideo,
+	MPEGObjectTypeAC3:               MPEGStreamTypeAudio,
+	MPEGObjectTypeEAC3:              MPEGStreamTypeAudio,
+	MPEGObjectTypeDTS:               MPEGStreamTypeAudio,
+	MPEGObjectTypeOPUS:              MPEGStreamTypeAudio,
+	MPEGObjectTypeVP9:               MPEGStreamTypeAudio,
+	MPEGObjectTypeFLAC:              MPEGStreamTypeAudio,
+	MPEGObjectTypeTSCC2:             MPEGStreamTypeVideo,
+	MPEGObjectTypeEVRC:              MPEGStreamTypeAudio,
+	MPEGObjectTypeVORBIS:            MPEGStreamTypeAudio,
+	MPEGObjectTypeDVDSubtitle:       MPEGStreamTypeText,
+	MPEGObjectTypeQCELP:             MPEGStreamTypeAudio,
+	MPEGObjectTypeMPEG4SYSTEMS1:     MPEGStreamTypeUnknown,
+	MPEGObjectTypeMPEG4SYSTEMS2:     MPEGStreamTypeUnknown,
+	MPEGObjectTypeNONE:              MPEGStreamTypeUnknown,
+}
+
 type MpegDecoderConfig struct {
 	ObjectType    int
 	ASCObjectType int

diff --git a/format/mpeg/es.go b/format/mpeg/es.go
@@ -205,54 +205,62 @@ func odDecodeTag(d *decode.D, edc *esDecodeContext, expectedTagID int, fn func(d
 
 			d.FieldStringMapFn("stream_type", streamTypeNames, "Unknown", d.U6, decode.NumberDecimal)
 			d.FieldBool("upstream")
-			specificInfoFlag := d.FieldBool("specific_info_flag")
+			d.FieldBool("specific_info_flag")
 			d.FieldU24("buffer_size_db")
 			d.FieldU32("max_bit_rate")
 			d.FieldU32("avg_bit_rate")
 
-			switch objectType {
-			case format.MPEGObjectTypeAAC:
-				// TODO: only if aac?
-				if specificInfoFlag {
+			// TODO: seems to be optional
+			if d.BitsLeft() > 0 {
+				switch objectType {
+				// TODO: vorbis is special case?
+				case format.MPEGObjectTypeVORBIS:
 					fieldODDecodeTag(d, edc, "decoder_specific_info", -1, func(d *decode.D) {
-						_, v := d.FieldDecode("audio_specific_config", mpegASCFormat)
-						mpegASCout, ok := v.(format.MPEGASCOut)
-						if !ok {
-							panic(fmt.Sprintf("expected MPEGASCOut got %#+v", v))
-						}
-						if edc.currentDecoderConfig != nil {
-							edc.currentDecoderConfig.ASCObjectType = mpegASCout.ObjectType
-						}
-					})
-				}
-			case format.MPEGObjectTypeVORBIS:
-				fieldODDecodeTag(d, edc, "decoder_specific_info", -1, func(d *decode.D) {
-					numPackets := d.FieldU8("num_packets")
-					// TODO: lacing
-					packetLengths := []int64{}
-					// Xiph-style lacing (similar to ogg) of n-1 packets, last is reset of block
-					d.FieldArrayFn("laces", func(d *decode.D) {
-						for i := uint64(0); i < numPackets; i++ {
-							l := d.FieldUFn("lace", func() (uint64, decode.DisplayFormat, string) {
-								var l uint64
-								for {
-									n := d.U8()
-									l += n
-									if n < 255 {
-										return l, decode.NumberDecimal, ""
+						numPackets := d.FieldU8("num_packets")
+						// TODO: lacing
+						packetLengths := []int64{}
+						// Xiph-style lacing (similar to ogg) of n-1 packets, last is reset of block
+						d.FieldArrayFn("laces", func(d *decode.D) {
+							for i := uint64(0); i < numPackets; i++ {
+								l := d.FieldUFn("lace", func() (uint64, decode.DisplayFormat, string) {
+									var l uint64
+									for {
+										n := d.U8()
+										l += n
+										if n < 255 {
+											return l, decode.NumberDecimal, ""
+										}
 									}
-								}
-							})
-							packetLengths = append(packetLengths, int64(l))
-						}
+								})
+								packetLengths = append(packetLengths, int64(l))
+							}
+						})
+						d.FieldArrayFn("packets", func(d *decode.D) {
+							for _, l := range packetLengths {
+								d.FieldDecodeLen("packet", l*8, vorbisPacketFormat)
+							}
+							d.FieldDecodeLen("packet", d.BitsLeft(), vorbisPacketFormat)
+						})
 					})
-					d.FieldArrayFn("packets", func(d *decode.D) {
-						for _, l := range packetLengths {
-							d.FieldDecodeLen("packet", l*8, vorbisPacketFormat)
-						}
-						d.FieldDecodeLen("packet", d.BitsLeft(), vorbisPacketFormat)
-					})
-				})
+				default:
+					switch format.MpegObjectTypeStreamType[objectType] {
+					case format.MPEGStreamTypeAudio:
+						fieldODDecodeTag(d, edc, "decoder_specific_info", -1, func(d *decode.D) {
+							_, v := d.FieldDecode("audio_specific_config", mpegASCFormat)
+							mpegASCout, ok := v.(format.MPEGASCOut)
+							if !ok {
+								panic(fmt.Sprintf("expected MPEGASCOut got %#+v", v))
+							}
+							if edc.currentDecoderConfig != nil {
+								edc.currentDecoderConfig.ASCObjectType = mpegASCout.ObjectType
+							}
+						})
+					case format.MPEGStreamTypeVideo:
+						// TODO:
+					case format.MPEGStreamTypeText:
+						// TODO:
+					}
+				}
 			}
 		},
 	}