Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
036d3e80
提交
036d3e80
authored
11月 14, 2018
作者:
Liyang
提交者:
Andrey Volk
1月 02, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
FS-11521: [mod_av] support colorspace from params of file interface
https://freeswitch.org/jira/browse/FS-11521
上级
863a0b1d
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
74 行增加
和
8 行删除
+74
-8
avformat.c
src/mod/applications/mod_av/avformat.c
+13
-2
test_avformat.c
src/mod/applications/mod_av/test/test_avformat.c
+61
-6
没有找到文件。
src/mod/applications/mod_av/avformat.c
浏览文件 @
036d3e80
...
...
@@ -126,6 +126,7 @@ struct av_file_context {
AVFormatContext
*
fc
;
AVCodec
*
audio_codec
;
AVCodec
*
video_codec
;
enum
AVColorSpace
colorspace
;
int
has_audio
;
int
has_video
;
...
...
@@ -573,8 +574,9 @@ GCC_DIAG_ON(deprecated-declarations)
// av_opt_set_int(c->priv_data, "slice-max-size", SWITCH_DEFAULT_VIDEO_SIZE, 0);
c
->
colorspace
=
avformat_globals
.
colorspace
;
c
->
colorspace
=
context
->
colorspace
;
c
->
color_range
=
AVCOL_RANGE_JPEG
;
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_DEBUG
,
"colorspace = %d
\n
"
,
c
->
colorspace
);
break
;
default:
...
...
@@ -1605,7 +1607,8 @@ static switch_status_t av_file_open(switch_file_handle_t *handle, const char *pa
context
->
offset
=
DFT_RECORD_OFFSET
;
context
->
handle
=
handle
;
context
->
audio_timer
=
1
;
context
->
colorspace
=
avformat_globals
.
colorspace
;
if
(
handle
->
params
)
{
if
((
tmp
=
switch_event_get_header
(
handle
->
params
,
"av_video_offset"
)))
{
context
->
offset
=
atoi
(
tmp
);
...
...
@@ -1615,6 +1618,14 @@ static switch_status_t av_file_open(switch_file_handle_t *handle, const char *pa
context
->
audio_timer
=
0
;
}
}
if
((
tmp
=
switch_event_get_header
(
handle
->
params
,
"colorspace"
)))
{
int
value
=
atoi
(
tmp
);
enum
AVColorSpace
colorspace
=
UINTVAL
(
value
);
if
(
colorspace
<=
AVCOL_SPC_NB
)
{
context
->
colorspace
=
colorspace
;
}
}
}
switch_mutex_init
(
&
context
->
mutex
,
SWITCH_MUTEX_NESTED
,
handle
->
memory_pool
);
...
...
src/mod/applications/mod_av/test/test_avformat.c
浏览文件 @
036d3e80
...
...
@@ -42,11 +42,11 @@ FST_CORE_BEGIN("conf")
}
FST_SETUP_END
()
FST_TEST_BEGIN
(
avformat_test
)
FST_TEST_BEGIN
(
avformat_test
_colorspace_RGB
)
{
switch_status_t
status
;
switch_image_t
*
img
=
switch_img_alloc
(
NULL
,
SWITCH_IMG_FMT_I420
,
1280
,
720
,
1
);
switch_file_handle_t
fh
=
{
0
};
switch_file_handle_t
fh
=
{
0
};
uint8_t
data
[
SAMPLES
*
2
]
=
{
0
};
switch_frame_t
frame
=
{
0
};
switch_size_t
len
=
SAMPLES
;
...
...
@@ -54,9 +54,9 @@ FST_CORE_BEGIN("conf")
fst_requires
(
img
);
status
=
switch_core_file_open
(
&
fh
,
"./test
.mp4"
,
1
,
8000
,
flags
,
fst_pool
);
status
=
switch_core_file_open
(
&
fh
,
"{colorspace=0}./test_RGB
.mp4"
,
1
,
8000
,
flags
,
fst_pool
);
fst_requires
(
status
==
SWITCH_STATUS_SUCCESS
);
fst_requires
(
switch_test_flag
(
&
fh
,
SWITCH_FILE_OPEN
));
fst_requires
(
switch_test_flag
(
&
fh
,
SWITCH_FILE_OPEN
));
status
=
switch_core_file_write
(
&
fh
,
data
,
&
len
);
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_INFO
,
"status: %d len: %d
\n
"
,
status
,
len
);
...
...
@@ -91,7 +91,62 @@ FST_CORE_BEGIN("conf")
switch_yield
(
100000
);
}
switch_core_file_close
(
&
fh
);
switch_core_file_close
(
&
fh
);
switch_img_free
(
&
img
);
switch_img_free
(
&
ccimg
);
}
FST_TEST_END
()
FST_TEST_BEGIN
(
avformat_test_colorspace_BT7
)
{
switch_status_t
status
;
switch_image_t
*
img
=
switch_img_alloc
(
NULL
,
SWITCH_IMG_FMT_I420
,
1280
,
720
,
1
);
switch_file_handle_t
fh
=
{
0
};
uint8_t
data
[
SAMPLES
*
2
]
=
{
0
};
switch_frame_t
frame
=
{
0
};
switch_size_t
len
=
SAMPLES
;
uint32_t
flags
=
SWITCH_FILE_FLAG_WRITE
|
SWITCH_FILE_DATA_SHORT
|
SWITCH_FILE_FLAG_VIDEO
;
fst_requires
(
img
);
status
=
switch_core_file_open
(
&
fh
,
"{colorspace=1}./test_BT7.mp4"
,
1
,
8000
,
flags
,
fst_pool
);
fst_requires
(
status
==
SWITCH_STATUS_SUCCESS
);
fst_requires
(
switch_test_flag
(
&
fh
,
SWITCH_FILE_OPEN
));
status
=
switch_core_file_write
(
&
fh
,
data
,
&
len
);
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_INFO
,
"status: %d len: %d
\n
"
,
status
,
len
);
fst_check
(
status
==
SWITCH_STATUS_SUCCESS
);
// fst_requires(len == SAMPLES);
frame
.
img
=
img
;
status
=
switch_core_file_write_video
(
&
fh
,
&
frame
);
fst_check
(
status
==
SWITCH_STATUS_SUCCESS
);
switch_image_t
*
ccimg
=
switch_img_read_png
(
"./cluecon.png"
,
SWITCH_IMG_FMT_ARGB
);
fst_requires
(
ccimg
);
switch_rgb_color_t
color
=
{
0
};
color
.
a
=
255
;
for
(
int
i
=
0
;
i
<
30
;
i
++
)
{
len
=
SAMPLES
;
if
(
i
==
10
)
{
color
.
r
=
255
;
}
else
if
(
i
==
20
)
{
color
.
r
=
0
;
color
.
b
=
255
;
}
switch_img_fill
(
img
,
0
,
0
,
img
->
d_w
,
img
->
d_h
,
&
color
);
switch_img_patch
(
img
,
ccimg
,
i
*
10
,
i
*
10
);
status
=
switch_core_file_write
(
&
fh
,
data
,
&
len
);
status
=
switch_core_file_write_video
(
&
fh
,
&
frame
);
switch_yield
(
100000
);
}
switch_core_file_close
(
&
fh
);
switch_img_free
(
&
img
);
switch_img_free
(
&
ccimg
);
}
...
...
@@ -101,7 +156,7 @@ FST_CORE_BEGIN("conf")
{
const
char
*
err
=
NULL
;
switch_sleep
(
1000000
);
fst_check
(
switch_loadable_module_unload_module
(
SWITCH_GLOBAL_dirs
.
mod_dir
,
(
char
*
)
"mod_av"
,
SWITCH_TRUE
,
&
err
)
==
SWITCH_STATUS_SUCCESS
);
//
fst_check(switch_loadable_module_unload_module(SWITCH_GLOBAL_dirs.mod_dir, (char *)"mod_av", SWITCH_TRUE, &err) == SWITCH_STATUS_SUCCESS);
}
FST_TEARDOWN_END
()
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论