Updated encoder

Author: djthorpe

pkg/ffmpeg/encoder.go

@@ -184,9 +184,6 @@ func (e *Encoder) encode(frame *ff.AVFrame, fn EncoderPacketFn) error {
 
 	// Send the frame to the encoder
 	if err := ff.AVCodec_send_frame(e.ctx, frame); err != nil {
-		if errors.Is(err, syscall.EAGAIN) || errors.Is(err, io.EOF) {
-			return nil
-		}
 		return err
 	}
 
@@ -201,6 +198,10 @@ func (e *Encoder) encode(frame *ff.AVFrame, fn EncoderPacketFn) error {
 			return err
 		}
 
+		// rescale output packet timestamp values from codec to stream timebase
+		ff.AVCodec_packet_rescale_ts(e.packet, e.ctx.TimeBase(), e.stream.TimeBase())
+		e.packet.SetStreamIndex(e.stream.Index())
+
 		// Pass back to the caller
 		if err := fn(e.packet, &timebase); errors.Is(err, io.EOF) {
 			// End early, return EOF

pkg/ffmpeg/par.go

@@ -80,6 +80,21 @@ func NewVideoPar(pixfmt string, size string, framerate float64) (*Par, error) {
 	// Set default sample aspect ratio
 	par.SetSampleAspectRatio(ff.AVUtil_rational(1, 1))
 
+	/* TODO
+	c->gop_size      = 12; // emit one intra frame every twelve frames at most
+	c->pix_fmt       = STREAM_PIX_FMT;
+	if (c->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
+		// just for testing, we also add B-frames
+		c->max_b_frames = 2;
+	}
+	if (c->codec_id == AV_CODEC_ID_MPEG1VIDEO) {
+		// Needed to avoid using macroblocks in which some coeffs overflow.
+		// This does not happen with normal video, it just happens here as
+		// the motion of the chroma plane does not match the luma plane.
+		c->mb_decision = 2;
+	}
+	*/
+
 	// Return success
 	return par, nil
 }

sys/ffmpeg61/avcodec_packet.go

@@ -110,6 +110,10 @@ func (ctx *AVPacket) StreamIndex() int {
 	return int(ctx.stream_index)
 }
 
+func (ctx *AVPacket) SetStreamIndex(index int) {
+	ctx.stream_index = C.int(index)
+}
+
 func (ctx *AVPacket) Pts() int64 {
 	return int64(ctx.pts)
 }