胡斌 / merge_av

转到一个项目
Toggle navigation Toggle navigation pinning
胡斌
a2e9bdaa 1 parent 4e2099b6

fix bug of time stamp

内嵌 并排对比
正在显示 1 个修改的文件 包含 4 行增加 和 4 行删除
... ... @@ -477,9 +477,9 @@ int merge_audio_video(vector<media_info> & files)
tmp_files.push_back(silence_aac_file);
}
if (audio.type_time - audio.start_time > 0.10 || audio_end.end_time - audio.type_time > 0.10) {
if (audio.type_time - audio.start_time > 0.10 || audio_end.end_time - audio_end.type_time > 0.10) {
sprintf(audio_file, "%d_%s", nf, audio.name.c_str());
split_audio(audio.name.c_str(), audio.type_time - audio.start_time, audio_end.type_time - audio.start_time, audio_file);
split_audio(audio.name.c_str(), audio.type_time - audio.start_time, audio_end.type_time - audio.type_time, audio_file);
tmp_files.push_back(audio_file);
}
... ... @@ -517,9 +517,9 @@ int merge_audio_pic(vector<media_info> & files)
media_info audio = files[0];
media_info audio_end = files[1];
if (audio.type_time - audio.start_time > 0.10 || audio_end.end_time - audio.type_time > 0.10) {
if (audio.type_time - audio.start_time > 0.10 || audio_end.end_time - audio_end.type_time > 0.10) {
sprintf(audio_file, "%d_%s", nf, audio.name.c_str());
split_audio(audio.name.c_str(), audio.type_time - audio.start_time, audio_end.type_time - audio.start_time, audio_file);
split_audio(audio.name.c_str(), audio.type_time - audio.start_time, audio_end.type_time - audio.type_time, audio_file);
tmp_files.push_back(audio_file);
}
else{
... ...