Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
89cfbdc0
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,发现更多精彩内容 >>
提交
89cfbdc0
编写于
2月 05, 2014
作者:
J
jp9000
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Improve naming scheme of libobs core structures
上级
ab4ab957
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
38 addition
and
38 deletion
+38
-38
libobs/obs-internal.h
libobs/obs-internal.h
+8
-8
libobs/obs-source.c
libobs/obs-source.c
+1
-1
libobs/obs-video.c
libobs/obs-video.c
+9
-9
libobs/obs.c
libobs/obs.c
+20
-20
未找到文件。
libobs/obs-internal.h
浏览文件 @
89cfbdc0
...
...
@@ -51,7 +51,7 @@ struct obs_display {
/* ------------------------------------------------------------------------- */
struct
obs_video
{
struct
obs_
core_
video
{
graphics_t
graphics
;
stagesurf_t
copy_surfaces
[
NUM_TEXTURES
];
texture_t
render_textures
[
NUM_TEXTURES
];
...
...
@@ -71,13 +71,13 @@ struct obs_video {
uint32_t
base_height
;
};
struct
obs_audio
{
struct
obs_
core_
audio
{
/* TODO: sound output subsystem */
audio_t
audio
;
};
/* user sources, output channels, and displays */
struct
obs_
program
_data
{
struct
obs_
core
_data
{
/* arrays of pointers jim? you should really stop being lazy and use
* linked lists. */
DARRAY
(
struct
obs_display
*
)
displays
;
...
...
@@ -94,7 +94,7 @@ struct obs_program_data {
volatile
bool
valid
;
};
struct
obs_
subsystem
{
struct
obs_
core
{
DARRAY
(
struct
obs_module
)
modules
;
DARRAY
(
struct
source_info
)
input_types
;
DARRAY
(
struct
source_info
)
filter_types
;
...
...
@@ -110,11 +110,11 @@ struct obs_subsystem {
/* segmented into multiple sub-structures to keep things a bit more
* clean and organized */
struct
obs_
video
video
;
struct
obs_
audio
audio
;
struct
obs_
program_data
data
;
struct
obs_
core_video
video
;
struct
obs_
core_audio
audio
;
struct
obs_
core_data
data
;
};
extern
struct
obs_
subsystem
*
obs
;
extern
struct
obs_
core
*
obs
;
extern
void
*
obs_video_thread
(
void
*
param
);
libobs/obs-source.c
浏览文件 @
89cfbdc0
...
...
@@ -236,7 +236,7 @@ void obs_source_release(obs_source_t source)
void
obs_source_remove
(
obs_source_t
source
)
{
struct
obs_
program
_data
*
data
=
&
obs
->
data
;
struct
obs_
core
_data
*
data
=
&
obs
->
data
;
size_t
id
;
pthread_mutex_lock
(
&
data
->
sources_mutex
);
...
...
libobs/obs-video.c
浏览文件 @
89cfbdc0
...
...
@@ -113,7 +113,7 @@ static inline void set_render_size(uint32_t width, uint32_t height)
static
inline
void
render_channels
(
void
)
{
struct
obs_
program
_data
*
data
=
&
obs
->
data
;
struct
obs_
core
_data
*
data
=
&
obs
->
data
;
for
(
size_t
i
=
0
;
i
<
MAX_CHANNELS
;
i
++
)
{
struct
obs_source
*
source
=
data
->
channels
[
i
];
...
...
@@ -122,7 +122,7 @@ static inline void render_channels(void)
}
}
static
inline
void
unmap_last_surface
(
struct
obs_video
*
video
)
static
inline
void
unmap_last_surface
(
struct
obs_
core_
video
*
video
)
{
if
(
video
->
mapped_surface
)
{
stagesurface_unmap
(
video
->
mapped_surface
);
...
...
@@ -130,8 +130,8 @@ static inline void unmap_last_surface(struct obs_video *video)
}
}
static
inline
void
render_main_texture
(
struct
obs_
video
*
video
,
int
cur_texture
,
int
prev_texture
)
static
inline
void
render_main_texture
(
struct
obs_
core_video
*
video
,
int
cur_texture
,
int
prev_texture
)
{
struct
vec4
clear_color
;
vec4_set
(
&
clear_color
,
0
.
3
f
,
0
.
0
f
,
0
.
0
f
,
1
.
0
f
);
...
...
@@ -145,7 +145,7 @@ static inline void render_main_texture(struct obs_video *video, int cur_texture,
video
->
textures_rendered
[
cur_texture
]
=
true
;
}
static
inline
void
render_output_texture
(
struct
obs_video
*
video
,
static
inline
void
render_output_texture
(
struct
obs_
core_
video
*
video
,
int
cur_texture
,
int
prev_texture
)
{
texture_t
texture
=
video
->
render_textures
[
prev_texture
];
...
...
@@ -189,7 +189,7 @@ static inline void render_output_texture(struct obs_video *video,
video
->
textures_output
[
cur_texture
]
=
true
;
}
static
inline
void
stage_output_texture
(
struct
obs_video
*
video
,
static
inline
void
stage_output_texture
(
struct
obs_
core_
video
*
video
,
int
cur_texture
,
int
prev_texture
)
{
texture_t
texture
=
video
->
output_textures
[
prev_texture
];
...
...
@@ -205,7 +205,7 @@ static inline void stage_output_texture(struct obs_video *video,
video
->
textures_copied
[
cur_texture
]
=
true
;
}
static
inline
void
render_video
(
struct
obs_video
*
video
,
int
cur_texture
,
static
inline
void
render_video
(
struct
obs_
core_
video
*
video
,
int
cur_texture
,
int
prev_texture
)
{
gs_beginscene
();
...
...
@@ -222,7 +222,7 @@ static inline void render_video(struct obs_video *video, int cur_texture,
gs_endscene
();
}
static
inline
void
output_video
(
struct
obs_video
*
video
,
int
cur_texture
,
static
inline
void
output_video
(
struct
obs_
core_
video
*
video
,
int
cur_texture
,
int
prev_texture
,
uint64_t
timestamp
)
{
stagesurf_t
surface
=
video
->
copy_surfaces
[
prev_texture
];
...
...
@@ -241,7 +241,7 @@ static inline void output_video(struct obs_video *video, int cur_texture,
static
inline
void
output_frame
(
uint64_t
timestamp
)
{
struct
obs_video
*
video
=
&
obs
->
video
;
struct
obs_
core_
video
*
video
=
&
obs
->
video
;
int
cur_texture
=
video
->
cur_texture
;
int
prev_texture
=
cur_texture
==
0
?
NUM_TEXTURES
-
1
:
cur_texture
-
1
;
...
...
libobs/obs.c
浏览文件 @
89cfbdc0
...
...
@@ -21,7 +21,7 @@
#include "obs-internal.h"
#include "obs-module.h"
struct
obs_
subsystem
*
obs
=
NULL
;
struct
obs_
core
*
obs
=
NULL
;
extern
char
*
find_libobs_data_file
(
const
char
*
file
);
...
...
@@ -50,7 +50,7 @@ static inline void make_video_info(struct video_output_info *vi,
static
bool
obs_init_textures
(
struct
obs_video_info
*
ovi
)
{
struct
obs_video
*
video
=
&
obs
->
video
;
struct
obs_
core_
video
*
video
=
&
obs
->
video
;
size_t
i
;
for
(
i
=
0
;
i
<
NUM_TEXTURES
;
i
++
)
{
...
...
@@ -81,7 +81,7 @@ static bool obs_init_textures(struct obs_video_info *ovi)
static
bool
obs_init_graphics
(
struct
obs_video_info
*
ovi
)
{
struct
obs_video
*
video
=
&
obs
->
video
;
struct
obs_
core_
video
*
video
=
&
obs
->
video
;
struct
gs_init_data
graphics_data
;
bool
success
=
true
;
int
errorcode
;
...
...
@@ -119,7 +119,7 @@ static bool obs_init_graphics(struct obs_video_info *ovi)
static
bool
obs_init_video
(
struct
obs_video_info
*
ovi
)
{
struct
obs_video
*
video
=
&
obs
->
video
;
struct
obs_
core_
video
*
video
=
&
obs
->
video
;
struct
video_output_info
vi
;
int
errorcode
;
...
...
@@ -146,7 +146,7 @@ static bool obs_init_video(struct obs_video_info *ovi)
static
void
obs_free_video
()
{
struct
obs_video
*
video
=
&
obs
->
video
;
struct
obs_
core_
video
*
video
=
&
obs
->
video
;
if
(
video
->
video
)
{
void
*
thread_retval
;
...
...
@@ -164,7 +164,7 @@ static void obs_free_video()
static
void
obs_free_graphics
()
{
struct
obs_video
*
video
=
&
obs
->
video
;
struct
obs_
core_
video
*
video
=
&
obs
->
video
;
size_t
i
;
if
(
video
->
graphics
)
{
...
...
@@ -197,7 +197,7 @@ static void obs_free_graphics()
static
bool
obs_init_audio
(
struct
audio_output_info
*
ai
)
{
struct
obs_audio
*
audio
=
&
obs
->
audio
;
struct
obs_
core_
audio
*
audio
=
&
obs
->
audio
;
int
errorcode
;
/* TODO: sound subsystem */
...
...
@@ -215,16 +215,16 @@ static bool obs_init_audio(struct audio_output_info *ai)
static
void
obs_free_audio
(
void
)
{
struct
obs_audio
*
audio
=
&
obs
->
audio
;
struct
obs_
core_
audio
*
audio
=
&
obs
->
audio
;
if
(
audio
->
audio
)
audio_output_close
(
audio
->
audio
);
memset
(
audio
,
0
,
sizeof
(
struct
obs_audio
));
memset
(
audio
,
0
,
sizeof
(
struct
obs_
core_
audio
));
}
static
bool
obs_init_data
(
void
)
{
struct
obs_
program
_data
*
data
=
&
obs
->
data
;
struct
obs_
core
_data
*
data
=
&
obs
->
data
;
pthread_mutexattr_t
attr
;
bool
success
=
false
;
...
...
@@ -252,7 +252,7 @@ fail:
static
void
obs_free_data
(
void
)
{
struct
obs_
program
_data
*
data
=
&
obs
->
data
;
struct
obs_
core
_data
*
data
=
&
obs
->
data
;
uint32_t
i
;
data
->
valid
=
false
;
...
...
@@ -291,8 +291,8 @@ static inline bool obs_init_handlers(void)
static
bool
obs_init
(
void
)
{
obs
=
bmalloc
(
sizeof
(
struct
obs_
subsystem
));
memset
(
obs
,
0
,
sizeof
(
struct
obs_
subsystem
));
obs
=
bmalloc
(
sizeof
(
struct
obs_
core
));
memset
(
obs
,
0
,
sizeof
(
struct
obs_
core
));
obs_init_data
();
return
obs_init_handlers
();
...
...
@@ -346,7 +346,7 @@ void obs_shutdown(void)
bool
obs_reset_video
(
struct
obs_video_info
*
ovi
)
{
struct
obs_video
*
video
=
&
obs
->
video
;
struct
obs_
core_
video
*
video
=
&
obs
->
video
;
obs_free_video
();
...
...
@@ -372,7 +372,7 @@ bool obs_reset_audio(struct audio_output_info *ai)
bool
obs_get_video_info
(
struct
obs_video_info
*
ovi
)
{
struct
obs_video
*
video
=
&
obs
->
video
;
struct
obs_
core_
video
*
video
=
&
obs
->
video
;
const
struct
video_output_info
*
info
;
if
(
!
obs
||
!
video
->
graphics
)
...
...
@@ -394,7 +394,7 @@ bool obs_get_video_info(struct obs_video_info *ovi)
bool
obs_get_audio_info
(
struct
audio_output_info
*
aoi
)
{
struct
obs_audio
*
audio
=
&
obs
->
audio
;
struct
obs_
core_
audio
*
audio
=
&
obs
->
audio
;
const
struct
audio_output_info
*
info
;
if
(
!
obs
||
!
audio
->
audio
)
...
...
@@ -562,7 +562,7 @@ void obs_set_output_source(uint32_t channel, obs_source_t source)
void
obs_enum_outputs
(
bool
(
*
enum_proc
)(
void
*
,
obs_output_t
),
void
*
param
)
{
struct
obs_
program
_data
*
data
=
&
obs
->
data
;
struct
obs_
core
_data
*
data
=
&
obs
->
data
;
pthread_mutex_lock
(
&
data
->
outputs_mutex
);
...
...
@@ -575,7 +575,7 @@ void obs_enum_outputs(bool (*enum_proc)(void*, obs_output_t), void *param)
void
obs_enum_encoders
(
bool
(
*
enum_proc
)(
void
*
,
obs_encoder_t
),
void
*
param
)
{
struct
obs_
program
_data
*
data
=
&
obs
->
data
;
struct
obs_
core
_data
*
data
=
&
obs
->
data
;
pthread_mutex_lock
(
&
data
->
encoders_mutex
);
...
...
@@ -588,7 +588,7 @@ void obs_enum_encoders(bool (*enum_proc)(void*, obs_encoder_t), void *param)
void
obs_enum_sources
(
bool
(
*
enum_proc
)(
void
*
,
obs_source_t
),
void
*
param
)
{
struct
obs_
program
_data
*
data
=
&
obs
->
data
;
struct
obs_
core
_data
*
data
=
&
obs
->
data
;
pthread_mutex_lock
(
&
data
->
sources_mutex
);
...
...
@@ -601,7 +601,7 @@ void obs_enum_sources(bool (*enum_proc)(void*, obs_source_t), void *param)
obs_source_t
obs_get_source_by_name
(
const
char
*
name
)
{
struct
obs_
program
_data
*
data
=
&
obs
->
data
;
struct
obs_
core
_data
*
data
=
&
obs
->
data
;
struct
obs_source
*
source
=
NULL
;
size_t
i
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录