Merge pull request #40 from mutablelogic/ffmpeg71

Updated chromaprint

Author: djthorpe

Makefile

@@ -2,10 +2,9 @@
 GO=$(shell which go)
 DOCKER=$(shell which docker)
 
-# Current ffmpeg version and config
+# Source version
 FFMPEG_VERSION=ffmpeg-7.1.1
-# Empty variable to collect FFmpeg configuration options - will be populated dynamically
-FFMPEG_CONFIG=
+CHROMAPRINT_VERSION=chromaprint-1.5.1
 
 # Build flags
 BUILD_MODULE := $(shell cat go.mod | head -1 | cut -d ' ' -f 2)
@@ -32,17 +31,17 @@ PREFIX ?= ${BUILD_DIR}/install
 # TARGETS
 
 .PHONY: all
-all: clean ffinstall cli
+all: clean ffmpeg cli
 
 .PHONY: cmds
 cmds: $(CMD_DIR)
 
 .PHONY: cli
-cli: go-dep mkdir
+cli: go-dep go-tidy 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
+$(CMD_DIR): go-dep go-tidy 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 $@) ./$@
 
@@ -60,8 +59,8 @@ ${BUILD_DIR}/${FFMPEG_VERSION}:
 	fi
 
 # Configure ffmpeg
-.PHONY: ffmpeg
-ffmpeg: mkdir ${BUILD_DIR}/${FFMPEG_VERSION} ffmpeg-dep
+.PHONY: ffmpeg-configure
+ffmpeg-configure: mkdir ${BUILD_DIR}/${FFMPEG_VERSION} ffmpeg-dep
 	@echo "Configuring ${FFMPEG_VERSION} => ${PREFIX}"	
 	@cd ${BUILD_DIR}/${FFMPEG_VERSION} && ./configure \
 		--enable-static --disable-doc --disable-programs \
@@ -71,17 +70,57 @@ ffmpeg: mkdir ${BUILD_DIR}/${FFMPEG_VERSION} ffmpeg-dep
 		--enable-gpl --enable-nonfree ${FFMPEG_CONFIG}
 
 # Build ffmpeg
-.PHONY: ffbuild
-ffbuild: ffmpeg
+.PHONY: ffmpeg-build
+ffmpeg-build: ffmpeg-configure
 	@echo "Building ${FFMPEG_VERSION}"
-	@cd $(BUILD_DIR)/$(FFMPEG_VERSION) && make
+	@cd $(BUILD_DIR)/$(FFMPEG_VERSION) && make -j2
 
 # Install ffmpeg
-.PHONY: ffinstall
-ffinstall: ffbuild
-	@echo "Installing ${FFMPEG_VERSION}"
+.PHONY: ffmpeg
+ffmpeg: ffmpeg-build
+	@echo "Installing ${FFMPEG_VERSION} => ${PREFIX}"
 	@cd $(BUILD_DIR)/$(FFMPEG_VERSION) && make install
 
+###############################################################################
+# CHROMAPRINT
+
+# Download ffmpeg sources
+${BUILD_DIR}/${CHROMAPRINT_VERSION}:
+	@if [ ! -d "$(BUILD_DIR)/$(CHROMAPRINT_VERSION)" ]; then \
+		echo "Downloading $(CHROMAPRINT_VERSION)"; \
+		mkdir -p $(BUILD_DIR)/${CHROMAPRINT_VERSION}; \
+		curl -L -o $(BUILD_DIR)/chromaprint.tar.gz https://github.com/acoustid/chromaprint/releases/download/v1.5.1/$(CHROMAPRINT_VERSION).tar.gz; \
+		tar -xzf $(BUILD_DIR)/chromaprint.tar.gz -C $(BUILD_DIR); \
+		rm -f $(BUILD_DIR)/chromaprint.tar.gz; \
+	fi
+
+
+# Configure chromaprint
+.PHONY: chromaprint-configure
+chromaprint-configure: mkdir ${BUILD_DIR}/${CHROMAPRINT_VERSION}
+	@echo "Configuring ${CHROMAPRINT_VERSION} => ${PREFIX}"	
+	cmake \
+		-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DBUILD_SHARED_LIBS=0 \
+		-DBUILD_TESTS=0 \
+		-DBUILD_TOOLS=0 \
+		--install-prefix "$(shell realpath ${PREFIX})" \
+		-S ${BUILD_DIR}/${CHROMAPRINT_VERSION} \
+		-B ${BUILD_DIR}
+
+# Build chromaprint
+.PHONY: chromaprint-build
+chromaprint-build: chromaprint-configure
+	@echo "Building ${CHROMAPRINT_VERSION}"
+	@cd $(BUILD_DIR) && make -j2
+
+# Install chromaprint
+.PHONY: chromaprint
+chromaprint: chromaprint-build
+	@echo "Installing ${CHROMAPRINT_VERSION} => ${PREFIX}"
+	@cd $(BUILD_DIR) && make install
+
 ###############################################################################
 # DOCKER
 
