Merge branch 'qualabs:master' into master

Author: kixelated

.gitignore

@@ -1,26 +1,19 @@
-# Exclude everything
-/*
+# Build directories
+build_*
+build/
+.deps/
 
-# Except for default project files
-!/.github
-!/build-aux
-!/cmake
-!/data
-!/src
-!.clang-format
-!.gersemirc
-!.gitignore
-!buildspec.json
-!CMakeLists.txt
-!CMakePresets.json
-!LICENSE
-!README.md
+# Nix
+.direnv/
+result
 
-# Exclude lock files
+# CMake
+cmake/.CMakeBuildNumber
 *.lock.json
 
-# Exclude macOS legacy resource forks
+# macOS
 .DS_Store
 
-# Exclude CMake build number cache
-/cmake/.CMakeBuildNumber
+# IDEs
+.vscode/
+.idea/

CMakeLists.txt

@@ -19,28 +19,27 @@ target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE OBS::libobs)
 option(MOQ_LOCAL "Path to moq repo for local development" "")
 
 if(MOQ_LOCAL)
-    add_subdirectory(${MOQ_LOCAL}/rs/libmoq moq)
+  add_subdirectory(${MOQ_LOCAL}/rs/libmoq moq)
 else()
-    include(FetchContent)
-    FetchContent_Declare(moq
-        URL https://github.com/kixelated/moq/releases/download/v${MOQ_VERSION}/moq-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}.tar.gz
-    )
-    FetchContent_MakeAvailable(moq)
+  include(FetchContent)
+  FetchContent_Declare(
+    moq
+    URL
+      https://github.com/kixelated/moq/releases/download/v${MOQ_VERSION}/moq-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}.tar.gz
+  )
+  FetchContent_MakeAvailable(moq)
 
-    add_library(moq SHARED IMPORTED GLOBAL)
-    set_target_properties(moq PROPERTIES
-        IMPORTED_LOCATION "${moq_SOURCE_DIR}/lib/libmoq.dylib"
-        INTERFACE_INCLUDE_DIRECTORIES "${moq_SOURCE_DIR}/include"
-    )
+  add_library(moq SHARED IMPORTED GLOBAL)
+  set_target_properties(
+    moq
+    PROPERTIES
+      IMPORTED_LOCATION "${moq_SOURCE_DIR}/lib/libmoq.dylib"
+      INTERFACE_INCLUDE_DIRECTORIES "${moq_SOURCE_DIR}/include"
+  )
 endif()
 
 target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE moq)
 
-add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:moq>
-            $<TARGET_BUNDLE_CONTENT_DIR:${CMAKE_PROJECT_NAME}>/MacOS/
-)
-
 if(ENABLE_FRONTEND_API)
   find_package(obs-frontend-api REQUIRED)
   target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE OBS::obs-frontend-api)
@@ -59,6 +58,9 @@ if(ENABLE_QT)
   )
 endif()
 
-target_sources(${CMAKE_PROJECT_NAME} PRIVATE src/obs-moq.cpp src/moq-output.h src/moq-service.h src/moq-output.cpp src/moq-service.cpp)
+target_sources(
+  ${CMAKE_PROJECT_NAME}
+  PRIVATE src/obs-moq.cpp src/moq-output.h src/moq-service.h src/moq-output.cpp src/moq-service.cpp
+)
 
 set_target_properties_plugin(${CMAKE_PROJECT_NAME} PROPERTIES OUTPUT_NAME ${_name})

README.md

@@ -33,11 +33,17 @@ Prerequisites:
 
 3.  Configure the project with CMake:
     ```bash
+    just setup ../moq
+
+    # Alternatively:
     cmake --preset macos -DMOQ_LOCAL=../moq
     ```
 
 4.  Build the plugin:
     ```bash
+    just build
+
+    # Alternatively:
     cmake --build --preset macos
     ```
 

cmake/common/buildspec_common.cmake

@@ -148,8 +148,7 @@ function(_check_dependencies)
 
     if(EXISTS "${dependencies_dir}/.dependency_${dependency}_${arch}.sha256")
       file(
-        READ
-        "${dependencies_dir}/.dependency_${dependency}_${arch}.sha256"
+        READ "${dependencies_dir}/.dependency_${dependency}_${arch}.sha256"
         OBS_DEPENDENCY_${dependency}_${arch}_HASH
       )
     endif()

cmake/linux/helpers.cmake

@@ -58,8 +58,7 @@ function(target_install_resources target)
     file(GLOB_RECURSE data_files "${CMAKE_CURRENT_SOURCE_DIR}/data/*")
     foreach(data_file IN LISTS data_files)
       cmake_path(
-        RELATIVE_PATH
-        data_file
+        RELATIVE_PATH data_file
         BASE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/data/"
         OUTPUT_VARIABLE relative_path
       )

cmake/macos/helpers.cmake

@@ -79,8 +79,7 @@ function(target_install_resources target)
     file(GLOB_RECURSE data_files "${CMAKE_CURRENT_SOURCE_DIR}/data/*")
     foreach(data_file IN LISTS data_files)
       cmake_path(
-        RELATIVE_PATH
-        data_file
+        RELATIVE_PATH data_file
         BASE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/data/"
         OUTPUT_VARIABLE relative_path
       )

cmake/windows/helpers.cmake

@@ -65,8 +65,7 @@ function(target_install_resources target)
     file(GLOB_RECURSE data_files "${CMAKE_CURRENT_SOURCE_DIR}/data/*")
     foreach(data_file IN LISTS data_files)
       cmake_path(
-        RELATIVE_PATH
-        data_file
+        RELATIVE_PATH data_file
         BASE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/data/"
         OUTPUT_VARIABLE relative_path
       )

justfile

@@ -0,0 +1,62 @@
+#!/usr/bin/env just --justfile
+
+# Using Just: https://github.com/casey/just?tab=readme-ov-file#installation
+
+set quiet
+
+# List all of the available commands.
+default:
+  just --list
+
+# Configure the project using CMake presets (optionally specify MOQ_LOCAL path and preset)
+setup path="" preset="":
+	#!/usr/bin/env bash
+	set -euo pipefail
+
+	PRESET=$(just preset "{{preset}}")
+
+	# Add MOQ_LOCAL if path is provided
+	if [[ -n "{{path}}" ]]; then
+		echo "Configuring with preset: $PRESET and MOQ_LOCAL={{path}}"
+		cmake --preset "$PRESET" -DMOQ_LOCAL="{{path}}"
+	else
+		echo "Configuring with preset: $PRESET"
+		cmake --preset "$PRESET"
+	fi
+
+# Build the project using CMake presets (optionally specify preset name)
+build preset="":
+	#!/usr/bin/env bash
+	set -euo pipefail
+
+	PRESET=$(just preset "{{preset}}")
+	cmake --build --preset "$PRESET"
+
+# Run the CI checks
+check:
+	./build-aux/run-clang-format --check
+	./build-aux/run-gersemi --check
+
+# Automatically fix formatting issues.
+fix:
+	./build-aux/run-clang-format --fix
+	./build-aux/run-gersemi --fix
+
+# Detect the appropriate CMake preset for the current platform (or use override)
+preset override="":
+	#!/usr/bin/env bash
+	set -euo pipefail
+
+	# Use provided override or auto-detect
+	if [[ -n "{{override}}" ]]; then
+		echo "{{override}}"
+	elif [[ "$OSTYPE" == "darwin"* ]]; then
+		echo "macos"
+	elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
+		echo "ubuntu-x86_64"
+	elif [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" ]]; then
+		echo "windows-x64"
+	else
+		echo "Unknown platform: $OSTYPE" >&2
+		exit 1
+	fi

src/moq-output.cpp

@@ -68,12 +68,13 @@ bool MoQOutput::Start()
 
 	// Create a callback to log when the session is connected or closed
 	auto session_connect_callback = [](void *user_data, int error_code) {
-		auto self = static_cast<MoQOutput*>(user_data);
+		auto self = static_cast<MoQOutput *>(user_data);
 
 		if (error_code == 0) {
 			auto elapsed = std::chrono::steady_clock::now() - self->connect_start;
 			self->connect_time_ms = std::chrono::duration_cast<std::chrono::milliseconds>(elapsed).count();
-			LOG_INFO("MoQ session established (%d ms): %s", self->connect_time_ms, self->server_url.c_str());
+			LOG_INFO("MoQ session established (%d ms): %s", self->connect_time_ms,
+				 self->server_url.c_str());
 		} else {
 			LOG_INFO("MoQ session closed (%d): %s", error_code, self->server_url.c_str());
 		}
@@ -151,11 +152,7 @@ void MoQOutput::AudioData(struct encoder_packet *packet)
 		return;
 	}
 
-	auto pts = util_mul_div64(
-		packet->pts,
-		1000000ULL * packet->timebase_num,
-		packet->timebase_den
-	);
+	auto pts = util_mul_div64(packet->pts, 1000000ULL * packet->timebase_num, packet->timebase_den);
 
 	auto result = moq_track_write(audio, packet->data, packet->size, pts);
 	if (result < 0) {
@@ -176,11 +173,7 @@ void MoQOutput::VideoData(struct encoder_packet *packet)
 		return;
 	}
 
-	auto pts = util_mul_div64(
-		packet->pts,
-		1000000ULL * packet->timebase_num,
-		packet->timebase_den
-	);
+	auto pts = util_mul_div64(packet->pts, 1000000ULL * packet->timebase_num, packet->timebase_den);
 
 	auto result = moq_track_write(video, packet->data, packet->size, pts);
 	if (result < 0) {
@@ -212,7 +205,6 @@ void MoQOutput::VideoInit()
 	auto video_height = obs_encoder_get_height(encoder);
 	*/
 
