Merge pull request #14 from mutablelogic/ffmpeg61

Updates for media manager and cli

Makefile

@@ -44,6 +44,8 @@ test: go-dep
 	@echo Test
 	@${GO} mod tidy
 	@${GO} test ./sys/ffmpeg61
+	@${GO} test ./pkg/...
+	@${GO} test .
 
 $(CMD_DIR): go-dep mkdir
 	@echo Build cmd $(notdir $@)

cmd/cli/decode.go

@@ -1,17 +1,15 @@
 package main
 
 import (
-
-	// Packages
-
 	"encoding/json"
 	"fmt"
 
+	// Packages
 	"github.com/mutablelogic/go-media"
 )
 
 type DecodeCmd struct {
-	Path string `arg required help:"Media file" type:"path"`
+	Path string `arg:"" required:"" help:"Media file" type:"path"`
 }
 
 func (cmd *DecodeCmd) Run(globals *Globals) error {

cmd/cli/demuxers.go

@@ -0,0 +1,26 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	// Packages
+	"github.com/djthorpe/go-tablewriter"
+	"github.com/mutablelogic/go-media"
+)
+
+type DemuxersCmd struct {
+	Filter string `arg:"" optional:"" help:"Filter by mimetype, name or .ext" type:"string"`
+}
+
+func (cmd *DemuxersCmd) Run(globals *Globals) error {
+	manager := media.NewManager()
+	formats := manager.InputFormats(cmd.Filter)
+	writer := tablewriter.New(os.Stdout, tablewriter.OptHeader(), tablewriter.OptOutputText())
+	if len(formats) == 0 {
+		fmt.Printf("No demuxers found for %q\n", cmd.Filter)
+		return nil
+	} else {
+		return writer.Write(formats)
+	}
+}

cmd/cli/main.go

@@ -15,6 +15,8 @@ type Globals struct {
 type CLI struct {
 	Globals
 	Version  VersionCmd  `cmd:"version" help:"Print version information"`
+	Demuxers DemuxersCmd `cmd:"demuxers" help:"List media demultiplex (input) formats"`
+	Muxers   MuxersCmd   `cmd:"muxers" help:"List media multiplex (output) formats"`
 	Metadata MetadataCmd `cmd:"metadata" help:"Display media metadata information"`
 	Decode   DecodeCmd   `cmd:"decode" help:"Decode media"`
 }

cmd/cli/muxers.go

@@ -0,0 +1,26 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	// Packages
+	"github.com/djthorpe/go-tablewriter"
+	"github.com/mutablelogic/go-media"
+)
+
+type MuxersCmd struct {
+	Filter string `arg:"" optional:"" help:"Filter by mimetype, name or .ext" type:"string"`
+}
+
+func (cmd *MuxersCmd) Run(globals *Globals) error {
+	manager := media.NewManager()
+	formats := manager.OutputFormats(cmd.Filter)
+	writer := tablewriter.New(os.Stdout, tablewriter.OptHeader(), tablewriter.OptOutputText())
+	if len(formats) == 0 {
+		fmt.Printf("No muxers found for %q\n", cmd.Filter)
+		return nil
+	} else {
+		return writer.Write(formats)
+	}
+}

cmd/ffmpeg/README.md

@@ -15,7 +15,7 @@ using the low-level golang bindings.
     Generate a synthetic audio signal and encode it to an output MP2 file.
 * [encode_video](encode_video) - libavcodec encoding video API usage example.
     Generate synthetic video data and encode it to an output file.
-* [mux](mux) - Muxing - libavformat/libavcodec muxing API usage example.
+* [mux](mux) - Muxing - libavformat/libavcodec muxing API usage example - NOT COMPLETED
     Generate a synthetic audio signal and mux it into a container format.
 * [remux](remux) - Remuxing - libavformat/libavcodec demuxing and muxing API usage example.
     Remux streams from one container format to another. Data is copied from the input to the output

cmd/ffmpeg/encode_audio/main.go

@@ -83,7 +83,7 @@ func main() {
 	}
 
 	// Allocate the data buffers
