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
胡斌
2018-02-10 12:49:47 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
0c6be3ac41dcae15102cc3f60f46fb4b71dda61e
0c6be3ac
1 parent
5630963b
add -n to support only merge pip,that is the input file is the output of merge_av
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
29 行增加
和
16 行删除
pip/pip.cpp
pip/pip.cpp
查看文件 @
0c6be3a
...
...
@@ -1452,6 +1452,8 @@ int main(int argc, char * argv[])
load_codec_param
();
bool
bmerge_files
=
true
;
for
(
int
i
=
3
;
i
<
argc
;
i
++
){
if
(
!
strcmp
(
argv
[
i
],
"-p"
)){
only_print
=
true
;
...
...
@@ -1459,28 +1461,39 @@ int main(int argc, char * argv[])
else
if
(
!
strcmp
(
argv
[
i
],
"-k"
)){
keep_tmp_files
=
true
;
}
else
if
(
!
strcmp
(
argv
[
i
],
"-n"
)){
bmerge_files
=
false
;
}
}
char
merged_info1
[
1024
];
if
(
readfile
(
argv
[
1
])
<
0
)
{
printf
(
"open file: %s error"
,
argv
[
1
]);
return
-
2
;
}
char
merged_info2
[
1024
];
get_outinfo_file_name
(
argv
[
1
]);
strcpy
(
merged_info1
,
out_info_file
);
process_record_file_to_ts
();
if
(
bmerge_files
)
{
if
(
readfile
(
argv
[
1
])
<
0
)
{
printf
(
"open file: %s error"
,
argv
[
1
]);
return
-
2
;
}
get_outinfo_file_name
(
argv
[
1
]);
strcpy
(
merged_info1
,
out_info_file
);
process_record_file_to_ts
();
char
merged_info2
[
1024
];
if
(
readfile
(
argv
[
2
])
<
0
)
{
printf
(
"open file: %s error"
,
argv
[
1
]);
return
-
2
;
}
get_outinfo_file_name
(
argv
[
2
]);
strcpy
(
merged_info2
,
out_info_file
);
process_record_file_to_ts
();
if
(
readfile
(
argv
[
2
])
<
0
)
{
printf
(
"open file: %s error"
,
argv
[
1
]);
return
-
2
;
}
get_outinfo_file_name
(
argv
[
2
]);
strcpy
(
merged_info2
,
out_info_file
);
process_record_file_to_ts
();
}
else
{
strcpy
(
merged_info1
,
argv
[
1
]);
strcpy
(
merged_info2
,
argv
[
2
]);
}
media_files
.
clear
();
...
...
@@ -1498,7 +1511,7 @@ int main(int argc, char * argv[])
process_merged_files_to_pip_files
();
if
(
!
keep_tmp_files
)
{
if
(
!
keep_tmp_files
&&
bmerge_files
)
{
removefiles
(
all_input_files_for_pip
);
remove_file
(
merged_info1
);
remove_file
(
merged_info2
);
...
...
请
注册
或
登录
后发表评论