Merge pull request #28 from mutablelogic/ffmpeg61

Mostly fixed resampling
mutablelogic · Jul 2, 2024 · fef25db · fef25db
2 parents 7ea948e + 7128226
commit fef25db
Show file tree

Hide file tree

Showing 53 changed files with 1,768 additions and 743 deletions.
diff --git a/Makefile b/Makefile
@@ -43,10 +43,22 @@ docker-push: docker-dep
 test: go-dep
 	@echo Test
 	@${GO} mod tidy
+	@echo ... test sys/ffmpeg61
 	@${GO} test ./sys/ffmpeg61
+	@echo ... test pkg/ffmpeg
+	@${GO} test -v ./pkg/ffmpeg
+	@echo ... test sys/chromaprint
 	@${GO} test ./sys/chromaprint
+	@echo ... test pkg/chromaprint
+	@${GO} test ./pkg/chromaprint
+	@echo ... test pkg/file
+	@${GO} test ./pkg/file
+	@echo ... test pkg/generator
+	@${GO} test ./pkg/generator
+	@echo ... test pkg/image
+	@${GO} test ./pkg/image
+	@echo ... test pkg
 	@${GO} test ./pkg/...
-	@${GO} test .
 
 container-test: go-dep
 	@echo Test
@@ -56,8 +68,6 @@ container-test: go-dep
 	@${GO} test --tags=container ./pkg/...
 	@${GO} test --tags=container .
 
-
-
 cli: go-dep mkdir
 	@echo Build media tool
 	@${GO} build ${BUILD_FLAGS} -o ${BUILD_DIR}/media ./cmd/cli

diff --git a/README.md b/README.md
@@ -104,7 +104,7 @@ func main() {
 }
 ```
 
-### Decoding - Video Frames
+### Decoding - Video
 
 This example shows you how to decode video frames from a media file into images.
 
@@ -156,9 +156,75 @@ func main() {
 }
 ```
 
-### Encoding
+### Encoding - Audio and Video
 
-TODO
+This example shows you how to encode video and audio frames into a media file.
+
+```go
+package main
+
+import (
+  "io"
+  "log"
+  "os"
+  "time"
+
+  media "github.com/mutablelogic/go-media"
+  ffmpeg "github.com/mutablelogic/go-media/pkg/ffmpeg"
+  generator "github.com/mutablelogic/go-media/pkg/generator"
+  ff "github.com/mutablelogic/go-media/sys/ffmpeg61"
+)
+
+func main() {
+  // Create a new file with an audio and video stream
+  // 30fps and 22050Hz mono audio
+  file, err := ffmpeg.Create(os.Args[1],
+    ffmpeg.OptStream(1, ffmpeg.VideoPar("yuv420p", "640x480", 30)),
+    ffmpeg.OptStream(2, ffmpeg.AudioPar("fltp", "mono", 22050)),
+  )
+  if err != nil {
+    log.Fatal(err)
+  }
+  defer file.Close()
+
+  // Make an video generator which can generate YUV420P frames
+  // with the same parameters as the video stream
+  video, err := generator.NewYUV420P(file.Stream(1).Par())
+  if err != nil {
+    log.Fatal(err)
+  }
+  defer video.Close()
+
+  // Make an audio generator which can generate a 440Hz tone
+  // at -5dB with the same parameters as the audio stream
+  audio, err := generator.NewSine(440, -5, file.Stream(2).Par())
+  if err != nil {
+    log.Fatal(err)
+  }
+  defer audio.Close()
+
+  // Write 1 min of frames, passing video and audio frames to the encoder
+  // and returning io.EOF when the duration is reached
+  duration := time.Minute
+  if err := file.Encode(func(stream int) (*ff.AVFrame, error) {
+    var frame media.Frame
+    switch stream {
+    case 1:
+      frame = video.Frame()
+    case 2:
+      frame = audio.Frame()
+    }
+    if frame.Time() >= duration {
+      return nil, io.EOF
+    } else {
+      log.Println("Frame", stream, "=>", frame.Time().Truncate(time.Millisecond))
+      return frame.(*ffmpeg.Frame).AVFrame(), nil
+    }
+  }, nil); err != nil {
+    log.Fatal(err)
+  }
+}
+```
 
 ### Multiplexing
 

