Updates to remove framerate

Author: djthorpe

pkg/ffmpeg/encoder.go

@@ -76,6 +76,7 @@ func NewEncoder(ctx *ff.AVFormatContext, stream int, par *Par) (*Encoder, error)
 		ff.AVCodec_free_context(encoder.ctx)
 		return nil, ErrInternalAppError.With("could not allocate stream")
 	} else {
+		// Set stream identifier and timebase from parameters
 		streamctx.SetId(stream)
 		encoder.stream = streamctx
 	}
@@ -95,6 +96,8 @@ func NewEncoder(ctx *ff.AVFormatContext, stream int, par *Par) (*Encoder, error)
 	if err := ff.AVCodec_parameters_from_context(encoder.stream.CodecPar(), encoder.ctx); err != nil {
 		ff.AVCodec_free_context(encoder.ctx)
 		return nil, err
+	} else {
+		encoder.stream.SetTimeBase(par.timebase)
 	}
 
 	// Create a packet
@@ -164,6 +167,7 @@ func (e *Encoder) Encode(frame *Frame, fn EncoderPacketFn) error {
 // Return the codec parameters
 func (e *Encoder) Par() *Par {
 	par := new(Par)
+	par.timebase = e.stream.TimeBase()
 	if err := ff.AVCodec_parameters_from_context(&par.AVCodecParameters, e.ctx); err != nil {
 		return nil
 	} else {

pkg/ffmpeg/frame.go

@@ -53,7 +53,7 @@ func NewFrame(par *Par) (*Frame, error) {
 		frame.SetWidth(par.Width())
 		frame.SetHeight(par.Height())
 		frame.SetSampleAspectRatio(par.SampleAspectRatio())
-		frame.SetTimeBase(par.timebase)
+		frame.SetTimeBase(par.timebase) // Also sets framerate
 	default:
 		ff.AVUtil_frame_free(frame)
 		return nil, errors.New("invalid codec type")

pkg/ffmpeg/opts.go

@@ -2,6 +2,7 @@ package ffmpeg
 
 import (
 	// Package imports
+
 	ffmpeg "github.com/mutablelogic/go-media/sys/ffmpeg61"
 
 	// Namespace imports

pkg/ffmpeg/par.go

@@ -21,6 +21,12 @@ type Par struct {
 	timebase ff.AVRational
 }
 
+type jsonPar struct {
+	Par       ff.AVCodecParameters `json:"parameters"`
+	Timebase  ff.AVRational        `json:"timebase"`
+	Framerate float64              `json:"framerate,omitempty"`
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // LIFECYCLE
 
@@ -76,13 +82,15 @@ func NewVideoPar(pixfmt string, size string, framerate float64) (*Par, error) {
 	// Frame rate
 	if framerate < 0 {
 		return nil, ErrBadParameter.Withf("negative framerate %v", framerate)
-	} else {
+	} else if framerate > 0 {
 		par.timebase = ff.AVUtil_rational_invert(ff.AVUtil_rational_d2q(framerate, 1<<24))
 	}
 
 	// Set default sample aspect ratio
 	par.SetSampleAspectRatio(ff.AVUtil_rational(1, 1))
 
+	// TODO: Set profile, codec and bitrate and any other parameters
+
 	/* TODO
 	c->gop_size      = 12; // emit one intra frame every twelve frames at most
 	c->pix_fmt       = STREAM_PIX_FMT;
@@ -122,12 +130,20 @@ func VideoPar(pixfmt string, size string, framerate float64) *Par {
 // STRINGIFY
 
 func (ctx *Par) MarshalJSON() ([]byte, error) {
-	return json.Marshal(ctx.AVCodecParameters)
+	return json.Marshal(jsonPar{
+		Par:       ctx.AVCodecParameters,
+		Timebase:  ctx.timebase,
+		Framerate: ctx.FrameRate(),
+	})
 }
 
 func (ctx *Par) String() string {
-	data, _ := json.MarshalIndent(ctx, "", "  ")
-	return string(data)
+	data, err := json.MarshalIndent(ctx, "", "  ")
+	if err != nil {
+		return err.Error()
+	} else {
+		return string(data)
+	}
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -153,8 +169,10 @@ func (ctx *Par) WidthHeight() string {
 }
 
 func (ctx *Par) FrameRate() float64 {
-	framerate := ff.AVUtil_rational_invert(ctx.timebase)
-	return ff.AVUtil_rational_q2d(framerate)
+	if ctx.timebase.Num() == 0 || ctx.timebase.Den() == 0 {
+		return 0
+	}
+	return ff.AVUtil_rational_q2d(ff.AVUtil_rational_invert(ctx.timebase))
 }
 
 func (ctx *Par) ValidateFromCodec(codec *ff.AVCodec) error {
@@ -183,6 +201,7 @@ func (ctx *Par) CopyToCodecContext(codec *ff.AVCodecContext) error {
 func (ctx *Par) copyAudioCodec(codec *ff.AVCodecContext) error {
 	codec.SetSampleFormat(ctx.SampleFormat())
 	codec.SetSampleRate(ctx.Samplerate())
+	codec.SetTimeBase(ff.AVUtil_rational(1, ctx.Samplerate()))
 	if err := codec.SetChannelLayout(ctx.ChannelLayout()); err != nil {
 		return err
 	}

pkg/ffmpeg/reader.go

@@ -346,6 +346,7 @@ func (r *Reader) mapStreams(fn DecoderMapFunc) (decoderMap, error) {
 		// Get decoder parameters and map to a decoder
 		par, err := fn(stream_index, &Par{
 			AVCodecParameters: *stream.CodecPar(),
+			timebase:          stream.TimeBase(),
 		})
 		if err != nil {
 			result = errors.Join(result, err)

pkg/ffmpeg/writer_test.go

@@ -137,12 +137,17 @@ func Test_writer_003(t *testing.T) {
 		frame := video.Frame()
 		if frame.Ts() >= duration {
 			return nil, io.EOF
-		} else {
-			t.Log("Frame", stream, "=>", frame.Ts())
-			return frame, nil
 		}
+		if !assert.NotEqual(ffmpeg.TS_UNDEFINED, frame.Ts()) {
+			t.FailNow()
+		}
+		t.Log("Frame", stream, "=>", frame.Ts())
+		return frame, nil
 	}, func(packet *ffmpeg.Packet) error {
 		if packet != nil {
+			if !assert.NotEqual(ffmpeg.TS_UNDEFINED, packet.Ts()) {
+				t.FailNow()
+			}
 			t.Log("Packet", packet.Ts())
 		}
 		return writer.Write(packet)

pkg/generator/yuv420p.go

@@ -33,8 +33,7 @@ func NewYUV420P(par *ffmpeg.Par) (*yuv420p, error) {
 	} else if par.PixelFormat() != ff.AV_PIX_FMT_YUV420P {
 		return nil, errors.New("invalid pixel format, only yuv420p is supported")
 	}
-	framerate := par.FrameRate()
-	if framerate <= 0 {
+	if framerate := par.FrameRate(); framerate <= 0 {
 		return nil, errors.New("invalid framerate")
 	}
 

sys/ffmpeg61/avcodec.go

@@ -186,6 +186,7 @@ func (ctx *AVCodecContext) MarshalJSON() ([]byte, error) {
 			Height:            int(ctx.height),
 			SampleAspectRatio: AVRational(ctx.sample_aspect_ratio),
 			Framerate:         AVRational(ctx.framerate),
+			TimeBase:          (AVRational)(ctx.time_base),
 		})
 	case C.AVMEDIA_TYPE_AUDIO:
 		return json.Marshal(jsonAVCodecContext{

sys/ffmpeg61/avcodec_parameters.go

@@ -30,7 +30,6 @@ type jsonAVCodecParameterVideo struct {
 	Width             int           `json:"width"`
 	Height            int           `json:"height"`
 	SampleAspectRatio AVRational    `json:"sample_aspect_ratio,omitempty"`
-	Framerate         AVRational    `json:"framerate,omitempty"`
 }
 
 type jsonAVCodecParameters struct {

sys/ffmpeg61/avformat_avio_test.go

@@ -55,7 +55,7 @@ func Test_avio_001(t *testing.T) {
 		if n == AVERROR_EOF {
 			break
 		}
-		fmt.Println("N=", n, string(buf[:n]))
+		t.Log("N=", n, string(buf[:n]))
 	}
 
 	// Free the context