Merge pull request #49 from tphakala/dev

fix(container): add ca-certificates package

Dockerfile

@@ -34,6 +34,7 @@ FROM debian:bookworm-slim
 
 # Install ALSA library and SOX
 RUN apt-get update && apt-get install -y \
+    ca-certificates \
     libasound2 \
     sox \
     && rm -rf /var/lib/apt/lists/*

Makefile

@@ -12,7 +12,8 @@ ifeq ($(TARGETPLATFORM),linux/arm64)
 endif
 
 # Common flags
-CGO_FLAGS := CGO_ENABLED=1 CGO_CFLAGS="-I$(HOME)/src/tensorflow -DMA_NO_PULSEAUDIO"
+#CGO_FLAGS := CGO_ENABLED=1 CGO_CFLAGS="-I$(HOME)/src/tensorflow -DMA_NO_PULSEAUDIO"
+CGO_FLAGS := CGO_ENABLED=1 CGO_CFLAGS="-I$(HOME)/src/tensorflow"
 LDFLAGS := -ldflags "-s -w"
 
 # Default build for local development

internal/analysis/processor/processor.go

@@ -104,7 +104,7 @@ func (p *Processor) startDetectionProcessor() {
 // processDetections examines each detection from the queue, updating held detections
 // with new or higher-confidence instances and setting an appropriate flush deadline.
 func (p *Processor) processDetections(item *queue.Results) {
-	const delay = 9 * time.Second // Delay before a detection is considered final and is flushed.
+	const delay = 12 * time.Second // Delay before a detection is considered final and is flushed.
 
 	for _, detection := range p.processResults(item) {
 		commonName := strings.ToLower(detection.Note.CommonName)

internal/conf/utils.go

@@ -2,12 +2,14 @@
 package conf
 
 import (
+	"bufio"
 	"fmt"
 	"log"
 	"os"
 	"os/user"
 	"path/filepath"
 	"runtime"
+	"strings"
 )
 
 // getDefaultConfigPaths returns a list of default configuration paths for the current operating system.
@@ -104,3 +106,39 @@ func PrintUserInfo() {
 		}
 	}
 }
+
+// RunningInContainer checks if the program is running inside a container.
+func RunningInContainer() bool {
+	// Check for the existence of the /.dockerenv file (Docker-specific).
+	if _, err := os.Stat("/.dockerenv"); err == nil {
+		return true
+	}
+
+	// Check for the existence of the /run/.containerenv file (Podman-specific).
+	if _, err := os.Stat("/run/.containerenv"); err == nil {
+		return true
+	}
+
+	// Check the container environment variable.
+	if containerEnv, exists := os.LookupEnv("container"); exists && containerEnv != "" {
+		return true
+	}
+
+	// Check cgroup for hints of container runtime.
+	file, err := os.Open("/proc/self/cgroup")
+	if err != nil {
+		fmt.Println("Error opening /proc/self/cgroup:", err)
+		return false
+	}
+	defer file.Close()
+
+	scanner := bufio.NewScanner(file)
+	for scanner.Scan() {
+		line := scanner.Text()
+		if strings.Contains(line, "docker") || strings.Contains(line, "podman") {
+			return true
+		}
+	}
+
+	return false
+}

internal/myaudio/audiobuffer.go

@@ -1,3 +1,4 @@
+// this file defines ring buffer which is used for capturing audio clips
 package myaudio
 
 import (

internal/myaudio/capture.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"runtime"
 	"sync"
 	"time"
 
@@ -19,7 +20,18 @@ func CaptureAudio(settings *conf.Settings, wg *sync.WaitGroup, quitChan chan str
 	if settings.Debug {
 		fmt.Println("Initializing context")
 	}
-	malgoCtx, err := malgo.InitContext(nil, malgo.ContextConfig{}, func(message string) {
+
+	// if Linux set malgo.BackendAlsa, else set nil for auto select
+	var backend malgo.Backend
+	if runtime.GOOS == "linux" {
+		backend = malgo.BackendAlsa
+	} else if runtime.GOOS == "windows" {
+		backend = malgo.BackendWasapi
+	} else if runtime.GOOS == "darwin" {
+		backend = malgo.BackendCoreaudio
+	}
+
+	malgoCtx, err := malgo.InitContext([]malgo.Backend{backend}, malgo.ContextConfig{}, func(message string) {
 		if settings.Debug {
 			fmt.Print(message)
 		}
@@ -35,6 +47,27 @@ func CaptureAudio(settings *conf.Settings, wg *sync.WaitGroup, quitChan chan str
 	deviceConfig.SampleRate = conf.SampleRate
 	deviceConfig.Alsa.NoMMap = 1
 
+	var infos []malgo.DeviceInfo
+
+	// Get list of capture devices
+	infos, err = malgoCtx.Devices(malgo.Capture)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	fmt.Println("Capture Devices")
+	for i, info := range infos {
+		e := "ok"
+		_, err := malgoCtx.DeviceInfo(malgo.Capture, info.ID, malgo.Shared)
+		if err != nil {
+			e = err.Error()
+		}
+		fmt.Printf("    %d: %s, %s, [%s]\n", i, info.Name(), info.ID.String(), e)
+	}
+	//selectedDeviceInfo := infos[2]
+	//deviceConfig.Capture.DeviceID = selectedDeviceInfo.ID.Pointer()
+
 	// Write to ringbuffer when audio data is received
 	// BufferMonitor() will poll this buffer and read data from it
 	onReceiveFrames := func(pSample2, pSamples []byte, framecount uint32) {

internal/myaudio/process.go

@@ -42,7 +42,11 @@ func ProcessData(data []byte, bn *birdnet.BirdNET) error {
 
 	// Create a Results message to be sent through queue to processor
 	resultsMessage := queue.Results{
-		StartTime:   startTime.Add(-4000 * time.Millisecond),
+		// Start time is the time from which point capture audio is started, because of delay
+		// caused by BirdNET analysis etc. we need to go back in time for some amount to start
+		// capture before bird call begins (at least that is the idea, not sure if it is always
+		// working as intended)
+		StartTime:   startTime.Add(-5000 * time.Millisecond),
 		ElapsedTime: elapsedTime,
 		PCMdata:     data,
 		Results:     results,