diff --git a/codec.go → _old/codec.go b/codec.go → _old/codec.go
diff --git a/decoder.go → _old/decoder.go b/decoder.go → _old/decoder.go
diff --git a/decoder_test.go → _old/decoder_test.go b/decoder_test.go → _old/decoder_test.go
diff --git a/device.go → _old/device.go b/device.go → _old/device.go
diff --git a/encoder.go → _old/encoder.go b/encoder.go → _old/encoder.go
diff --git a/format.go → _old/format.go b/format.go → _old/format.go
diff --git a/frame.go → _old/frame.go b/frame.go → _old/frame.go
diff --git a/manager.go → _old/manager.go b/manager.go → _old/manager.go
diff --git a/manager_ex_test.go → _old/manager_ex_test.go b/manager_ex_test.go → _old/manager_ex_test.go
diff --git a/manager_test.go → _old/manager_test.go b/manager_test.go → _old/manager_test.go
diff --git a/mediatype.go → _old/mediatype.go b/mediatype.go → _old/mediatype.go
diff --git a/metadata.go → _old/metadata.go b/metadata.go → _old/metadata.go
diff --git a/opts.go → _old/opts.go b/opts.go → _old/opts.go
diff --git a/packet.go → _old/packet.go b/packet.go → _old/packet.go
diff --git a/parameters.go → _old/parameters.go b/parameters.go → _old/parameters.go
diff --git a/parameters_test.go → _old/parameters_test.go b/parameters_test.go → _old/parameters_test.go
diff --git a/reader.go → _old/reader.go b/reader.go → _old/reader.go
diff --git a/stream.go → _old/stream.go b/stream.go → _old/stream.go
diff --git a/cmd/examples/encode/main.go b/cmd/examples/encode/main.go
@@ -0,0 +1,62 @@
+package main
+
+import (
+	"io"
+	"log"
+	"os"
+	"time"
+
+	media "github.com/mutablelogic/go-media"
+	ffmpeg "github.com/mutablelogic/go-media/pkg/ffmpeg"
+	generator "github.com/mutablelogic/go-media/pkg/generator"
+	ff "github.com/mutablelogic/go-media/sys/ffmpeg61"
+)
+
+func main() {
+	// Create a new file with an audio and video stream
+	file, err := ffmpeg.Create(os.Args[1],
+		ffmpeg.OptStream(1, ffmpeg.VideoPar("yuv420p", "640x480", 30)),
+		ffmpeg.OptStream(2, ffmpeg.AudioPar("fltp", "mono", 22050)),
+	)
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer file.Close()
+
+	// Make an video generator which can generate YUV420P frames
+	// with the same parameters as the video stream
+	video, err := generator.NewYUV420P(file.Stream(1).Par())
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer video.Close()
+
+	// Make an audio generator which can generate a 440Hz tone
+	// at -5dB with the same parameters as the audio stream
+	audio, err := generator.NewSine(440, -5, file.Stream(2).Par())
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer audio.Close()
+
+	// Write 1 min of frames, passing video and audio frames to the encoder
+	// and returning io.EOF when the duration is reached
+	duration := time.Minute
+	if err := file.Encode(func(stream int) (*ff.AVFrame, error) {
+		var frame media.Frame
+		switch stream {
+		case 1:
+			frame = video.Frame()
+		case 2:
+			frame = audio.Frame()
+		}
+		if frame.Time() >= duration {
+			return nil, io.EOF
+		} else {
+			log.Println("Frame", stream, "=>", frame.Time().Truncate(time.Millisecond))
+			return frame.(*ffmpeg.Frame).AVFrame(), nil
+		}
+	}, nil); err != nil {
+		log.Fatal(err)
+	}
+}
diff --git a/etc/test/sample.jpg b/etc/test/sample.jpg
diff --git a/etc/test/sample.png b/etc/test/sample.png
diff --git a/etc/test/sample_resized.png b/etc/test/sample_resized.png
diff --git a/interfaces.go b/interfaces.go
@@ -42,12 +42,12 @@ type Manager interface {
 	// Return supported input formats which match any filter, which can be
 	// a name, extension (with preceeding period) or mimetype. The MediaType
 	// can be NONE (for any) or combinations of DEVICE and STREAM.
-	InputFormats(MediaType, ...string) []Format
+	InputFormats(Type, ...string) []Format
 
 	// Return supported output formats which match any filter, which can be
 	// a name, extension (with preceeding period) or mimetype. The MediaType
 	// can be NONE (for any) or combinations of DEVICE and STREAM.
-	OutputFormats(MediaType, ...string) []Format
+	OutputFormats(Type, ...string) []Format
 
 	// Return supported devices for a given format.
 	// Not all devices may be supported on all platforms or listed
@@ -105,7 +105,7 @@ type Device interface {
 	Description() string
 
 	// Flags indicating the type INPUT or OUTPUT, AUDIO or VIDEO
-	Type() MediaType
+	Type() Type
 
 	// Whether this is the default device
 	Default() bool
@@ -129,7 +129,7 @@ type Format interface {
 
 	// Flags indicating the type. INPUT for a demuxer or source, OUTPUT for a muxer or
 	// sink, DEVICE for a device, FILE for a file. Plus AUDIO, VIDEO, DATA, SUBTITLE.
-	Type() MediaType
+	Type() Type
 }
 
 // Media represents a media stream, which can be input or output. A new media
@@ -150,7 +150,7 @@ type Media interface {
 
 	// Return INPUT for a demuxer or source, OUTPUT for a muxer or
 	// sink, DEVICE for a device, FILE for a file or stream.
-	Type() MediaType
+	Type() Type
 
 	// Return the metadata for the media, filtering by keys if any
 	// are included. Use the "artwork" key to return only artwork.
@@ -168,7 +168,7 @@ type DecoderMapFunc func(Stream) (Parameters, error)
 // within a media file
 type Stream interface {
 	// Return AUDIO, VIDEO, SUBTITLE or DATA
-	Type() MediaType
+	Type() Type
 
 	// Return the stream parameters
 	Parameters() Parameters
@@ -195,7 +195,7 @@ type Parameters interface {
 	VideoParameters
 
 	// Return the media type (AUDIO, VIDEO, SUBTITLE, DATA)
-	Type() MediaType
+	Type() Type
 
 	// Return the stream id for encoding, or zero if not set
 	Id() int
@@ -254,14 +254,14 @@ type Codec interface {
 	Description() string
 
 	// Return the codec type (AUDIO, VIDEO, SUBTITLE, DATA, INPUT, OUTPUT)
-	Type() MediaType
+	Type() Type
 }
 
 // Packet represents a packet of demultiplexed data, or a packet
 // to be multiplexed.
 type Packet interface {
 	// The packet can be audio, video, subtitle or data.
-	Type() MediaType
+	Type() Type
 
 	// The stream identifier for the packet
 	Id() int