comparison mplayer.c @ 29668:ecc719c6d7a9

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.

29667:8cfbe411de01

	if (in_size > max_framesize)
	    max_framesize = in_size;
	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_teletext(sh_video, mpctx->demuxer, 0);
	    update_osd_msg();
	    current_module = "filter video";
	    if (filter_video(sh_video, decoded_frame, sh_video->pts))
		break;

	if (mpctx->sh_audio)
	    mpctx->delay -= frame_time;
	// 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_teletext(sh_video, mpctx->demuxer, 0);
	update_osd_msg();
	current_module = "decode_video";
#ifdef CONFIG_DVDNAV
	decoded_frame = mp_dvdnav_restore_smpi(&in_size,&start,decoded_frame);

	mpctx->delay = 0;
	// Not all demuxers set d_video->pts during seek, so this value
	// (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_teletext(mpctx->sh_video, mpctx->demuxer, 1);
    }

    if (mpctx->sh_audio) {
	current_module = "seek_audio_reset";

29668:ecc719c6d7a9

	if (in_size > max_framesize)
	    max_framesize = in_size;
	current_module = "decode video";
	decoded_frame = decode_video(sh_video, start, in_size, drop_frame, pts);
	if (decoded_frame) {
	    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";
	    if (filter_video(sh_video, decoded_frame, sh_video->pts))
		break;

	if (mpctx->sh_audio)
	    mpctx->delay -= frame_time;
	// 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, sh_video->pts, mpctx->d_sub, 0);
	update_teletext(sh_video, mpctx->demuxer, 0);
	update_osd_msg();
	current_module = "decode_video";
#ifdef CONFIG_DVDNAV
	decoded_frame = mp_dvdnav_restore_smpi(&in_size,&start,decoded_frame);

	mpctx->delay = 0;
	// Not all demuxers set d_video->pts during seek, so this value
	// (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->sh_video->pts, mpctx->d_sub, 1);
	update_teletext(mpctx->sh_video, mpctx->demuxer, 1);
    }

    if (mpctx->sh_audio) {
	current_module = "seek_audio_reset";