Updated writer

Author: djthorpe

encoder.go

@@ -135,7 +135,7 @@ func newEncoder(ctx *ff.AVFormatContext, stream_id int, param Parameters) (*enco
 	}
 
 	// Some formats want stream headers to be separate.
-	if ctx.Flags().Is(ff.AVFMT_GLOBALHEADER) {
+	if ctx.Output().Flags().Is(ff.AVFMT_GLOBALHEADER) {
 		codecctx.SetFlags(codecctx.Flags() | ff.AV_CODEC_FLAG_GLOBAL_HEADER)
 	}
 

pkg/ffmpeg/writer.go

@@ -74,7 +74,7 @@ func (w *Writer) Close() error {
 	if w.output != nil {
 		// This calls avio_close(w.avio)
 		fmt.Println("TODO: AVFormat_close_writer")
-		//result = errors.Join(result, ff.AVFormat_close_writer(w.output))
+		result = errors.Join(result, ff.AVFormat_close_writer(w.output))
 		w.output = nil
 	}
 

pkg/ffmpeg/writer_test.go

@@ -22,8 +22,6 @@ func Test_writer_001(t *testing.T) {
 	// Create a writer with an audio stream
 	writer, err := ffmpeg.NewWriter(w,
 		ffmpeg.OptOutputFormat(w.Name()),
-		ffmpeg.OptAudioStream(),
-		ffmpeg.OptVideoStream("1280x720"),
 	)
 	if !assert.NoError(err) {
 		t.FailNow()

sys/ffmpeg61/avformat.go

@@ -254,11 +254,11 @@ func (ctx *AVFormatContext) Stream(stream int) *AVStream {
 	}
 }
 
-func (ctx *AVFormatContext) Flags() AVFormat {
-	return AVFormat(ctx.flags)
+func (ctx *AVFormatContext) Flags() AVFormatFlag {
+	return AVFormatFlag(ctx.flags)
 }
 
-func (ctx *AVFormatContext) SetFlags(flag AVFormat) {
+func (ctx *AVFormatContext) SetFlags(flag AVFormatFlag) {
 	ctx.flags = C.int(flag)
 }
 

sys/ffmpeg61/avformat_mux.go

@@ -29,6 +29,8 @@ func AVFormat_open_writer(writer *AVIOContextEx, format *AVOutputFormat, filenam
 		ctx.SetPb(writer)
 	}
 
+	ctx.SetFlags(ctx.Flags() | AVFMT_FLAG_CUSTOM_IO)
+
 	// TODO: Mark AVFMT_NOFILE
 
 	// Return success
@@ -59,7 +61,7 @@ func AVFormat_close_writer(ctx *AVFormatContext) error {
 	var result error
 
 	octx := (*C.struct_AVFormatContext)(ctx)
-	if octx.oformat.flags&C.int(AVFMT_NOFILE) == 0 && octx.pb != nil {
+	if octx.oformat.flags&C.int(AVFMT_NOFILE) == 0 && octx.flags&C.int(AVFMT_FLAG_CUSTOM_IO) == 0 {
 		if err := AVError(C.avio_closep(&octx.pb)); err != 0 {
 			result = errors.Join(result, err)
 		}

writer.go

@@ -89,7 +89,7 @@ func createMedia(url string, format Format, metadata []Metadata, params ...Param
 	}
 
 	// Open the output file, if needed
-	if !ctx.Flags().Is(ff.AVFMT_NOFILE) {
+	if !ctx.Output().Flags().Is(ff.AVFMT_NOFILE) {
 		w, err := ff.AVFormat_avio_open(url, ff.AVIO_FLAG_WRITE)
 		if err != nil {
 			return nil, errors.Join(err, writer.Close())