comparison mplayer.c @ 22144:7285f260cc27

Fix multiple appearing or appearing+disappearing subs in the same frame in non-ASS mode. The latter is common (old sub replaced by new) and resulted in an incorrect frame where both appeared simultaneously.

22143:be16314071fe

	if (spudec_changed(vo_spudec))
	    vo_osd_changed(OSDTYPE_SPU);
    } else if (dvdsub_id >= 0 && type == 't') {
      static subtitle subs;
      double curpts = sh_video->pts + sub_delay;
      double pts = MP_NOPTS_VALUE;
      double endpts;
      vo_sub = &subs;
      while (d_dvdsub->first) {
        double nextpts = ds_get_next_pts(d_dvdsub);
        if (nextpts == MP_NOPTS_VALUE || nextpts > curpts)
          break;
        endpts = d_dvdsub->first->endpts;
        len = ds_get_packet_sub(d_dvdsub, &packet);
        pts = nextpts;
      }
#ifdef USE_ASS
      if (ass_enabled) {
        static ass_track_t *global_ass_track = NULL;
        if (!global_ass_track) global_ass_track = ass_default_track(ass_library);
        ass_track = global_ass_track;

      if (pts != MP_NOPTS_VALUE) {
        if (endpts == MP_NOPTS_VALUE)
        sub_clear_text(&subs, MP_NOPTS_VALUE);
        sub_add_text(&subs, packet, len, endpts);
        vo_osd_changed(OSDTYPE_SUBTITLE);
      } else if (sub_clear_text(&subs, curpts))
        vo_osd_changed(OSDTYPE_SUBTITLE);
    }
    current_module=NULL;
}

22144:7285f260cc27

	if (spudec_changed(vo_spudec))
	    vo_osd_changed(OSDTYPE_SPU);
    } else if (dvdsub_id >= 0 && type == 't') {
      static subtitle subs;
      double curpts = sh_video->pts + sub_delay;
      double endpts;
      vo_sub = &subs;
      while (d_dvdsub->first) {
        double pts = ds_get_next_pts(d_dvdsub);
        if (pts > curpts)
          break;
        endpts = d_dvdsub->first->endpts;
        len = ds_get_packet_sub(d_dvdsub, &packet);
#ifdef USE_ASS
      if (ass_enabled) {
        static ass_track_t *global_ass_track = NULL;
        if (!global_ass_track) global_ass_track = ass_default_track(ass_library);
        ass_track = global_ass_track;

      if (pts != MP_NOPTS_VALUE) {
        if (endpts == MP_NOPTS_VALUE)
        sub_clear_text(&subs, MP_NOPTS_VALUE);
        sub_add_text(&subs, packet, len, endpts);
        vo_osd_changed(OSDTYPE_SUBTITLE);
      }
      }
      if (sub_clear_text(&subs, curpts))
        vo_osd_changed(OSDTYPE_SUBTITLE);
    }
    current_module=NULL;
}