@@ -102,11 +141,26 @@ docker-push: docker-dep
 ###############################################################################
 # TESTS
 
-test: go-dep
+.PHONY: test
+test: test-ffmpeg test-chromaprint
+
+.PHONY: test-chromaprint
+test-chromaprint: go-dep go-tidy
+	@echo Test
+	@echo ... test sys/chromaprint
+	@PKG_CONFIG_PATH=$(shell realpath ${PREFIX})/lib/pkgconfig ${GO} test ./sys/chromaprint
+
+.PHONY: test-ffmpeg
+test-ffmpeg: go-dep go-tidy
 	@echo Test
-	@${GO} mod tidy
 	@echo ... test sys/ffmpeg71
-	@PKG_CONFIG_PATH=$(shell realpath ${PREFIX})/lib/pkgconfig ${GO} test ./sys/ffmpeg71
+	@PKG_CONFIG_PATH="$(shell realpath ${PREFIX})/lib/pkgconfig" CGO_LDFLAGS_ALLOW="-(W|D).*" ${GO} test ./sys/ffmpeg71
+	@echo ... test pkg/segmenter
+	@PKG_CONFIG_PATH="$(shell realpath ${PREFIX})/lib/pkgconfig" CGO_LDFLAGS_ALLOW="-(W|D).*" ${GO} test ./pkg/segmenter
+	@echo ... test pkg/chromaprint
+	@PKG_CONFIG_PATH="$(shell realpath ${PREFIX})/lib/pkgconfig" CGO_LDFLAGS_ALLOW="-(W|D).*" ${GO} test ./pkg/chromaprint
+
+
 #	@echo ... test pkg/ffmpeg
 #	@${GO} test -v ./pkg/ffmpeg
 #	@echo ... test sys/chromaprint
@@ -122,7 +176,7 @@ test: go-dep
 #	@echo ... test pkg
 #	@${GO} test ./pkg/...
 
-container-test: go-dep
+container-test: go-dep go-tidy
 	@echo Test
 	@${GO} mod tidy
 	@${GO} test --tags=container ./sys/ffmpeg71
@@ -134,22 +188,30 @@ container-test: go-dep
 ###############################################################################
 # DEPENDENCIES, ETC
 
+.PHONY: go-dep
 go-dep:
 	@test -f "${GO}" && test -x "${GO}"  || (echo "Missing go binary" && exit 1)
 
+.PHONY: docker-dep
 docker-dep:
 	@test -f "${DOCKER}" && test -x "${DOCKER}"  || (echo "Missing docker binary" && exit 1)
 
+.PHONY: mkdir
 mkdir:
 	@echo Mkdir ${BUILD_DIR}
 	@install -d ${BUILD_DIR}
 	@install -d ${PREFIX}
 
-clean:
+.PHONY: go-tidy
+go-tidy:
+	@echo Tidy
+	@${GO} mod tidy
+
+.PHONY: clean
+clean: go-tidy
 	@echo Clean
 	@rm -fr $(BUILD_DIR)
-	@${GO} mod tidy
-	@${GO} clean
+	@${GO} clean -cache
 
 # Check for FFmpeg dependencies
 .PHONY: ffmpeg-dep

error.go

