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

Make update_subtitles work without sh_video for text subtitles. 

This fixes a crash with e.g. auto-enabled subtitles and -novideo due to
command.c calling update_subtitles even without video and is a step
toward subtitle support for audio-only files.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29710 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2009-09-23 21:21:58 +00:00
parent 4834e21162
commit bf16f6f4f3
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
command.c
View File

@ -1314,6 +1314,7 @@ static int mp_property_sub(m_option_t * prop, int action, void *arg,
demux_stream_t *const d_sub = mpctx->d_sub;
const int global_sub_size = mpctx->global_sub_size;
int source = -1, reset_spu = 0;
double pts = 0;
char *sub_name;
if (global_sub_size <= 0)
@ -1500,7 +1501,11 @@ static int mp_property_sub(m_option_t * prop, int action, void *arg,
d_sub->id = dvdsub_id;
}
#endif
update_subtitles(mpctx->sh_video, d_sub, 1);
if (mpctx->sh_audio)
pts = mpctx->sh_audio->pts;
if (mpctx->sh_video)
pts = mpctx->sh_video->pts;
update_subtitles(mpctx->sh_video, pts, d_sub, 1);
return M_PROPERTY_OK;
}

2
mencoder.c
View File

@ -1454,7 +1454,7 @@ if(sh_audio && !demuxer2){
}
else
#endif
update_subtitles(sh_video, d_dvdsub, 0);
update_subtitles(sh_video, sh_video->pts, d_dvdsub, 0);
frame_data = (s_frame_data){ .start = NULL, .in_size = 0, .frame_time = 0., .already_read = 0 };

5
mpcommon.c
View File

@ -66,13 +66,12 @@ if (HAVE_CMOV)
}
void update_subtitles(sh_video_t *sh_video, demux_stream_t *d_dvdsub, int reset)
void update_subtitles(sh_video_t *sh_video, double refpts, demux_stream_t *d_dvdsub, int reset)
{
unsigned char *packet=NULL;
int len;
char type = d_dvdsub->sh ? ((sh_sub_t *)d_dvdsub->sh)->type : 'v';
static subtitle subs;
double refpts = sh_video->pts;
if (reset) {
sub_clear_text(&subs, MP_NOPTS_VALUE);
if (vo_sub) {
@ -86,7 +85,7 @@ void update_subtitles(sh_video_t *sh_video, demux_stream_t *d_dvdsub, int reset)
}
// find sub
if (subdata) {
if (sub_fps==0) sub_fps = sh_video->fps;
if (sub_fps==0) sub_fps = sh_video ? sh_video->fps : 25;
current_module = "find_sub";
if (refpts > sub_last_pts || refpts < sub_last_pts-1.0) {
find_sub(subdata, (refpts+sub_delay) *

2
mpcommon.h
View File

@ -10,7 +10,7 @@ extern struct ass_track_s *ass_track;
extern subtitle *vo_sub_last;
void print_version(const char* name);
void update_subtitles(sh_video_t *sh_video, demux_stream_t *d_dvdsub, int reset);
void update_subtitles(sh_video_t *sh_video, double pts, demux_stream_t *d_dvdsub, int reset);
void update_teletext(sh_video_t *sh_video, demuxer_t *demuxer, int reset);
int select_audio(demuxer_t* demuxer, int audio_id, char* audio_lang);

6
mplayer.c
View File

@ -1767,7 +1767,7 @@ static int generate_video_frame(sh_video_t *sh_video, demux_stream_t *d_video)
current_module = "decode video";
decoded_frame = decode_video(sh_video, start, in_size, drop_frame, pts);
if (decoded_frame) {
update_subtitles(sh_video, mpctx->d_sub, 0);
update_subtitles(sh_video, sh_video->pts, mpctx->d_sub, 0);
update_teletext(sh_video, mpctx->demuxer, 0);
update_osd_msg();
current_module = "filter video";
@ -2290,7 +2290,7 @@ static double update_video(int *blit_frame)
// video_read_frame can change fps (e.g. for ASF video)
vo_fps = sh_video->fps;
drop_frame = check_framedrop(frame_time);
update_subtitles(sh_video, mpctx->d_sub, 0);
update_subtitles(sh_video, sh_video->pts, mpctx->d_sub, 0);
update_teletext(sh_video, mpctx->demuxer, 0);
update_osd_msg();
current_module = "decode_video";
@ -2483,7 +2483,7 @@ static int seek(MPContext *mpctx, double amount, int style)
// (which is used by at least vobsub and edl code below) may
// be completely wrong (probably 0).
mpctx->sh_video->pts = mpctx->d_video->pts;
update_subtitles(mpctx->sh_video, mpctx->d_sub, 1);
update_subtitles(mpctx->sh_video, mpctx->sh_video->pts, mpctx->d_sub, 1);
update_teletext(mpctx->sh_video, mpctx->demuxer, 1);
}