Updated decoder

Author: djthorpe

pkg/ffmpeg/decoder.go

@@ -176,7 +176,7 @@ func (decoder *decoder) Rescale(width, height int) error {
 func (decoder *decoder) re(src *ff.AVFrame) (*ff.AVFrame, error) {
 	switch decoder.codec.Codec().Type() {
 	case ff.AVMEDIA_TYPE_AUDIO:
-		// Resample the audio
+		// Resample the audio - can flush if src is nil
 		if decoder.resampler != nil {
 			if err := decoder.resample(decoder.frame, src); err != nil {
 				return nil, err
@@ -185,7 +185,7 @@ func (decoder *decoder) re(src *ff.AVFrame) (*ff.AVFrame, error) {
 		}
 	case ff.AVMEDIA_TYPE_VIDEO:
 		// Rescale the video
-		if decoder.rescaler != nil {
+		if decoder.rescaler != nil && src != nil {
 			if err := decoder.rescale(decoder.frame, src); err != nil {
 				return nil, err
 			}
@@ -198,13 +198,19 @@ func (decoder *decoder) re(src *ff.AVFrame) (*ff.AVFrame, error) {
 }
 
 func (decoder *decoder) resample(dest, src *ff.AVFrame) error {
-	dest_samples, err := ff.SWResample_get_out_samples(decoder.resampler, src.NumSamples())
+	num_samples := 0
+	if src != nil {
+		num_samples = src.NumSamples()
+	}
+	dest_samples, err := ff.SWResample_get_out_samples(decoder.resampler, num_samples)
 	if err != nil {
 		return fmt.Errorf("SWResample_get_out_samples: %w", err)
 	}
 
 	dest.SetNumSamples(dest_samples)
-	dest.SetPts(decoder.get_next_pts(src))
+	if src != nil {
+		dest.SetPts(decoder.get_next_pts(src))
+	}
 
 	// Perform resampling
 	if err := ff.SWResample_convert_frame(decoder.resampler, src, dest); err != nil {
@@ -223,7 +229,6 @@ func (decoder *decoder) rescale(dest, src *ff.AVFrame) error {
 	//if err := ff.AVUtil_frame_copy_props(dest, src); err != nil {
 	//	return fmt.Errorf("failed to copy props: %w", err)
 	//}
-
 	// Perform resizing
 	if err := ff.SWScale_scale_frame(decoder.rescaler, dest, src, false); err != nil {
 		return fmt.Errorf("SWScale_scale_frame: %w", err)

pkg/ffmpeg/reader.go

@@ -186,7 +186,7 @@ func (r *reader) Decode(fn FrameFunc) DecoderFunc {
 		for {
 			if err := ff.AVCodec_receive_frame(codec.(*decoder).codec, r.frame); errors.Is(err, syscall.EAGAIN) || errors.Is(err, io.EOF) {
 				// Finished decoding packet or EOF
-				return nil
+				break
 			} else if err != nil {
 				return err
 			}
@@ -196,11 +196,25 @@ func (r *reader) Decode(fn FrameFunc) DecoderFunc {
 				return err
 			} else if err := fn(frame); errors.Is(err, io.EOF) {
 				// End early
-				return nil
+				break
 			} else if err != nil {
 				return err
 			}
 		}
+
+		// Flush
+		if frame, err := codec.(*decoder).re(nil); err != nil {
+			return err
+		} else if frame == nil {
+			// NOOP
+		} else if err := fn(frame); errors.Is(err, io.EOF) {
+			// NOOP
+		} else if err != nil {
+			return err
+		}
+
+		// Success
+		return nil
 	}
 }
 

sys/ffmpeg61/avutil_frame.go

@@ -218,13 +218,13 @@ func (ctx *AVFrame) Linesize(plane int) int {
 }
 
 // Return a buffer reference to the data for a plane.
-func (ctx *AVFrame) BufferRef(plane int) *AVBufferRef {
+func (ctx *AVFrame) bufferRef(plane int) *AVBufferRef {
 	return (*AVBufferRef)(C.av_frame_get_plane_buffer((*C.AVFrame)(ctx), C.int(plane)))
 }
 
 // Returns a plane as a uint8 array.
 func (ctx *AVFrame) Uint8(plane int) []uint8 {
-	if buf := ctx.BufferRef(plane); buf == nil {
+	if buf := ctx.bufferRef(plane); buf == nil {
 		return nil
 	} else {
 		return cUint8Slice(unsafe.Pointer(buf.data), C.int(buf.size))
@@ -233,20 +233,9 @@ func (ctx *AVFrame) Uint8(plane int) []uint8 {
 
 // Returns a plane as a int16 array.
 func (ctx *AVFrame) Int16(plane int) []int16 {
-	if buf := ctx.BufferRef(plane); buf == nil {
+	if buf := ctx.bufferRef(plane); buf == nil {
 		return nil
 	} else {
 		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
-}