@@ -0,0 +1,45 @@
+package media
+
+import (
+	"fmt"
+	"net/http"
+)
+
+///////////////////////////////////////////////////////////////////////////////
+// TYPES
+
+type Err uint
+
+///////////////////////////////////////////////////////////////////////////////
+// GLOBALS
+
+const (
+	ErrBadParameter  Err = http.StatusBadRequest
+	ErrInternalError Err = http.StatusInternalServerError
+)
+
+///////////////////////////////////////////////////////////////////////////////
+// ERROR
+
+func (code Err) Code() uint {
+	return uint(code)
+}
+
+func (code Err) Error() string {
+	switch code {
+	case ErrBadParameter:
+		return "bad parameter"
+	case ErrInternalError:
+		return "internal error"
+	default:
+		return fmt.Sprintf("error code %d", code.Code())
+	}
+}
+
+func (code Err) With(args ...interface{}) error {
+	return fmt.Errorf("%w: %s", code, fmt.Sprint(args...))
+}
+
+func (code Err) Withf(format string, args ...interface{}) error {
+	return fmt.Errorf("%w: %s", code, fmt.Sprintf(format, args...))
+}

etc/docker/Dockerfile

@@ -9,22 +9,19 @@ WORKDIR /usr/src/app
 COPY . .
 
 # Install dependencies
-RUN set -x \
-  && apt update -y \
+RUN set -x && apt update -y \
   && apt install -y ca-certificates lsb-release nasm curl \
   && apt install -y libfreetype-dev libmp3lame-dev libopus-dev libvorbis-dev libvpx-dev libx264-dev libx265-dev libnuma-dev
 
 # Build all the commands
-RUN set -x \
-  && OS=${OS} ARCH=${ARCH} make ffinstall cli
+RUN set -x && OS=${OS} ARCH=${ARCH} make all
 
 # Copy commands to /usr/local/bin
 FROM --platform=${OS}/${ARCH} debian:bookworm-slim
 ARG OS
 ARG ARCH
 ARG SOURCE
-RUN set -x \
-  && apt update -y \
+RUN set -x && apt update -y \
   && apt install -y ca-certificates lsb-release \
   && apt install -y libfreetype-dev libmp3lame-dev libopus-dev libvorbis-dev libvpx-dev libx264-dev libx265-dev libnuma-dev
 

pkg/chromaprint/client.go

@@ -1,12 +1,18 @@
 package chromaprint
 
 import (
+	"context"
 	"fmt"
+	"io"
 	"net/url"
 	"time"
+	"unsafe"
 
 	// Packages
 	"github.com/mutablelogic/go-client"
+	"github.com/mutablelogic/go-media"
+	"github.com/mutablelogic/go-media/pkg/segmenter"
+	"github.com/mutablelogic/go-media/sys/chromaprint"
 
 	// Namespace imports
 	. "github.com/djthorpe/go-errors"
@@ -84,3 +90,48 @@ func (c *Client) Lookup(fingerprint string, duration time.Duration, flags Meta)
 		return response.Results, nil
 	}
 }
+
+////////////////////////////////////////////////////////////////////////////////
+// FINGERPRINT
+
+// Match a media file and lookup any matches
+func (c *Client) Match(ctx context.Context, r io.Reader) ([]*ResponseMatch, error) {
+	// Create a segmenter
+	segmenter, err := segmenter.NewReader(r, 0, 32000)
+	if err != nil {
+		return nil, err
+	}
+	defer segmenter.Close()
+
+	// Create a fingerprinting context
+	fp := chromaprint.NewChromaprint(chromaprint.ALGORITHM_DEFAULT)
+	if fp == nil {
+		return nil, media.ErrInternalError.With("chromaprint.NewChromaprint")
+	}
+	defer fp.Free()
+
+	// Start the fingerprinting
+	if err := fp.Start(32000, 1); err != nil {
+		return nil, err
+	}
+
+	// Perform fingerprinting
+	if err := segmenter.DecodeInt16(ctx, func(timestamp time.Duration, data []int16) error {
+		return fp.WritePtr(uintptr(unsafe.Pointer(&data[0])), len(data))
+	}); err != nil {
+		return nil, err
+	}
+
+	// Complete fingerprinting
+	if err := fp.Finish(); err != nil {
+		return nil, err
+	}
+
+	value, err := fp.GetFingerprint()
+	if err != nil {
+		return nil, err
+	}
+
+	// Lookup fingerprint
+	return c.Lookup(value, segmenter.Duration(), META_ALL)
+}

