Merge branch 'omeryusufyagci-main'

Author: nikhiljangra264

.github/workflows/build_and_publish_docker_image.yml

@@ -1,12 +1,10 @@
-name: Build and Publish Docker Image
+name: Build and Publish Docker Images
 
 on:
   push:
     branches:
       - main
-  pull_request:
-    branches:
-      - main
+
 
 jobs:
   build-and-push:
@@ -18,7 +16,6 @@ jobs:
       id-token: write
 
     steps:
-
       - name: Checkout Repository
         uses: actions/checkout@v3
 
@@ -29,11 +26,22 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build Docker Image
-        run: |
-          docker build -t ghcr.io/${{ github.repository_owner }}/fast-music-remover:latest .
+      # Required for cross-platform builds with buildx to emulate foreign archs
+      - name: Enable QEMU Emulation
+        uses: docker/setup-qemu-action@v2
+
+      # Required for multi-arch image
+      - name: Enable Buildx for Multi-Platform
+        uses: docker/setup-buildx-action@v2
 
-      - name: Push Docker Image
-        if: github.event_name == 'push'
+      # Build and Push Multi-Arch Image:
+      # Thanks to buildx, this image works for both archs (amd64/arm64)
+      # Docker resolves the arch per platform for us, via the manifest
+      - name: Build and Push Multi-Arch Image
         run: |
-          docker push ghcr.io/${{ github.repository_owner }}/fast-music-remover:latest
+          docker buildx build \
+            --platform linux/amd64,linux/arm64 \
+            --no-cache \
+            --tag ghcr.io/${{ github.repository_owner }}/fast-music-remover:latest \
+            --push \
+            .

Dockerfile

@@ -11,10 +11,20 @@ RUN apt-get update && \
 
 WORKDIR /app
 
-# Copy the project into the container/app
+# Copy the project into the container
 COPY . /app
 
-# Compile the C++ project with a fresh CMakeCache (issues with cache not matching source)
+# Handle library wrt arch
+# This is used in CI to avoid having separate images per arch
+ARG TARGETPLATFORM
+RUN echo "Detected platform: ${TARGETPLATFORM}" && \
+    case "${TARGETPLATFORM}" in \
+      "linux/amd64") cp /app/MediaProcessor/lib/libdf-linux-amd64.so /app/MediaProcessor/lib/libdf.so ;; \
+      "linux/arm64") cp /app/MediaProcessor/lib/libdf-linux-arm64.so /app/MediaProcessor/lib/libdf.so ;; \
+      *) echo "Unsupported platform: ${TARGETPLATFORM}" && exit 1 ;; \
+    esac
+
+# Compile the C++ project with a fresh CMakeCache
 RUN mkdir -p MediaProcessor/build && \
     cd MediaProcessor/build && \
     rm -rf CMakeCache.txt CMakeFiles _deps && \

MediaProcessor/CMakeLists.txt

@@ -8,7 +8,7 @@ if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release)
 endif()
 
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -march=native -ffast-math -flto")
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O3 -march=native")
 
 include(FetchContent)
 set(FETCHCONTENT_BASE_DIR "${CMAKE_BINARY_DIR}/_deps") # helps with Docker to resolve

MediaProcessor/lib/libdf-linux-amd64.so

@@ -1,4 +1,12 @@
+<<<<<<<< HEAD:MediaProcessor/src/Processor.cpp
+<<<<<<<< HEAD:MediaProcessor/src/Engine.cpp
 #include "Engine.h"
+========
+#include "Processor.h"
+>>>>>>>> 48771f6 (Fix broken build and add macos-specific link fix):MediaProcessor/src/Processor.cpp
+========
+#include "Engine.h"
+>>>>>>>> 1766575 (Core: Refactor Processor class to better reflect intentions):MediaProcessor/src/Engine.cpp
 
 #include <iostream>
 
@@ -9,10 +17,24 @@
 
 namespace MediaProcessor {
 
+<<<<<<<< HEAD:MediaProcessor/src/Processor.cpp
+<<<<<<<< HEAD:MediaProcessor/src/Engine.cpp
+Engine::Engine(const std::filesystem::path& mediaPath)
+    : m_mediaPath(std::filesystem::absolute(mediaPath)) {}
+
+bool Engine::processMedia() {
+========
+Processor::Processor(const std::filesystem::path& mediaPath)
+    : m_mediaPath(std::filesystem::absolute(mediaPath)) {}
+
+bool Processor::process() {
+>>>>>>>> 48771f6 (Fix broken build and add macos-specific link fix):MediaProcessor/src/Processor.cpp
+========
 Engine::Engine(const std::filesystem::path& mediaPath)
     : m_mediaPath(std::filesystem::absolute(mediaPath)) {}
 
 bool Engine::processMedia() {
+>>>>>>>> 1766575 (Core: Refactor Processor class to better reflect intentions):MediaProcessor/src/Engine.cpp
     ConfigManager& configManager = ConfigManager::getInstance();
     if (!configManager.loadConfig("config.json")) {
         std::cerr << "Error: Could not load configuration." << std::endl;
@@ -33,7 +55,15 @@ bool Engine::processMedia() {
     }
 }
 
+<<<<<<<< HEAD:MediaProcessor/src/Processor.cpp
+<<<<<<<< HEAD:MediaProcessor/src/Engine.cpp
+bool Engine::processAudio() {
+========
+bool Processor::processAudio() {
+>>>>>>>> 48771f6 (Fix broken build and add macos-specific link fix):MediaProcessor/src/Processor.cpp
+========
 bool Engine::processAudio() {
+>>>>>>>> 1766575 (Core: Refactor Processor class to better reflect intentions):MediaProcessor/src/Engine.cpp
     AudioProcessor audioProcessor(m_mediaPath, Utils::prepareAudioOutputPath(m_mediaPath));
     if (!audioProcessor.isolateVocals()) {
         std::cerr << "Failed to process audio." << std::endl;
@@ -44,7 +74,15 @@ bool Engine::processAudio() {
     return true;
 }
 
+<<<<<<<< HEAD:MediaProcessor/src/Processor.cpp
+<<<<<<<< HEAD:MediaProcessor/src/Engine.cpp
 bool Engine::processVideo() {
+========
+bool Processor::processVideo() {
+>>>>>>>> 48771f6 (Fix broken build and add macos-specific link fix):MediaProcessor/src/Processor.cpp
+========
+bool Engine::processVideo() {
+>>>>>>>> 1766575 (Core: Refactor Processor class to better reflect intentions):MediaProcessor/src/Engine.cpp
     auto [extractedVocalsPath, processedMediaPath] = Utils::prepareOutputPaths(m_mediaPath);
     AudioProcessor audioProcessor(m_mediaPath, extractedVocalsPath);
 
@@ -63,7 +101,15 @@ bool Engine::processVideo() {
     return true;
 }
 
+<<<<<<<< HEAD:MediaProcessor/src/Processor.cpp
+<<<<<<<< HEAD:MediaProcessor/src/Engine.cpp
+MediaType Engine::getMediaType() const {
+========
+MediaType Processor::getMediaType() const {
+>>>>>>>> 48771f6 (Fix broken build and add macos-specific link fix):MediaProcessor/src/Processor.cpp
+========
 MediaType Engine::getMediaType() const {
+>>>>>>>> 1766575 (Core: Refactor Processor class to better reflect intentions):MediaProcessor/src/Engine.cpp
     const std::string command =
         "ffprobe -loglevel error -show_entries stream=codec_type "
         "-of default=noprint_wrappers=1:nokey=1 \"" +