Various updates

Author: djthorpe

etc/test/sample.jpg

@@ -35,7 +35,7 @@ type EncoderFrameFn func(int) (*Frame, error)
 
 // EncoderPacketFn is a function which is called for each packet encoded, with
 // the stream timebase.
-type EncoderPacketFn func(*ff.AVPacket, *ff.AVRational) error
+type EncoderPacketFn func(*Packet) error
 
 ////////////////////////////////////////////////////////////////////////////////
 // LIFECYCLE
@@ -199,8 +199,6 @@ func (e *Encoder) nextPts(frame *Frame) int64 {
 // PRIVATE METHODS
 
 func (e *Encoder) encode(frame *Frame, fn EncoderPacketFn) error {
-	timebase := e.stream.TimeBase()
-
 	// Send the frame to the encoder
 	if err := ff.AVCodec_send_frame(e.ctx, (*ff.AVFrame)(frame)); err != nil {
 		return err
@@ -223,7 +221,7 @@ func (e *Encoder) encode(frame *Frame, fn EncoderPacketFn) error {
 		e.packet.SetTimeBase(e.stream.TimeBase())
 
 		// Pass back to the caller
-		if err := fn(e.packet, &timebase); errors.Is(err, io.EOF) {
+		if err := fn((*Packet)(e.packet)); errors.Is(err, io.EOF) {
 			// End early, return EOF
 			result = io.EOF
 			break
@@ -235,9 +233,9 @@ func (e *Encoder) encode(frame *Frame, fn EncoderPacketFn) error {
 		ff.AVCodec_packet_unref(e.packet)
 	}
 
-	// Flush
+	// Flush packet
 	if result == nil {
-		result = fn(nil, &timebase)
+		result = fn(nil)
 	}
 
 	// Return success or EOF

etc/test/sample.png

@@ -1,6 +1,7 @@
 package ffmpeg
 
 import (
+	"encoding/json"
 	"errors"
 
 	// Packages
@@ -78,6 +79,14 @@ func (frame *Frame) Close() error {
 	return nil
 }
 
+///////////////////////////////////////////////////////////////////////////////
+// STRINGIFY
+
+func (frame *Frame) String() string {
+	data, _ := json.MarshalIndent((*ff.AVFrame)(frame), "", "  ")
+	return string(data)
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC METHODS - FRAME
 
@@ -101,9 +110,8 @@ func (frame *Frame) CopyPropsFromFrame(other *Frame) error {
 	return ff.AVUtil_frame_copy_props((*ff.AVFrame)(frame), (*ff.AVFrame)(other))
 }
 
-// Return frame type - AUDIO or VIDEO
-// other types are not yet identified
-// and returned as UNKNOWN
+// Return frame type - AUDIO or VIDEO. Other types are not yet
+// identified and returned as UNKNOWN
 func (frame *Frame) Type() Type {
 	switch {
 	case frame.SampleRate() > 0 && frame.SampleFormat() != ff.AV_SAMPLE_FMT_NONE:
@@ -245,6 +253,8 @@ func (frame *Frame) matchesResampleResize(other *Frame) bool {
 		if frame.Width() != other.Width() || frame.Height() != other.Height() {
 			return false
 		}
+		// We don't need to check the SampleAspectRatio, TimeBase or FrameRate
+		// for the purposes of resampling or resizing
 		return true
 	default:
 		return false

pkg/ffmpeg/encoder.go

@@ -17,3 +17,30 @@ func Test_frame_001(t *testing.T) {
 	defer frame.Close()
 	t.Log(frame)
 }
+
+func Test_frame_002(t *testing.T) {
+	assert := assert.New(t)
+
+	frame, err := ffmpeg.NewFrame(ffmpeg.AudioPar("s16", "stereo", 44100))
+	if !assert.NoError(err) {
+		t.FailNow()
+	}
+	defer frame.Close()
+	assert.Equal(ffmpeg.AUDIO, frame.Type())
+	assert.Equal(44100, frame.SampleRate())
+	t.Log(frame)
+}
+
+func Test_frame_003(t *testing.T) {
+	assert := assert.New(t)
+
+	frame, err := ffmpeg.NewFrame(ffmpeg.VideoPar("rgba", "1280x720", 25))
+	if !assert.NoError(err) {
+		t.FailNow()
+	}
+	defer frame.Close()
+	assert.Equal(ffmpeg.VIDEO, frame.Type())
+	assert.Equal(1280, frame.Width())
+	assert.Equal(720, frame.Height())
+	t.Log(frame)
+}