Updated

Author: djthorpe

cmd/cli/decode.go

@@ -9,7 +9,7 @@ import (
 )
 
 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/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 renamed to 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
 	}

manager.go

@@ -15,20 +15,21 @@ import (
 type manager struct {
 }
 
-type inputformat struct {
-	ctx         *ff.AVInputFormat
-	Name        string `json:"name"`
+type formatmeta struct {
+	Name        string `json:"name" writer:",width:25"`
 	Description string `json:"description" writer:",wrap,width:40"`
 	Extensions  string `json:"extensions,omitempty"`
 	MimeTypes   string `json:"mimetypes,omitempty"`
 }
 
+type inputformat struct {
+	formatmeta
+	ctx *ff.AVInputFormat
+}
+
 type outputformat struct {
-	ctx         *ff.AVOutputFormat
-	Name        string `json:"name"`
-	Description string `json:"description" writer:",wrap,width:40"`
-	Extensions  string `json:"extensions,omitempty"`
-	MimeTypes   string `json:"mimetypes,omitempty"`
+	formatmeta
+	ctx *ff.AVOutputFormat
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -40,21 +41,25 @@ func NewManager() *manager {
 
 func newInputFormat(ctx *ff.AVInputFormat) *inputformat {
 	return &inputformat{
-		ctx:         ctx,
-		Name:        ctx.Name(),
-		Description: ctx.LongName(),
-		Extensions:  ctx.Extensions(),
-		MimeTypes:   ctx.MimeTypes(),
+		ctx: ctx,
+		formatmeta: formatmeta{
+			Name:        ctx.Name(),
+			Description: ctx.LongName(),
+			Extensions:  ctx.Extensions(),
+			MimeTypes:   ctx.MimeTypes(),
+		},
 	}
 }
 
 func newOutputFormat(ctx *ff.AVOutputFormat) *outputformat {
 	return &outputformat{
-		ctx:         ctx,
-		Name:        ctx.Name(),
-		Description: ctx.LongName(),
-		Extensions:  ctx.Extensions(),
-		MimeTypes:   ctx.MimeTypes(),
+		ctx: ctx,
+		formatmeta: formatmeta{
+			Name:        ctx.Name(),
+			Description: ctx.LongName(),
+			Extensions:  ctx.Extensions(),
+			MimeTypes:   ctx.MimeTypes(),
+		},
 	}
 }
 

sys/ffmpeg61/avutil_frame.go

@@ -239,3 +239,14 @@ func (ctx *AVFrame) Int16(plane int) []int16 {
 		return cInt16Slice(unsafe.Pointer(buf.data), C.int(buf.size)>>1)
 	}
 }
+
+// Returns the data as a set of planes and strides
+func (ctx *AVFrame) Data() ([][]byte, []int) {
+	planes := make([][]byte, int(C.AV_NUM_DATA_POINTERS))
+	strides := make([]int, int(C.AV_NUM_DATA_POINTERS))
+	for i := 0; i < int(C.AV_NUM_DATA_POINTERS); i++ {
+		planes[i] = ctx.Uint8(i)
+		strides[i] = ctx.Linesize(i)
+	}
+	return planes, strides
+}