comparison mplayer.c @ 29854:00ebdb6cb87f

Factor out code that decides which subtitle to play.

29853:415169f556ed

	    while (time_frame > 0)
		time_frame-=GetRelativeTime(); // burn the CPU
	}
    }
    return time_frame;
}

#ifdef CONFIG_DVDNAV
#ifndef FF_B_TYPE
#define FF_B_TYPE 3

      mpctx->global_sub_size += mpctx->set_of_sub_size;
  }
}

if (mpctx->global_sub_size) {
  // find the best sub to use
  int vobsub_index_id = vobsub_get_index_by_id(vo_vobsub, vobsub_id);
  mpctx->global_sub_pos = -1; // no subs by default
  if (vobsub_index_id >= 0) {
    // if user asks for a vobsub id, use that first.
    mpctx->global_sub_pos = mpctx->global_sub_indices[SUB_SOURCE_VOBSUB] + vobsub_index_id;
  } else if (dvdsub_id >= 0 && mpctx->global_sub_indices[SUB_SOURCE_DEMUX] >= 0) {
    // if user asks for a dvd sub id, use that next.
    mpctx->global_sub_pos = mpctx->global_sub_indices[SUB_SOURCE_DEMUX] + dvdsub_id;
  } else if (mpctx->global_sub_indices[SUB_SOURCE_SUBS] >= 0) {
    // if there are text subs to use, use those.  (autosubs come last here)
    mpctx->global_sub_pos = mpctx->global_sub_indices[SUB_SOURCE_SUBS];
  } else if (dvdsub_id == -1 && mpctx->global_sub_indices[SUB_SOURCE_DEMUX] >= 0) {
    // finally select subs by language and container hints
    if (dvdsub_id == -1 && dvdsub_lang)
      dvdsub_id = demuxer_sub_track_by_lang(mpctx->demuxer, dvdsub_lang);
    if (dvdsub_id == -1)
      dvdsub_id = demuxer_default_sub_track(mpctx->demuxer);
    if (dvdsub_id >= 0)
      mpctx->global_sub_pos = mpctx->global_sub_indices[SUB_SOURCE_DEMUX] + dvdsub_id;
  }
  // rather than duplicate code, use the SUB_SELECT handler to init the right one.
  mpctx->global_sub_pos--;
  mp_property_do("sub",M_PROPERTY_STEP_UP,NULL, mpctx);
  if(subdata)
    switch (stream_dump_type) {
        case 3: list_sub_file(subdata); break;
        case 4: dump_mpsub(subdata, mpctx->sh_video->fps); break;
        case 6: dump_srt(subdata, mpctx->sh_video->fps); break;

29854:00ebdb6cb87f

	    while (time_frame > 0)
		time_frame-=GetRelativeTime(); // burn the CPU
	}
    }
    return time_frame;
}

static void select_subtitle(MPContext *mpctx) {
  // find the best sub to use
  int vobsub_index_id = vobsub_get_index_by_id(vo_vobsub, vobsub_id);
  mpctx->global_sub_pos = -1; // no subs by default
  if (vobsub_index_id >= 0) {
    // if user asks for a vobsub id, use that first.
    mpctx->global_sub_pos = mpctx->global_sub_indices[SUB_SOURCE_VOBSUB] + vobsub_index_id;
  } else if (dvdsub_id >= 0 && mpctx->global_sub_indices[SUB_SOURCE_DEMUX] >= 0) {
    // if user asks for a dvd sub id, use that next.
    mpctx->global_sub_pos = mpctx->global_sub_indices[SUB_SOURCE_DEMUX] + dvdsub_id;
  } else if (mpctx->global_sub_indices[SUB_SOURCE_SUBS] >= 0) {
    // if there are text subs to use, use those.  (autosubs come last here)
    mpctx->global_sub_pos = mpctx->global_sub_indices[SUB_SOURCE_SUBS];
  } else if (dvdsub_id == -1 && mpctx->global_sub_indices[SUB_SOURCE_DEMUX] >= 0) {
    // finally select subs by language and container hints
    if (dvdsub_id == -1 && dvdsub_lang)
      dvdsub_id = demuxer_sub_track_by_lang(mpctx->demuxer, dvdsub_lang);
    if (dvdsub_id == -1)
      dvdsub_id = demuxer_default_sub_track(mpctx->demuxer);
    if (dvdsub_id >= 0)
      mpctx->global_sub_pos = mpctx->global_sub_indices[SUB_SOURCE_DEMUX] + dvdsub_id;
  }
  // rather than duplicate code, use the SUB_SELECT handler to init the right one.
  mpctx->global_sub_pos--;
  mp_property_do("sub",M_PROPERTY_STEP_UP,NULL, mpctx);
}

#ifdef CONFIG_DVDNAV
#ifndef FF_B_TYPE
#define FF_B_TYPE 3

      mpctx->global_sub_size += mpctx->set_of_sub_size;
  }
}

if (mpctx->global_sub_size) {
  select_subtitle(mpctx);
  if(subdata)
    switch (stream_dump_type) {
        case 3: list_sub_file(subdata); break;
        case 4: dump_mpsub(subdata, mpctx->sh_video->fps); break;
        case 6: dump_srt(subdata, mpctx->sh_video->fps); break;