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-30 18:39:30 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
d64cb08412b65369882ce97069e12163822333be
d64cb084
1 parent
a2e9bdaa
remove temp file,set version to 1.0.6
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
6 行增加
和
5 行删除
merge_av/merge_av.cpp
merge_av/merge_av.cpp
查看文件 @
d64cb08
...
...
@@ -473,8 +473,8 @@ int merge_audio_video(vector<media_info> & files)
if
(
audio
.
type_time
-
start_time
>
0.1
){
sprintf
(
audio_file
,
"%d_%d_silence.aac"
,
nf
,
nsilence
++
);
//a duration of silence
split_audio
(
silence_aac_file
,
0
,
audio
.
type_time
-
start_time
,
audio_file
);
merge_audio_files
.
push_back
(
silence_aac_file
);
tmp_files
.
push_back
(
silence_aac_file
);
merge_audio_files
.
push_back
(
audio_file
);
tmp_files
.
push_back
(
audio_file
);
}
if
(
audio
.
type_time
-
audio
.
start_time
>
0.10
||
audio_end
.
end_time
-
audio_end
.
type_time
>
0.10
)
{
...
...
@@ -494,14 +494,15 @@ int merge_audio_video(vector<media_info> & files)
if
(
video
.
end_time
-
audio_end
.
type_time
>
0.1
){
sprintf
(
audio_file
,
"%d_%d_silence.aac"
,
nf
,
nsilence
++
);
//a duration of silence
split_audio
(
silence_aac_file
,
0
,
video
.
end_time
-
audio_end
.
type_time
,
audio_file
);
merge_audio_files
.
push_back
(
silence_aac_file
);
tmp_files
.
push_back
(
silence_aac_file
);
merge_audio_files
.
push_back
(
audio_file
);
tmp_files
.
push_back
(
audio_file
);
}
}
}
sprintf
(
audio_file
,
"%d_merged.aac"
,
nf
);
merge_audio_file
(
merge_audio_files
,
audio_file
);
tmp_files
.
push_back
(
audio_file
);
sprintf
(
destfile
,
"%d.ts"
,
nf
);
...
...
@@ -828,7 +829,7 @@ void load_codec_param()
int
main
(
int
argc
,
char
*
argv
[])
{
if
(
argc
<
2
)
{
printf
(
" merge_av 1.0.
5
\n
"
);
printf
(
" merge_av 1.0.
6
\n
"
);
printf
(
" run ffmpeg to merge audio and video files according to the record info file,
\n
usage:"
);
printf
(
"
\n
%s record_info_filename [-p] [-k]"
,
argv
[
0
]);
printf
(
"
\n
-p :only print the command,don't run ffmpeg"
);
...
...
请
注册
或
登录
后发表评论