Added support for Linux

Author: GennadiyAMD

.gitattributes

@@ -1 +1 @@
-prebuilt/Windows filter=lfs diff=lfs merge=lfs -text
+prebuilt/ filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -3,7 +3,7 @@
 build/*
 out/*
 bin/*
-
+*.spv*
 
 # User-specific files
 *.rsuser

.gitmodules

@@ -5,3 +5,4 @@
 	path = amf
 	url = https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git
 	ignore = untracked
+	branch = master

CMakeLists.txt

@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.15)
 # Define the project name
 project(StreamingSDK)
 
-if(WIN32)
 # Specify the C++ standard
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
@@ -27,26 +26,31 @@ if(MSVC)
     set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG /INCREMENTAL:NO /OPT:REF /OPT:ICF /NOLOGO")
     set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /LTCG /NOLOGO")
 
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-register -Werror -Wall -Wextra -Wno-unknown-pragmas -Wno-reorder -Wno-unused -Wno-switch -Wno-sign-compare -Wno-missing-field-initializers -Wno-nonnull -Wno-overloaded-virtual -Wno-deprecated-declarations -Wno-type-limits -Wno-free-nonheap-object -Wno-maybe-uninitialized")
 endif()
 
-set(PROGRAM_FILES_X86 "$ENV{ProgramFiles\(x86\)}")
-set(WINDOWS_SDK_VERSION "10.0.26100.0")
-set(WINDOWS_SDK_INCLUDE_BASE "${PROGRAM_FILES_X86}/Windows Kits/10/Include/${WINDOWS_SDK_VERSION}")
-set(WINDOWS_SDK_INCLUDE
-    "${WINDOWS_SDK_INCLUDE_BASE}/ucrt"
-    "${WINDOWS_SDK_INCLUDE_BASE}/um"
-    "${WINDOWS_SDK_INCLUDE_BASE}/shared"
-    "${WINDOWS_SDK_INCLUDE_BASE}/winrt"
-    "${WINDOWS_SDK_INCLUDE_BASE}/cppwinrt"
-    "${WINDOWS_SDK_INCLUDE_BASE}/um"
-    )
-set(WINDOWS_SDK_BIN "${PROGRAM_FILES_X86}/Windows Kits/10/bin/${WINDOWS_SDK_VERSION}/x64")
-set(OCL_ROOT "$ENV{OCL_ROOT}")
-set(VK_SDK_PATH "$ENV{VK_SDK_PATH}")
-include_directories(${WINDOWS_SDK_INCLUDE} $ENV{VK_SDK_PATH}/include)
-include_directories(${OCL_ROOT}/include)
+if(WIN32)
+    set(PROGRAM_FILES_X86 "$ENV{ProgramFiles\(x86\)}")
+    set(WINDOWS_SDK_VERSION "10.0.26100.0")
+    set(WINDOWS_SDK_INCLUDE_BASE "${PROGRAM_FILES_X86}/Windows Kits/10/Include/${WINDOWS_SDK_VERSION}")
+    set(WINDOWS_SDK_INCLUDE
+        "${WINDOWS_SDK_INCLUDE_BASE}/ucrt"
+        "${WINDOWS_SDK_INCLUDE_BASE}/um"
+        "${WINDOWS_SDK_INCLUDE_BASE}/shared"
+        "${WINDOWS_SDK_INCLUDE_BASE}/winrt"
+        "${WINDOWS_SDK_INCLUDE_BASE}/cppwinrt"
+        "${WINDOWS_SDK_INCLUDE_BASE}/um"
+        )
+    set(WINDOWS_SDK_BIN "${PROGRAM_FILES_X86}/Windows Kits/10/bin/${WINDOWS_SDK_VERSION}/x64")
+    set(OCL_ROOT "$ENV{OCL_ROOT}")
+    include_directories(${WINDOWS_SDK_INCLUDE})
+    include_directories(${OCL_ROOT}/include)
+endif()
+
+set(VK_SDK_PATH "$ENV{VULKAN_SDK}")
+include_directories(${VK_SDK_PATH}/include)
+
 
 # Set output directories for all build configurations
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_SOURCE_DIR}/bin/Debug")
@@ -103,4 +107,3 @@ set_target_properties(ssdk PROPERTIES FOLDER "libs")
 set_target_properties(mbedtls-custom PROPERTIES FOLDER "libs")
 set_target_properties(SimpleStreamingClient PROPERTIES FOLDER "samples")
 set_target_properties(RemoteDesktopServer PROPERTIES FOLDER "samples")
-endif()

CMakePresets.json

@@ -8,31 +8,31 @@
     "configurePresets": [
       {
         "name": "Debug",
-        "generator": "Ninja",
+        "generator": "Unix Makefiles",
         "binaryDir": "${sourceDir}/build",
         "cacheVariables": {
           "CMAKE_BUILD_TYPE": "Debug"
         }
       },
       {
         "name": "Release",
-        "generator": "Ninja",
+        "generator": "Unix Makefiles",
         "binaryDir": "${sourceDir}/build",
         "cacheVariables": {
           "CMAKE_BUILD_TYPE": "Release"
         }
       },
       {
         "name": "ReleaseWithDebugInfo",
-        "generator": "Ninja",
+        "generator": "Unix Makefiles",
         "binaryDir": "${sourceDir}/build",
         "cacheVariables": {
           "CMAKE_BUILD_TYPE": "RelWithDebInfo"
         }
       },
       {
         "name": "MinSizeRelease",
-        "generator": "Ninja",
+        "generator": "Unix Makefiles",
         "binaryDir": "${sourceDir}/build",
         "cacheVariables": {
           "CMAKE_BUILD_TYPE": "MinSizeRel"

README.md

@@ -4,6 +4,10 @@ Advanced Interactive Streaming SDK is a C++ library that provides building block
 Virtual and Augmented Reality, etc. using AMD Radeon graphics. It allows you to build a complete streaming solution including video and audio capture, video and audio encoder/decoder/pre-post-processing pipelines, a robust and secure network stack, or use some of its components, while implementing the rest yourself.
 
 ## Changelog:
+- v1.1.0 - added support for Linux:
+	- Server supported on AMD graphics with the Pro driver (X.org required)
+	- Client supported on AMD graphics with the Pro and RADV drivers, NVidia graphics (proprietary driver recommended), Intel graphics (X.org recommended, Wayland supported with some limitations)
+	- Tested with Ubuntu 22.04 LTS and 24.04 LTS
 - v1.0.2 - bug fixes:
 	- Encoder frame rate wasn't being set correctly when display capture mode was set to *present* or when QoS was turned off
 - v1.0.1 - bug fixes:

amf

@@ -7,8 +7,6 @@ endif()
 # Define the project name
 project(amf-component-ffmpeg64)
 
-if(WIN32)
-
 # Define source files
 set(SOURCE_FILES
     "../../amf/amf/public/common/AMFFactory.cpp"
@@ -33,8 +31,18 @@ set(SOURCE_FILES
     "../../amf/amf/public/src/components/ComponentsFFMPEG/HEVCEncoderFFMPEGImpl.cpp"
     "../../amf/amf/public/src/components/ComponentsFFMPEG/UtilsFFMPEG.cpp"
     "../../amf/amf/public/src/components/ComponentsFFMPEG/VideoDecoderFFMPEGImpl.cpp"
+)
+
+# Add platform-specific files:
+if(WIN32)
+set(SOURCE_FILES ${SOURCE_FILES}
     "../../amf/amf/public/common/Windows/ThreadWindows.cpp"
 )
+elseif(UNIX)
+    set(SOURCE_FILES ${SOURCE_FILES}
+    "../../amf/amf/public/common/Linux/ThreadLinux.cpp"
+)
+endif()
 
 # Define header files
 set(HEADER_FILES
@@ -82,6 +90,8 @@ set(HEADER_FILES
 add_library(amf-component-ffmpeg64 SHARED ${SOURCE_FILES} ${HEADER_FILES})
 
 set(FFMPEG_VERSION 7.0)
+
+if(WIN32)
 set(FFMPEG_BASE_PATH "../../amf/Thirdparty/ffmpeg/ffmpeg/ffmpeg-${FFMPEG_VERSION}/x64/release")
 
 get_filename_component(FFMPEG_BASE_PATH_ABS ${FFMPEG_BASE_PATH} ABSOLUTE)
@@ -106,6 +116,32 @@ target_link_libraries(amf-component-ffmpeg64 PRIVATE
     "${FFMPEG_BASE_PATH_ABS}/lib/swresample.lib"
     "${FFMPEG_BASE_PATH_ABS}/lib/swscale.lib" )
 
+elseif(UNIX)
+set(FFMPEG_BASE_PATH "${CMAKE_SOURCE_DIR}/amf/Thirdparty/ffmpeg/ffmpeg/ffmpeg-${FFMPEG_VERSION}/lnx64/release")
+
+set(FFMPEG_DLLS
+	"${FFMPEG_BASE_PATH}/bin/libavcodec.so.61"
+	"${FFMPEG_BASE_PATH}/bin/libavdevice.so.61"
+	"${FFMPEG_BASE_PATH}/bin/libavfilter.so.10"
+	"${FFMPEG_BASE_PATH}/bin/libavformat.so.61"
+	"${FFMPEG_BASE_PATH}/bin/libavutil.so.59"
+	"${FFMPEG_BASE_PATH}/bin/libswresample.so.5"
+	"${FFMPEG_BASE_PATH}/bin/libswscale.so.8"
+)
+
+target_link_libraries(amf-component-ffmpeg64 PRIVATE
+    "${FFMPEG_BASE_PATH}/bin/libavcodec.so.61"
+    "${FFMPEG_BASE_PATH}/bin/libavdevice.so.61"
+    "${FFMPEG_BASE_PATH}/bin/libavfilter.so.10"
+    "${FFMPEG_BASE_PATH}/bin/libavformat.so.61"
+    "${FFMPEG_BASE_PATH}/bin/libavutil.so.59"
+    "${FFMPEG_BASE_PATH}/bin/libswresample.so.5"
+    "${FFMPEG_BASE_PATH}/bin/libswscale.so.8"
+)
+
+endif()
+
+
 # Include directories
 target_include_directories(amf-component-ffmpeg64 PRIVATE
     ../../amf/amf
@@ -118,13 +154,18 @@ target_compile_definitions(amf-component-ffmpeg64 PRIVATE
     $<$<CONFIG:Release>:NDEBUG;_LIB;AMF_COMPONENT_FFMPEG_EXPORTS;_CRT_SECURE_NO_WARNINGS>
 )
 
-# Link options
-target_link_options(amf-component-ffmpeg64 PRIVATE
-    $<$<CONFIG:Debug>:/DEBUG /INCREMENTAL>
-    $<$<CONFIG:Release>:/LTCG /OPT:REF /OPT:ICF /INCREMENTAL:NO>
-)
+if(WIN32)
+    # Link options
+    target_link_options(amf-component-ffmpeg64 PRIVATE
+        $<$<CONFIG:Debug>:/DEBUG /INCREMENTAL>
+        $<$<CONFIG:Release>:/LTCG /OPT:REF /OPT:ICF /INCREMENTAL:NO>
+    )
+
+    set(OUTPUT_DIRECTORY "$<IF:$<CONFIG:Debug>,${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG},$<IF:$<CONFIG:Release>,${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE},$<IF:$<CONFIG:RelWithDebInfo>,${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO},${CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL}>>>")
 
-set(OUTPUT_DIRECTORY "$<IF:$<CONFIG:Debug>,${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG},$<IF:$<CONFIG:Release>,${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE},$<IF:$<CONFIG:RelWithDebInfo>,${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO},${CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL}>>>")
+elseif(UNIX)
+    set(OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
+endif()
 
 foreach(DLL ${FFMPEG_DLLS})
     get_filename_component(DLL_NAME ${DLL} NAME)
@@ -137,5 +178,3 @@ foreach(DLL ${FFMPEG_DLLS})
         COMMENT "Copying ${DLL} to ${OUTPUT_DIRECTORY}/${DLL_NAME}"
     )
 endforeach()
-
-endif()