Merge pull request #39 from mutablelogic/ffmpeg71

Update to ffmpeg 7.1

Author: djthorpe

Makefile

@@ -2,6 +2,11 @@
 GO=$(shell which go)
 DOCKER=$(shell which docker)
 
+# Current ffmpeg version and config
+FFMPEG_VERSION=ffmpeg-7.1.1
+# Empty variable to collect FFmpeg configuration options - will be populated dynamically
+FFMPEG_CONFIG=
+
 # Build flags
 BUILD_MODULE := $(shell cat go.mod | head -1 | cut -d ' ' -f 2)
 BUILD_LD_FLAGS += -X $(BUILD_MODULE)/pkg/version.GitSource=${BUILD_MODULE}
@@ -21,11 +26,65 @@ DOCKER_REGISTRY ?= ghcr.io/mutablelogic
 BUILD_DIR := "build"
 CMD_DIR := $(filter-out cmd/ffmpeg/README.md, $(wildcard cmd/ffmpeg/*))
 BUILD_TAG := ${DOCKER_REGISTRY}/go-media-${OS}-${ARCH}:${VERSION}
+PREFIX ?= ${BUILD_DIR}/install
+
+###############################################################################
+# TARGETS
 
-all: clean cmds
+.PHONY: all
+all: clean ffinstall cli
 
+.PHONY: cmds
 cmds: $(CMD_DIR)
 
+.PHONY: cli
+cli: go-dep mkdir
+	@echo Build media tool
+	@PKG_CONFIG_PATH="$(shell realpath ${PREFIX})/lib/pkgconfig" CGO_LDFLAGS_ALLOW="-(W|D).*" ${GO} build ${BUILD_FLAGS} -o ${BUILD_DIR}/media ./cmd/media
+
+$(CMD_DIR): go-dep mkdir
+	@echo Build cmd $(notdir $@)
+	@PKG_CONFIG_PATH="$(shell realpath ${PREFIX})/lib/pkgconfig" CGO_LDFLAGS_ALLOW="-(W|D).*" ${GO} build ${BUILD_FLAGS} -o ${BUILD_DIR}/$(notdir $@) ./$@
+
+###############################################################################
+# FFMPEG
+
+# Download ffmpeg sources
+${BUILD_DIR}/${FFMPEG_VERSION}:
+	@if [ ! -d "$(BUILD_DIR)/$(FFMPEG_VERSION)" ]; then \
+		echo "Downloading $(FFMPEG_VERSION)"; \
+		mkdir -p $(BUILD_DIR)/${FFMPEG_VERSION}; \
+		curl -L -o $(BUILD_DIR)/ffmpeg.tar.gz https://ffmpeg.org/releases/$(FFMPEG_VERSION).tar.gz; \
+		tar -xzf $(BUILD_DIR)/ffmpeg.tar.gz -C $(BUILD_DIR); \
+		rm -f $(BUILD_DIR)/ffmpeg.tar.gz; \
+	fi
+
+# Configure ffmpeg
+.PHONY: ffmpeg
+ffmpeg: mkdir ${BUILD_DIR}/${FFMPEG_VERSION} ffmpeg-dep
+	@echo "Configuring ${FFMPEG_VERSION} => ${PREFIX}"	
+	@cd ${BUILD_DIR}/${FFMPEG_VERSION} && ./configure \
+		--enable-static --disable-doc --disable-programs \
+		--prefix="$(shell realpath ${PREFIX})" \
+	  	--pkg-config-flags="--static" \
+		--extra-libs="-lpthread" \
+		--enable-gpl --enable-nonfree ${FFMPEG_CONFIG}
+
+# Build ffmpeg
+.PHONY: ffbuild
+ffbuild: ffmpeg
+	@echo "Building ${FFMPEG_VERSION}"
+	@cd $(BUILD_DIR)/$(FFMPEG_VERSION) && make
+
+# Install ffmpeg
+.PHONY: ffinstall
+ffinstall: ffbuild
+	@echo "Installing ${FFMPEG_VERSION}"
+	@cd $(BUILD_DIR)/$(FFMPEG_VERSION) && make install
+
+###############################################################################
+# DOCKER
+
 docker: docker-dep
 	@echo build docker image: ${BUILD_TAG} for ${OS}/${ARCH}
 	@${DOCKER} build \
@@ -40,43 +99,40 @@ docker-push: docker-dep
 	@echo push docker image: ${BUILD_TAG}
 	@${DOCKER} push ${BUILD_TAG}
 
+###############################################################################
+# TESTS
+
 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/...
+	@echo ... test sys/ffmpeg71
+	@PKG_CONFIG_PATH=$(shell realpath ${PREFIX})/lib/pkgconfig ${GO} test ./sys/ffmpeg71
+#	@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/...
 
 container-test: go-dep
 	@echo Test
 	@${GO} mod tidy
-	@${GO} test --tags=container ./sys/ffmpeg61
+	@${GO} test --tags=container ./sys/ffmpeg71
 	@${GO} test --tags=container ./sys/chromaprint
 	@${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
 
-$(CMD_DIR): go-dep mkdir
-	@echo Build cmd $(notdir $@)
-	@${GO} build ${BUILD_FLAGS} -o ${BUILD_DIR}/$(notdir $@) ./$@
-
-FORCE:
+###############################################################################
+# DEPENDENCIES, ETC
 
 go-dep:
 	@test -f "${GO}" && test -x "${GO}"  || (echo "Missing go binary" && exit 1)
@@ -87,9 +143,26 @@ docker-dep:
 mkdir:
 	@echo Mkdir ${BUILD_DIR}
 	@install -d ${BUILD_DIR}
+	@install -d ${PREFIX}
 
 clean:
 	@echo Clean
 	@rm -fr $(BUILD_DIR)
 	@${GO} mod tidy
 	@${GO} clean
+
+# Check for FFmpeg dependencies
+.PHONY: ffmpeg-dep
+ffmpeg-dep:
+	$(eval FFMPEG_CONFIG := $(FFMPEG_CONFIG) $(shell pkg-config --exists libass && echo "--enable-libass"))
+	$(eval FFMPEG_CONFIG := $(FFMPEG_CONFIG) $(shell pkg-config --exists fdk-aac && echo "--enable-libfdk-aac"))
+	$(eval FFMPEG_CONFIG := $(FFMPEG_CONFIG) $(shell pkg-config --exists lame && echo "--enable-libmp3lame"))
+	$(eval FFMPEG_CONFIG := $(FFMPEG_CONFIG) $(shell pkg-config --exists freetype2 && echo "--enable-libfreetype"))
+	$(eval FFMPEG_CONFIG := $(FFMPEG_CONFIG) $(shell pkg-config --exists theora && echo "--enable-libtheora"))
+	$(eval FFMPEG_CONFIG := $(FFMPEG_CONFIG) $(shell pkg-config --exists vorbis && echo "--enable-libvorbis"))
+	$(eval FFMPEG_CONFIG := $(FFMPEG_CONFIG) $(shell pkg-config --exists vpx && echo "--enable-libvpx"))
+	$(eval FFMPEG_CONFIG := $(FFMPEG_CONFIG) $(shell pkg-config --exists x264 && echo "--enable-libx264"))
+	$(eval FFMPEG_CONFIG := $(FFMPEG_CONFIG) $(shell pkg-config --exists x265 && echo "--enable-libx265"))
+	$(eval FFMPEG_CONFIG := $(FFMPEG_CONFIG) $(shell pkg-config --exists opus && echo "--enable-libopus"))
+	$(eval FFMPEG_CONFIG := $(FFMPEG_CONFIG) $(shell pkg-config --exists xvid && echo "--enable-libxvid"))
+	@echo "FFmpeg configuration: $(FFMPEG_CONFIG)"

README.md

@@ -3,7 +3,7 @@
 
 This module provides an interface for media services, including:
 
-* Bindings in golang for [FFmpeg 6.1](https://ffmpeg.org/);
+* Bindings in golang for [FFmpeg 7.1](https://ffmpeg.org/);
 * Opening media files, devices and network sockets for reading and writing;
 * Retrieving metadata and artwork from audio and video media;
 * Re-multiplexing media files from one format to another;
@@ -16,79 +16,49 @@ you are interested in, please see below "Contributing & Distribution" below.
 
 ## Requirements
 
-In order to build the examples, you'll need the library and header files 
-for [FFmpeg 6](https://ffmpeg.org/download.html) installed.The `chromaprint` library is also 
-required for fingerprinting audio files and SDL2 for the video player.
-
-### MacOS
-
-On Macintosh with [homebrew](http://bew.sh/), for example:
+If you're building for docker, then you can simply run the following command. This creates a docker
+image with all the dependencies installed.
 
 ```bash
-brew install ffmpeg@6 chromaprint make
-brew link ffmpeg@6
+DOCKER_REGISTRY=docker.io/user make docker
 ```
 
-### Debian
-
-If you're using Debian you may not be able to get the ffmpeg 6 unless you first of all add the debi-multimedia repository. 
-You can do this by adding the following line to your `/etc/apt/sources.list` file:
+However, it's more likely that you want to build the bindings. To do so, compile the FFmpeg libraries
+first:
 
 ```bash
-# Run commands as privileged user
-echo "deb https://www.deb-multimedia.org $(lsb_release -sc) main" >> /etc/apt/sources.list
-apt update -y -oAcquire::AllowInsecureRepositories=true
-apt install -y --force-yes deb-multimedia-keyring
+# Debian/Ubuntu
+apt install libfreetype-dev libmp3lame-dev libopus-dev libvorbis-dev libvpx-dev libx264-dev libx265-dev libnuma-dev
+git clone github.com/mutablelogic/go-media
+cd go-media
+make ffmpeg
 ```
 
-Then you can proceed to install the ffmpeg 6 and the other dependencies:
-
 ```bash
-# Run commands as privileged user
-apt install -y libavcodec-dev libavdevice-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev
-apt install -y libchromaprint-dev
-apt install -y libsdl2-dev
+# Fedora
+dnf install freetype-devel lame-devel opus-devel libvorbis-devel libvpx-devel x264-devel x265-devel numactl-devel
+git clone github.com/mutablelogic/go-media
+cd go-media
+make ffmpeg
 ```
 
-### Docker Container
-
-TODO
-
-## Examples
-
-There are some examples in the `cmd` folder of the main repository on how to use
-the package. The various make targets are:
-
-* `make all` will perform tests, build all examples and the backend API;
-* `make test` will perform tests;
-* `make cmd` will build example command-line tools into the `build` folder;
-* `make clean` will remove all build artifacts.
-
-There are also some targets to build a docker image:
-
-* `DOCKER_REGISTRY=docker.io/user make docker` will build a docker image;
-* `DOCKER_REGISTRY=docker.io/user make docker-push` will push the docker image to the registry.
-
-For example,
-
 ```bash
-git clone git@github.com:djthorpe/go-media.git
+# Homebrew
+brew install freetype lame opus libvorbis libvpx x264 x265
+git clone github.com/mutablelogic/go-media
 cd go-media
-DOCKER_REGISTRY=ghcr.io/mutablelogic make docker
+make ffmpeg
 ```
 
-There are a variety of types of object needed as part of media processing.
-All examples require a `Manager` to be created, which is used to enumerate all supported formats
-and open media files and byte streams.
+This will place the static libraries in the `build/install` folder which you can refer to when compiling your
+golang code. For example, here's a typical compile or run command on a Mac:
 
-* `Manager` is the main entry point for the package. It is used to open media files and byte streams,
-  and enumerate supported formats, codecs, pixel formats, etc.
-* `Media` is a hardware device, file or byte stream. It contains metadata, artwork, and streams.
-* `Decoder` is used to demultiplex media streams. Create a decoder and enumerate the streams which
-  you'd like to demultiplex. Provide the audio and video parameters if you want to resample or
-  reformat the streams.
-* `Encoder` is used to multiplex media streams. Create an encoder and send the output of the
-  decoder to reencode the streams.
+```bash
+PKG_CONFIG_PATH="${PWD}/build/install/lib/pkgconfig" \
+  LD_LIBRARY_PATH="/opt/homebrew/lib" \
+  CGO_LDFLAGS_ALLOW="-(W|D).*" \
+  go build -o build/media ./cmd/media
+```
 
 ### Demultiplexing
 
@@ -360,12 +330,12 @@ repository for more information:
 
 > __go-media__\
 > [https://github.com/mutablelogic/go-media/](https://github.com/mutablelogic/go-media/)\
-> Copyright (c) 2021-2024 David Thorpe, All rights reserved.
+> Copyright (c) 2021-2025 David Thorpe, All rights reserved.
 
 This software links to shared libraries of [FFmpeg](http://ffmpeg.org/) licensed under
 the [LGPLv2.1](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html).
 
 ## References
 
-* https://ffmpeg.org/doxygen/6.1/index.html
-* https://pkg.go.dev/github.com/mutablelogic/go-media
+* <https://ffmpeg.org/doxygen/7.0/index.html>
+* <https://pkg.go.dev/github.com/mutablelogic/go-media>