pkg/chromaprint/client_test.go

@@ -1,6 +1,7 @@
 package chromaprint_test
 
 import (
+	"context"
 	"os"
 	"testing"
 	"time"
@@ -22,6 +23,7 @@ const (
 	//	SAMPLE_002_FINGERPRINT = "AQAAZMmShFmSJFSEHO-O6_ARcoc-5NrRB67RvMepI1KyXOihE21KpIc95UJlCV1TEf-RH43T4RFkDU32Izx6esiJW0ctBl8EzVSQRj3OBs8Djyd-pI5R7_gEfWLQKMKnHN-OD_XBPAzRVIk-_IfWSULTnXjPgSYdBP7wDXkUaMmOcA9K5pjyGl0zwl_QG6EO7Rly41taPMuOSVd2NLWR04J-IXyGl0XTTxmeHOfw5ciZQ1WmC_mUoz8ep2iMOctRHj7RPMgF_Qifw6obOD8-Sim8XaikPUF3IzYPSQCigBElEADCAIKwMABA4gDDQhBhiGCGUUEMIgYBA4EQAgAAlFKQMACYUAIIIAgDThCgBGJIEACQIhRAhAxgCiGBkKAE"
 	SAMPLE_003_DURATION    = 230 * time.Second
 	SAMPLE_003_FINGERPRINT = "AQADtJmSiN0U4Q6mjEN-Cf5Q5HzwGdKHUON6vLiYqziDh0j74yeuCdnz4fmF4-UxS1mFf0gVqDz8RA9yZRdeH9jzBIG7H9KPXqnw8bhRbcRD8EYdCX0uRJeMX2iu4zueIMzxfZCrC2kc5fCPYz_6G_1B3SwqxugcFVNyJHmOnMN38FFxdUOfnPCPo8ceh0ZyhTzS469Q7cPazDiynMGn43swKdCJV8F3ND1y5cFP_Ef1w1R9_MKHzsd95DuUO8XBN6isYxN-QWx0XEZ-9MvxD42PeqOE3AqqG6J8nGKOWSkXlBny46QGKj--JBEu7aCWHf8K_grS-Aqeo5kgZcmzIy8Oiwt4ScaZBz1hEo1wFx8-uEsSnPgzqcizC82kC3UOVcdz9D5SqUYWXA_-QV-Ofse5IBd-wdISGV8Y9MjxQvuPMC7IHMd7ND5uOHQRLkxWoacSaImYIWxkodkafDiYE79gZYpR94j_48KP-9CVaEPdIwyZHT_OHL0SoXGOH3_APEGYfNC7I1dm4Xs0XAGTkUH748KH8A00PQgHR2MytGPBMlci4UaYpzaSfR_6o3ny4KSMXiH8HT0uJD9i5-hy-MyEagv-TMMzJ0iPRF0YfFFMMB-aSvLx42KO8NCibaIRX8bn4x-uLD2aos-FXDj-Q7uOM-OC-7CaHfma4VuO8_AVHL4ER-TxXXiYw26MXjl62DvOI80B8cUHe6h1oUfz1fiPH3eLPkcYJseJa9zBILyGTwmhKrODMNsldP6GSmoSguKPM0eYH9Jp5Fk2FP5w8tg-Gy6R9xCZfQjp-fjxadHgpil-4eiKMF846KKR58OP9MdL6DvxJDWMy9CzC9dz5Nj4WPiRZ4GUdEe4OxquHO9wEm7wXkKZXfBzIjQVPNlRUTukJDlOPcGjLMeVZLiO8kGY58MuXPCzDFeC6znCPDySSdmPoqmDJzMu5Xjy4TwafohEBnrC9PhAjcyGB0-Sj7jDHZKeQw8-B_mc5riSw_ky_IgLM6IP2eoc5NKKH_3x7CnMiEflXMHxiNGFcgqaIke7zAmaMzd0HWeEnGiOPphvPHuQi5kUaAmj4Q9yHiWFV8Wjp_gV5Fl2aGQR5sKXhLh8_OngkU6OT0eeELpS-BeuLMGha-GwnYWe4Ed4NIlZ_A-y54eWb0f4SC7K6Ck8PnCVPOgRiloyiGMQTsLDPHhIKXgTUMIb5NOgjMiV_Wgs9MQf5E126PwQwmEYEpeYwlzkBCVx9OUQKVGS7ArkSDm0XAif4xQ-V2iYo8eFI3-gbbzQpPWQ_UT_4KiPF28kIoycQHvO4MfJI9_xDP5AHGEiPsXERBn0Hc2vozre41agLz-OPAtyGm0OC3pjbNDn4cPxFzqc48d_-DnEe6iHHz_4C_WOJpZ1qNEYoV8PJr9wQd-JR8ir4WWIRuPxpzDHIfyHh4Tm5IKrH_2LvjihiceVMNMmPBseoXmOXgp4E49b6BOOGn6GPsyIfmjqFD96-MzwDPJx4Rn-Fz-mE_ehC9eO_MGUU-gvfKOEBp2WtXhQ0RTC3EiegyePx8Fz4TPhnMcnHLHmSEGtwz_6Dvl8_MeD08NFPBlOfMzRfPjhRoerRBbCC0l4oQ-sEM-T46LReTn6D1aOSD6meILmsbiGR_Ae4-GH5kedhogp4jkKF6E04cyNi8ePP9ih69Cu_GgmKclxZrgY9HQSNFQSSzgugpGzTPDBkoemBzN1I8-HR3LRWcGXBp5oIbyWQzdC-EPfDhedIzoO7Tny9HCFHj19-Dm-XCuaJkOiqUGWqA2FnsNT8DxOhUb5g8kj4ttx3oh-yBNTXEO-C9WF7bpQXJQQpjlqPcMPrSSYnMd9jI4EWaMlNPlR9sF1NE1jlFmG_9By1MoRayGLVeEPR0xFfMLV4wqYuMQfBmmlH-Yy9EW-zXhMnEmKa6iORk_xH1mfo41owc8R1sEV_ENjhIrGEJc2DpcC8Zl4XDqu5sSVUcJZIb2CL7jkAo0nSijJoJoSHame49eh40fJ4wrCwz8-HlS08LDUC5eUCn3Qp4N_XISd4A78zDiRB46oG8ym5MWPPyE0KxqaUT6C41JoXC7KHg7R57h25KugTZGONE5atD_KM3hk_Hhy5BfEkSqydNlRPsSOK8hziPMRPkFPoQmVKHhaFQ-6f9izjAijkJDBKngO8Tke5PqCJ9vh40Z26KIQUycc8_iOa0gvWeCJh5AZwcclZRae8QnC_KiV4BSOJjy6-MGVKMuRTyzx6bgO8SGRlccXHj-xVTye5EN86IlS4StyPBsjXDn6C1cW5Dy0vMeT5EdEGj-JMNIeod6l4wkOH88R-Vhnojl6CTnEZUMeJgp-_OiP5nvwPXjE4z2OR8smNGmGNjzQM83RhMqOH59e5IOWa-iFvDr-G3-wx0WYH21_6BUu5tgnHhqTI-RjVDeYPMEnXHHx8fB6Kci1H8mL2imaZRHOGzwOa0eeQz_CPIuDXgYqanjxgkwu5HoS-BHEB3mW4RL6B58uPMT1wWmGR4mM53CO7NASHaH1YXKa4iamJ8dL5EmTQ1-b4DsiPTp-RPsObUkiXHyCw3F26DGJXDyKZg8-HscvNBN1Ixz9Qv-E8Hnwo1ZwxsH3I8yTFFrHIDvT4zx-oTnRHzwAYBQVyDkjAGAMAKWIEQYAsBBADAgCjCCEEGYMAIIBYYwlFCCAJBCCEIMIEYYYZA0gDAAkhBJyC0IsQ4JMIxAxxkFkCHCCEAQIEAwAQoWQHCEFgBAEIKWEJUAwxBAQRAogjDDICsMQIEQBpJgBChhDnECEMCiAIs54IQmRlhghgRHEMAccMwIQwoikAADHFBPSAC8IEcgYghBgxAEAKBCGASCYERBgZJAARDBgJDEKEGyIYAQBAZQ0wAhBABMCSGIIE8IIoQjUhEijnEEEACUoEAZRQgRCAECCACOKEiGQEgIAQYQZxBADEREEGIaYAEACZAEgEAhACAJECQIJMIIwBIAwHBDCABAGKCSYIEoQIEQSCBiGGAAGAaaEAUYIJgQAQ3kgiAKSGMGAIYJYhAwUggFBhAEAEcMAAoQIZIEAQghBDCHMACWIQoQaAQRiQAFDnAAGCgAI1A5AAQESxAIGlDCCAKCogMcIQYBkSABhGFEAKScc4sBoxIAwykjrGHCAECAQEE4BRARxAhnghMKMMA2MAIo4AAgAAjDIkAEAAYKAQAAIJhCyDClijEIOACOkIIIBwoxoECEjBHEGCYEQQIIoyaWTRADECALCQAmMIwIIoAgSABlAjEHGAUGEQAIpYgCSQgADjGJEACKEEQAqoQwRwkFFqFAECuEUccwAhABhjCAiiGDMKGIIAEgIYKADgAFClBGIEUMAEUAIZQBCFlAEiABKKIcQYFIgD4AxoBhAIJJCAEAYAwwpA4VBxhgkkEfAGAUMOcI4MTRThCARjISAAGCUUwIAhBwTSBlFCETAIEYSMsIAwQBAQBBhAECWOgmBMAAxYIAVgDDjiAFCCCGUE4oBBCRAADmBgBAAAUIUNEAQA4AhwBCEmEOIGGAAYcYAJAhAQjCCDAWQgAGE4QIARARhjAACwCBGMGCIBAQQIAxjTAkAiACMGUWoBQ"
+	SAMPLE_004_FILE        = "../../etc/test/sample.mp4"
 )
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -73,43 +75,21 @@ func Test_client_003(t *testing.T) {
 	t.Log(matches)
 }
 
-/*
-func Test_Client_004(t *testing.T) {
-	key := os.Getenv("CHROMAPRINT_KEY")
-	if key == "" {
-		t.Skip("No API key set, set using environment variable CHROMAPRINT_KEY")
-	}
-	client, err := NewClientWithConfig(Config{Key: key})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if matches, err := client.Lookup(SAMPLE_002_FINGERPRINT, SAMPLE_002_DURATION, META_ALL); err != nil {
-		t.Error(err)
-	} else if len(matches) == 0 {
-		t.Error("No matches")
-	} else {
-		t.Log(matches)
+func Test_client_004(t *testing.T) {
+	assert := assert.New(t)
+	client, err := NewClient(GetKey(t))
+	if !assert.NoError(err) {
+		t.SkipNow()
 	}
-}
 
-func Test_Client_005(t *testing.T) {
-	key := os.Getenv("CHROMAPRINT_KEY")
-	if key == "" {
-		t.Skip("No API key set, set using environment variable CHROMAPRINT_KEY")
-	}
-	client, err := NewClientWithConfig(Config{Key: key})
-	if err != nil {
-		t.Fatal(err)
+	// Open the file
+	r, err := os.Open(SAMPLE_004_FILE)
+	if !assert.NoError(err) {
+		t.SkipNow()
 	}
+	defer r.Close()
 
-	if matches, err := client.Lookup(SAMPLE_003_FINGERPRINT, SAMPLE_003_DURATION, META_ALL); err != nil {
-		t.Error(err)
-	} else if len(matches) == 0 {
-		t.Error("No matches")
-	} else {
-		t.Log(matches)
-	}
+	matches, err := client.Match(context.Background(), r)
+	assert.NoError(err)
+	t.Log(matches)
 }
-
-*/