-	if err := ff.AVUtil_frame_get_buffer(frame, 0); err != nil {
+	if err := ff.AVUtil_frame_get_buffer(frame, false); err != nil {
 		log.Fatal(err)
 	}
 

cmd/ffmpeg/encode_video/main.go

@@ -92,7 +92,7 @@ func main() {
 	frame.SetHeight(ctx.Height())
 
 	// Allocate the data buffers
-	if err := ff.AVUtil_frame_get_buffer(frame, 0); err != nil {
+	if err := ff.AVUtil_frame_get_buffer(frame, false); err != nil {
 		log.Fatal(err)
 	}
 

cmd/ffmpeg/mux/generate.go → cmd/ffmpeg/mux/generate.go_old

@@ -67,7 +67,7 @@ func write_video_frame(ctx *ff.AVFormatContext, stream *Stream) bool {
 
 
 
-
+/*
  static int write_audio_frame(AVFormatContext *oc, OutputStream *ost)
  {
 	 AVCodecContext *c;
@@ -80,8 +80,8 @@ func write_video_frame(ctx *ff.AVFormatContext, stream *Stream) bool {
 	 frame = get_audio_frame(ost);
 
 	 if (frame) {
-		 /* convert samples from native format to destination codec format, using the resampler */
-		 /* compute destination number of samples */
+		 /* convert samples from native format to destination codec format, using the resampler
+		 /* compute destination number of samples 
 		 dst_nb_samples = av_rescale_rnd(swr_get_delay(ost->swr_ctx, c->sample_rate) + frame->nb_samples,
 										 c->sample_rate, c->sample_rate, AV_ROUND_UP);
 		 av_assert0(dst_nb_samples == frame->nb_samples);
@@ -94,7 +94,7 @@ func write_video_frame(ctx *ff.AVFormatContext, stream *Stream) bool {
 		 if (ret < 0)
 			 exit(1);
 
-		 /* convert to destination format */
+		 /* convert to destination format 
 		 ret = swr_convert(ost->swr_ctx,
 						   ost->frame->data, dst_nb_samples,
 						   (const uint8_t **)frame->data, frame->nb_samples);
@@ -109,4 +109,5 @@ func write_video_frame(ctx *ff.AVFormatContext, stream *Stream) bool {
 	 }
 
 	 return write_frame(oc, c, ost->st, frame, ost->tmp_pkt);
- }
+ }
+ */

cmd/ffmpeg/mux/main.go

@@ -90,9 +90,13 @@ func main() {
 	for encode_audio || encode_video {
 		// Choose video if both are available, and video is earlier than audio
 		if (encode_video && !encode_audio) || (encode_video && ff.AVUtil_compare_ts(video.next_pts, video.Encoder.TimeBase(), audio.next_pts, audio.Encoder.TimeBase()) <= 0) {
-			encode_video = !write_video_frame(ctx, video)
+			fmt.Println("TODO: Write video frame")
+			encode_video = false
+			//	encode_video = !write_video_frame(ctx, video)
 		} else {
-			encode_audio = !write_audio_frame(ctx, audio)
+			fmt.Println("TODO: Write audio frame")
+			encode_audio = false
+			//			encode_audio = !write_audio_frame(ctx, audio)
 		}
 	}
 

cmd/ffmpeg/mux/stream.go

@@ -223,7 +223,7 @@ func alloc_video_frame(pix_fmt ff.AVPixelFormat, width, height int) (*ff.AVFrame
 	frame.SetPixFmt(pix_fmt)
 
 	// allocate the buffers for the frame data
-	if err := ff.AVUtil_frame_get_buffer(frame, 0); err != nil {
+	if err := ff.AVUtil_frame_get_buffer(frame, false); err != nil {
 		ff.AVUtil_frame_free(frame)
 		return nil, err
 	}
@@ -246,7 +246,7 @@ func alloc_audio_frame(sample_fmt ff.AVSampleFormat, channel_layout ff.AVChannel
 	}
 
 	// allocate the buffers for the frame data
-	if err := ff.AVUtil_frame_get_buffer(frame, 0); err != nil {
+	if err := ff.AVUtil_frame_get_buffer(frame, false); err != nil {
 		ff.AVUtil_frame_free(frame)
 		return nil, err
 	}

etc/docker/Dockerfile

@@ -12,7 +12,7 @@ COPY . .
 RUN set -x \
   && apt update -y \
   && apt install -y ca-certificates lsb-release \
-  && echo "deb https://www.deb-multimedia.org $(lsb_release -sc) main non-free" >> /etc/apt/sources.list \
+  && echo "deb https://www.deb-multimedia.org $(lsb_release -sc) main" >> /etc/apt/sources.list \
   && apt update -y -oAcquire::AllowInsecureRepositories=true \
   && apt install -y --force-yes deb-multimedia-keyring \
   && apt install -y --allow-unauthenticated libavcodec-dev libavdevice-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev
@@ -29,7 +29,7 @@ ARG SOURCE
 RUN set -x \
   && apt update -y \
   && apt install -y ca-certificates lsb-release \
-  && echo "deb https://www.deb-multimedia.org $(lsb_release -sc) main non-free" >> /etc/apt/sources.list \
+  && echo "deb https://www.deb-multimedia.org $(lsb_release -sc) main" >> /etc/apt/sources.list \
   && apt update -y -oAcquire::AllowInsecureRepositories=true \
   && apt install -y --force-yes deb-multimedia-keyring \
   && apt install -y --allow-unauthenticated ffmpeg

go.mod

@@ -7,19 +7,19 @@ toolchain go1.22.4
 require (
 	github.com/alecthomas/kong v0.9.0
 	github.com/djthorpe/go-errors v1.0.3
-	github.com/djthorpe/go-tablewriter v0.0.7
+	github.com/djthorpe/go-tablewriter v0.0.8
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/mutablelogic/go-client v1.0.8
 	github.com/stretchr/testify v1.9.0
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/hashicorp/errwrap v1.0.0 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
-	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/term v0.20.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/term v0.21.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )