Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
merge_av
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
继续操作前请注册或者登录。
Authored by
胡斌
2017-12-07 19:43:25 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
35edaa40687f7cbfe14495a5aee8ca67fbd024ee
35edaa40
1 parent
3569f789
try to avoid the start time is not 0
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
11 行增加
和
0 行删除
merge_av/merge_av.cpp
merge_av/merge_av.cpp
查看文件 @
35edaa4
...
...
@@ -76,6 +76,9 @@ const char * default_acodec_param = "-acodec copy";
char
vcodec_param
[
1024
];
char
acodec_param
[
1024
];
bool
first_time_set
=
false
;
float
start_time
=
0.0
f
;
void
addinfo
(
string
t
,
string
name
,
bool
bstart
){
media_type
mtype
=
name
.
substr
(
name
.
length
()
-
4
,
name
.
length
())
==
".aac"
?
type_audio
:
type_video
;
if
(
bstart
)
{
...
...
@@ -86,6 +89,13 @@ void addinfo(string t, string name, bool bstart){
f
.
end_time_str
=
t
;
f
.
name
=
name
;
if
(
!
first_time_set
)
{
first_time_set
=
true
;
start_time
=
f
.
start_time
;
}
f
.
start_time
-=
start_time
;
media_files
[
mtype
].
push_back
(
f
);
}
else
{
...
...
@@ -95,6 +105,7 @@ void addinfo(string t, string name, bool bstart){
if
(
files
[
i
].
name
==
name
)
{
files
[
i
].
end_time
=
atof
(
t
.
c_str
());
files
[
i
].
end_time_str
=
t
;
files
[
i
].
end_time
-=
start_time
;
break
;
}
}
...
...
请
注册
或
登录
后发表评论