RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

corrections to adjust_subs_time function which now uses fps if needed 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4053 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
atlka 2002-01-08 14:10:22 +00:00
parent 723e6e76b3
commit 61bcfde0a0
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mplayer.c
View File

@ -30,6 +30,7 @@
#ifdef USE_SUB #ifdef USE_SUB
#include "subreader.h" #include "subreader.h"
void find_sub(subtitle* subtitles,int key); void find_sub(subtitle* subtitles,int key);
void adjust_subs_time(subtitle* subtitles, float subadj, float fps);
#endif #endif
#ifdef USE_LIBVO2 #ifdef USE_LIBVO2
@ -1031,7 +1032,12 @@ if(!sh_video){
/* display clip info */ /* display clip info */
demux_info_print(demuxer); demux_info_print(demuxer);
#ifdef USE_SUB
// we know fps so now we can adjust subtitles time to ~6 seconds AST
adjust_subs_time(subtitles, 6.0, sh_video->fps);
#endif
//================== Init AUDIO (codec) ========================== //================== Init AUDIO (codec) ==========================
current_module="init_audio_codec"; current_module="init_audio_codec";

18
subreader.c
View File

@ -599,19 +599,20 @@ subtitle* subcp_recode (subtitle *sub)
#endif #endif
static void adjust_subs_time(subtitle* sub, unsigned long subtime){ void adjust_subs_time(subtitle* sub, float subtime, float fps){
int i = sub_num;
subtitle* nextsub; subtitle* nextsub;
int i = sub_num;
unsigned long subfms = (sub_uses_time ? 100 : fps) * subtime;
for (;;){ if (i) for (;;){
if (sub->end <= sub->start) if (sub->end <= sub->start)
sub->end = sub->start + subtime; sub->end = sub->start + subfms;
if (!--i) return; if (!--i) return;
nextsub = sub + 1; nextsub = sub + 1;
if (sub->end >= nextsub->start){ if (sub->end >= nextsub->start){
sub->end = nextsub->start - 1; sub->end = nextsub->start - 1;
if (sub->end - sub->start > subtime) if (sub->end - sub->start > subfms)
sub->end = sub->start + subtime; sub->end = sub->start + subfms;
} }
sub = nextsub; sub = nextsub;
} }
@ -682,11 +683,6 @@ subtitle* sub_read_file (char *filename) {
return NULL; return NULL;
} }
// if sub->end time is 0 set it to sub_>start + ~6 sec but not
// after next sub->start time
// correct also if sub->end time is below sub->start time
// maybe default subtime (150fms) should be a program option AST
adjust_subs_time(first, 150);
return first; return first;
} }