-
 	uint8_t *extra_data = nullptr;
 	size_t extra_size = 0;
 

src/moq-output.h

@@ -5,38 +5,45 @@
 #include <string>
 #include "logger.h"
 
-class MoQOutput {
-public:
-	MoQOutput(obs_data_t *settings, obs_output_t *output);
-	~MoQOutput();
-
-	bool Start();
-	void Stop(bool signal = true);
-	void Data(struct encoder_packet *packet);
-
-	inline size_t GetTotalBytes() { return total_bytes_sent; }
-
-	inline int GetConnectTime() { return connect_time_ms; }
-
-private:
-	void VideoInit();
-	void VideoData(struct encoder_packet *packet);
-	void AudioInit();
-	void AudioData(struct encoder_packet *packet);
-
-	obs_output_t *output;
-
-	std::string server_url;
-	std::string path;
-
-	size_t total_bytes_sent;
-	int connect_time_ms;
-	std::chrono::steady_clock::time_point connect_start;
-
-	int session;
-	int broadcast;
-	int video;
-	int audio;
+class MoQOutput
+{
+      public:
+    MoQOutput(obs_data_t *settings, obs_output_t *output);
+    ~MoQOutput();
+
+    bool Start();
+    void Stop(bool signal = true);
+    void Data(struct encoder_packet *packet);
+
+    inline size_t GetTotalBytes()
+    {
+        return total_bytes_sent;
+    }
+
+    inline int GetConnectTime()
+    {
+        return connect_time_ms;
+    }
+
+      private:
+    void VideoInit();
+    void VideoData(struct encoder_packet *packet);
+    void AudioInit();
+    void AudioData(struct encoder_packet *packet);
+
+    obs_output_t *output;
+
+    std::string server_url;
+    std::string path;
+
+    size_t total_bytes_sent;
+    int connect_time_ms;
+    std::chrono::steady_clock::time_point connect_start;
+
+    int session;
+    int broadcast;
+    int video;
+    int audio;
 };
 
 void register_moq_output();