Added packet type

Author: djthorpe

cmd/cli/decode.go

@@ -1,10 +1,12 @@
 package main
 
 import (
-	"encoding/json"
+	"context"
 	"fmt"
+	"os"
 
 	// Packages
+	"github.com/djthorpe/go-tablewriter"
 	"github.com/mutablelogic/go-media"
 )
 
@@ -29,14 +31,31 @@ func (cmd *DecodeCmd) Run(globals *Globals) error {
 		}
 	}
 
+	// Open media file
 	reader, err := manager.Open(cmd.Path, format)
 	if err != nil {
 		return err
 	}
 	defer reader.Close()
 
-	data, _ := json.MarshalIndent(reader, "", "  ")
-	fmt.Println(string(data))
+	// Create a decoder - copy streams
+	decoder, err := reader.Decoder(nil)
+	if err != nil {
+		return err
+	}
 
-	return nil
+	// Demultiplex the stream
+	header := []tablewriter.TableOpt{tablewriter.OptHeader()}
+	tablewriter := tablewriter.New(os.Stdout, tablewriter.OptOutputText())
+	return decoder.Demux(context.Background(), func(packet media.Packet) error {
+		if packet == nil {
+			return nil
+		}
+		if err := tablewriter.Write(packet, header...); err != nil {
+			return err
+		}
+		// Reset the header
+		header = header[:0]
+		return nil
+	})
 }

decoder.go

@@ -225,7 +225,7 @@ func (d *demuxer) Decode(context.Context, FrameFunc) error {
 func (d *decoder) decode(fn DecoderFunc, packet *ff.AVPacket) error {
 	// Send the packet to the user defined packet function or
 	// to the default version
-	return fn(packet)
+	return fn(newPacket(packet))
 }
 
 /*

packet.go

@@ -0,0 +1,23 @@
+package media
+
+import (
+	// Packages
+	ff "github.com/mutablelogic/go-media/sys/ffmpeg61"
+)
+
+////////////////////////////////////////////////////////////////////////////////
+// TYPES
+
+type packet struct {
+	X string `json:"type"`
+	*ff.AVPacket
+}
+
+var _ Packet = (*packet)(nil)
+
+////////////////////////////////////////////////////////////////////////////////
+// LIFECYCLE
+
+func newPacket(ctx *ff.AVPacket) *packet {
+	return &packet{"X", ctx}
+}

stream.go

@@ -39,5 +39,5 @@ func (stream *stream) Type() MediaType {
 
 func (stream *stream) Parameters() Parameters {
 	// TODO
-	return nil
+	return new(par)
 }