comparison mplayer.c @ 21827:b0bc0d81f91b

Subtitle handling cleanup: factor out code for parsing embedded subtitles and adding and removing of lines in subtitle struct into subreader.c.

21826:d4dbadf11019

	audio_out->get_delay();
}

static void update_subtitles(void)
{
    // find sub
    if (subdata) {
	double pts = sh_video->pts;
	if (sub_fps==0) sub_fps = sh_video->fps;
	current_module = "find_sub";

	    sub_last_pts = pts;
	}
    }

    // DVD sub:
    if (vo_config_count && vo_spudec) {
	unsigned char* packet=NULL;
	int len, timestamp;
	current_module = "spudec";
	spudec_heartbeat(vo_spudec, 90000*sh_video->timer);
	/* Get a sub packet from the DVD or a vobsub and make a timestamp
	 * relative to sh_video->timer */
	while(1) {

		spudec_assemble(vo_spudec, packet, len, timestamp);
	}

	if (spudec_changed(vo_spudec))
	    vo_osd_changed(OSDTYPE_SPU);
    }
    current_module=NULL;
}

static int generate_video_frame(sh_video_t *sh_video, demux_stream_t *d_video)

21827:b0bc0d81f91b

	audio_out->get_delay();
}

static void update_subtitles(void)
{
    unsigned char *packet=NULL;
    int len;
    char type = d_dvdsub->sh ? ((sh_sub_t *)d_dvdsub->sh)->type : 'v';
    // find sub
    if (subdata) {
	double pts = sh_video->pts;
	if (sub_fps==0) sub_fps = sh_video->fps;
	current_module = "find_sub";

	    sub_last_pts = pts;
	}
    }

    // DVD sub:
    if (vo_config_count && vo_spudec && type == 'v') {
	int timestamp;
	current_module = "spudec";
	spudec_heartbeat(vo_spudec, 90000*sh_video->timer);
	/* Get a sub packet from the DVD or a vobsub and make a timestamp
	 * relative to sh_video->timer */
	while(1) {

		spudec_assemble(vo_spudec, packet, len, timestamp);
	}

	if (spudec_changed(vo_spudec))
	    vo_osd_changed(OSDTYPE_SPU);
    } else if (dvdsub_id >= 0 && type == 't') {
      double pts = MP_NOPTS_VALUE;
      while (d_dvdsub->first) {
        double nextpts = ds_get_next_pts(d_dvdsub);
        if (nextpts == MP_NOPTS_VALUE || nextpts - sub_delay > sh_video->pts)
          break;
        len = ds_get_packet_sub(d_dvdsub, &packet);
        pts = nextpts - sub_delay;
      }
      if (pts != MP_NOPTS_VALUE) {
        static subtitle subs;
        sub_clear_text(&subs, MP_NOPTS_VALUE);
        sub_add_text(&subs, packet, len, MP_NOPTS_VALUE);
        vo_sub = &subs;
        vo_osd_changed(OSDTYPE_SUBTITLE);
      }
    }
    current_module=NULL;
}

static int generate_video_frame(sh_video_t *sh_video, demux_stream_t *d_video)