diff options
| -rw-r--r-- | command.c | 2 | ||||
| -rw-r--r-- | find_sub.c | 4 | ||||
| -rw-r--r-- | mp_core.h | 2 | ||||
| -rw-r--r-- | mpcommon.c | 320 | ||||
| -rw-r--r-- | mpcommon.h | 23 | ||||
| -rw-r--r-- | mplayer.c | 314 | ||||
| -rw-r--r-- | mplayer.h | 5 |
7 files changed, 314 insertions, 356 deletions
@@ -1711,7 +1711,7 @@ static int mp_property_sub(m_option_t *prop, int action, void *arg, } #endif - update_subtitles(mpctx, &mpctx->opts, mpctx->sh_video, 0, 0, d_sub, 1); + update_subtitles(mpctx, 0, 0, true); return M_PROPERTY_OK; } diff --git a/find_sub.c b/find_sub.c index d0ea3c0016..7eeefda9d1 100644 --- a/find_sub.c +++ b/find_sub.c @@ -28,6 +28,7 @@ #include "mp_msg.h" #include "mpcommon.h" +#include "mplayer.h" static int current_sub=0; @@ -36,9 +37,6 @@ static int nosub_range_start=-1; static int nosub_range_end=-1; static const sub_data *last_sub_data = NULL; -extern float sub_delay; -extern float sub_fps; - void step_sub(sub_data *subd, float pts, int movement) { subtitle *subs; int key; @@ -246,5 +246,7 @@ double get_current_time(struct MPContext *mpctx); int get_percent_pos(struct MPContext *mpctx); int get_current_chapter(struct MPContext *mpctx); char *chapter_display_name(struct MPContext *mpctx, int chapter); +void update_subtitles(struct MPContext *mpctx, double refpts, + double sub_offset, bool reset); #endif /* MPLAYER_MP_CORE_H */ diff --git a/mpcommon.c b/mpcommon.c index 2af26314bb..47c056a08e 100644 --- a/mpcommon.c +++ b/mpcommon.c @@ -16,326 +16,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if defined(__MINGW32__) || defined(__CYGWIN__) -#include <windows.h> -#endif -#include <stdlib.h> -#include <stdbool.h> - -#include "mpcommon.h" -#include "options.h" -#include "stream/stream.h" -#include "libmpdemux/demuxer.h" -#include "libmpdemux/stheader.h" -#include "mplayer.h" -#include "libvo/sub.h" -#include "libvo/video_out.h" -#include "cpudetect.h" -#include "mp_msg.h" -#include "spudec.h" #include "version.h" -#include "vobsub.h" -#include "av_sub.h" -#include "libmpcodecs/dec_teletext.h" -#include "ffmpeg_files/intreadwrite.h" -#include "m_option.h" -#include "mp_core.h" - -#ifdef CONFIG_ASS -#include "ass_mp.h" -ASS_Track *ass_track = 0; // current track to render -#endif -const char *mencoder_version = "MEncoder " VERSION; const char *mplayer_version = "MPlayer " VERSION; - -void print_version(const char* name) -{ - mp_msg(MSGT_CPLAYER, MSGL_INFO, MP_TITLE, name); - - /* Test for CPU capabilities (and corresponding OS support) for optimizing */ - GetCpuCaps(&gCpuCaps); -#if ARCH_X86 - mp_msg(MSGT_CPLAYER, MSGL_V, - "CPUflags: MMX: %d MMX2: %d 3DNow: %d 3DNowExt: %d SSE: %d SSE2: %d SSSE3: %d\n", - gCpuCaps.hasMMX, gCpuCaps.hasMMX2, - gCpuCaps.has3DNow, gCpuCaps.has3DNowExt, - gCpuCaps.hasSSE, gCpuCaps.hasSSE2, gCpuCaps.hasSSSE3); -#if CONFIG_RUNTIME_CPUDETECT - mp_tmsg(MSGT_CPLAYER,MSGL_V, "Compiled with runtime CPU detection.\n"); -#else - mp_tmsg(MSGT_CPLAYER,MSGL_V, "Compiled for x86 CPU with extensions:"); -if (HAVE_MMX) - mp_msg(MSGT_CPLAYER,MSGL_V," MMX"); -if (HAVE_MMX2) - mp_msg(MSGT_CPLAYER,MSGL_V," MMX2"); -if (HAVE_AMD3DNOW) - mp_msg(MSGT_CPLAYER,MSGL_V," 3DNow"); -if (HAVE_AMD3DNOWEXT) - mp_msg(MSGT_CPLAYER,MSGL_V," 3DNowExt"); -if (HAVE_SSE) - mp_msg(MSGT_CPLAYER,MSGL_V," SSE"); -if (HAVE_SSE2) - mp_msg(MSGT_CPLAYER,MSGL_V," SSE2"); -if (HAVE_SSSE3) - mp_msg(MSGT_CPLAYER,MSGL_V," SSSE3"); -if (HAVE_CMOV) - mp_msg(MSGT_CPLAYER,MSGL_V," CMOV"); - mp_msg(MSGT_CPLAYER,MSGL_V,"\n"); -#endif /* CONFIG_RUNTIME_CPUDETECT */ -#endif /* ARCH_X86 */ -} - -static bool is_text_sub(int type) -{ - return type == 't' || type == 'm' || type == 'a'; -} - -static bool is_av_sub(int type) -{ - return type == 'b' || type == 'p' || type == 'x'; -} - -void update_subtitles(struct MPContext *mpctx, struct MPOpts *opts, - sh_video_t *sh_video, double refpts, double sub_offset, - demux_stream_t *d_dvdsub, int reset) -{ - double curpts = refpts + sub_delay; - unsigned char *packet=NULL; - int len; - int type = d_dvdsub->sh ? ((sh_sub_t *)d_dvdsub->sh)->type : 'v'; - static subtitle subs; - if (reset) { - sub_clear_text(&subs, MP_NOPTS_VALUE); - if (vo_sub) { - set_osd_subtitle(mpctx, NULL); - } - if (vo_spudec) { - spudec_reset(vo_spudec); - vo_osd_changed(OSDTYPE_SPU); - } -#ifdef CONFIG_FFMPEG - if (is_av_sub(type)) - reset_avsub(d_dvdsub->sh); -#endif - return; - } - // find sub - if (mpctx->subdata) { - if (sub_fps==0) sub_fps = sh_video ? sh_video->fps : 25; - current_module = "find_sub"; - find_sub(mpctx, mpctx->subdata, curpts * - (mpctx->subdata->sub_uses_time ? 100. : sub_fps)); - if (vo_sub) - mpctx->vo_sub_last = vo_sub; - } - - // DVD sub: - if (vobsub_id >= 0 || type == 'v') { - int timestamp; - current_module = "spudec"; - /* Get a sub packet from the DVD or a vobsub */ - while(1) { - // Vobsub - len = 0; - if (vo_vobsub) { - if (curpts >= 0) { - len = vobsub_get_packet(vo_vobsub, curpts, - (void**)&packet, ×tamp); - if (len > 0) { - mp_dbg(MSGT_CPLAYER,MSGL_V,"\rVOB sub: len=%d v_pts=%5.3f v_timer=%5.3f sub=%5.3f ts=%d \n",len,refpts,sh_video->timer,timestamp / 90000.0,timestamp); - } - } - } else { - // DVD sub - len = ds_get_packet_sub(d_dvdsub, (unsigned char**)&packet); - if (len > 0) { - // XXX This is wrong, sh_video->pts can be arbitrarily - // much behind demuxing position. Unfortunately using - // d_video->pts which would have been the simplest - // improvement doesn't work because mpeg specific hacks - // in video.c set d_video->pts to 0. - float x = d_dvdsub->pts - refpts; - if (x > -20 && x < 20) // prevent missing subs on pts reset - timestamp = 90000*d_dvdsub->pts; - else timestamp = 90000*curpts; - mp_dbg(MSGT_CPLAYER, MSGL_V, "\rDVD sub: len=%d " - "v_pts=%5.3f s_pts=%5.3f ts=%d \n", len, - refpts, d_dvdsub->pts, timestamp); - } - } - if (len<=0 || !packet) break; - // create it only here, since with some broken demuxers we might - // type = v but no DVD sub and we currently do not change the - // "original frame size" ever after init, leading to wrong-sized - // PGS subtitles. - if (!vo_spudec) - vo_spudec = spudec_new(NULL); - if (vo_vobsub || timestamp >= 0) - spudec_assemble(vo_spudec, packet, len, timestamp); - } - } else if (is_text_sub(type) || is_av_sub(type) || type == 'd') { - if (type == 'd' && !d_dvdsub->demuxer->teletext) { - tt_stream_props tsp = {0}; - void *ptr = &tsp; - if (teletext_control(NULL, TV_VBI_CONTROL_START, &ptr) == VBI_CONTROL_TRUE) - d_dvdsub->demuxer->teletext = ptr; - } - if (d_dvdsub->non_interleaved) - ds_get_next_pts(d_dvdsub); - - int orig_type = type; - while (d_dvdsub->first) { - double subpts = ds_get_next_pts(d_dvdsub) + sub_offset; - type = orig_type; - if (subpts > curpts) { - // Libass handled subs can be fed to it in advance - if (!opts->ass_enabled || !is_text_sub(type)) - break; - // Try to avoid demuxing whole file at once - if (d_dvdsub->non_interleaved && subpts > curpts + 1) - break; - } - double endpts = d_dvdsub->first->endpts + sub_offset; - len = ds_get_packet_sub(d_dvdsub, &packet); - if (is_av_sub(type)) { -#ifdef CONFIG_FFMPEG - type = decode_avsub(d_dvdsub->sh, &packet, &len, &subpts, &endpts); - if (type <= 0) -#endif - continue; - } - if (type == 'm') { - if (len < 2) continue; - len = FFMIN(len - 2, AV_RB16(packet)); - packet += 2; - } - if (type == 'd') { - if (d_dvdsub->demuxer->teletext) { - uint8_t *p = packet; - p++; - len--; - while (len >= 46) { - int sublen = p[1]; - if (p[0] == 2 || p[0] == 3) - teletext_control(d_dvdsub->demuxer->teletext, - TV_VBI_CONTROL_DECODE_DVB, p + 2); - p += sublen + 2; - len -= sublen + 2; - } - } - continue; - } -#ifdef CONFIG_ASS - if (opts->ass_enabled) { - sh_sub_t* sh = d_dvdsub->sh; - ass_track = sh ? sh->ass_track : NULL; - if (!ass_track) continue; - if (type == 'a') { // ssa/ass subs with libass - ass_process_chunk(ass_track, packet, len, - (long long)(subpts*1000 + 0.5), - (long long)((endpts-subpts)*1000 + 0.5)); - } else { // plaintext subs with libass - if (subpts != MP_NOPTS_VALUE) { - subtitle tmp_subs = {0}; - if (endpts == MP_NOPTS_VALUE) endpts = subpts + 3; - sub_add_text(&tmp_subs, packet, len, endpts); - tmp_subs.start = subpts * 100; - tmp_subs.end = endpts * 100; - ass_process_subtitle(ass_track, &tmp_subs); - sub_clear_text(&tmp_subs, MP_NOPTS_VALUE); - } - } - continue; - } -#endif - if (subpts != MP_NOPTS_VALUE) { - if (endpts == MP_NOPTS_VALUE) - sub_clear_text(&subs, MP_NOPTS_VALUE); - if (type == 'a') { // ssa/ass subs without libass => convert to plaintext - int i; - unsigned char* p = packet; - for (i=0; i < 8 && *p != '\0'; p++) - if (*p == ',') - i++; - if (*p == '\0') /* Broken line? */ - continue; - len -= p - packet; - packet = p; - } - sub_add_text(&subs, packet, len, endpts); - set_osd_subtitle(mpctx, &subs); - } - if (d_dvdsub->non_interleaved) - ds_get_next_pts(d_dvdsub); - } - if (!opts->ass_enabled) - if (sub_clear_text(&subs, curpts)) - set_osd_subtitle(mpctx, &subs); - } - if (vo_spudec) { - spudec_heartbeat(vo_spudec, 90000*curpts); - if (spudec_changed(vo_spudec)) - vo_osd_changed(OSDTYPE_SPU); - } - - current_module=NULL; -} - -void update_teletext(sh_video_t *sh_video, demuxer_t *demuxer, int reset) -{ - int page_changed; - - if (!demuxer->teletext) - return; - - //Also forcing page update when such ioctl is not supported or call error occured - if(teletext_control(demuxer->teletext,TV_VBI_CONTROL_IS_CHANGED,&page_changed)!=VBI_CONTROL_TRUE) - page_changed=1; - - if(!page_changed) - return; - - if(teletext_control(demuxer->teletext,TV_VBI_CONTROL_GET_VBIPAGE,&vo_osd_teletext_page)!=VBI_CONTROL_TRUE) - vo_osd_teletext_page=NULL; - if(teletext_control(demuxer->teletext,TV_VBI_CONTROL_GET_HALF_PAGE,&vo_osd_teletext_half)!=VBI_CONTROL_TRUE) - vo_osd_teletext_half=0; - if(teletext_control(demuxer->teletext,TV_VBI_CONTROL_GET_MODE,&vo_osd_teletext_mode)!=VBI_CONTROL_TRUE) - vo_osd_teletext_mode=0; - if(teletext_control(demuxer->teletext,TV_VBI_CONTROL_GET_FORMAT,&vo_osd_teletext_format)!=VBI_CONTROL_TRUE) - vo_osd_teletext_format=0; - vo_osd_changed(OSDTYPE_TELETEXT); - - teletext_control(demuxer->teletext,TV_VBI_CONTROL_MARK_UNCHANGED,NULL); -} - -int select_audio(demuxer_t* demuxer, int audio_id, char* audio_lang) -{ - if (audio_id == -1) - audio_id = demuxer_audio_track_by_lang_and_default(demuxer, audio_lang); - if (audio_id != -1) // -1 (automatic) is the default behaviour of demuxers - demuxer_switch_audio(demuxer, audio_id); - if (audio_id == -2) { // some demuxers don't yet know how to switch to no sound - demuxer->audio->id = -2; - demuxer->audio->sh = NULL; - } - return demuxer->audio->id; -} - -bool attachment_is_font(struct demux_attachment *att) -{ - if (!att->name || !att->type || !att->data || !att->data_size) - return false; - // match against MIME types - if (strcmp(att->type, "application/x-truetype-font") == 0 - || strcmp(att->type, "application/x-font") == 0) - return true; - // fallback: match against file extension - if (strlen(att->name) > 4) { - char *ext = att->name + strlen(att->name) - 4; - if (strcasecmp(ext, ".ttf") == 0 || strcasecmp(ext, ".ttc") == 0 - || strcasecmp(ext, ".otf") == 0) - return true; - } - return false; -} diff --git a/mpcommon.h b/mpcommon.h index 5d114f38a5..8a55d33a9f 100644 --- a/mpcommon.h +++ b/mpcommon.h @@ -19,31 +19,8 @@ #ifndef MPLAYER_MPCOMMON_H #define MPLAYER_MPCOMMON_H -#include <stdbool.h> - -struct subtitle; - extern struct ass_track *ass_track; -extern const char *mencoder_version; extern const char *mplayer_version; -struct MPContext; -struct demuxer; -struct demux_stream; -struct demux_attachment; -struct sh_video; -struct MPOpts; - -void print_version(const char* name); -void update_subtitles(struct MPContext *mpctx, struct MPOpts *opts, - struct sh_video *sh_video, double refpts, - double sub_offset, struct demux_stream *d_dvdsub, - int reset); -void update_teletext(struct sh_video *sh_video, struct demuxer *demuxer, - int reset); -int select_audio(struct demuxer *demuxer, int audio_id, char *audio_lang); -void set_osd_subtitle(struct MPContext *mpctx, struct subtitle *subs); -bool attachment_is_font(struct demux_attachment *att); - #endif /* MPLAYER_MPCOMMON_H */ @@ -78,6 +78,11 @@ #include "libvo/font_load.h" #include "libvo/sub.h" +#include "ffmpeg_files/intreadwrite.h" +#include "av_sub.h" +#include "libmpcodecs/dec_teletext.h" +#include "cpudetect.h" +#include "version.h" #ifdef CONFIG_X11 #include "libvo/x11_common.h" @@ -330,6 +335,9 @@ int subcc_enabled=0; int suboverlap_enabled = 1; #include "ass_mp.h" +#ifdef CONFIG_ASS +ASS_Track *ass_track = 0; // current track to render +#endif char* current_module=NULL; // for debugging @@ -1797,6 +1805,230 @@ double playing_audio_pts(struct MPContext *mpctx) mpctx->audio_out->get_delay(); } +static bool is_text_sub(int type) +{ + return type == 't' || type == 'm' || type == 'a'; +} + +static bool is_av_sub(int type) +{ + return type == 'b' || type == 'p' || type == 'x'; +} + +void update_subtitles(struct MPContext *mpctx, double refpts, + double sub_offset, bool reset) +{ + struct MPOpts *opts = &mpctx->opts; + struct sh_video *sh_video = mpctx->sh_video; + struct demux_stream *d_sub = mpctx->d_sub; + double curpts = refpts + sub_delay; + unsigned char *packet=NULL; + int len; + int type = d_sub->sh ? ((sh_sub_t *)d_sub->sh)->type : 'v'; + static subtitle subs; + if (reset) { + sub_clear_text(&subs, MP_NOPTS_VALUE); + if (vo_sub) + set_osd_subtitle(mpctx, NULL); + if (vo_spudec) { + spudec_reset(vo_spudec); + vo_osd_changed(OSDTYPE_SPU); + } +#ifdef CONFIG_FFMPEG + if (is_av_sub(type)) + reset_avsub(d_sub->sh); +#endif + return; + } + // find sub + if (mpctx->subdata) { + if (sub_fps==0) sub_fps = sh_video ? sh_video->fps : 25; + current_module = "find_sub"; + find_sub(mpctx, mpctx->subdata, curpts * + (mpctx->subdata->sub_uses_time ? 100. : sub_fps)); + if (vo_sub) + mpctx->vo_sub_last = vo_sub; + } + + // DVD sub: + if (vobsub_id >= 0 || type == 'v') { + int timestamp; + current_module = "spudec"; + /* Get a sub packet from the DVD or a vobsub */ + while(1) { + // Vobsub + len = 0; + if (vo_vobsub) { + if (curpts >= 0) { + len = vobsub_get_packet(vo_vobsub, curpts, + (void**)&packet, ×tamp); + if (len > 0) { + mp_dbg(MSGT_CPLAYER,MSGL_V,"\rVOB sub: len=%d v_pts=%5.3f v_timer=%5.3f sub=%5.3f ts=%d \n",len,refpts,sh_video->timer,timestamp / 90000.0,timestamp); + } + } + } else { + // DVD sub + len = ds_get_packet_sub(d_sub, (unsigned char**)&packet); + if (len > 0) { + // XXX This is wrong, sh_video->pts can be arbitrarily + // much behind demuxing position. Unfortunately using + // d_video->pts which would have been the simplest + // improvement doesn't work because mpeg specific hacks + // in video.c set d_video->pts to 0. + float x = d_sub->pts - refpts; + if (x > -20 && x < 20) // prevent missing subs on pts reset + timestamp = 90000*d_sub->pts; + else timestamp = 90000*curpts; + mp_dbg(MSGT_CPLAYER, MSGL_V, "\rDVD sub: len=%d " + "v_pts=%5.3f s_pts=%5.3f ts=%d \n", len, + refpts, d_sub->pts, timestamp); + } + } + if (len<=0 || !packet) break; + // create it only here, since with some broken demuxers we might + // type = v but no DVD sub and we currently do not change the + // "original frame size" ever after init, leading to wrong-sized + // PGS subtitles. + if (!vo_spudec) + vo_spudec = spudec_new(NULL); + if (vo_vobsub || timestamp >= 0) + spudec_assemble(vo_spudec, packet, len, timestamp); + } + } else if (is_text_sub(type) || is_av_sub(type) || type == 'd') { + if (type == 'd' && !d_sub->demuxer->teletext) { + tt_stream_props tsp = {0}; + void *ptr = &tsp; + if (teletext_control(NULL, TV_VBI_CONTROL_START, &ptr) == VBI_CONTROL_TRUE) + d_sub->demuxer->teletext = ptr; + } + if (d_sub->non_interleaved) + ds_get_next_pts(d_sub); + + int orig_type = type; + while (d_sub->first) { + double subpts = ds_get_next_pts(d_sub) + sub_offset; + type = orig_type; + if (subpts > curpts) { + // Libass handled subs can be fed to it in advance + if (!opts->ass_enabled || !is_text_sub(type)) + break; + // Try to avoid demuxing whole file at once + if (d_sub->non_interleaved && subpts > curpts + 1) + break; + } + double endpts = d_sub->first->endpts + sub_offset; + len = ds_get_packet_sub(d_sub, &packet); + if (is_av_sub(type)) { +#ifdef CONFIG_FFMPEG + type = decode_avsub(d_sub->sh, &packet, &len, &subpts, &endpts); + if (type <= 0) +#endif + continue; + } + if (type == 'm') { + if (len < 2) continue; + len = FFMIN(len - 2, AV_RB16(packet)); + packet += 2; + } + if (type == 'd') { + if (d_sub->demuxer->teletext) { + uint8_t *p = packet; + p++; + len--; + while (len >= 46) { + int sublen = p[1]; + if (p[0] == 2 || p[0] == 3) + teletext_control(d_sub->demuxer->teletext, + TV_VBI_CONTROL_DECODE_DVB, p + 2); + p += sublen + 2; + len -= sublen + 2; + } + } + continue; + } +#ifdef CONFIG_ASS + if (opts->ass_enabled) { + sh_sub_t* sh = d_sub->sh; + ass_track = sh ? sh->ass_track : NULL; + if (!ass_track) continue; + if (type == 'a') { // ssa/ass subs with libass + ass_process_chunk(ass_track, packet, len, + (long long)(subpts*1000 + 0.5), + (long long)((endpts-subpts)*1000 + 0.5)); + } else { // plaintext subs with libass + if (subpts != MP_NOPTS_VALUE) { + subtitle tmp_subs = {0}; + if (endpts == MP_NOPTS_VALUE) endpts = subpts + 3; + sub_add_text(&tmp_subs, packet, len, endpts); + tmp_subs.start = subpts * 100; + tmp_subs.end = endpts * 100; + ass_process_subtitle(ass_track, &tmp_subs); + sub_clear_text(&tmp_subs, MP_NOPTS_VALUE); + } + } + continue; + } +#endif + if (subpts != MP_NOPTS_VALUE) { + if (endpts == MP_NOPTS_VALUE) + sub_clear_text(&subs, MP_NOPTS_VALUE); + if (type == 'a') { // ssa/ass subs without libass => convert to plaintext + int i; + unsigned char* p = packet; + for (i=0; i < 8 && *p != '\0'; p++) + if (*p == ',') + i++; + if (*p == '\0') /* Broken line? */ + continue; + len -= p - packet; + packet = p; + } + sub_add_text(&subs, packet, len, endpts); + set_osd_subtitle(mpctx, &subs); + } + if (d_sub->non_interleaved) + ds_get_next_pts(d_sub); + } + if (!opts->ass_enabled) + if (sub_clear_text(&subs, curpts)) + set_osd_subtitle(mpctx, &subs); + } + if (vo_spudec) { + spudec_heartbeat(vo_spudec, 90000*curpts); + if (spudec_changed(vo_spudec)) + vo_osd_changed(OSDTYPE_SPU); + } + + current_module=NULL; +} + +static void update_teletext(sh_video_t *sh_video, demuxer_t *demuxer, int reset) +{ + int page_changed; + + if (!demuxer->teletext) + return; + + //Also forcing page update when such ioctl is not supported or call error occured + if(teletext_control(demuxer->teletext,TV_VBI_CONTROL_IS_CHANGED,&page_changed)!=VBI_CONTROL_TRUE) + page_changed=1; + + if(!page_changed) + return; + + if(teletext_control(demuxer->teletext,TV_VBI_CONTROL_GET_VBIPAGE,&vo_osd_teletext_page)!=VBI_CONTROL_TRUE) + vo_osd_teletext_page=NULL; + if(teletext_control(demuxer->teletext,TV_VBI_CONTROL_GET_HALF_PAGE,&vo_osd_teletext_half)!=VBI_CONTROL_TRUE) + vo_osd_teletext_half=0; + if(teletext_control(demuxer->teletext,TV_VBI_CONTROL_GET_MODE,&vo_osd_teletext_mode)!=VBI_CONTROL_TRUE) + vo_osd_teletext_mode=0; + if(teletext_control(demuxer->teletext,TV_VBI_CONTROL_GET_FORMAT,&vo_osd_teletext_format)!=VBI_CONTROL_TRUE) + vo_osd_teletext_format=0; + vo_osd_changed(OSDTYPE_TELETEXT); + + teletext_control(demuxer->teletext,TV_VBI_CONTROL_MARK_UNCHANGED,NULL); +} + static int check_framedrop(struct MPContext *mpctx, double frame_time) { struct MPOpts *opts = &mpctx->opts; // check for frame-drop: @@ -2758,9 +2990,8 @@ static void seek_reset(struct MPContext *mpctx) // be completely wrong (probably 0). mpctx->sh_video->pts = mpctx->d_video->pts + mpctx->video_offset; mpctx->video_pts = mpctx->sh_video->pts; - update_subtitles(mpctx, &mpctx->opts, mpctx->sh_video, - mpctx->sh_video->pts, mpctx->video_offset, - mpctx->d_sub, 1); + update_subtitles(mpctx, mpctx->sh_video->pts, mpctx->video_offset, + true); update_teletext(mpctx->sh_video, mpctx->demuxer, 1); } @@ -2771,8 +3002,8 @@ static void seek_reset(struct MPContext *mpctx) mpctx->sh_audio->a_buffer_len = 0; mpctx->sh_audio->a_out_buffer_len = 0; if (!mpctx->sh_video) - update_subtitles(mpctx, &mpctx->opts, NULL, mpctx->sh_audio->pts, - mpctx->video_offset, mpctx->d_sub, 1); + update_subtitles(mpctx, mpctx->sh_audio->pts, + mpctx->video_offset, true); } if (vo_vobsub && mpctx->sh_video) { @@ -3110,8 +3341,7 @@ static void run_playloop(struct MPContext *mpctx) if (end_at.type == END_AT_TIME && end_at.pos < a_pos) mpctx->stop_play = PT_NEXT_ENTRY; - update_subtitles(mpctx, &mpctx->opts, NULL, a_pos, mpctx->video_offset, - mpctx->d_sub, 0); + update_subtitles(mpctx, a_pos, mpctx->video_offset, false); update_osd_msg(mpctx); } else { @@ -3182,8 +3412,7 @@ static void run_playloop(struct MPContext *mpctx) if (!frame_time_remaining && blit_frame) { struct sh_video *sh_video = mpctx->sh_video; mpctx->video_pts = sh_video->pts; - update_subtitles(mpctx, &mpctx->opts, sh_video, sh_video->pts, - mpctx->video_offset, mpctx->d_sub, 0); + update_subtitles(mpctx, sh_video->pts, mpctx->video_offset, false); update_teletext(sh_video, mpctx->demuxer, 0); update_osd_msg(mpctx); struct vf_instance *vf = sh_video->vfilter; @@ -3576,6 +3805,73 @@ static int read_keys(void *ctx, int fd) return mplayer_get_key(ctx, 0); } +static bool attachment_is_font(struct demux_attachment *att) +{ + if (!att->name || !att->type || !att->data || !att->data_size) + return false; + // match against MIME types + if (strcmp(att->type, "application/x-truetype-font") == 0 + || strcmp(att->type, "application/x-font") == 0) + return true; + // fallback: match against file extension + if (strlen(att->name) > 4) { + char *ext = att->name + strlen(att->name) - 4; + if (strcasecmp(ext, ".ttf") == 0 || strcasecmp(ext, ".ttc") == 0 + || strcasecmp(ext, ".otf") == 0) + return true; + } + return false; +} + +static int select_audio(demuxer_t *demuxer, int audio_id, char *audio_lang) +{ + if (audio_id == -1) + audio_id = demuxer_audio_track_by_lang_and_default(demuxer, audio_lang); + if (audio_id != -1) // -1 (automatic) is the default behaviour of demuxers + demuxer_switch_audio(demuxer, audio_id); + if (audio_id == -2) { // some demuxers don't yet know how to switch to no sound + demuxer->audio->id = -2; + demuxer->audio->sh = NULL; + } + return demuxer->audio->id; +} + +static void print_version(const char* name) +{ + mp_msg(MSGT_CPLAYER, MSGL_INFO, MP_TITLE, name); + + /* Test for CPU capabilities (and corresponding OS support) for optimizing */ + GetCpuCaps(&gCpuCaps); +#if ARCH_X86 + mp_msg(MSGT_CPLAYER, MSGL_V, + "CPUflags: MMX: %d MMX2: %d 3DNow: %d 3DNowExt: %d SSE: %d SSE2: %d SSSE3: %d\n", + gCpuCaps.hasMMX, gCpuCaps.hasMMX2, + gCpuCaps.has3DNow, gCpuCaps.has3DNowExt, + gCpuCaps.hasSSE, gCpuCaps.hasSSE2, gCpuCaps.hasSSSE3); +#if CONFIG_RUNTIME_CPUDETECT + mp_tmsg(MSGT_CPLAYER,MSGL_V, "Compiled with runtime CPU detection.\n"); +#else + mp_tmsg(MSGT_CPLAYER,MSGL_V, "Compiled for x86 CPU with extensions:"); +if (HAVE_MMX) + mp_msg(MSGT_CPLAYER,MSGL_V," MMX"); +if (HAVE_MMX2) + mp_msg(MSGT_CPLAYER,MSGL_V," MMX2"); +if (HAVE_AMD3DNOW) + mp_msg(MSGT_CPLAYER,MSGL_V," 3DNow"); +if (HAVE_AMD3DNOWEXT) + mp_msg(MSGT_CPLAYER,MSGL_V," 3DNowExt"); +if (HAVE_SSE) + mp_msg(MSGT_CPLAYER,MSGL_V," SSE"); +if (HAVE_SSE2) + mp_msg(MSGT_CPLAYER,MSGL_V," SSE2"); +if (HAVE_SSSE3) + mp_msg(MSGT_CPLAYER,MSGL_V," SSSE3"); +if (HAVE_CMOV) + mp_msg(MSGT_CPLAYER,MSGL_V," CMOV"); + mp_msg(MSGT_CPLAYER,MSGL_V,"\n"); +#endif /* CONFIG_RUNTIME_CPUDETECT */ +#endif /* ARCH_X86 */ +} /* This preprocessor directive is a hack to generate a mplayer-nomain.o object * file for some tools to link against. */ @@ -19,6 +19,8 @@ #ifndef MPLAYER_MPLAYER_H #define MPLAYER_MPLAYER_H +#include <stdlib.h> + #include "mp_msg.h" extern char* current_module; @@ -57,5 +59,8 @@ static inline void exit_player_bad(const char *how) } struct MPContext; +struct subtitle; + +void set_osd_subtitle(struct MPContext *mpctx, struct subtitle *subs); #endif /* MPLAYER_MPLAYER_H */ |