August 2010 - MPlayer-cvslog - lists.mplayerhq.hu

r32032 - trunk/libmpdemux/demux_lavf.c
by reimar 29 Aug '10

29 Aug '10

Author: reimar Date: Sun Aug 29 08:51:05 2010 New Revision: 32032 Log: Always use convergence_duration for subtitles otherwise they will stay on screen forever for ASS subtitles in mkv if no ASS renderer is used. Modified: trunk/libmpdemux/demux_lavf.c Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c Sun Aug 29 08:46:06 2010 (r32031) +++ trunk/libmpdemux/demux_lavf.c Sun Aug 29 08:51:05 2010 (r32032) @@ -628,7 +628,10 @@ static int demux_lavf_fill_buffer(demuxe if(pkt.pts != AV_NOPTS_VALUE){ dp->pts=pkt.pts * av_q2d(priv->avfc->streams[id]->time_base); priv->last_pts= dp->pts * AV_TIME_BASE; - if(pkt.flags & PKT_FLAG_KEY && pkt.convergence_duration > 0) + // always set endpts for subtitles, even if PKT_FLAG_KEY is not set, + // otherwise they will stay on screen to long if e.g. ASS is demuxed from mkv + if((ds == demux->sub || (pkt.flags & PKT_FLAG_KEY)) && + pkt.convergence_duration > 0) dp->endpts = dp->pts + pkt.convergence_duration * av_q2d(priv->avfc->streams[id]->time_base); } dp->pos=demux->filepos;

1 0

r32031 - trunk/libmpdemux/demuxer.c
by reimar 29 Aug '10

29 Aug '10

Author: reimar Date: Sun Aug 29 08:46:06 2010 New Revision: 32031 Log: Also reset subtitle EOF on seeking. Modified: trunk/libmpdemux/demuxer.c Modified: trunk/libmpdemux/demuxer.c ============================================================================== --- trunk/libmpdemux/demuxer.c Sun Aug 29 08:33:29 2010 (r32030) +++ trunk/libmpdemux/demuxer.c Sun Aug 29 08:46:06 2010 (r32031) @@ -1306,6 +1306,7 @@ int demux_seek(demuxer_t *demuxer, float demuxer->stream->eof = 0; demuxer->video->eof = 0; demuxer->audio->eof = 0; + demuxer->sub->eof = 0; if (flags & SEEK_ABSOLUTE) pts = 0.0f;

1 0

r32030 - trunk/mpcommon.c
by reimar 29 Aug '10

29 Aug '10

Author: reimar Date: Sun Aug 29 08:33:29 2010 New Revision: 32030 Log: Fix indentation. Modified: trunk/mpcommon.c Modified: trunk/mpcommon.c ============================================================================== --- trunk/mpcommon.c Sun Aug 29 08:06:28 2010 (r32029) +++ trunk/mpcommon.c Sun Aug 29 08:33:29 2010 (r32030) @@ -228,9 +228,9 @@ void update_subtitles(sh_video_t *sh_vid if (len > 10 && memcmp(packet, "Dialogue: ", 10) == 0) ass_process_data(ass_track, packet, len); else - ass_process_chunk(ass_track, packet, len, - (long long)(subpts*1000 + 0.5), - (long long)((endpts-subpts)*1000 + 0.5)); + 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};

1 0

r32029 - trunk/libmpcodecs/vf_vo.c
by reimar 29 Aug '10

29 Aug '10

Author: reimar Date: Sun Aug 29 08:06:28 2010 New Revision: 32029 Log: Replace ass_mp.h include by eosd.h include. Avoids a dependency on ASS and fixes implicit declaration warnings. Modified: trunk/libmpcodecs/vf_vo.c Modified: trunk/libmpcodecs/vf_vo.c ============================================================================== --- trunk/libmpcodecs/vf_vo.c Sat Aug 28 16:20:58 2010 (r32028) +++ trunk/libmpcodecs/vf_vo.c Sun Aug 29 08:06:28 2010 (r32029) @@ -29,9 +29,7 @@ #include "libvo/sub.h" #include "libvo/video_out.h" -#ifdef CONFIG_ASS -#include "libass/ass_mp.h" -#endif +#include "eosd.h" //===========================================================================//

1 0

r32028 - in branches/1.0rc4: . loader/module.c mplayer.c
by siretart 28 Aug '10

28 Aug '10

Author: siretart Date: Sat Aug 28 16:20:58 2010 New Revision: 32028 Log: Disable loading codecs from the current directory. While convenient, it is too risky. backport r32025 and r32026 by reimar Modified: branches/1.0rc4/ (props changed) branches/1.0rc4/loader/module.c branches/1.0rc4/mplayer.c Modified: branches/1.0rc4/loader/module.c ============================================================================== --- branches/1.0rc4/loader/module.c Fri Aug 27 23:58:14 2010 (r32027) +++ branches/1.0rc4/loader/module.c Sat Aug 28 16:20:58 2010 (r32028) @@ -381,6 +381,10 @@ HMODULE WINAPI LoadLibraryExA(LPCSTR lib // if(fs_installed==0) // install_fs(); + // Do not load libraries from a path relative to the current directory + if (*libname != '/') + i++; + while (wm == 0 && listpath[++i]) { if (i < 2) Modified: branches/1.0rc4/mplayer.c ============================================================================== --- branches/1.0rc4/mplayer.c Fri Aug 27 23:58:14 2010 (r32027) +++ branches/1.0rc4/mplayer.c Sat Aug 28 16:20:58 2010 (r32028) @@ -2746,9 +2746,13 @@ int gui_no_filename=0; { HMODULE kernel32 = GetModuleHandle("Kernel32.dll"); BOOL WINAPI (*setDEP)(DWORD) = NULL; - if (kernel32) + BOOL WINAPI (*setDllDir)(LPCTSTR) = NULL; + if (kernel32) { setDEP = GetProcAddress(kernel32, "SetProcessDEPPolicy"); + setDllDir = GetProcAddress(kernel32, "SetDllDirectoryA"); + } if (setDEP) setDEP(3); + if (setDllDir) setDllDir(""); } // stop Windows from showing all kinds of annoying error dialogs SetErrorMode(0x8003);

1 0

r32027 - trunk/configure
by cehoyos 27 Aug '10

27 Aug '10

Author: cehoyos Date: Fri Aug 27 23:58:14 2010 New Revision: 32027 Log: Fix compilation with --disable-networking. Patch by Andrew Wason, rectalogic rectalogic com Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri Aug 27 21:48:39 2010 (r32026) +++ trunk/configure Fri Aug 27 23:58:14 2010 (r32027) @@ -3427,7 +3427,7 @@ else def_network='#undef CONFIG_NETWORK' def_networking='#undef CONFIG_NETWORKING' _ftp=no - libavprotocols=$(echo $libavprotocols | sed -e s/GOPHER_PROTOCOL// -e s/HTTP_PROTOCOL// -e s/RTMP_PROTOCOL// -e s/RTP_PROTOCOL// -e s/TCP_PROTOCOL// -e s/UDP_PROTOCOL//) + libavprotocols=$(echo $libavprotocols | sed -e s/GOPHER_PROTOCOL// -e s/HTTP_PROTOCOL// -e s/RTMP_PROTOCOL// -e s/RTP_PROTOCOL// -e s/TCP_PROTOCOL// -e s/UDP_PROTOCOL// -e s/MMSH_PROTOCOL// -e s/MMST_PROTOCOL//) libavdemuxers=$(echo $libavdemuxers | sed -e s/RTSP_DEMUXER// -e s/SDP_DEMUXER//) fi echores "$networking"

1 0

r32025 - in trunk: loader/module.c mplayer.c
by reimar 27 Aug '10

27 Aug '10

Author: reimar Date: Fri Aug 27 18:28:53 2010 New Revision: 32025 Log: Disable loading codecs from the current directory. While convenient, it is too risky. Modified: trunk/loader/module.c trunk/mplayer.c Modified: trunk/loader/module.c ============================================================================== --- trunk/loader/module.c Fri Aug 27 18:19:24 2010 (r32024) +++ trunk/loader/module.c Fri Aug 27 18:28:53 2010 (r32025) @@ -381,6 +381,10 @@ HMODULE WINAPI LoadLibraryExA(LPCSTR lib // if(fs_installed==0) // install_fs(); + // Do not load libraries from a path relative to the current directory + if (*libname != '/') + i++; + while (wm == 0 && listpath[++i]) { if (i < 2) Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Fri Aug 27 18:19:24 2010 (r32024) +++ trunk/mplayer.c Fri Aug 27 18:28:53 2010 (r32025) @@ -2768,9 +2768,13 @@ int gui_no_filename=0; { HMODULE kernel32 = GetModuleHandle("Kernel32.dll"); BOOL WINAPI (*setDEP)(DWORD) = NULL; - if (kernel32) + BOOL WINAPI (*setDllDir)(LPCTSTR) = NULL; + if (kernel32) { setDEP = GetProcAddress(kernel32, "SetProcessDEPPolicy"); + setDllDir = GetProcAddress(kernel32, "SetDllDirectory"); + } if (setDEP) setDEP(3); + if (setDllDir) setDllDir(""); } // stop Windows from showing all kinds of annoying error dialogs SetErrorMode(0x8003);

3 2

r32026 - trunk/mplayer.c
by reimar 27 Aug '10

27 Aug '10

Author: reimar Date: Fri Aug 27 21:48:39 2010 New Revision: 32026 Log: 100l, we need to search for SetDllDirectoryA instead of SetDllDirectory Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Fri Aug 27 18:28:53 2010 (r32025) +++ trunk/mplayer.c Fri Aug 27 21:48:39 2010 (r32026) @@ -2771,7 +2771,7 @@ int gui_no_filename=0; BOOL WINAPI (*setDllDir)(LPCTSTR) = NULL; if (kernel32) { setDEP = GetProcAddress(kernel32, "SetProcessDEPPolicy"); - setDllDir = GetProcAddress(kernel32, "SetDllDirectory"); + setDllDir = GetProcAddress(kernel32, "SetDllDirectoryA"); } if (setDEP) setDEP(3); if (setDllDir) setDllDir("");

1 0

r32024 - trunk/configure
by reimar 27 Aug '10

27 Aug '10

Author: reimar Date: Fri Aug 27 18:19:24 2010 New Revision: 32024 Log: Fix arts check to actually check linking so it doesn't get enabled when e.g. cross-compiling under Linux for Windows. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri Aug 27 16:12:20 2010 (r32023) +++ trunk/configure Fri Aug 27 18:19:24 2010 (r32024) @@ -94,6 +94,7 @@ function_check() { int main(void) { $2; return 0; } EOF shift + shift compile_check $TMPC $@ } @@ -5695,7 +5696,7 @@ echocheck "aRts" if test "$_arts" = auto ; then _arts=no if ( artsc-config --version ) >> "$TMPLOG" 2>&1 ; then - header_check artsc.h $(artsc-config --libs) $(artsc-config --cflags) && + function_check artsc.h "arts_init()" $(artsc-config --libs) $(artsc-config --cflags) && _arts=yes fi fi

1 0

r32023 - trunk/eosd.h
by cigaes 27 Aug '10

27 Aug '10

Author: cigaes Date: Fri Aug 27 16:12:20 2010 New Revision: 32023 Log: Add Doxygen comments and formal parameters names in eosd.h. Modified: trunk/eosd.h Modified: trunk/eosd.h ============================================================================== --- trunk/eosd.h Fri Aug 27 14:14:59 2010 (r32022) +++ trunk/eosd.h Fri Aug 27 16:12:20 2010 (r32023) @@ -22,12 +22,44 @@ #ifndef MPLAYER_EOSD_H #define MPLAYER_EOSD_H -void eosd_init(vf_instance_t *); +/** + * Initialize the EOSD subsystem. + * + * @param vf the video filter chain where the rendering will take place. + */ +void eosd_init(vf_instance_t *vf); -void eosd_configure(mp_eosd_res_t *, int); -struct ass_image *eosd_render_frame(double, int *); +/** + * Configure the resolution for EOSD rendering. + * Should be called by the rendering engine whenever the resolution or + * settings change. + * + * @param res resolution and margins of the rendering area. + * @param hinting nonzero if hinting is useful. + */ +void eosd_configure(mp_eosd_res_t *res, int hinting); + +/** + * Renders the EOSD elements for the current frame. + * Should be called by the rendering engine when it is about to do or + * prepare the rendering. + * + * @param ts presentation timestamp of the frame. + * @param changed if not NULL, will be set to 0 if the elements are + * identical since the last call, 1 if they have changed + * only in coordinates, and 2 if they have really changed. + * @return a linked list of EOSD elements. + */ +struct ass_image *eosd_render_frame(double ts, int *changed); + +/** + * Shut down the EOSD subsystem and free the associated resources. + */ void eosd_uninit(void); +/** + * Initialize the use of EOSD for ASS subtitles rendering. + */ void eosd_ass_init(struct ass_library *); #endif /* MPLAYER_EOSD_H */

1 0