November 2006 - MPlayer-cvslog - lists.mplayerhq.hu

r20931 - in trunk: DOCS/tech/slave.txt input/input.c input/input.h mplayer.c
by reimar 14 Nov '06

14 Nov '06

Author: reimar Date: Tue Nov 14 20:52:21 2006 New Revision: 20931 Modified: trunk/DOCS/tech/slave.txt trunk/input/input.c trunk/input/input.h trunk/mplayer.c Log: Introduce step_property command. Patch by Carl Eugen Hoyos [cehoyos <at> ag or at] with modifications by me. Modified: trunk/DOCS/tech/slave.txt ============================================================================== --- trunk/DOCS/tech/slave.txt (original) +++ trunk/DOCS/tech/slave.txt Tue Nov 14 20:52:21 2006 @@ -249,6 +249,9 @@ speed_set <value> Set the speed to <value>. +step_property <property> [<value>] + Change property by value, or increase by a default if value is not given. + sub_alignment [value] Toggle/set subtitle alignment. 0 top alignment Modified: trunk/input/input.c ============================================================================== --- trunk/input/input.c (original) +++ trunk/input/input.c Tue Nov 14 20:52:21 2006 @@ -164,6 +164,7 @@ { MP_CMD_KEYDOWN_EVENTS, "key_down_event", 1, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, { MP_CMD_SET_PROPERTY, "set_property", 2, { {MP_CMD_ARG_STRING, {0}}, {MP_CMD_ARG_STRING, {0}}, {-1,{0}} } }, { MP_CMD_GET_PROPERTY, "get_property", 1, { {MP_CMD_ARG_STRING, {0}}, {-1,{0}} } }, + { MP_CMD_STEP_PROPERTY, "step_property", 1, { {MP_CMD_ARG_STRING, {0}}, {MP_CMD_ARG_FLOAT,{0}}, {-1,{0}} } }, { MP_CMD_SEEK_CHAPTER, "seek_chapter", 1, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, { MP_CMD_SET_MOUSE_POS, "set_mouse_pos", 2, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, Modified: trunk/input/input.h ============================================================================== --- trunk/input/input.h (original) +++ trunk/input/input.h Tue Nov 14 20:52:21 2006 @@ -90,6 +90,7 @@ #define MP_CMD_RADIO_SET_CHANNEL 88 #define MP_CMD_RADIO_SET_FREQ 89 #define MP_CMD_SET_MOUSE_POS 90 +#define MP_CMD_STEP_PROPERTY 91 #define MP_CMD_GUI_EVENTS 5000 #define MP_CMD_GUI_LOADFILE 5001 Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c (original) +++ trunk/mplayer.c Tue Nov 14 20:52:21 2006 @@ -4637,6 +4637,13 @@ cmd->args[0].v.s,cmd->args[1].v.s); } break; + case MP_CMD_STEP_PROPERTY: { + m_option_t* prop = mp_property_find(cmd->args[0].v.s); + float arg = cmd->args[1].v.f; + if(!prop) mp_msg(MSGT_CPLAYER,MSGL_WARN, "Unknown property: '%s'\n",cmd->args[0].v.s); + else if(m_property_do(prop,M_PROPERTY_STEP_UP, arg ? &arg : NULL) <= 0) + mp_msg(MSGT_CPLAYER,MSGL_WARN, "Failed to increment property '%s' by %f.\n",cmd->args[0].v.s, arg); + } break; case MP_CMD_GET_PROPERTY: { m_option_t* prop; void* val;

1 0

r20930 - trunk/mplayer.c
by reimar 14 Nov '06

14 Nov '06

Author: reimar Date: Tue Nov 14 20:24:41 2006 New Revision: 20930 Modified: trunk/mplayer.c Log: Fix Unkown -> Unknown typo Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c (original) +++ trunk/mplayer.c Tue Nov 14 20:24:41 2006 @@ -4631,7 +4631,7 @@ } break; case MP_CMD_SET_PROPERTY: { m_option_t* prop = mp_property_find(cmd->args[0].v.s); - if(!prop) mp_msg(MSGT_CPLAYER,MSGL_WARN,"Unkown property: '%s'\n",cmd->args[0].v.s); + if(!prop) mp_msg(MSGT_CPLAYER,MSGL_WARN,"Unknown property: '%s'\n",cmd->args[0].v.s); else if(m_property_parse(prop,cmd->args[1].v.s) <= 0) mp_msg(MSGT_CPLAYER,MSGL_WARN,"Failed to set property '%s' to '%s'.\n", cmd->args[0].v.s,cmd->args[1].v.s); @@ -4642,7 +4642,7 @@ void* val; prop = mp_property_find(cmd->args[0].v.s); if(!prop) { - mp_msg(MSGT_CPLAYER,MSGL_WARN,"Unkown property: '%s'\n",cmd->args[0].v.s); + mp_msg(MSGT_CPLAYER,MSGL_WARN,"Unknown property: '%s'\n",cmd->args[0].v.s); break; } /* Use m_option_print directly to get easily parseable values. */

1 0

[propchange]: r20927 - svn:log
by ods15 14 Nov '06

14 Nov '06

Author: ods15 Revision: 20927 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -bump date +bump date of NUT spec for previous commit

1 0

r20925 - trunk/libmpdemux/demux_nut.c
by ods15 14 Nov '06

14 Nov '06

Author: ods15 Date: Tue Nov 14 18:00:47 2006 New Revision: 20925 Modified: trunk/libmpdemux/demux_nut.c Log: update to libnut, add cache_syncpoints Modified: trunk/libmpdemux/demux_nut.c ============================================================================== --- trunk/libmpdemux/demux_nut.c (original) +++ trunk/libmpdemux/demux_nut.c Tue Nov 14 18:00:47 2006 @@ -69,7 +69,8 @@ .file_pos = stream_tell(demuxer->stream), }, .alloc = { .malloc = NULL }, - .read_index = index_mode + .read_index = index_mode, + .cache_syncpoints = 1, }; nut_priv_t * priv = demuxer->priv; nut_context_t * nut = priv->nut = nut_demuxer_init(&dopts);

1 0

r20924 - trunk/configure
by diego 14 Nov '06

14 Nov '06

Author: diego Date: Tue Nov 14 17:51:06 2006 New Revision: 20924 Modified: trunk/configure Log: MEMALIGN_HACK --> CONFIG_MEMALIGN_HACK patch by "Hervé W.", H.O.W.aka.V+mplayer gmail com Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Tue Nov 14 17:51:06 2006 @@ -2900,7 +2900,7 @@ else _def_memalign='#undef HAVE_MEMALIGN' _def_map_memalign='#define memalign(a,b) malloc(b)' - not darwin && _def_memalign_hack='#define MEMALIGN_HACK 1' + not darwin && _def_memalign_hack='#define CONFIG_MEMALIGN_HACK 1' fi echores "$_memalign"

1 0

r20917 - in trunk: cfg-common.h cfg-mencoder.h cfg-mplayer.h
by diego 14 Nov '06

14 Nov '06

Author: diego Date: Tue Nov 14 12:14:03 2006 New Revision: 20917 Modified: trunk/cfg-common.h trunk/cfg-mencoder.h trunk/cfg-mplayer.h Log: Clarify messages for unavailable options. Modified: trunk/cfg-common.h ============================================================================== --- trunk/cfg-common.h (original) +++ trunk/cfg-common.h Tue Nov 14 12:14:03 2006 @@ -24,8 +24,8 @@ #else {"cache", "MPlayer was compiled without cache2 support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #endif - {"vcd", "-vcd N is deprecated, use vcd://N instead.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL}, - {"cuefile", "-cuefile is deprecated, use cue://filename:N where N is the track number.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"vcd", "-vcd N has been removed, use vcd://N instead.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL}, + {"cuefile", "-cuefile has been removed, use cue://filename:N where N is the track number.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, {"cdrom-device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL}, #if defined(USE_DVDREAD) || defined(USE_DVDNAV) {"dvd-device", &dvd_device, CONF_TYPE_STRING, 0, 0, 0, NULL}, @@ -33,7 +33,7 @@ {"dvd-device", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #endif #ifdef USE_DVDREAD - {"dvd", "-dvd N is deprecated, use dvd://N instead.\n" , CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"dvd", "-dvd N has been removed, use dvd://N instead.\n" , CONF_TYPE_PRINT, 0, 0, 0, NULL}, {"dvdangle", &dvd_angle, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL}, {"chapter", dvd_parse_chapter_range, CONF_TYPE_FUNC_PARAM, 0, 0, 0, NULL}, #else @@ -70,11 +70,11 @@ #endif #ifdef STREAMING_LIVE555 - {"sdp", "-sdp is obsolete, use sdp://file instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"sdp", "-sdp has been removed, use sdp://file instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, // -rtsp-stream-over-tcp option, specifying TCP streaming of RTP/RTCP {"rtsp-stream-over-tcp", &rtspStreamOverTCP, CONF_TYPE_FLAG, 0, 0, 1, NULL}, #else - {"rtsp-stream-over-tcp", "RTSP support requires the \"LIVE555 Streaming Media\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, + {"rtsp-stream-over-tcp", "-rtsp-stream-over-tcp requires the \"LIVE555 Streaming Media\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #endif #ifdef MPLAYER_NETWORK {"rtsp-port", &rtsp_port, CONF_TYPE_INT, CONF_RANGE, -1, 65535, NULL}, @@ -405,7 +405,7 @@ #ifdef USE_TV m_option_t tvopts_conf[]={ - {"on", "-tv on is deprecated, use tv:// instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"on", "-tv on has been removed, use tv:// instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, {"immediatemode", &tv_param_immediate, CONF_TYPE_INT, CONF_RANGE, 0, 1, NULL}, {"noaudio", &tv_param_noaudio, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"audiorate", &tv_param_audiorate, CONF_TYPE_INT, 0, 0, 0, NULL}, @@ -548,7 +548,7 @@ extern m_obj_list_t vf_obj_list; m_option_t mfopts_conf[]={ - {"on", "-mf on is deprecated, use mf:// instead.\n", CONF_TYPE_PRINT, 0, 0, 1, NULL}, + {"on", "-mf on has been removed, use mf:// instead.\n", CONF_TYPE_PRINT, 0, 0, 1, NULL}, {"w", &mf_w, CONF_TYPE_INT, 0, 0, 0, NULL}, {"h", &mf_h, CONF_TYPE_INT, 0, 0, 0, NULL}, {"fps", &mf_fps, CONF_TYPE_FLOAT, 0, 0, 0, NULL}, Modified: trunk/cfg-mencoder.h ============================================================================== --- trunk/cfg-mencoder.h (original) +++ trunk/cfg-mencoder.h Tue Nov 14 12:14:03 2006 @@ -204,8 +204,8 @@ {"audio-preload", &audio_preload, CONF_TYPE_FLOAT, CONF_RANGE|CONF_GLOBAL, 0, 2, NULL}, {"audio-delay", &audio_delay_fix, CONF_TYPE_FLOAT, CONF_GLOBAL, 0, 0, NULL}, - {"x", "-x is obsolete, use -vf scale=w:h for scaling.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, - {"xsize", "-xsize is obsolete, use -vf crop=w:h:x:y for cropping.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, + {"x", "-x has been removed, use -vf scale=w:h for scaling.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, + {"xsize", "-xsize has been removed, use -vf crop=w:h:x:y for cropping.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, // output audio/video codec selection {"oac", oac_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, @@ -222,7 +222,7 @@ // override avi aspect autodetection {"force-avi-aspect", &avi_aspect_override, CONF_TYPE_FLOAT, CONF_RANGE|CONF_GLOBAL, 0.2, 3.0, NULL}, - {"pass", "-pass is obsolete, use -lavcopts vpass=n, -xvidencopts pass=n\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, + {"pass", "-pass has been removed, use -lavcopts vpass=n, -xvidencopts pass=n\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, {"passlogfile", &passtmpfile, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, {"vobsubout", &vobsub_out, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, Modified: trunk/cfg-mplayer.h ============================================================================== --- trunk/cfg-mplayer.h (original) +++ trunk/cfg-mplayer.h Tue Nov 14 12:14:03 2006 @@ -136,8 +136,8 @@ {"border", &vo_border, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"noborder", &vo_border, CONF_TYPE_FLAG, 0, 1, 0, NULL}, - {"aop", "-aop is deprecated, use -af instead.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, - {"dsp", "Use -ao oss:dsp_path.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, + {"aop", "-aop has been removed, use -af instead.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, + {"dsp", "-dsp has been removed. Use -ao oss:dsp_path instead.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, {"mixer", &mixer_device, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"mixer-channel", &mixer_channel, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"softvol", &soft_vol, CONF_TYPE_FLAG, 0, 0, 1, NULL}, @@ -149,9 +149,9 @@ {"abs", &ao_data.buffersize, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL}, // -ao pcm options: - {"aofile", "-aofile is deprecated. Use -ao pcm:file=<filename> instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, - {"waveheader", "-waveheader is deprecated. Use -ao pcm:waveheader instead.\n", CONF_TYPE_PRINT, 0, 0, 1, NULL}, - {"nowaveheader", "-nowaveheader is deprecated. Use -ao pcm:nowaveheader instead.\n", CONF_TYPE_PRINT, 0, 1, 0, NULL}, + {"aofile", "-aofile has been removed. Use -ao pcm:file=<filename> instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"waveheader", "-waveheader has been removed. Use -ao pcm:waveheader instead.\n", CONF_TYPE_PRINT, 0, 0, 1, NULL}, + {"nowaveheader", "-nowaveheader has been removed. Use -ao pcm:nowaveheader instead.\n", CONF_TYPE_PRINT, 0, 1, 0, NULL}, {"alsa", "-alsa has been removed. Remove it from your config file.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, @@ -165,18 +165,18 @@ // -vo png only: #ifdef HAVE_PNG - {"z", "-z is replaced by -vo png:z=<0-9>\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"z", "-z has been removed. Use -vo png:z=<0-9> instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, #endif // -vo jpeg only: #ifdef HAVE_JPEG - {"jpeg", "-jpeg is deprecated. Use -vo jpeg:options instead.\n", + {"jpeg", "-jpeg has been removed. Use -vo jpeg:<options> instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, #endif // -vo sdl only: {"sdl", "Use -vo sdl:driver=<driver> instead of -vo sdl -sdl driver.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, - {"noxv", "-noxv is deprecated. Use -vo sdl:nohwaccel instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, - {"forcexv", "-forcexv is deprecated. Use -vo sdl:forcexv instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"noxv", "-noxv has been removed. Use -vo sdl:nohwaccel instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"forcexv", "-forcexv has been removed. Use -vo sdl:forcexv instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, // -ao sdl only: {"sdla", "Use -ao sdl:driver instead of -ao sdl -sdla driver.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, @@ -193,7 +193,7 @@ #endif #ifdef HAVE_DIRECTFB #if DIRECTFBVERSION > 912 - {"dfbopts", "-dfbopts is deprecated, use -vf directfb:dfbopts=... instead\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"dfbopts", "-dfbopts has been removed. Use -vf directfb:dfbopts=... instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, #endif #endif @@ -238,7 +238,7 @@ {"wid", &WinID, CONF_TYPE_INT, 0, 0, 0, NULL}, #ifdef HAVE_X11 // x11,xv,xmga,xvidix - {"icelayer", "-icelayer is obsolete. Use -fstype layer:<number> instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"icelayer", "-icelayer has been removed. Use -fstype layer:<number> instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, {"stop-xscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"nostop-xscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"stop_xscreensaver", "Use -stop-xscreensaver instead, options with _ have been obsoleted.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, @@ -258,12 +258,12 @@ // direct rendering (decoding to video out buffer) {"dr", &vo_directrendering, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"nodr", &vo_directrendering, CONF_TYPE_FLAG, 0, 1, 0, NULL}, - {"vaa_dr", "-vaa_dr is obsolete, use -dr.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, - {"vaa_nodr", "-vaa_nodr is obsolete, use -nodr.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"vaa_dr", "-vaa_dr has been removed, use -dr.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"vaa_nodr", "-vaa_nodr has been removed, use -nodr.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, #ifdef HAVE_AA // -vo aa - {"aa*", "-aa* is deprecated. Use -vo aa:suboption instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"aa*", "-aa* has been removed. Use -vo aa:suboption instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, #endif #ifdef HAVE_ZR

2 1

r20923 - trunk/libmpdemux/demux_mov.c
by reimar 14 Nov '06

14 Nov '06

Author: reimar Date: Tue Nov 14 16:02:15 2006 New Revision: 20923 Modified: trunk/libmpdemux/demux_mov.c Log: 10l copy&Ãpaste bug in subtitle sh handling Modified: trunk/libmpdemux/demux_mov.c ============================================================================== --- trunk/libmpdemux/demux_mov.c (original) +++ trunk/libmpdemux/demux_mov.c Tue Nov 14 16:02:15 2006 @@ -1932,9 +1932,9 @@ } } if(demuxer->sub->id>=0){ - sh_video_t* sh=demuxer->s_streams[demuxer->sub->id]; + sh_sub_t* sh=demuxer->s_streams[demuxer->sub->id]; if(sh){ - demuxer->sub->sh=sh; sh->ds=demuxer->sub; + demuxer->sub->sh=sh; } else { mp_msg(MSGT_DEMUX, MSGL_ERR, "MOV: selected video stream (%d) does not exists\n",demuxer->video->id); demuxer->sub->id=-2;

1 0

r20922 - in trunk: libmpcodecs/vf.h libmpcodecs/vf_vo.c mplayer.c
by uau 14 Nov '06

14 Nov '06

Author: uau Date: Tue Nov 14 15:02:55 2006 New Revision: 20922 Modified: trunk/libmpcodecs/vf.h trunk/libmpcodecs/vf_vo.c trunk/mplayer.c Log: Use vf control for reading pts from vf_vo Modified: trunk/libmpcodecs/vf.h ============================================================================== --- trunk/libmpcodecs/vf.h (original) +++ trunk/libmpcodecs/vf.h Tue Nov 14 15:02:55 2006 @@ -79,6 +79,7 @@ #define VFCTRL_SCREENSHOT 14 /* Make a screenshot */ #define VFCTRL_INIT_EOSD 15 /* Select EOSD renderer */ #define VFCTRL_DRAW_EOSD 16 /* Render EOSD */ +#define VFCTRL_GET_PTS 17 /* Return last pts value that reached vf_vo*/ #include "vfcap.h" Modified: trunk/libmpcodecs/vf_vo.c ============================================================================== --- trunk/libmpcodecs/vf_vo.c (original) +++ trunk/libmpcodecs/vf_vo.c Tue Nov 14 15:02:55 2006 @@ -21,18 +21,14 @@ extern int sub_visibility; extern float sub_delay; -typedef struct vf_vo_data_s { +struct vf_priv_s { double pts; vo_functions_t *vo; -} vf_vo_data_t; - -struct vf_priv_s { - vf_vo_data_t* vf_vo_data; #ifdef USE_ASS ass_renderer_t* ass_priv; #endif }; -#define video_out (vf->priv->vf_vo_data->vo) +#define video_out (vf->priv->vo) static int query_format(struct vf_instance_s* vf, unsigned int fmt); /* forward declaration */ @@ -115,7 +111,7 @@ case VFCTRL_DRAW_EOSD: { ass_image_t* images = 0; - double pts = vf->priv->vf_vo_data->pts; + double pts = vf->priv->pts; if (!vo_config_count || !vf->priv->ass_priv) return CONTROL_FALSE; if (sub_visibility && vf->priv->ass_priv && ass_track && (pts != MP_NOPTS_VALUE)) { mp_eosd_res_t res; @@ -130,6 +126,11 @@ return (video_out->control(VOCTRL_DRAW_EOSD, images) == VO_TRUE) ? CONTROL_TRUE : CONTROL_FALSE; } #endif + case VFCTRL_GET_PTS: + { + *(double *)data = vf->priv->pts; + return CONTROL_TRUE; + } } // return video_out->control(request,data); return CONTROL_UNKNOWN; @@ -154,7 +155,7 @@ mp_image_t *mpi, double pts){ if(!vo_config_count) return 0; // vo not configured? // record pts (potentially modified by filters) for main loop - vf->priv->vf_vo_data->pts = pts; + vf->priv->pts = pts; // first check, maybe the vo/vf plugin implements draw_image using mpi: if(video_out->control(VOCTRL_DRAW_IMAGE,mpi)==VO_TRUE) return 1; // done. // nope, fallback to old draw_frame/draw_slice: @@ -203,7 +204,7 @@ vf->start_slice=start_slice; vf->uninit=uninit; vf->priv=calloc(1, sizeof(struct vf_priv_s)); - vf->priv->vf_vo_data=(vf_vo_data_t*)args; + vf->priv->vo = (vo_functions_t *)args; if(!video_out) return 0; // no vo ? // if(video_out->preinit(args)) return 0; // preinit failed return 1; Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c (original) +++ trunk/mplayer.c Tue Nov 14 15:02:55 2006 @@ -3084,8 +3084,6 @@ int gui_no_filename=0; -struct {double pts; vo_functions_t *vo;} vf_vo_data; - srand((int) time(NULL)); InitTimer(); @@ -4107,10 +4105,9 @@ inited_flags|=INITED_VO; } -vf_vo_data.vo = video_out; current_module="init_video_filters"; { - char* vf_arg[] = { "_oldargs_", (char*)&vf_vo_data , NULL }; + char* vf_arg[] = { "_oldargs_", (char*)video_out , NULL }; sh_video->vfilter=(void*)vf_open_filter(NULL,"vo",vf_arg); } #ifdef HAVE_MENU @@ -4385,7 +4382,8 @@ eof = 1; break; } - sh_video->pts = vf_vo_data.pts; + ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, + VFCTRL_GET_PTS, &sh_video->pts); if (sh_video->pts == MP_NOPTS_VALUE) { mp_msg(MSGT_CPLAYER, MSGL_ERR, "pts after filters MISSING\n"); sh_video->pts = last_pts;

1 0

r20920 - trunk/mplayer.c
by reimar 14 Nov '06

14 Nov '06

Author: reimar Date: Tue Nov 14 14:41:24 2006 New Revision: 20920 Modified: trunk/mplayer.c Log: Fix statement-before-declaration warnings. Having a look at the gcc output before committing is a good idea btw. Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c (original) +++ trunk/mplayer.c Tue Nov 14 14:41:24 2006 @@ -2760,6 +2760,7 @@ double pts; while (1) { + void *decoded_frame; current_module = "decode video"; // XXX Time used in this call is not counted in any performance // timer now, OSD is not updated correctly for filter-added frames @@ -2778,7 +2779,7 @@ if (pts == MP_NOPTS_VALUE) mp_msg(MSGT_CPLAYER, MSGL_ERR, "pts value from demuxer MISSING\n"); current_module = "decode video"; - void *decoded_frame = decode_video(sh_video, start, in_size, 0, pts); + decoded_frame = decode_video(sh_video, start, in_size, 0, pts); if (decoded_frame) { update_osd_msg(); if (filter_video(sh_video, decoded_frame, sh_video->pts)) @@ -3009,9 +3010,9 @@ int sleep_until_update(float *time_frame, float *aq_sleep_time) { + int frame_time_remaining = 0; current_module="calc_sleep_time"; - int frame_time_remaining = 0; *time_frame -= GetRelativeTime(); // reset timer if (sh_audio && !d_audio->eof) { @@ -4342,6 +4343,7 @@ blit_frame = 0; // Don't blit if we hit EOF if (!correct_pts) while(1) { unsigned char* start=NULL; + void *decoded_frame; int in_size; // get it! current_module="video_read_frame"; @@ -4373,7 +4375,7 @@ current_module="decode_video"; // printf("Decode! %p %d \n",start,in_size); update_osd_msg(); - void *decoded_frame = decode_video(sh_video,start,in_size,drop_frame, sh_video->pts); + decoded_frame = decode_video(sh_video,start,in_size,drop_frame, sh_video->pts); blit_frame = (decoded_frame && filter_video(sh_video, decoded_frame, sh_video->pts)); break;

1 0

r20919 - trunk/mplayer.c
by uau 14 Nov '06

14 Nov '06

Author: uau Date: Tue Nov 14 13:39:49 2006 New Revision: 20919 Modified: trunk/mplayer.c Log: Remove write-only variable Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c (original) +++ trunk/mplayer.c Tue Nov 14 13:39:49 2006 @@ -4215,9 +4215,6 @@ int grab_frames=0; int drop_frame=0; // current dropping status int dropped_frames=0; // how many frames dropped since last non-dropped frame -// for auto-quality: -double vdecode_time; -/*float time_frame_corr_avg=0;*/ /* unused */ float next_frame_time=0; int frame_time_remaining=0; // flag @@ -4343,7 +4340,6 @@ if(!frame_time_remaining){ //-------------------- Decode a frame: ----------------------- blit_frame = 0; // Don't blit if we hit EOF - vdecode_time=video_time_usage; if (!correct_pts) while(1) { unsigned char* start=NULL; int in_size; @@ -4408,7 +4404,6 @@ break; } - vdecode_time=video_time_usage-vdecode_time; //------------------------ frame decoded. -------------------- mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"*** ftime=%5.3f ***\n",frame_time);

1 0