mirror of
https://github.com/obsproject/obs-studio.git
synced 2026-08-30 17:58:37 +08:00
obs-outputs: Remove FTL output
This commit is contained in:
derrod
@@ -83,8 +83,6 @@ if(OS_WINDOWS)
|
||||
target_sources(obs-outputs PRIVATE obs-outputs.rc)
|
||||
endif()
|
||||
|
||||
include(cmake/ftl.cmake)
|
||||
|
||||
# cmake-format: off
|
||||
set_target_properties_obs(obs-outputs PROPERTIES FOLDER plugins/obs-outputs PREFIX "")
|
||||
# cmake-format: on
|
||||
|
||||
@@ -1,65 +0,0 @@
|
||||
find_package(CURL REQUIRED)
|
||||
find_package(jansson REQUIRED)
|
||||
|
||||
add_library(ftl-sdk OBJECT)
|
||||
add_library(OBS::ftl-sdk ALIAS ftl-sdk)
|
||||
|
||||
target_compile_definitions(ftl-sdk PUBLIC FTL_FOUND FTL_STATIC_COMPILE)
|
||||
|
||||
target_link_libraries(ftl-sdk PRIVATE jansson::jansson CURL::libcurl)
|
||||
|
||||
target_sources(
|
||||
ftl-sdk
|
||||
PRIVATE # cmake-format: sortable
|
||||
$<$<NOT:$<PLATFORM_ID:Windows>>:ftl-sdk/libftl/posix/socket.c>
|
||||
$<$<NOT:$<PLATFORM_ID:Windows>>:ftl-sdk/libftl/posix/threads.c>
|
||||
$<$<NOT:$<PLATFORM_ID:Windows>>:ftl-sdk/libftl/posix/threads.h>
|
||||
$<$<PLATFORM_ID:Windows>:ftl-sdk/libftl/win32/socket.c>
|
||||
$<$<PLATFORM_ID:Windows>:ftl-sdk/libftl/win32/threads.c>
|
||||
$<$<PLATFORM_ID:Windows>:ftl-sdk/libftl/win32/threads.h>
|
||||
ftl-sdk/libftl/ftl-sdk.c
|
||||
ftl-sdk/libftl/ftl_helpers.c
|
||||
ftl-sdk/libftl/ftl_private.h
|
||||
ftl-sdk/libftl/gettimeofday/gettimeofday.c
|
||||
ftl-sdk/libftl/gettimeofday/gettimeofday.h
|
||||
ftl-sdk/libftl/handshake.c
|
||||
ftl-sdk/libftl/hmac/hmac.c
|
||||
ftl-sdk/libftl/hmac/hmac.h
|
||||
ftl-sdk/libftl/hmac/sha2.c
|
||||
ftl-sdk/libftl/hmac/sha2.h
|
||||
ftl-sdk/libftl/ingest.c
|
||||
ftl-sdk/libftl/logging.c
|
||||
ftl-sdk/libftl/media.c
|
||||
PUBLIC ftl-sdk/libftl/ftl.h)
|
||||
|
||||
target_compile_options(
|
||||
ftl-sdk
|
||||
PRIVATE $<$<COMPILE_LANG_AND_ID:C,AppleClang,Clang,GNU>:-Wno-unused-parameter>
|
||||
$<$<COMPILE_LANG_AND_ID:C,AppleClang,Clang,GNU>:-Wno-unused-variable>
|
||||
$<$<COMPILE_LANG_AND_ID:C,AppleClang,Clang,GNU>:-Wno-sign-compare>
|
||||
$<$<COMPILE_LANG_AND_ID:C,AppleClang,Clang,GNU>:-Wno-pointer-sign>
|
||||
$<$<COMPILE_LANG_AND_ID:C,AppleClang,Clang,GNU>:-Wno-int-conversion>
|
||||
$<$<COMPILE_LANG_AND_ID:C,AppleClang,Clang>:-Wno-incompatible-function-pointer-types>
|
||||
$<$<COMPILE_LANG_AND_ID:C,AppleClang,Clang>:-Wno-implicit-int-conversion>
|
||||
$<$<COMPILE_LANG_AND_ID:C,AppleClang,Clang>:-Wno-shorten-64-to-32>
|
||||
$<$<COMPILE_LANG_AND_ID:C,AppleClang,Clang>:-Wno-macro-redefined>
|
||||
$<$<COMPILE_LANG_AND_ID:C,AppleClang,Clang>:-Wno-enum-conversion>
|
||||
$<$<COMPILE_LANG_AND_ID:C,GNU>:-Wno-extra>
|
||||
$<$<COMPILE_LANG_AND_ID:C,GNU>:-Wno-incompatible-pointer-types>
|
||||
$<$<COMPILE_LANG_AND_ID:C,GNU>:-Wno-builtin-macro-redefined>)
|
||||
|
||||
target_include_directories(
|
||||
ftl-sdk
|
||||
PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/ftl-sdk/libftl"
|
||||
"$<$<PLATFORM_ID:Windows>:${CMAKE_CURRENT_SOURCE_DIR}/ftl-sdk/libftl/win32>"
|
||||
"$<$<NOT:$<PLATFORM_ID:Windows>>:${CMAKE_CURRENT_SOURCE_DIR}/ftl-sdk/libftl/posix>")
|
||||
|
||||
if(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 10)
|
||||
target_compile_options(ftl-sdk PRIVATE -Wno-error=enum-conversion -Wno-error=maybe-uninitialized)
|
||||
endif()
|
||||
|
||||
target_sources(obs-outputs PRIVATE ftl-stream.c)
|
||||
target_link_libraries(obs-outputs PRIVATE ftl-sdk)
|
||||
target_enable_feature(obs-outputs "FTL protocol support")
|
||||
|
||||
set_target_properties(ftl-sdk PROPERTIES FOLDER plugins/obs-outputs POSITION_INDEPENDENT_CODE TRUE)
|
||||
@@ -110,85 +110,4 @@ else()
|
||||
target_compile_definitions(obs-outputs PRIVATE NO_CRYPTO)
|
||||
endif()
|
||||
|
||||
find_package(PkgConfig QUIET)
|
||||
if(PKG_CONFIG_FOUND)
|
||||
pkg_check_modules(FTL QUIET libftl)
|
||||
endif()
|
||||
|
||||
if(FTL_FOUND)
|
||||
find_package(CURL REQUIRED)
|
||||
obs_status(ENABLED "ftl outputs (system ftl-sdk)")
|
||||
|
||||
target_sources(obs-outputs PRIVATE ftl-stream.c)
|
||||
|
||||
target_include_directories(obs-outputs PRIVATE ${FTL_INCLUDE_DIRS})
|
||||
|
||||
target_link_libraries(obs-outputs PRIVATE ${FTL_LIBRARIES} CURL::libcurl)
|
||||
|
||||
target_compile_features(obs-outputs PRIVATE c_std_11)
|
||||
|
||||
target_compile_definitions(obs-outputs PRIVATE FTL_FOUND)
|
||||
|
||||
elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ftl-sdk/CMakeLists.txt")
|
||||
find_package(CURL REQUIRED)
|
||||
find_package(Jansson 2.5 REQUIRED)
|
||||
obs_status(ENABLED "ftl ouputs (bundled ftl-sdk)")
|
||||
|
||||
target_compile_definitions(obs-outputs PRIVATE FTL_STATIC_COMPILE)
|
||||
|
||||
target_compile_features(obs-outputs PRIVATE c_std_11)
|
||||
|
||||
target_link_libraries(obs-outputs PRIVATE Jansson::Jansson CURL::libcurl)
|
||||
|
||||
target_sources(
|
||||
obs-outputs
|
||||
PRIVATE ftl-stream.c
|
||||
ftl-sdk/libftl/ftl.h
|
||||
ftl-sdk/libftl/ftl_private.h
|
||||
ftl-sdk/libftl/hmac/hmac.c
|
||||
ftl-sdk/libftl/hmac/hmac.h
|
||||
ftl-sdk/libftl/hmac/sha2.c
|
||||
ftl-sdk/libftl/hmac/sha2.h
|
||||
ftl-sdk/libftl/ftl-sdk.c
|
||||
ftl-sdk/libftl/handshake.c
|
||||
ftl-sdk/libftl/ingest.c
|
||||
ftl-sdk/libftl/ftl_helpers.c
|
||||
ftl-sdk/libftl/media.c
|
||||
ftl-sdk/libftl/gettimeofday/gettimeofday.c
|
||||
ftl-sdk/libftl/logging.c)
|
||||
|
||||
target_include_directories(obs-outputs PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ftl-sdk/libftl)
|
||||
|
||||
if(OS_WINDOWS)
|
||||
target_sources(
|
||||
obs-outputs PRIVATE ftl-sdk/libftl/gettimeofday/gettimeofday.c ftl-sdk/libftl/gettimeofday/gettimeofday.h
|
||||
ftl-sdk/libftl/win32/socket.c ftl-sdk/libftl/win32/threads.c ftl-sdk/libftl/win32/threads.h)
|
||||
|
||||
target_include_directories(obs-outputs PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ftl-sdk/libftl/win32)
|
||||
elseif(OS_POSIX)
|
||||
target_sources(obs-outputs PRIVATE ftl-sdk/libftl/posix/socket.c ftl-sdk/libftl/posix/threads.c
|
||||
ftl-sdk/libftl/posix/threads.h)
|
||||
|
||||
target_include_directories(obs-outputs PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ftl-sdk/libftl/posix)
|
||||
endif()
|
||||
|
||||
if(NOT MSVC)
|
||||
target_compile_options(
|
||||
obs-outputs
|
||||
PRIVATE -Wno-error=extra
|
||||
-Wno-error=sign-compare
|
||||
-Wno-error=incompatible-pointer-types
|
||||
-Wno-error=int-conversion
|
||||
-Wno-error=unused-parameter
|
||||
-Wno-error=deprecated-declarations
|
||||
"$<$<COMPILE_LANG_AND_ID:C,GNU>:-Wno-error=maybe-uninitialized>"
|
||||
"$<$<COMPILE_LANG_AND_ID:C,AppleClang,Clang>:-Wno-error=pointer-sign>")
|
||||
if((NOT CMAKE_C_COMPILER_ID STREQUAL "GNU") OR CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "10")
|
||||
target_compile_options(obs-outputs PRIVATE -Wno-error=enum-conversion)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
target_compile_definitions(obs-outputs PRIVATE FTL_FOUND)
|
||||
endif()
|
||||
|
||||
setup_plugin_target(obs-outputs)
|
||||
|
||||
@@ -27,6 +27,3 @@ AddressNotAvailable="Address not available. You may have tried to bind to an inv
|
||||
SSLCertVerifyFailed="The RTMP server sent an invalid SSL certificate."
|
||||
InvalidParameter="Invalid connection parameters. Check that the streaming service address is correct."
|
||||
NoRoute="Error reaching host. Make sure that the interface you have bound can access the internet and that the streaming service supports the address family you selected (see Settings → Advanced)."
|
||||
|
||||
FTLStream="FTL Stream"
|
||||
FTLStream.PeakBitrate="Peak Bitrate"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -9,16 +9,13 @@ OBS_DECLARE_MODULE()
|
||||
OBS_MODULE_USE_DEFAULT_LOCALE("obs-outputs", "en-US")
|
||||
MODULE_EXPORT const char *obs_module_description(void)
|
||||
{
|
||||
return "OBS core RTMP/FLV/null/FTL outputs";
|
||||
return "OBS core RTMP/FLV/null outputs";
|
||||
}
|
||||
|
||||
extern struct obs_output_info rtmp_output_info;
|
||||
extern struct obs_output_info null_output_info;
|
||||
extern struct obs_output_info flv_output_info;
|
||||
extern struct obs_output_info mp4_output_info;
|
||||
#if defined(FTL_FOUND)
|
||||
extern struct obs_output_info ftl_output_info;
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32) && defined(MBEDTLS_THREADING_ALT)
|
||||
void mbed_mutex_init(mbedtls_threading_mutex_t *m)
|
||||
@@ -67,9 +64,6 @@ bool obs_module_load(void)
|
||||
obs_register_output(&null_output_info);
|
||||
obs_register_output(&flv_output_info);
|
||||
obs_register_output(&mp4_output_info);
|
||||
#if defined(FTL_FOUND)
|
||||
obs_register_output(&ftl_output_info);
|
||||
#endif
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user