Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
7b0d7c63
O
obs-studio
项目概览
尘离序散
/
obs-studio
与 Fork 源项目一致
从无法访问的项目Fork
通知
30
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
obs-studio
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7b0d7c63
编写于
11月 02, 2020
作者:
C
Colin Edwards
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove BUILD_CAPTIONS build flag
上级
923f06bf
变更
16
显示空白变更内容
内联
并排
Showing
16 changed file
with
30 addition
and
57 deletion
+30
-57
.github/workflows/main.yml
.github/workflows/main.yml
+4
-4
CI/before-script-linux.sh
CI/before-script-linux.sh
+1
-1
CI/before-script-osx.sh
CI/before-script-osx.sh
+0
-1
CI/full-build-macos.sh
CI/full-build-macos.sh
+0
-1
CI/install-script-win.cmd
CI/install-script-win.cmd
+4
-4
CMakeLists.txt
CMakeLists.txt
+0
-1
UI/frontend-plugins/frontend-tools/CMakeLists.txt
UI/frontend-plugins/frontend-tools/CMakeLists.txt
+13
-15
UI/frontend-plugins/frontend-tools/frontend-tools-config.h.in
...rontend-plugins/frontend-tools/frontend-tools-config.h.in
+0
-1
UI/frontend-plugins/frontend-tools/frontend-tools.c
UI/frontend-plugins/frontend-tools/frontend-tools.c
+3
-3
deps/CMakeLists.txt
deps/CMakeLists.txt
+1
-3
deps/obs-scripting/CMakeLists.txt
deps/obs-scripting/CMakeLists.txt
+0
-4
deps/obs-scripting/obs-scripting-config.h.in
deps/obs-scripting/obs-scripting-config.h.in
+0
-1
libobs/CMakeLists.txt
libobs/CMakeLists.txt
+4
-6
libobs/obs-output.c
libobs/obs-output.c
+0
-8
libobs/obs.h
libobs/obs.h
+0
-3
libobs/obsconfig.h.in
libobs/obsconfig.h.in
+0
-1
未找到文件。
.github/workflows/main.yml
浏览文件 @
7b0d7c63
...
@@ -152,7 +152,7 @@ jobs:
...
@@ -152,7 +152,7 @@ jobs:
run
:
|
run
:
|
mkdir ./build
mkdir ./build
cd ./build
cd ./build
cmake -DENABLE_UNIT_TESTS=YES -DENABLE_SPARKLE_UPDATER=ON -DDISABLE_PYTHON=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=${{ env.MIN_MACOS_VERSION }} -DQTDIR="/tmp/obsdeps" -DSWIGDIR="/tmp/obsdeps" -DDepsPath="/tmp/obsdeps" -DVLCPath="${{ github.workspace }}/cmbuild/vlc-${{ env.VLC_VERSION }}" -DENABLE_VLC=ON -DBUILD_BROWSER=ON -DBROWSER_DEPLOY=ON -D
BUILD_CAPTIONS=ON -D
WITH_RTMPS=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_BUILD_VERSION }}_macosx64" ..
cmake -DENABLE_UNIT_TESTS=YES -DENABLE_SPARKLE_UPDATER=ON -DDISABLE_PYTHON=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=${{ env.MIN_MACOS_VERSION }} -DQTDIR="/tmp/obsdeps" -DSWIGDIR="/tmp/obsdeps" -DDepsPath="/tmp/obsdeps" -DVLCPath="${{ github.workspace }}/cmbuild/vlc-${{ env.VLC_VERSION }}" -DENABLE_VLC=ON -DBUILD_BROWSER=ON -DBROWSER_DEPLOY=ON -DWITH_RTMPS=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_BUILD_VERSION }}_macosx64" ..
-
name
:
'
Build'
-
name
:
'
Build'
shell
:
bash
shell
:
bash
working-directory
:
${{ github.workspace }}/build
working-directory
:
${{ github.workspace }}/build
...
@@ -417,7 +417,7 @@ jobs:
...
@@ -417,7 +417,7 @@ jobs:
run
:
|
run
:
|
mkdir ./build
mkdir ./build
cd ./build
cd ./build
cmake -DUNIX_STRUCTURE=0 -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/obs-studio-portable" -DENABLE_UNIT_TESTS=ON -DENABLE_VLC=ON -D
BUILD_CAPTIONS=ON -D
WITH_RTMPS=ON -DBUILD_BROWSER=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_BUILD_VERSION }}_linux64" ..
cmake -DUNIX_STRUCTURE=0 -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/obs-studio-portable" -DENABLE_UNIT_TESTS=ON -DENABLE_VLC=ON -DWITH_RTMPS=ON -DBUILD_BROWSER=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_BUILD_VERSION }}_linux64" ..
-
name
:
'
Build'
-
name
:
'
Build'
shell
:
bash
shell
:
bash
working-directory
:
${{ github.workspace }}/build
working-directory
:
${{ github.workspace }}/build
...
@@ -541,7 +541,7 @@ jobs:
...
@@ -541,7 +541,7 @@ jobs:
mkdir ./build
mkdir ./build
mkdir ./build64
mkdir ./build64
cd ./build64
cd ./build64
cmake -G"${{ env.CMAKE_GENERATOR }}" -A"x64" -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DBUILD_BROWSER=true -D
BUILD_CAPTIONS=true -D
COMPILE_D3D12_HOOK=true -DVLCPath="${{ github.workspace }}/cmbuild/vlc" -DDepsPath="${{ github.workspace }}/cmbuild/deps/win64" -DQTDIR="${{ github.workspace }}/cmbuild/QT/${{ env.QT_VERSION }}/msvc2017_64" -DENABLE_VLC=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_VERSION }}_windows64_minimal" -DCOPIED_DEPENDENCIES=FALSE -DCOPY_DEPENDENCIES=TRUE -DVIRTUALCAM_GUID=${{ env.VIRTUALCAM-GUID }} ..
cmake -G"${{ env.CMAKE_GENERATOR }}" -A"x64" -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DBUILD_BROWSER=true -DCOMPILE_D3D12_HOOK=true -DVLCPath="${{ github.workspace }}/cmbuild/vlc" -DDepsPath="${{ github.workspace }}/cmbuild/deps/win64" -DQTDIR="${{ github.workspace }}/cmbuild/QT/${{ env.QT_VERSION }}/msvc2017_64" -DENABLE_VLC=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_VERSION }}_windows64_minimal" -DCOPIED_DEPENDENCIES=FALSE -DCOPY_DEPENDENCIES=TRUE -DVIRTUALCAM_GUID=${{ env.VIRTUALCAM-GUID }} ..
-
name
:
'
Build'
-
name
:
'
Build'
run
:
msbuild /m /p:Configuration=RelWithDebInfo .\build64\obs-studio.sln
run
:
msbuild /m /p:Configuration=RelWithDebInfo .\build64\obs-studio.sln
-
name
:
'
Package'
-
name
:
'
Package'
...
@@ -653,7 +653,7 @@ jobs:
...
@@ -653,7 +653,7 @@ jobs:
mkdir ./build
mkdir ./build
mkdir ./build32
mkdir ./build32
cd ./build32
cd ./build32
cmake -G"${{ env.CMAKE_GENERATOR }}" -A"Win32" -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DENABLE_VLC=ON -DBUILD_BROWSER=true -D
BUILD_CAPTIONS=true -D
COMPILE_D3D12_HOOK=true -DVLCPath="${{ github.workspace }}/cmbuild/vlc" -DDepsPath="${{ github.workspace }}/cmbuild/deps/win32" -DQTDIR="${{ github.workspace }}/cmbuild/QT/${{ env.QT_VERSION }}/msvc2017" -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_VERSION }}_windows32_minimal" -DCOPIED_DEPENDENCIES=FALSE -DCOPY_DEPENDENCIES=TRUE -DVIRTUALCAM_GUID=${{ env.VIRTUALCAM-GUID }} ..
cmake -G"${{ env.CMAKE_GENERATOR }}" -A"Win32" -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DENABLE_VLC=ON -DBUILD_BROWSER=true -DCOMPILE_D3D12_HOOK=true -DVLCPath="${{ github.workspace }}/cmbuild/vlc" -DDepsPath="${{ github.workspace }}/cmbuild/deps/win32" -DQTDIR="${{ github.workspace }}/cmbuild/QT/${{ env.QT_VERSION }}/msvc2017" -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_VERSION }}_windows32_minimal" -DCOPIED_DEPENDENCIES=FALSE -DCOPY_DEPENDENCIES=TRUE -DVIRTUALCAM_GUID=${{ env.VIRTUALCAM-GUID }} ..
-
name
:
'
Build'
-
name
:
'
Build'
run
:
msbuild /m /p:Configuration=RelWithDebInfo .\build32\obs-studio.sln
run
:
msbuild /m /p:Configuration=RelWithDebInfo .\build32\obs-studio.sln
-
name
:
'
Package'
-
name
:
'
Package'
...
...
CI/before-script-linux.sh
浏览文件 @
7b0d7c63
...
@@ -3,4 +3,4 @@
...
@@ -3,4 +3,4 @@
set
-ex
set
-ex
ccache
-s
||
echo
"CCache is not available."
ccache
-s
||
echo
"CCache is not available."
mkdir
build
&&
cd
build
mkdir
build
&&
cd
build
cmake
-DBUILD_
CAPTIONS
=
ON
-DBUILD_
BROWSER
=
ON
-DCEF_ROOT_DIR
=
"../cef_binary_
${
CEF_BUILD_VERSION
}
_linux64"
..
cmake
-DBUILD_BROWSER
=
ON
-DCEF_ROOT_DIR
=
"../cef_binary_
${
CEF_BUILD_VERSION
}
_linux64"
..
CI/before-script-osx.sh
浏览文件 @
7b0d7c63
...
@@ -13,6 +13,5 @@ cmake -DENABLE_SPARKLE_UPDATER=ON \
...
@@ -13,6 +13,5 @@ cmake -DENABLE_SPARKLE_UPDATER=ON \
-DVLCPath
=
$PWD
/../../vlc-3.0.8
\
-DVLCPath
=
$PWD
/../../vlc-3.0.8
\
-DBUILD_BROWSER
=
ON
\
-DBUILD_BROWSER
=
ON
\
-DBROWSER_DEPLOY
=
ON
\
-DBROWSER_DEPLOY
=
ON
\
-DBUILD_CAPTIONS
=
ON
\
-DWITH_RTMPS
=
ON
\
-DWITH_RTMPS
=
ON
\
-DCEF_ROOT_DIR
=
$PWD
/../../cef_binary_
${
CEF_BUILD_VERSION
}
_macosx64 ..
-DCEF_ROOT_DIR
=
$PWD
/../../cef_binary_
${
CEF_BUILD_VERSION
}
_macosx64 ..
CI/full-build-macos.sh
浏览文件 @
7b0d7c63
...
@@ -278,7 +278,6 @@ configure_obs_build() {
...
@@ -278,7 +278,6 @@ configure_obs_build() {
-DVLCPath
=
"
${
DEPS_BUILD_DIR
}
/vlc-
${
VLC_VERSION
:-${
CI_VLC_VERSION
}}
"
\
-DVLCPath
=
"
${
DEPS_BUILD_DIR
}
/vlc-
${
VLC_VERSION
:-${
CI_VLC_VERSION
}}
"
\
-DBUILD_BROWSER
=
ON
\
-DBUILD_BROWSER
=
ON
\
-DBROWSER_DEPLOY
=
ON
\
-DBROWSER_DEPLOY
=
ON
\
-DBUILD_CAPTIONS
=
ON
\
-DWITH_RTMPS
=
ON
\
-DWITH_RTMPS
=
ON
\
-DCEF_ROOT_DIR
=
"
${
DEPS_BUILD_DIR
}
/cef_binary_
${
CEF_BUILD_VERSION
:-${
CI_CEF_VERSION
}}
_macosx64"
\
-DCEF_ROOT_DIR
=
"
${
DEPS_BUILD_DIR
}
/cef_binary_
${
CEF_BUILD_VERSION
:-${
CI_CEF_VERSION
}}
_macosx64"
\
-DCMAKE_BUILD_TYPE
=
"
${
BUILD_CONFIG
}
"
\
-DCMAKE_BUILD_TYPE
=
"
${
BUILD_CONFIG
}
"
\
...
...
CI/install-script-win.cmd
浏览文件 @
7b0d7c63
...
@@ -18,13 +18,13 @@ set VIRTUALCAM-GUID=A3FCE0F5-3493-419F-958A-ABA1250EC20B
...
@@ -18,13 +18,13 @@ set VIRTUALCAM-GUID=A3FCE0F5-3493-419F-958A-ABA1250EC20B
mkdir
build
build32
build64
mkdir
build
build32
build64
if
"
%TWITCH
-CLIENTID
%
"
==
"$(twitch_clientid)"
(
if
"
%TWITCH
-CLIENTID
%
"
==
"$(twitch_clientid)"
(
cd
./build32
cd
./build32
cmake
-G
"Visual Studio 16 2019"
-A
Win32
-DCMAKE
_SYSTEM_VERSION
=
10
.0
-DCOPIED
_DEPENDENCIES
=
false
-DCOPY
_DEPENDENCIES
=
true
-DENABLE
_VLC
=
ON
-D
BUILD
_CAPTIONS
=
true
-D
COMPILE
_D3D12_HOOK
=
true
-DBUILD
_BROWSER
=
true
-DCEF
_ROOT_DIR
=
%CEF
_32
%
-DVIRTUALCAM
_GUID
=
"
%VIRTUALCAM
-GUID
%
"
..
cmake
-G
"Visual Studio 16 2019"
-A
Win32
-DCMAKE
_SYSTEM_VERSION
=
10
.0
-DCOPIED
_DEPENDENCIES
=
false
-DCOPY
_DEPENDENCIES
=
true
-DENABLE
_VLC
=
ON
-DCOMPILE
_D3D12_HOOK
=
true
-DBUILD
_BROWSER
=
true
-DCEF
_ROOT_DIR
=
%CEF
_32
%
-DVIRTUALCAM
_GUID
=
"
%VIRTUALCAM
-GUID
%
"
..
cd
../build64
cd
../build64
cmake
-G
"Visual Studio 16 2019"
-A
x64
-DCMAKE
_SYSTEM_VERSION
=
10
.0
-DCOPIED
_DEPENDENCIES
=
false
-DCOPY
_DEPENDENCIES
=
true
-DENABLE
_VLC
=
ON
-D
BUILD
_CAPTIONS
=
true
-D
COMPILE
_D3D12_HOOK
=
true
-DBUILD
_BROWSER
=
true
-DCEF
_ROOT_DIR
=
%CEF
_64
%
-DVIRTUALCAM
_GUID
=
"
%VIRTUALCAM
-GUID
%
"
..
cmake
-G
"Visual Studio 16 2019"
-A
x64
-DCMAKE
_SYSTEM_VERSION
=
10
.0
-DCOPIED
_DEPENDENCIES
=
false
-DCOPY
_DEPENDENCIES
=
true
-DENABLE
_VLC
=
ON
-DCOMPILE
_D3D12_HOOK
=
true
-DBUILD
_BROWSER
=
true
-DCEF
_ROOT_DIR
=
%CEF
_64
%
-DVIRTUALCAM
_GUID
=
"
%VIRTUALCAM
-GUID
%
"
..
)
else
(
)
else
(
cd
./build32
cd
./build32
cmake
-G
"Visual Studio 16 2019"
-A
Win32
-DCMAKE
_SYSTEM_VERSION
=
10
.0
-DCOPIED
_DEPENDENCIES
=
false
-DCOPY
_DEPENDENCIES
=
true
-DENABLE
_VLC
=
ON
-D
BUILD
_CAPTIONS
=
true
-D
COMPILE
_D3D12_HOOK
=
true
-DBUILD
_BROWSER
=
true
-DCEF
_ROOT_DIR
=
%CEF
_32
%
-DTWITCH
_CLIENTID
=
"
%TWITCH
-CLIENTID
%
"
-DTWITCH
_HASH
=
"
%TWITCH
-HASH
%
"
-DRESTREAM
_CLIENTID
=
"
%RESTREAM
-CLIENTID
%
"
-DRESTREAM
_HASH
=
"
%RESTREAM
-HASH
%
"
-DVIRTUALCAM
_GUID
=
"
%VIRTUALCAM
-GUID
%
"
..
cmake
-G
"Visual Studio 16 2019"
-A
Win32
-DCMAKE
_SYSTEM_VERSION
=
10
.0
-DCOPIED
_DEPENDENCIES
=
false
-DCOPY
_DEPENDENCIES
=
true
-DENABLE
_VLC
=
ON
-DCOMPILE
_D3D12_HOOK
=
true
-DBUILD
_BROWSER
=
true
-DCEF
_ROOT_DIR
=
%CEF
_32
%
-DTWITCH
_CLIENTID
=
"
%TWITCH
-CLIENTID
%
"
-DTWITCH
_HASH
=
"
%TWITCH
-HASH
%
"
-DRESTREAM
_CLIENTID
=
"
%RESTREAM
-CLIENTID
%
"
-DRESTREAM
_HASH
=
"
%RESTREAM
-HASH
%
"
-DVIRTUALCAM
_GUID
=
"
%VIRTUALCAM
-GUID
%
"
..
cd
../build64
cd
../build64
cmake
-G
"Visual Studio 16 2019"
-A
x64
-DCMAKE
_SYSTEM_VERSION
=
10
.0
-DCOPIED
_DEPENDENCIES
=
false
-DCOPY
_DEPENDENCIES
=
true
-DENABLE
_VLC
=
ON
-D
BUILD
_CAPTIONS
=
true
-D
COMPILE
_D3D12_HOOK
=
true
-DBUILD
_BROWSER
=
true
-DCEF
_ROOT_DIR
=
%CEF
_64
%
-DTWITCH
_CLIENTID
=
"
%TWITCH
-CLIENTID
%
"
-DTWITCH
_HASH
=
"
%TWITCH
-HASH
%
"
-DRESTREAM
_CLIENTID
=
"
%RESTREAM
-CLIENTID
%
"
-DRESTREAM
_HASH
=
"
%RESTREAM
-HASH
%
"
-DVIRTUALCAM
_GUID
=
"
%VIRTUALCAM
-GUID
%
"
..
cmake
-G
"Visual Studio 16 2019"
-A
x64
-DCMAKE
_SYSTEM_VERSION
=
10
.0
-DCOPIED
_DEPENDENCIES
=
false
-DCOPY
_DEPENDENCIES
=
true
-DENABLE
_VLC
=
ON
-DCOMPILE
_D3D12_HOOK
=
true
-DBUILD
_BROWSER
=
true
-DCEF
_ROOT_DIR
=
%CEF
_64
%
-DTWITCH
_CLIENTID
=
"
%TWITCH
-CLIENTID
%
"
-DTWITCH
_HASH
=
"
%TWITCH
-HASH
%
"
-DRESTREAM
_CLIENTID
=
"
%RESTREAM
-CLIENTID
%
"
-DRESTREAM
_HASH
=
"
%RESTREAM
-HASH
%
"
-DVIRTUALCAM
_GUID
=
"
%VIRTUALCAM
-GUID
%
"
..
)
)
cd
..
cd
..
CMakeLists.txt
浏览文件 @
7b0d7c63
...
@@ -7,7 +7,6 @@ endif()
...
@@ -7,7 +7,6 @@ endif()
project
(
obs-studio
)
project
(
obs-studio
)
option
(
BUILD_CAPTIONS
"Build captions"
FALSE
)
option
(
DEBUG_FFMPEG_MUX
"Debug FFmpeg muxer subprocess"
FALSE
)
option
(
DEBUG_FFMPEG_MUX
"Debug FFmpeg muxer subprocess"
FALSE
)
set_property
(
GLOBAL PROPERTY USE_FOLDERS ON
)
set_property
(
GLOBAL PROPERTY USE_FOLDERS ON
)
...
...
UI/frontend-plugins/frontend-tools/CMakeLists.txt
浏览文件 @
7b0d7c63
...
@@ -81,7 +81,6 @@ if(WIN32)
...
@@ -81,7 +81,6 @@ if(WIN32)
auto-scene-switcher-win.cpp
auto-scene-switcher-win.cpp
frontend-tools.rc
)
frontend-tools.rc
)
if
(
BUILD_CAPTIONS
)
set
(
frontend-tools_PLATFORM_SOURCES
set
(
frontend-tools_PLATFORM_SOURCES
${
frontend-tools_PLATFORM_SOURCES
}
${
frontend-tools_PLATFORM_SOURCES
}
captions.cpp
captions.cpp
...
@@ -95,7 +94,6 @@ if(WIN32)
...
@@ -95,7 +94,6 @@ if(WIN32)
captions-mssapi-stream.hpp
)
captions-mssapi-stream.hpp
)
set
(
frontend-tools_PLATFORM_UI
set
(
frontend-tools_PLATFORM_UI
forms/captions.ui
)
forms/captions.ui
)
endif
()
elseif
(
APPLE
)
elseif
(
APPLE
)
set
(
frontend-tools_PLATFORM_SOURCES
set
(
frontend-tools_PLATFORM_SOURCES
auto-scene-switcher-osx.mm
)
auto-scene-switcher-osx.mm
)
...
...
UI/frontend-plugins/frontend-tools/frontend-tools-config.h.in
浏览文件 @
7b0d7c63
...
@@ -16,7 +16,6 @@
...
@@ -16,7 +16,6 @@
#define OFF 0
#define OFF 0
#endif
#endif
#define BUILD_CAPTIONS @BUILD_CAPTIONS@
#define ENABLE_SCRIPTING @SCRIPTING_ENABLED@
#define ENABLE_SCRIPTING @SCRIPTING_ENABLED@
#define COMPILE_LUA @COMPILE_LUA@
#define COMPILE_LUA @COMPILE_LUA@
#define COMPILE_PYTHON @COMPILE_PYTHON@
#define COMPILE_PYTHON @COMPILE_PYTHON@
UI/frontend-plugins/frontend-tools/frontend-tools.c
浏览文件 @
7b0d7c63
...
@@ -7,7 +7,7 @@ OBS_MODULE_USE_DEFAULT_LOCALE("frontend-tools", "en-US")
...
@@ -7,7 +7,7 @@ OBS_MODULE_USE_DEFAULT_LOCALE("frontend-tools", "en-US")
void
InitSceneSwitcher
();
void
InitSceneSwitcher
();
void
FreeSceneSwitcher
();
void
FreeSceneSwitcher
();
#if defined(_WIN32)
&& BUILD_CAPTIONS
#if defined(_WIN32)
void
InitCaptions
();
void
InitCaptions
();
void
FreeCaptions
();
void
FreeCaptions
();
#endif
#endif
...
@@ -22,7 +22,7 @@ void FreeScripts();
...
@@ -22,7 +22,7 @@ void FreeScripts();
bool
obs_module_load
(
void
)
bool
obs_module_load
(
void
)
{
{
#if defined(_WIN32)
&& BUILD_CAPTIONS
#if defined(_WIN32)
InitCaptions
();
InitCaptions
();
#endif
#endif
InitSceneSwitcher
();
InitSceneSwitcher
();
...
@@ -35,7 +35,7 @@ bool obs_module_load(void)
...
@@ -35,7 +35,7 @@ bool obs_module_load(void)
void
obs_module_unload
(
void
)
void
obs_module_unload
(
void
)
{
{
#if defined(_WIN32)
&& BUILD_CAPTIONS
#if defined(_WIN32)
FreeCaptions
();
FreeCaptions
();
#endif
#endif
FreeSceneSwitcher
();
FreeSceneSwitcher
();
...
...
deps/CMakeLists.txt
浏览文件 @
7b0d7c63
...
@@ -19,9 +19,7 @@ if(WIN32)
...
@@ -19,9 +19,7 @@ if(WIN32)
add_subdirectory
(
lzma
)
add_subdirectory
(
lzma
)
endif
()
endif
()
if
(
BUILD_CAPTIONS
)
add_subdirectory
(
libcaption
)
add_subdirectory
(
libcaption
)
endif
()
find_package
(
Jansson 2.5 QUIET
)
find_package
(
Jansson 2.5 QUIET
)
...
...
deps/obs-scripting/CMakeLists.txt
浏览文件 @
7b0d7c63
...
@@ -87,10 +87,6 @@ if(UI_ENABLED)
...
@@ -87,10 +87,6 @@ if(UI_ENABLED)
include_directories
(
SYSTEM
"
${
CMAKE_SOURCE_DIR
}
/UI/obs-frontend-api"
)
include_directories
(
SYSTEM
"
${
CMAKE_SOURCE_DIR
}
/UI/obs-frontend-api"
)
endif
()
endif
()
IF
(
BUILD_CAPTIONS
)
string
(
TOUPPER
"
${
BUILD_CAPTIONS
}
"
BUILD_CAPTIONS
)
endif
()
configure_file
(
configure_file
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/obs-scripting-config.h.in"
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/obs-scripting-config.h.in"
"
${
CMAKE_CURRENT_BINARY_DIR
}
/obs-scripting-config.h"
)
"
${
CMAKE_CURRENT_BINARY_DIR
}
/obs-scripting-config.h"
)
...
...
deps/obs-scripting/obs-scripting-config.h.in
浏览文件 @
7b0d7c63
...
@@ -21,4 +21,3 @@
...
@@ -21,4 +21,3 @@
#define COMPILE_LUA @LUAJIT_FOUND@
#define COMPILE_LUA @LUAJIT_FOUND@
#define COMPILE_PYTHON @PYTHON_FOUND@
#define COMPILE_PYTHON @PYTHON_FOUND@
#define UI_ENABLED @UI_ENABLED@
#define UI_ENABLED @UI_ENABLED@
#define BUILD_CAPTIONS @BUILD_CAPTIONS@
libobs/CMakeLists.txt
浏览文件 @
7b0d7c63
...
@@ -473,12 +473,10 @@ source_group("util\\Header Files" FILES ${libobs_util_HEADERS})
...
@@ -473,12 +473,10 @@ source_group("util\\Header Files" FILES ${libobs_util_HEADERS})
source_group
(
"audio-monitoring
\\
Source Files"
FILES
${
libobs_audio_monitoring_SOURCES
}
)
source_group
(
"audio-monitoring
\\
Source Files"
FILES
${
libobs_audio_monitoring_SOURCES
}
)
source_group
(
"audio-monitoring
\\
Header Files"
FILES
${
libobs_audio_monitoring_HEADERS
}
)
source_group
(
"audio-monitoring
\\
Header Files"
FILES
${
libobs_audio_monitoring_HEADERS
}
)
if
(
BUILD_CAPTIONS
)
include_directories
(
${
CMAKE_SOURCE_DIR
}
/deps/libcaption
)
include_directories
(
${
CMAKE_SOURCE_DIR
}
/deps/libcaption
)
set
(
libobs_PLATFORM_DEPS
set
(
libobs_PLATFORM_DEPS
${
libobs_PLATFORM_DEPS
}
${
libobs_PLATFORM_DEPS
}
caption
)
caption
)
endif
()
add_library
(
libobs SHARED
${
libobs_SOURCES
}
${
libobs_HEADERS
}
)
add_library
(
libobs SHARED
${
libobs_SOURCES
}
${
libobs_HEADERS
}
)
if
(
UNIX AND NOT APPLE
)
if
(
UNIX AND NOT APPLE
)
...
...
libobs/obs-output.c
浏览文件 @
7b0d7c63
...
@@ -21,10 +21,8 @@
...
@@ -21,10 +21,8 @@
#include "obs.h"
#include "obs.h"
#include "obs-internal.h"
#include "obs-internal.h"
#if BUILD_CAPTIONS
#include <caption/caption.h>
#include <caption/caption.h>
#include <caption/mpeg.h>
#include <caption/mpeg.h>
#endif
static
inline
bool
active
(
const
struct
obs_output
*
output
)
static
inline
bool
active
(
const
struct
obs_output
*
output
)
{
{
...
@@ -1206,7 +1204,6 @@ static inline bool has_higher_opposing_ts(struct obs_output *output,
...
@@ -1206,7 +1204,6 @@ static inline bool has_higher_opposing_ts(struct obs_output *output,
return
output
->
highest_video_ts
>
packet
->
dts_usec
;
return
output
->
highest_video_ts
>
packet
->
dts_usec
;
}
}
#if BUILD_CAPTIONS
static
const
uint8_t
nal_start
[
4
]
=
{
0
,
0
,
0
,
1
};
static
const
uint8_t
nal_start
[
4
]
=
{
0
,
0
,
0
,
1
};
static
bool
add_caption
(
struct
obs_output
*
output
,
struct
encoder_packet
*
out
)
static
bool
add_caption
(
struct
obs_output
*
output
,
struct
encoder_packet
*
out
)
...
@@ -1302,7 +1299,6 @@ static bool add_caption(struct obs_output *output, struct encoder_packet *out)
...
@@ -1302,7 +1299,6 @@ static bool add_caption(struct obs_output *output, struct encoder_packet *out)
return
true
;
return
true
;
}
}
#endif
double
last_caption_timestamp
=
0
;
double
last_caption_timestamp
=
0
;
...
@@ -1321,7 +1317,6 @@ static inline void send_interleaved(struct obs_output *output)
...
@@ -1321,7 +1317,6 @@ static inline void send_interleaved(struct obs_output *output)
if
(
out
.
type
==
OBS_ENCODER_VIDEO
)
{
if
(
out
.
type
==
OBS_ENCODER_VIDEO
)
{
output
->
total_frames
++
;
output
->
total_frames
++
;
#if BUILD_CAPTIONS
pthread_mutex_lock
(
&
output
->
caption_mutex
);
pthread_mutex_lock
(
&
output
->
caption_mutex
);
double
frame_timestamp
=
double
frame_timestamp
=
...
@@ -1349,7 +1344,6 @@ static inline void send_interleaved(struct obs_output *output)
...
@@ -1349,7 +1344,6 @@ static inline void send_interleaved(struct obs_output *output)
}
}
pthread_mutex_unlock
(
&
output
->
caption_mutex
);
pthread_mutex_unlock
(
&
output
->
caption_mutex
);
#endif
}
}
output
->
info
.
encoded_packet
(
output
->
context
.
data
,
&
out
);
output
->
info
.
encoded_packet
(
output
->
context
.
data
,
&
out
);
...
@@ -2545,7 +2539,6 @@ void obs_output_caption(obs_output_t *output,
...
@@ -2545,7 +2539,6 @@ void obs_output_caption(obs_output_t *output,
pthread_mutex_unlock
(
&
output
->
caption_mutex
);
pthread_mutex_unlock
(
&
output
->
caption_mutex
);
}
}
#if BUILD_CAPTIONS
static
struct
caption_text
*
caption_text_new
(
const
char
*
text
,
size_t
bytes
,
static
struct
caption_text
*
caption_text_new
(
const
char
*
text
,
size_t
bytes
,
struct
caption_text
*
tail
,
struct
caption_text
*
tail
,
struct
caption_text
**
head
,
struct
caption_text
**
head
,
...
@@ -2592,7 +2585,6 @@ void obs_output_output_caption_text2(obs_output_t *output, const char *text,
...
@@ -2592,7 +2585,6 @@ void obs_output_output_caption_text2(obs_output_t *output, const char *text,
pthread_mutex_unlock
(
&
output
->
caption_mutex
);
pthread_mutex_unlock
(
&
output
->
caption_mutex
);
}
}
#endif
float
obs_output_get_congestion
(
obs_output_t
*
output
)
float
obs_output_get_congestion
(
obs_output_t
*
output
)
{
{
...
...
libobs/obs.h
浏览文件 @
7b0d7c63
...
@@ -1906,15 +1906,12 @@ EXPORT const char *obs_output_get_id(const obs_output_t *output);
...
@@ -1906,15 +1906,12 @@ EXPORT const char *obs_output_get_id(const obs_output_t *output);
EXPORT
void
obs_output_caption
(
obs_output_t
*
output
,
EXPORT
void
obs_output_caption
(
obs_output_t
*
output
,
const
struct
obs_source_cea_708
*
captions
);
const
struct
obs_source_cea_708
*
captions
);
#if BUILD_CAPTIONS
EXPORT
void
obs_output_output_caption_text1
(
obs_output_t
*
output
,
EXPORT
void
obs_output_output_caption_text1
(
obs_output_t
*
output
,
const
char
*
text
);
const
char
*
text
);
EXPORT
void
obs_output_output_caption_text2
(
obs_output_t
*
output
,
EXPORT
void
obs_output_output_caption_text2
(
obs_output_t
*
output
,
const
char
*
text
,
const
char
*
text
,
double
display_duration
);
double
display_duration
);
#endif
EXPORT
float
obs_output_get_congestion
(
obs_output_t
*
output
);
EXPORT
float
obs_output_get_congestion
(
obs_output_t
*
output
);
EXPORT
int
obs_output_get_connect_time_ms
(
obs_output_t
*
output
);
EXPORT
int
obs_output_get_connect_time_ms
(
obs_output_t
*
output
);
...
...
libobs/obsconfig.h.in
浏览文件 @
7b0d7c63
...
@@ -15,7 +15,6 @@
...
@@ -15,7 +15,6 @@
#define OBS_PLUGIN_DESTINATION "@OBS_PLUGIN_DESTINATION@"
#define OBS_PLUGIN_DESTINATION "@OBS_PLUGIN_DESTINATION@"
#define OBS_RELATIVE_PREFIX "@OBS_RELATIVE_PREFIX@"
#define OBS_RELATIVE_PREFIX "@OBS_RELATIVE_PREFIX@"
#define OBS_UNIX_STRUCTURE @OBS_UNIX_STRUCTURE@
#define OBS_UNIX_STRUCTURE @OBS_UNIX_STRUCTURE@
#define BUILD_CAPTIONS @BUILD_CAPTIONS@
#define HAVE_DBUS @HAVE_DBUS@
#define HAVE_DBUS @HAVE_DBUS@
#define HAVE_PULSEAUDIO @HAVE_PULSEAUDIO@
#define HAVE_PULSEAUDIO @HAVE_PULSEAUDIO@
#define USE_XINPUT @USE_XINPUT@
#define USE_XINPUT @USE_XINPUT@
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录