October 2005 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main get_path.c,1.11,1.12
by syncmail＠mplayerhq.hu 08 Nov '05

08 Nov '05

CVS change done by Alban Bedel CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv4772 Modified Files: get_path.c Log Message: Allow the user to set the $MPLAYER_HOME environment variable to point to the location were they want mplayer to store its configuration stuff. Patch by Nikolai Weibull (nikolai _(dot)_ weibull _(at)_ gmail _(dot)_ com) Index: get_path.c =================================================================== RCS file: /cvsroot/mplayer/main/get_path.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- get_path.c 16 Oct 2005 19:14:09 -0000 1.11 +++ get_path.c 29 Oct 2005 12:16:46 -0000 1.12 @@ -36,7 +36,9 @@ char *bdl_url_path = NULL; #endif - if ((homedir = getenv("HOME")) == NULL) + if ((homedir = getenv("MPLAYER_HOME")) != NULL) + config_dir = ""; + else if ((homedir = getenv("HOME")) == NULL) #if defined(__MINGW32__)||defined(__CYGWIN__) /*hack to get fonts etc. loaded outside of cygwin environment*/ { int i,imax=0;

8 11

CVS: main configure,1.1089,1.1090
by syncmail＠mplayerhq.hu 03 Nov '05

03 Nov '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv3293 Modified Files: configure Log Message: Simplification of the system_name check and the PPC CPU type check. Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.1089 retrieving revision 1.1090 diff -u -r1.1089 -r1.1090 --- configure 23 Oct 2005 11:26:36 -0000 1.1089 +++ configure 23 Oct 2005 12:39:47 -0000 1.1090 @@ -477,7 +477,7 @@ # OS name system_name=`uname -s 2>&1` case "$system_name" in - Linux|FreeBSD|NetBSD|BSD/OS|OpenBSD|SunOS|QNX|Darwin|GNU|BeOS) + Linux|FreeBSD|NetBSD|BSD/OS|OpenBSD|SunOS|QNX|Darwin|GNU|BeOS|MorphOS) ;; IRIX*) system_name=IRIX @@ -491,9 +491,6 @@ MINGW32*) system_name=MINGW32 ;; - MorphOS) - system_name=MorphOS - ;; *) system_name="$system_name-UNKNOWN" ;; @@ -1136,22 +1133,22 @@ _altivec=no echocheck "CPU type" - if linux && test -n "$_cpuinfo"; then + case $system_name in + Linux) proc=`$_cpuinfo | grep 'cpu' | cut -d ':' -f 2 | cut -d ',' -f 1 | cut -b 2- | _head 1` if test -n "`$_cpuinfo | grep altivec`"; then _altivec=yes fi - fi - if darwin ; then + ;; + Darwin) proc=`$_cpuinfo | grep "Processor type" | cut -f 3 -d ' ' | sed 's/ppc//'` - if [ `sysctl -n hw.vectorunit` -eq 1 ]; then - _altivec=yes - elif [ "`sysctl -n hw.optional.altivec 2>/dev/null`" = 1 ]; then + if [ `sysctl -n hw.vectorunit` -eq 1 -o + "`sysctl -n hw.optional.altivec 2>/dev/null`" -eq 1 ]; then _altivec=yes fi - fi - # only gcc 3.4 works reliably with altivec code under netbsd - if netbsd ; then + ;; + NetBSD) + # only gcc 3.4 works reliably with AltiVec code under NetBSD case $cc_version in 2*|3.0*|3.1*|3.2*|3.3*) ;; @@ -1161,7 +1158,8 @@ fi ;; esac - fi + ;; + esac if test "$_altivec" = yes; then echores "$proc altivec" else

3 2

CVS: main/libmpdemux demux_ts.c,1.37,1.38
by syncmail＠mplayerhq.hu 31 Oct '05

31 Oct '05

CVS change done by Nico Sabbi CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv11891 Modified Files: demux_ts.c Log Message: more precise seeking based on calculated average video bitrate; works quite well in case of a TS with only 1 video stream Index: demux_ts.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ts.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- demux_ts.c 30 Oct 2005 09:19:05 -0000 1.37 +++ demux_ts.c 31 Oct 2005 23:38:32 -0000 1.38 @@ -201,6 +201,13 @@ } pmt_t; typedef struct { + uint64_t size; + float duration; + float first_pts; + float last_pts; +} TS_stream_info; + +typedef struct { MpegTSContext ts; int last_pid; av_fifo_t fifo[3]; //0 for audio, 1 for video, 2 for subs @@ -208,8 +215,10 @@ pmt_t *pmt; uint16_t pmt_cnt; uint32_t prog; + uint32_t vbitrate; int keep_broken; char packet[TS_FEC_PACKET_SIZE]; + TS_stream_info vstr, astr; } ts_priv_t; @@ -849,7 +858,7 @@ if(!packet_size) return NULL; - priv = malloc(sizeof(ts_priv_t)); + priv = calloc(1, sizeof(ts_priv_t)); if(priv == NULL) { mp_msg(MSGT_DEMUX, MSGL_FATAL, "DEMUX_OPEN_TS, couldn't allocate enough memory for ts->priv, exit\n"); @@ -2456,7 +2465,7 @@ } -static int fill_packet(demuxer_t *demuxer, demux_stream_t *ds, demux_packet_t **dp, int *dp_offset) +static int fill_packet(demuxer_t *demuxer, demux_stream_t *ds, demux_packet_t **dp, int *dp_offset, TS_stream_info *si) { int ret = 0; @@ -2466,6 +2475,30 @@ resize_demux_packet(*dp, ret); //shrinked to the right size ds_add_packet(ds, *dp); mp_msg(MSGT_DEMUX, MSGL_DBG2, "ADDED %d bytes to %s fifo, PTS=%.3f\n", ret, (ds == demuxer->audio ? "audio" : (ds == demuxer->video ? "video" : "sub")), (*dp)->pts); + if(si) + { + float diff = (*dp)->pts - si->last_pts; + float dur; + + if(abs(diff) > 1) //1 second, there's a discontinuity + { + si->duration += si->last_pts - si->first_pts; + si->first_pts = si->last_pts = (*dp)->pts; + } + else + { + si->last_pts = (*dp)->pts; + } + si->size += ret; + dur = si->duration + (si->last_pts - si->first_pts); + + if(dur > 0 && ds == demuxer->video) + { + ts_priv_t * priv = (ts_priv_t*) demuxer->priv; + if(dur > 1) //otherwise it may be unreliable + priv->vbitrate = (uint32_t) ((float) si->size / dur); + } + } } *dp = NULL; @@ -2513,6 +2546,7 @@ int junk = 0, rap_flag = 0; pmt_t *pmt; mp4_decoder_config_t *mp4_dec; + TS_stream_info *si; while(! done) @@ -2524,6 +2558,7 @@ rap_flag = 0; mp4_dec = NULL; es->is_synced = 0; + si = NULL; junk = priv->ts.packet_size - TS_PACKET_SIZE; buf_size = priv->ts.packet_size - junk; @@ -2707,6 +2742,7 @@ dp = &priv->fifo[1].pack; dp_offset = &priv->fifo[1].offset; buffer_size = &priv->fifo[1].buffer_size; + si = &priv->vstr; } else if(is_audio && (demuxer->audio->id == tss->pid)) { @@ -2715,6 +2751,7 @@ dp = &priv->fifo[0].pack; dp_offset = &priv->fifo[0].offset; buffer_size = &priv->fifo[0].buffer_size; + si = &priv->astr; } else if(is_sub || (pid_type == SPU_DVD) || (pid_type == SPU_DVB)) @@ -2780,7 +2817,7 @@ //IS IT TIME TO QUEUE DATA to the dp_packet? if(is_start && (dp != NULL)) { - retv = fill_packet(demuxer, ds, dp, dp_offset); + retv = fill_packet(demuxer, ds, dp, dp_offset, si); } @@ -2893,7 +2930,7 @@ if(is_audio) { - retv = fill_packet(demuxer, ds, dp, dp_offset); + retv = fill_packet(demuxer, ds, dp, dp_offset, si); return 1; } @@ -2966,7 +3003,7 @@ if(is_audio) { (*dp)->pts = tss->last_pts; - retv = fill_packet(demuxer, ds, dp, dp_offset); + retv = fill_packet(demuxer, ds, dp, dp_offset, si); return 1; } @@ -3056,7 +3093,13 @@ video_stats = (sh_video != NULL); if(video_stats) - video_stats = sh_video->i_bps; + { + mp_msg(MSGT_DEMUX, MSGL_V, "IBPS: %d, vb: %d\r\n", sh_video->i_bps, priv->vbitrate); + if(priv->vbitrate) + video_stats = priv->vbitrate; + else + video_stats = sh_video->i_bps; + } newpos = (flags & 1) ? demuxer->movi_start : demuxer->filepos; if(flags & 2) // float seek 0..1

1 0

CVS: main/libmpdemux ai_alsa.c, 1.5, 1.6 ai_alsa1x.c, 1.6, 1.7 ai_oss.c, 1.8, 1.9 asf_mmst_streaming.c, 1.33, 1.34 asf_streaming.c, 1.57, 1.58 asfheader.c, 1.44, 1.45 audio_in.c, 1.9, 1.10 aviheader.c, 1.67, 1.68 url.c, 1.27, 1.28
by syncmail＠mplayerhq.hu 31 Oct '05

31 Oct '05

CVS change done by Reynaldo H. Verdejo CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv26451 Modified Files: ai_alsa.c ai_alsa1x.c ai_oss.c asf_mmst_streaming.c asf_streaming.c asfheader.c audio_in.c aviheader.c url.c Log Message: libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2 Index: ai_alsa.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/ai_alsa.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ai_alsa.c 7 Aug 2003 12:24:35 -0000 1.5 +++ ai_alsa.c 31 Oct 2005 23:37:41 -0000 1.6 @@ -9,6 +9,7 @@ #include <alsa/asoundlib.h> #include "audio_in.h" #include "mp_msg.h" +#include "help_mp.h" int ai_alsa_setup(audio_in_t *ai) { @@ -23,24 +24,24 @@ err = snd_pcm_hw_params_any(ai->alsa.handle, params); if (err < 0) { - mp_msg(MSGT_TV, MSGL_ERR, "Broken configuration for this PCM: no configurations available\n"); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA_PcmBrokenConfig); return -1; } err = snd_pcm_hw_params_set_access(ai->alsa.handle, params, SND_PCM_ACCESS_RW_INTERLEAVED); if (err < 0) { - mp_msg(MSGT_TV, MSGL_ERR, "Access type not available\n"); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA_UnavailableAccessType); return -1; } err = snd_pcm_hw_params_set_format(ai->alsa.handle, params, SND_PCM_FORMAT_S16_LE); if (err < 0) { - mp_msg(MSGT_TV, MSGL_ERR, "Sample format not available\n"); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA_UnavailableSampleFmt); return -1; } err = snd_pcm_hw_params_set_channels(ai->alsa.handle, params, ai->req_channels); if (err < 0) { ai->channels = snd_pcm_hw_params_get_channels(params); - mp_msg(MSGT_TV, MSGL_ERR, "Channel count not available - reverting to default: %d\n", + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA_UnavailableChanCount, ai->channels); } else { ai->channels = ai->req_channels; @@ -61,14 +62,14 @@ assert(ai->alsa.period_time >= 0); err = snd_pcm_hw_params(ai->alsa.handle, params); if (err < 0) { - mp_msg(MSGT_TV, MSGL_ERR, "Unable to install hw params:"); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA_CannotInstallHWParams); snd_pcm_hw_params_dump(params, ai->alsa.log); return -1; } ai->alsa.chunk_size = snd_pcm_hw_params_get_period_size(params, 0); buffer_size = snd_pcm_hw_params_get_buffer_size(params); if (ai->alsa.chunk_size == buffer_size) { - mp_msg(MSGT_TV, MSGL_ERR, "Can't use period equal to buffer size (%u == %lu)\n", ai->alsa.chunk_size, (long)buffer_size); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA_PeriodEqualsBufferSize, ai->alsa.chunk_size, (long)buffer_size); return -1; } snd_pcm_sw_params_current(ai->alsa.handle, swparams); @@ -84,7 +85,7 @@ assert(err >= 0); if (snd_pcm_sw_params(ai->alsa.handle, swparams) < 0) { - mp_msg(MSGT_TV, MSGL_ERR, "unable to install sw params:\n"); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA_CannotInstallSWParams); snd_pcm_sw_params_dump(swparams, ai->alsa.log); return -1; } @@ -108,7 +109,7 @@ err = snd_pcm_open(&ai->alsa.handle, ai->alsa.device, SND_PCM_STREAM_CAPTURE, 0); if (err < 0) { - mp_msg(MSGT_TV, MSGL_ERR, "Error opening audio: %s\n", snd_strerror(err)); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA_ErrorOpeningAudio, snd_strerror(err)); return -1; } @@ -142,7 +143,7 @@ snd_pcm_status_alloca(&status); if ((res = snd_pcm_status(ai->alsa.handle, status))<0) { - mp_msg(MSGT_TV, MSGL_ERR, "ALSA status error: %s", snd_strerror(res)); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA_AlsaStatusError, snd_strerror(res)); return -1; } if (snd_pcm_status_get_state(status) == SND_PCM_STATE_XRUN) { @@ -150,19 +151,19 @@ gettimeofday(&now, 0); snd_pcm_status_get_trigger_tstamp(status, &tstamp); timersub(&now, &tstamp, &diff); - mp_msg(MSGT_TV, MSGL_ERR, "ALSA xrun!!! (at least %.3f ms long)\n", + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA_AlsaXRUN, diff.tv_sec * 1000 + diff.tv_usec / 1000.0); if (mp_msg_test(MSGT_TV, MSGL_V)) { - mp_msg(MSGT_TV, MSGL_ERR, "ALSA Status:\n"); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA_AlsaStatus); snd_pcm_status_dump(status, ai->alsa.log); } if ((res = snd_pcm_prepare(ai->alsa.handle))<0) { - mp_msg(MSGT_TV, MSGL_ERR, "ALSA xrun: prepare error: %s", snd_strerror(res)); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA_AlsaXRUNPrepareError, snd_strerror(res)); return -1; } return 0; /* ok, data should be accepted again */ } - mp_msg(MSGT_TV, MSGL_ERR, "ALSA read/write error"); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA_AlsaReadWriteError); return -1; } Index: ai_alsa1x.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/ai_alsa1x.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ai_alsa1x.c 11 Jan 2004 17:07:32 -0000 1.6 +++ ai_alsa1x.c 31 Oct 2005 23:37:41 -0000 1.7 @@ -9,6 +9,7 @@ #include <alsa/asoundlib.h> #include "audio_in.h" #include "mp_msg.h" +#include "help_mp.h" int ai_alsa_setup(audio_in_t *ai) { @@ -24,27 +25,27 @@ err = snd_pcm_hw_params_any(ai->alsa.handle, params); if (err < 0) { - mp_msg(MSGT_TV, MSGL_ERR, "Broken configuration for this PCM: no configurations available\n"); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA1X_PcmBrokenConfig); return -1; } err = snd_pcm_hw_params_set_access(ai->alsa.handle, params, SND_PCM_ACCESS_RW_INTERLEAVED); if (err < 0) { - mp_msg(MSGT_TV, MSGL_ERR, "Access type not available\n"); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA1X_UnavailableAccessType); return -1; } err = snd_pcm_hw_params_set_format(ai->alsa.handle, params, SND_PCM_FORMAT_S16_LE); if (err < 0) { - mp_msg(MSGT_TV, MSGL_ERR, "Sample format not available\n"); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA1X_UnavailableSampleFmt); return -1; } err = snd_pcm_hw_params_set_channels(ai->alsa.handle, params, ai->req_channels); if (err < 0) { snd_pcm_hw_params_get_channels(params, &ai->channels); - mp_msg(MSGT_TV, MSGL_ERR, "Channel count not available - reverting to default: %d\n", + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA1X_UnavailableChanCount, ai->channels); } else { ai->channels = ai->req_channels; @@ -54,7 +55,7 @@ rate = ai->req_samplerate; err = snd_pcm_hw_params_set_rate_near(ai->alsa.handle, params, &rate, &dir); if (err < 0) { - mp_msg(MSGT_TV, MSGL_ERR, "Cannot set samplerate\n"); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA1X_CannotSetSamplerate); } ai->samplerate = rate; @@ -63,7 +64,7 @@ err = snd_pcm_hw_params_set_buffer_time_near(ai->alsa.handle, params, &ai->alsa.buffer_time, &dir); if (err < 0) { - mp_msg(MSGT_TV, MSGL_ERR, "Cannot set buffer time\n"); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA1X_CannotSetBufferTime); } dir = 0; @@ -71,12 +72,12 @@ err = snd_pcm_hw_params_set_period_time_near(ai->alsa.handle, params, &ai->alsa.period_time, &dir); if (err < 0) { - mp_msg(MSGT_TV, MSGL_ERR, "Cannot set period time\n"); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA1X_CannotSetPeriodTime); } err = snd_pcm_hw_params(ai->alsa.handle, params); if (err < 0) { - mp_msg(MSGT_TV, MSGL_ERR, "Unable to install hw params: %s\n", snd_strerror(err)); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA1X_CannotInstallHWParams, snd_strerror(err)); snd_pcm_hw_params_dump(params, ai->alsa.log); return -1; } @@ -86,7 +87,7 @@ snd_pcm_hw_params_get_buffer_size(params, &buffer_size); ai->alsa.chunk_size = period_size; if (period_size == buffer_size) { - mp_msg(MSGT_TV, MSGL_ERR, "Can't use period equal to buffer size (%u == %lu)\n", ai->alsa.chunk_size, (long)buffer_size); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA1X_PeriodEqualsBufferSize, ai->alsa.chunk_size, (long)buffer_size); return -1; } @@ -103,7 +104,7 @@ assert(err >= 0); if (snd_pcm_sw_params(ai->alsa.handle, swparams) < 0) { - mp_msg(MSGT_TV, MSGL_ERR, "unable to install sw params:\n"); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA1X_CannotInstallSWParams); snd_pcm_sw_params_dump(swparams, ai->alsa.log); return -1; } @@ -127,7 +128,7 @@ err = snd_pcm_open(&ai->alsa.handle, ai->alsa.device, SND_PCM_STREAM_CAPTURE, 0); if (err < 0) { - mp_msg(MSGT_TV, MSGL_ERR, "Error opening audio: %s\n", snd_strerror(err)); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA1X_ErrorOpeningAudio, snd_strerror(err)); return -1; } @@ -161,7 +162,7 @@ snd_pcm_status_alloca(&status); if ((res = snd_pcm_status(ai->alsa.handle, status))<0) { - mp_msg(MSGT_TV, MSGL_ERR, "ALSA status error: %s", snd_strerror(res)); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA1X_AlsaStatusError, snd_strerror(res)); return -1; } if (snd_pcm_status_get_state(status) == SND_PCM_STATE_XRUN) { @@ -169,19 +170,19 @@ gettimeofday(&now, 0); snd_pcm_status_get_trigger_tstamp(status, &tstamp); timersub(&now, &tstamp, &diff); - mp_msg(MSGT_TV, MSGL_ERR, "ALSA xrun!!! (at least %.3f ms long)\n", + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA1X_AlsaXRUN, diff.tv_sec * 1000 + diff.tv_usec / 1000.0); if (mp_msg_test(MSGT_TV, MSGL_V)) { - mp_msg(MSGT_TV, MSGL_ERR, "ALSA Status:\n"); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA1X_AlsaStatus); snd_pcm_status_dump(status, ai->alsa.log); } if ((res = snd_pcm_prepare(ai->alsa.handle))<0) { - mp_msg(MSGT_TV, MSGL_ERR, "ALSA xrun: prepare error: %s", snd_strerror(res)); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA1X_AlsaXRUNPrepareError, snd_strerror(res)); return -1; } return 0; /* ok, data should be accepted again */ } - mp_msg(MSGT_TV, MSGL_ERR, "ALSA read/write error"); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA1X_AlsaReadWriteError); return -1; } Index: ai_oss.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/ai_oss.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ai_oss.c 29 Jan 2004 12:43:54 -0000 1.8 +++ ai_oss.c 31 Oct 2005 23:37:41 -0000 1.9 @@ -22,6 +22,7 @@ #include "audio_in.h" #include "mp_msg.h" +#include "help_mp.h" int ai_oss_set_samplerate(audio_in_t *ai) { @@ -42,7 +43,7 @@ mp_msg(MSGT_TV, MSGL_V, "ioctl dsp channels: %d\n", err = ioctl(ai->oss.audio_fd, SNDCTL_DSP_CHANNELS, &ioctl_param)); if (err < 0) { - mp_msg(MSGT_TV, MSGL_ERR, "Unable to set channel count: %d\n", + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIOSS_Unable2SetChanCount, ai->req_channels); return -1; } @@ -55,7 +56,7 @@ err = ioctl(ai->oss.audio_fd, SNDCTL_DSP_STEREO, &ioctl_param), ioctl_param); if (err < 0) { - mp_msg(MSGT_TV, MSGL_ERR, "Unable to set stereo: %d\n", + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIOSS_Unable2SetStereo, ai->req_channels == 2); return -1; } @@ -72,7 +73,7 @@ ai->oss.audio_fd = open(ai->oss.device, O_RDONLY); if (ai->oss.audio_fd < 0) { - mp_msg(MSGT_TV, MSGL_ERR, "unable to open '%s': %s\n", + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIOSS_Unable2Open, ai->oss.device, strerror(errno)); return -1; } @@ -83,13 +84,13 @@ mp_msg(MSGT_TV, MSGL_V, "Supported formats: %x\n", ioctl_param); if (!(ioctl_param & AFMT_S16_LE)) - mp_msg(MSGT_TV, MSGL_ERR, "notsupported format\n"); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIOSS_UnsupportedFmt); ioctl_param = AFMT_S16_LE; mp_msg(MSGT_TV, MSGL_V, "ioctl dsp setfmt: %d\n", err = ioctl(ai->oss.audio_fd, SNDCTL_DSP_SETFMT, &ioctl_param)); if (err < 0) { - mp_msg(MSGT_TV, MSGL_ERR, "Unable to set audio format."); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIOSS_Unable2SetAudioFmt); return -1; } @@ -99,7 +100,7 @@ mp_msg(MSGT_TV, MSGL_V, "ioctl dsp speed: %d\n", err = ioctl(ai->oss.audio_fd, SNDCTL_DSP_SPEED, &ioctl_param)); if (err < 0) { - mp_msg(MSGT_TV, MSGL_ERR, "Unable to set samplerate: %d\n", + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIOSS_Unable2SetSamplerate, ai->req_samplerate); return -1; } @@ -112,7 +113,7 @@ mp_msg(MSGT_TV, MSGL_V, "ioctl dsp trigger: %d\n", err = ioctl(ai->oss.audio_fd, SNDCTL_DSP_SETTRIGGER, &ioctl_param)); if (err < 0) { - mp_msg(MSGT_TV, MSGL_ERR, "Unable to set trigger: %d\n", + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIOSS_Unable2SetTrigger, PCM_ENABLE_INPUT); } @@ -120,17 +121,17 @@ mp_msg(MSGT_TV, MSGL_V, "ioctl dsp getblocksize: %d\n", err = ioctl(ai->oss.audio_fd, SNDCTL_DSP_GETBLKSIZE, &ai->blocksize)); if (err < 0) { - mp_msg(MSGT_TV, MSGL_ERR, "Unable to get block size!\n"); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIOSS_Unable2GetBlockSize); } mp_msg(MSGT_TV, MSGL_V, "blocksize: %d\n", ai->blocksize); // correct the blocksize to a reasonable value if (ai->blocksize <= 0) { ai->blocksize = 4096*ai->channels*2; - mp_msg(MSGT_TV, MSGL_ERR, "audio block size is zero, setting to %d!\n", ai->blocksize); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIOSS_AudioBlockSizeZero, ai->blocksize); } else if (ai->blocksize < 4096*ai->channels*2) { ai->blocksize *= 4096*ai->channels*2/ai->blocksize; - mp_msg(MSGT_TV, MSGL_ERR, "audio block size too low, setting to %d!\n", ai->blocksize); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIOSS_AudioBlockSize2Low, ai->blocksize); } ai->samplesize = 16; Index: asf_mmst_streaming.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/asf_mmst_streaming.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- asf_mmst_streaming.c 31 Aug 2005 21:13:05 -0000 1.33 +++ asf_mmst_streaming.c 31 Oct 2005 23:37:41 -0000 1.34 @@ -16,6 +16,9 @@ #include "config.h" +#include "mp_msg.h" +#include "help_mp.h" + #ifndef HAVE_WINSOCK2 #define closesocket close #else @@ -112,7 +115,7 @@ memset(&cmd.buf[48 + length], 0, 8 - (length & 7)); if (send (s, cmd.buf, len8*8+48, 0) != (len8*8+48)) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"write error\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_MMST_WriteError); } } @@ -160,7 +163,7 @@ len = recv (s, data, BUF_SIZE, 0) ; if (!len) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"\nalert! eof\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_MMST_EOFAlert); return; } @@ -207,7 +210,7 @@ while (1) { if (!get_data (s, pre_header, 8)) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"pre-header read failed\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_MMST_PreHeaderReadFailed); return 0; } if (pre_header[4] == 0x02) { @@ -219,12 +222,12 @@ // mp_msg(MSGT_NETWORK,MSGL_INFO,"asf header packet detected, len=%d\n", packet_len); if (packet_len < 0 || packet_len > HDR_BUF_SIZE - header_len) { - mp_msg(MSGT_NETWORK, MSGL_FATAL, "Invalid header size, giving up\n"); + mp_msg(MSGT_NETWORK, MSGL_FATAL, MSGTR_MPDEMUX_MMST_InvalidHeaderSize); return 0; } if (!get_data (s, &header[header_len], packet_len)) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"header data read failed\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_MMST_HeaderDataReadFailed); return 0; } @@ -250,7 +253,7 @@ char data[BUF_SIZE]; if (!get_data (s, (char*)&packet_len, 4)) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"packet_len read failed\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_MMST_packet_lenReadFailed); return 0; } @@ -260,12 +263,12 @@ if (packet_len < 0 || packet_len > BUF_SIZE) { mp_msg(MSGT_NETWORK, MSGL_FATAL, - "Invalid rtsp packet size, giving up\n"); + MSGTR_MPDEMUX_MMST_InvalidRTSPPacketSize); return 0; } if (!get_data (s, data, packet_len)) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"command data read failed\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_MMST_CmdDataReadFailed); return 0; } @@ -318,14 +321,14 @@ i += 8; if ( (guid_1 == 0x6cce6200aa00d9a6ULL) && (guid_2 == 0x11cf668e75b22630ULL) ) { - mp_msg(MSGT_NETWORK,MSGL_INFO,"header object\n"); + mp_msg(MSGT_NETWORK,MSGL_INFO,MSGTR_MPDEMUX_MMST_HeaderObject); } else if ((guid_1 == 0x6cce6200aa00d9a6ULL) && (guid_2 == 0x11cf668e75b22636ULL)) { - mp_msg(MSGT_NETWORK,MSGL_INFO,"data object\n"); + mp_msg(MSGT_NETWORK,MSGL_INFO,MSGTR_MPDEMUX_MMST_DataObject); } else if ((guid_1 == 0x6553200cc000e48eULL) && (guid_2 == 0x11cfa9478cabdca1ULL)) { packet_length = get_32(header, i+92-24); - mp_msg(MSGT_NETWORK,MSGL_INFO,"file object, packet length = %d (%d)\n", + mp_msg(MSGT_NETWORK,MSGL_INFO,MSGTR_MPDEMUX_MMST_FileObjectPacketLen, packet_length, get_32(header, i+96-24)); @@ -333,13 +336,13 @@ int stream_id = header[i+48] | header[i+49] << 8; - mp_msg(MSGT_NETWORK,MSGL_INFO,"stream object, stream id: %d\n", stream_id); + mp_msg(MSGT_NETWORK,MSGL_INFO,MSGTR_MPDEMUX_MMST_StreamObjectStreamID, stream_id); if (num_stream_ids < MAX_STREAMS) { stream_ids[num_stream_ids] = stream_id; num_stream_ids++; } else { - mp_msg(MSGT_NETWORK,MSGL_ERR,"too many id, stream skipped"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_MMST_2ManyStreamID); } } else { @@ -355,7 +358,7 @@ } printf("\n"); #else - mp_msg(MSGT_NETWORK,MSGL_WARN,"unknown object\n"); + mp_msg(MSGT_NETWORK,MSGL_WARN,MSGTR_MPDEMUX_MMST_UnknownObject); #endif } @@ -375,7 +378,7 @@ char data[BUF_SIZE]; if (!get_data (s, pre_header, 8)) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"pre-header read failed\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_MMST_PreHeaderReadFailed); return 0; } @@ -392,13 +395,12 @@ // mp_msg(MSGT_NETWORK,MSGL_INFO,"asf media packet detected, len=%d\n", packet_len); if (packet_len < 0 || packet_len > BUF_SIZE) { - mp_msg(MSGT_NETWORK, MSGL_FATAL, - "Invalid rtsp packet size, giving up\n"); + mp_msg(MSGT_NETWORK, MSGL_FATAL, MSGTR_MPDEMUX_MMST_InvalidRTSPPacketSize); return 0; } if (!get_data (s, data, packet_len)) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"media data read failed\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_MMST_MediaDataReadFailed); return 0; } @@ -410,27 +412,26 @@ int command; if (!get_data (s, (char*)&packet_len, 4)) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"packet_len read failed\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_MMST_packet_lenReadFailed); return 0; } packet_len = get_32 ((unsigned char*)&packet_len, 0) + 4; if (packet_len < 0 || packet_len > BUF_SIZE) { - mp_msg(MSGT_NETWORK, MSGL_FATAL, - "Invalid rtsp packet size, giving up\n"); + mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MPDEMUX_MMST_InvalidRTSPPacketSize); return 0; } if (!get_data (s, data, packet_len)) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"command data read failed\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_MMST_CmdDataReadFailed); return 0; } if ( (pre_header[7] != 0xb0) || (pre_header[6] != 0x0b) || (pre_header[5] != 0xfa) || (pre_header[4] != 0xce) ) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"missing signature\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_MMST_MissingSignature); return -1; } @@ -441,7 +442,7 @@ if (command == 0x1b) send_command (s, 0x1b, 0, 0, 0, data); else if (command == 0x1e) { - mp_msg(MSGT_NETWORK,MSGL_INFO,"everything done. Thank you for downloading a media file containing proprietary and patented technology.\n"); + mp_msg(MSGT_NETWORK,MSGL_INFO,MSGTR_MPDEMUX_MMST_PatentedTechnologyJoke); return 0; } else if (command == 0x21 ) { @@ -450,7 +451,7 @@ return 0; } else if (command != 0x05) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"unknown command %02x\n", command); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_MMST_UnknownCmd,command); return -1; } } @@ -471,7 +472,7 @@ // buffer is empty - fill it! int ret = get_media_packet( fd, packet_length1, stream_ctrl); if( ret<0 ) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"get_media_packet error : %s\n",strerror(errno)); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_MMST_GetMediaPacketErr,strerror(errno)); return -1; } else if (ret==0) //EOF? return ret; @@ -524,7 +525,7 @@ */ unescpath=malloc(strlen(path)+1); if (!unescpath) { - mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); + mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MPDEMUX_MMST_MallocFailed); return -1; } url_unescape_string(unescpath,path); @@ -539,7 +540,7 @@ free(path); return s; } - mp_msg(MSGT_NETWORK,MSGL_INFO,"connected\n"); + mp_msg(MSGT_NETWORK,MSGL_INFO,MSGTR_MPDEMUX_MMST_Connected); seq_num=0; @@ -653,7 +654,7 @@ stream->streaming_ctrl->status = streaming_playing_e; packet_length1 = packet_length; - mp_msg(MSGT_NETWORK,MSGL_INFO,"mmst packet_length = %d\n",packet_length); + mp_msg(MSGT_NETWORK,MSGL_INFO,"mmst packet_length = %d\n"); #ifdef USE_ICONV if (url_conv != (iconv_t)(-1)) Index: asf_streaming.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/asf_streaming.c,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- asf_streaming.c 6 Sep 2005 21:08:36 -0000 1.57 +++ asf_streaming.c 31 Oct 2005 23:37:41 -0000 1.58 @@ -6,6 +6,8 @@ #include <limits.h> #include "config.h" +#include "mp_msg.h" +#include "help_mp.h" #ifndef HAVE_WINSOCK2 #define closesocket close @@ -96,11 +98,11 @@ if( drop_packet!=NULL ) *drop_packet = 0; if( stream_chunck->size<8 ) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"Ahhhh, stream_chunck size is too small: %d\n", stream_chunck->size); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_StreamChunkSize2Small, stream_chunck->size); return -1; } if( stream_chunck->size!=stream_chunck->size_confirm ) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"size_confirm mismatch!: %d %d\n", stream_chunck->size, stream_chunck->size_confirm); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_SizeConfirmMismatch, stream_chunck->size, stream_chunck->size_confirm); return -1; } /* @@ -183,19 +185,19 @@ // Endian handling of the stream chunk le2me_ASF_stream_chunck_t(&chunk); size = asf_streaming( &chunk, &r) - sizeof(ASF_stream_chunck_t); - if(r) mp_msg(MSGT_NETWORK,MSGL_WARN,"Warning : drop header ????\n"); + if(r) mp_msg(MSGT_NETWORK,MSGL_WARN,MSGTR_MPDEMUX_ASF_WarnDropHeader); if(size < 0){ - mp_msg(MSGT_NETWORK,MSGL_ERR,"Error while parsing chunk header\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_ErrorParsingChunkHeader); return -1; } if (chunk.type != ASF_STREAMING_HEADER) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"Don't got a header as first chunk !!!!\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_NoHeaderAtFirstChunk); return -1; } buffer = (char*) malloc(size+buffer_size); if(buffer == NULL) { - mp_msg(MSGT_NETWORK,MSGL_FATAL,"Error can't allocate %d bytes buffer\n",size+buffer_size); + mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MPDEMUX_ASF_BufferMallocFailed,size+buffer_size); return -1; } if( chunk_buffer!=NULL ) { @@ -209,7 +211,7 @@ for(r = 0; r < size;) { i = nop_streaming_read(fd,buffer+r,size-r,streaming_ctrl); if(i < 0) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"Error while reading network stream\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_ErrReadingNetworkStream); return -1; } r += i; @@ -217,7 +219,7 @@ if( chunk_size2read==0 ) { if(size < (int)sizeof(asfh)) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"Error chunk is too small\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_ErrChunk2Small); return -1; } else mp_msg(MSGT_NETWORK,MSGL_DBG2,"Got chunk\n"); memcpy(&asfh,buffer,sizeof(asfh)); @@ -230,7 +232,7 @@ size = buffer_size; if(asfh.cno > 256) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"Error sub chunks number is invalid\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_ErrSubChunkNumberInvalid); return -1; } @@ -368,8 +370,7 @@ free(a_rates); if (a_idx < 0 && v_idx < 0) { - mp_msg(MSGT_NETWORK, MSGL_FATAL, "bandwidth too small, " - "file cannot be played!\n"); + mp_msg(MSGT_NETWORK, MSGL_FATAL, MSGTR_MPDEMUX_ASF_Bandwidth2SmallCannotPlay); return -1; } @@ -379,8 +380,7 @@ else if (a_idx >= 0) asf_ctrl->audio_id = asf_ctrl->audio_streams[a_idx]; else if (asf_ctrl->n_audio) { - mp_msg(MSGT_NETWORK, MSGL_WARN, "bandwidth too small, " - "deselected audio stream\n"); + mp_msg(MSGT_NETWORK, MSGL_WARN, MSGTR_MPDEMUX_ASF_Bandwidth2SmallDeselectedAudio); audio_id = -2; } @@ -390,15 +390,14 @@ else if (v_idx >= 0) asf_ctrl->video_id = asf_ctrl->video_streams[v_idx]; else if (asf_ctrl->n_video) { - mp_msg(MSGT_NETWORK, MSGL_WARN, "bandwidth too small, " - "deselected video stream\n"); + mp_msg(MSGT_NETWORK, MSGL_WARN, MSGTR_MPDEMUX_ASF_Bandwidth2SmallDeselectedVideo); video_id = -2; } return 1; len_err_out: - mp_msg(MSGT_NETWORK, MSGL_FATAL, "Invalid length in ASF header!\n"); + mp_msg(MSGT_NETWORK, MSGL_FATAL, MSGTR_MPDEMUX_ASF_InvalidLenInHeader); if (buffer) free(buffer); if (v_rates) free(v_rates); if (a_rates) free(a_rates); @@ -420,7 +419,7 @@ streaming_ctrl ); if(r <= 0){ if( r < 0) - mp_msg(MSGT_NETWORK,MSGL_ERR,"Error while reading chunk header\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_ErrReadingChunkHeader); return -1; } read += r; @@ -430,14 +429,14 @@ le2me_ASF_stream_chunck_t(&chunk); chunk_size = asf_streaming( &chunk, &drop_chunk ); if(chunk_size < 0) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"Error while parsing chunk header\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_ErrorParsingChunkHeader); return -1; } chunk_size -= sizeof(ASF_stream_chunck_t); if(chunk.type != ASF_STREAMING_HEADER && (!drop_chunk)) { if (asf_http_ctrl->packet_size < chunk_size) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"Error chunk_size > packet_size\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_ErrChunkBiggerThanPacket); return -1; } waiting = asf_http_ctrl->packet_size; @@ -460,7 +459,7 @@ int got = nop_streaming_read( fd,buffer+read,chunk_size-read,streaming_ctrl ); if(got <= 0) { if(got < 0) - mp_msg(MSGT_NETWORK,MSGL_ERR,"Error while reading chunk\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_ErrReadingChunk); return -1; } read += got; @@ -536,7 +535,7 @@ (!strcasecmp(content_type, "video/x-ms-wvx")) || (!strcasecmp(content_type, "video/x-ms-wmv")) || (!strcasecmp(content_type, "video/x-ms-wma")) ) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"=====> ASF Redirector\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_ASFRedirector); return ASF_Redirector_e; } else if( !strcasecmp(content_type, "text/plain") ) { mp_msg(MSGT_NETWORK,MSGL_V,"=====> ASF Plain text\n"); @@ -578,7 +577,7 @@ if( !strcasecmp( url->protocol, "http_proxy" ) ) { server_url = url_new( (url->file)+1 ); if( server_url==NULL ) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"Invalid proxy URL\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_InvalidProxyURL); http_free( http_hdr ); return NULL; } @@ -639,7 +638,7 @@ // First request goes here. break; default: - mp_msg(MSGT_NETWORK,MSGL_ERR,"Unknown asf stream type\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_UnknownASFStreamType); } http_set_field( http_hdr, "Connection: Close" ); @@ -653,7 +652,7 @@ char features[64] = "\0"; size_t len; if( http_response_parse(http_hdr)<0 ) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"Failed to parse HTTP response\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_Failed2ParseHTTPResponse); return -1; } switch( http_hdr->status_code ) { @@ -662,7 +661,7 @@ case 401: // Authentication required return ASF_Authenticate_e; default: - mp_msg(MSGT_NETWORK,MSGL_ERR,"Server return %d:%s\n", http_hdr->status_code, http_hdr->reason_phrase); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_ServerReturn, http_hdr->status_code, http_hdr->reason_phrase); return -1; } @@ -683,7 +682,7 @@ if( end==NULL ) { size_t s = strlen(pragma); if(s > sizeof(features)) { - mp_msg(MSGT_NETWORK,MSGL_WARN,"ASF HTTP PARSE WARNING : Pragma %s cuted from %d bytes to %d\n",pragma,s,sizeof(features)); + mp_msg(MSGT_NETWORK,MSGL_WARN,MSGTR_MPDEMUX_ASF_ASFHTTPParseWarnCuttedPragma,pragma,s,sizeof(features)); len = sizeof(features); } else { len = s; @@ -719,7 +718,7 @@ asf_http_ctrl = (asf_http_streaming_ctrl_t*)malloc(sizeof(asf_http_streaming_ctrl_t)); if( asf_http_ctrl==NULL ) { - mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n"); + mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MPDEMUX_ASF_MallocFailed); return -1; } asf_http_ctrl->streaming_type = ASF_Unknown_e; @@ -745,7 +744,7 @@ for(i=0; i < (int)http_hdr->buffer_size ; ) { int r = send( fd, http_hdr->buffer+i, http_hdr->buffer_size-i, 0 ); if(r <0) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"Socket write error : %s\n",strerror(errno)); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_SocketWriteError,strerror(errno)); return -1; } i += r; @@ -768,7 +767,7 @@ } ret = asf_http_parse_response(asf_http_ctrl, http_hdr); if( ret<0 ) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"Failed to parse header\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_HeaderParseFailed); http_free( http_hdr ); return -1; } @@ -788,7 +787,7 @@ ret = asf_streaming_parse_header(fd,stream->streaming_ctrl); if(ret < 0) return -1; if(asf_http_ctrl->n_audio == 0 && asf_http_ctrl->n_video == 0) { - mp_msg(MSGT_NETWORK,MSGL_ERR,"No stream found\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_NoStreamFound); return -1; } asf_http_ctrl->request++; @@ -815,7 +814,7 @@ break; case ASF_Unknown_e: default: - mp_msg(MSGT_NETWORK,MSGL_ERR,"Unknown ASF streaming type\n"); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_ASF_UnknownASFStreamingType); closesocket(fd); http_free( http_hdr ); return -1; @@ -851,7 +850,7 @@ stream->streaming_ctrl->url = check4proxies(url); url_free(url); - mp_msg(MSGT_OPEN, MSGL_INFO, "STREAM_ASF, URL: %s\n", stream->url); + mp_msg(MSGT_OPEN, MSGL_INFO, MSGTR_MPDEMUX_ASF_InfoStreamASFURL); if((!strncmp(stream->url, "http", 4)) && (*file_format!=DEMUXER_TYPE_ASF && *file_format!=DEMUXER_TYPE_UNKNOWN)) { streaming_ctrl_free(stream->streaming_ctrl); stream->streaming_ctrl = NULL; @@ -859,7 +858,7 @@ } if(asf_streaming_start(stream, file_format) < 0) { - mp_msg(MSGT_OPEN, MSGL_ERR, "failed, exiting\n"); + mp_msg(MSGT_OPEN, MSGL_ERR, MSGTR_MPDEMUX_ASF_StreamingFailed); streaming_ctrl_free(stream->streaming_ctrl); stream->streaming_ctrl = NULL; return STREAM_UNSUPORTED; Index: asfheader.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/asfheader.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- asfheader.c 5 Aug 2005 19:57:46 -0000 1.44 +++ asfheader.c 31 Oct 2005 23:37:41 -0000 1.45 @@ -9,6 +9,7 @@ #include "config.h" #include "mp_msg.h" +#include "help_mp.h" #include "stream.h" #include "demuxer.h" @@ -165,22 +166,19 @@ uint64_t data_len; if (hdr_len > 1024 * 1024) { - mp_msg(MSGT_HEADER, MSGL_FATAL, - "FATAL: header size bigger than 1 MB (%d)!\n" - "Please contact MPlayer authors, and upload/send this file.\n", - hdr_len); + mp_msg(MSGT_HEADER, MSGL_FATAL, MSGTR_MPDEMUX_ASFHDR_HeaderSizeOver1MB, + hdr_len); return 0; } hdr = malloc(hdr_len); if (!hdr) { - mp_msg(MSGT_HEADER, MSGL_FATAL, "Could not allocate %d bytes for header\n", + mp_msg(MSGT_HEADER, MSGL_FATAL, MSGTR_MPDEMUX_ASFHDR_HeaderMallocFailed, hdr_len); return 0; } stream_read(demuxer->stream, hdr, hdr_len); if (stream_eof(demuxer->stream)) { - mp_msg(MSGT_HEADER, MSGL_FATAL, - "EOF while reading asf header, broken/incomplete file?\n"); + mp_msg(MSGT_HEADER, MSGL_FATAL, MSGTR_MPDEMUX_ASFHDR_EOFWhileReadingHeader); goto err_out; } @@ -239,8 +237,7 @@ memcpy(sh_video->bih,&buffer[4+4+1+2],len); le2me_BITMAPINFOHEADER(sh_video->bih); if (sh_video->bih->biCompression == mmioFOURCC('D', 'V', 'R', ' ')) - mp_msg(MSGT_DEMUXER, MSGL_WARN, "DVR will probably only work with " - "libavformat, try -demuxer 35 if you have problems\n"); + mp_msg(MSGT_DEMUXER, MSGL_WARN, MSGTR_MPDEMUX_ASFHDR_DVRWantsLibavformat); //sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale; //sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate; if(verbose>=1) print_video_header(sh_video->bih); @@ -369,7 +366,7 @@ start = stream_tell(demuxer->stream); // start of first data chunk stream_read(demuxer->stream, guid_buffer, 16); if (memcmp(guid_buffer, asf_data_chunk_guid, 16) != 0) { - mp_msg(MSGT_HEADER, MSGL_FATAL, "No data chunk following header!\n"); + mp_msg(MSGT_HEADER, MSGL_FATAL, MSGTR_MPDEMUX_ASFHDR_NoDataChunkAfterHeader); return 0; } // read length of chunk @@ -414,7 +411,7 @@ else if(best_audio > 0 && demuxer->audio->id == -1) demuxer->audio->id=best_audio; if(!video_streams){ if(!audio_streams){ - mp_msg(MSGT_HEADER,MSGL_ERR,"ASF: no audio or video headers found - broken file?\n"); + mp_msg(MSGT_HEADER,MSGL_ERR,MSGTR_MPDEMUX_ASFHDR_AudioVideoHeaderNotFound); return 0; } demuxer->video->id=-2; // audio-only @@ -431,7 +428,7 @@ return 1; len_err_out: - mp_msg(MSGT_HEADER, MSGL_FATAL, "Invalid length in ASF header!\n"); + mp_msg(MSGT_HEADER, MSGL_FATAL, MSGTR_MPDEMUX_ASFHDR_InvalidLengthInASFHeader); err_out: if (hdr) free(hdr); if (streams) free(streams); Index: audio_in.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/audio_in.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- audio_in.c 11 Jan 2004 17:07:32 -0000 1.9 +++ audio_in.c 31 Oct 2005 23:37:41 -0000 1.10 @@ -8,6 +8,7 @@ #include "audio_in.h" #include "mp_msg.h" +#include "help_mp.h" #include <string.h> #include <errno.h> @@ -186,16 +187,16 @@ ret = snd_pcm_readi(ai->alsa.handle, buffer, ai->alsa.chunk_size); if (ret != ai->alsa.chunk_size) { if (ret < 0) { - mp_msg(MSGT_TV, MSGL_ERR, "\nerror reading audio: %s\n", snd_strerror(ret)); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AUDIOIN_ErrReadingAudio, snd_strerror(ret)); if (ret == -EPIPE) { if (ai_alsa_xrun(ai) == 0) { - mp_msg(MSGT_TV, MSGL_ERR, "Recovered from cross-run, some frames may be left out!\n"); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AUDIOIN_XRUNSomeFramesMayBeLeftOut); } else { - mp_msg(MSGT_TV, MSGL_ERR, "Fatal error, cannot recover!\n"); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AUDIOIN_ErrFatalCannotRecover); } } } else { - mp_msg(MSGT_TV, MSGL_ERR, "\nnot enough audio samples!\n"); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AUDIOIN_NotEnoughSamples); } return -1; } @@ -206,9 +207,9 @@ ret = read(ai->oss.audio_fd, buffer, ai->blocksize); if (ret != ai->blocksize) { if (ret < 0) { - mp_msg(MSGT_TV, MSGL_ERR, "\nerror reading audio: %s\n", strerror(errno)); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AUDIOIN_ErrReadingAudio, strerror(errno)); } else { - mp_msg(MSGT_TV, MSGL_ERR, "\nnot enough audio samples!\n"); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AUDIOIN_NotEnoughSamples); } return -1; } Index: aviheader.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/aviheader.c,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- aviheader.c 16 Jun 2005 19:04:09 -0000 1.67 +++ aviheader.c 31 Oct 2005 23:37:41 -0000 1.68 @@ -6,6 +6,7 @@ #include "config.h" #include "mp_msg.h" +#include "help_mp.h" #include "stream.h" #include "demuxer.h" @@ -81,7 +82,7 @@ len -= 4; list_end=stream_tell(demuxer->stream)+((len+1)&(~1)); } else { - mp_msg(MSGT_HEADER,MSGL_WARN,"** empty list?!\n"); + mp_msg(MSGT_HEADER,MSGL_WARN,MSGTR_MPDEMUX_AVIHDR_EmptyList); list_end = 0; } mp_msg(MSGT_HEADER,MSGL_V,"list_end=0x%X\n",(int)list_end); @@ -89,7 +90,7 @@ // found MOVI header if(!demuxer->movi_start) demuxer->movi_start=stream_tell(demuxer->stream); demuxer->movi_end=stream_tell(demuxer->stream)+len; - mp_msg(MSGT_HEADER,MSGL_V,"Found movie at 0x%X - 0x%X\n",(int)demuxer->movi_start,(int)demuxer->movi_end); + mp_msg(MSGT_HEADER,MSGL_V,MSGTR_MPDEMUX_AVIHDR_FoundMovieAt,(int)demuxer->movi_start,(int)demuxer->movi_end); if(demuxer->stream->end_pos>demuxer->movi_end) demuxer->movi_end=demuxer->stream->end_pos; if(index_mode==-2 || index_mode==2 || index_mode==0) break; // reading from non-seekable source (stdin) or forced index or no index forced @@ -247,7 +248,7 @@ if(last_fccType==streamtypeVIDEO){ sh_video->bih=calloc((chunksize<sizeof(BITMAPINFOHEADER))?sizeof(BITMAPINFOHEADER):chunksize,1); // sh_video->bih=malloc(chunksize); memset(sh_video->bih,0,chunksize); - mp_msg(MSGT_HEADER,MSGL_V,"found 'bih', %u bytes of %d\n",chunksize,sizeof(BITMAPINFOHEADER)); + mp_msg(MSGT_HEADER,MSGL_V,MSGTR_MPDEMUX_AVIHDR_FoundBitmapInfoHeader,chunksize,sizeof(BITMAPINFOHEADER)); stream_read(demuxer->stream,(char*) sh_video->bih,chunksize); le2me_BITMAPINFOHEADER(sh_video->bih); // swap to machine endian // fixup MS-RLE header (seems to be broken for <256 color files) @@ -265,7 +266,7 @@ case mmioFOURCC('m', 'p', 'g', '4'): case mmioFOURCC('D', 'I', 'V', '1'): idxfix_divx=3; // set index recovery mpeg4 flavour: msmpeg4v1 - mp_msg(MSGT_HEADER,MSGL_V,"Regenerating keyframe table for M$ mpg4v1 video\n"); + mp_msg(MSGT_HEADER,MSGL_V,MSGTR_MPDEMUX_AVIHDR_RegeneratingKeyfTableForMPG4V1); break; case mmioFOURCC('D', 'I', 'V', '3'): case mmioFOURCC('d', 'i', 'v', '3'): @@ -282,7 +283,7 @@ case mmioFOURCC('D', 'I', 'V', '2'): case mmioFOURCC('A', 'P', '4', '1'): idxfix_divx=1; // set index recovery mpeg4 flavour: msmpeg4v3 - mp_msg(MSGT_HEADER,MSGL_V,"Regenerating keyframe table for DIVX3 video\n"); + mp_msg(MSGT_HEADER,MSGL_V,MSGTR_MPDEMUX_AVIHDR_RegeneratingKeyfTableForDIVX3); break; case mmioFOURCC('D', 'I', 'V', 'X'): case mmioFOURCC('d', 'i', 'v', 'x'): @@ -292,7 +293,7 @@ case mmioFOURCC('F', 'M', 'P', '4'): case mmioFOURCC('f', 'm', 'p', '4'): idxfix_divx=2; // set index recovery mpeg4 flavour: generic mpeg4 - mp_msg(MSGT_HEADER,MSGL_V,"Regenerating keyframe table for MPEG4 video\n"); + mp_msg(MSGT_HEADER,MSGL_V,MSGTR_MPDEMUX_AVIHDR_RegeneratingKeyfTableForMPEG4); break; } } else @@ -300,7 +301,7 @@ unsigned wf_size = chunksize<sizeof(WAVEFORMATEX)?sizeof(WAVEFORMATEX):chunksize; sh_audio->wf=calloc(wf_size,1); // sh_audio->wf=malloc(chunksize); memset(sh_audio->wf,0,chunksize); - mp_msg(MSGT_HEADER,MSGL_V,"found 'wf', %d bytes of %d\n",chunksize,sizeof(WAVEFORMATEX)); + mp_msg(MSGT_HEADER,MSGL_V,MSGTR_MPDEMUX_AVIHDR_FoundWaveFmt,chunksize,sizeof(WAVEFORMATEX)); stream_read(demuxer->stream,(char*) sh_audio->wf,chunksize); le2me_WAVEFORMATEX(sh_audio->wf); if (sh_audio->wf->cbSize != 0 && @@ -338,7 +339,7 @@ case mmioFOURCC('d', 'm', 'l', 'h'): { // dmlh 00 00 00 04 frms unsigned int total_frames = stream_read_dword_le(demuxer->stream); - mp_msg(MSGT_HEADER,MSGL_V,"AVI: dmlh found (size=%d) (total_frames=%d)\n", chunksize, total_frames); + mp_msg(MSGT_HEADER,MSGL_V,MSGTR_MPDEMUX_AVIHDR_FoundAVIV2Header, chunksize, total_frames); stream_skip(demuxer->stream, chunksize-4); chunksize = 0; } @@ -351,7 +352,7 @@ off_t base = 0; uint32_t last_off = 0; priv->idx_size=size2>>4; - mp_msg(MSGT_HEADER,MSGL_V,"Reading INDEX block, %d chunks for %ld frames (fpos=%p)\n", + mp_msg(MSGT_HEADER,MSGL_V,MSGTR_MPDEMUX_AVIHDR_ReadingIndexBlockChunksForFrames, priv->idx_size,avih.dwTotalFrames, stream_tell(demuxer->stream)); priv->idx=malloc(priv->idx_size<<4); // printf("\nindex to %p !!!!! (priv=%p)\n",priv->idx,priv); @@ -374,11 +375,10 @@ case mmioFOURCC('R','I','F','F'): { char riff_type[4]; - mp_msg(MSGT_HEADER, MSGL_V, "additional RIFF header...\n"); + mp_msg(MSGT_HEADER, MSGL_V, MSGTR_MPDEMUX_AVIHDR_AdditionalRIFFHdr); stream_read(demuxer->stream, riff_type, sizeof riff_type); if (strncmp(riff_type, "AVIX", sizeof riff_type)) - mp_msg(MSGT_HEADER, MSGL_WARN, - "** warning: this is no extended AVI header..\n"); + mp_msg(MSGT_HEADER, MSGL_WARN, MSGTR_MPDEMUX_AVIHDR_WarnNotExtendedAVIHdr); else { /* * We got an extended AVI header, so we need to switch to @@ -416,7 +416,7 @@ if(list_end>0 && chunksize+stream_tell(demuxer->stream) == list_end) list_end=0; if(list_end>0 && chunksize+stream_tell(demuxer->stream)>list_end){ - mp_msg(MSGT_HEADER,MSGL_V,"Broken chunk? chunksize=%d (id=%.4s)\n",chunksize,(char *) &id); + mp_msg(MSGT_HEADER,MSGL_V,MSGTR_MPDEMUX_AVIHDR_BrokenChunk,chunksize,(char *) &id); stream_seek(demuxer->stream,list_end); list_end=0; } else @@ -445,8 +445,7 @@ priv->idx_offset = 0; priv->idx = NULL; - mp_msg(MSGT_HEADER, MSGL_INFO, - "AVI: ODML: Building odml index (%d superindexchunks)\n", priv->suidx_size); + mp_msg(MSGT_HEADER, MSGL_INFO, MSGTR_MPDEMUX_AVIHDR_BuildingODMLidx, priv->suidx_size); // read the standard indices for (cx = &priv->suidx[0], i=0; i<priv->suidx_size; cx++, i++) { @@ -461,8 +460,7 @@ // gen_index routine handle this priv->isodml = 0; priv->idx_size = 0; - mp_msg(MSGT_HEADER, MSGL_WARN, - "AVI: ODML: Broken (incomplete?) file detected. Will use traditional index\n"); + mp_msg(MSGT_HEADER, MSGL_WARN, MSGTR_MPDEMUX_AVIHDR_BrokenODMLfile); goto freeout; } @@ -566,18 +564,18 @@ unsigned int i; if ((fp = fopen(index_file_load, "r")) == NULL) { - mp_msg(MSGT_HEADER,MSGL_ERR, "Can't read index file %s: %s\n", index_file_load, strerror(errno)); + mp_msg(MSGT_HEADER,MSGL_ERR, MSGTR_MPDEMUX_AVIHDR_CantReadIdxFile, index_file_load, strerror(errno)); goto gen_index; } fread(&magic, 6, 1, fp); if (strncmp(magic, "MPIDX1", 6)) { - mp_msg(MSGT_HEADER,MSGL_ERR, "%s is not a valid MPlayer index file\n", index_file_load); + mp_msg(MSGT_HEADER,MSGL_ERR, MSGTR_MPDEMUX_AVIHDR_NotValidMPidxFile, index_file_load); goto gen_index; } fread(&priv->idx_size, sizeof(priv->idx_size), 1, fp); priv->idx=malloc(priv->idx_size*sizeof(AVIINDEXENTRY)); if (!priv->idx) { - mp_msg(MSGT_HEADER,MSGL_ERR, "Could not allocate memory for index data from %s\n", index_file_load); + mp_msg(MSGT_HEADER,MSGL_ERR, MSGTR_MPDEMUX_AVIHDR_FailedMallocForIdxFile, index_file_load); priv->idx_size = 0; goto gen_index; } @@ -587,14 +585,14 @@ idx=&((AVIINDEXENTRY *)priv->idx)[i]; fread(idx, sizeof(AVIINDEXENTRY), 1, fp); if (feof(fp)) { - mp_msg(MSGT_HEADER,MSGL_ERR, "Premature end of index file %s\n", index_file_load); + mp_msg(MSGT_HEADER,MSGL_ERR, MSGTR_MPDEMUX_AVIHDR_PrematureEOF, index_file_load); free(priv->idx); priv->idx_size = 0; goto gen_index; } } fclose(fp); - mp_msg(MSGT_HEADER,MSGL_INFO, "Loaded index file: %s\n", index_file_load); + mp_msg(MSGT_HEADER,MSGL_INFO, MSGTR_MPDEMUX_AVIHDR_IdxFileLoaded, index_file_load); } gen_index: if(index_mode>=2 || (priv->idx_size==0 && index_mode==1)){ @@ -659,7 +657,7 @@ } if(pos!=lastpos){ lastpos=pos; - mp_msg(MSGT_HEADER,MSGL_STATUS,"Generating Index: %3lu %s \r", + mp_msg(MSGT_HEADER,MSGL_STATUS,MSGTR_MPDEMUX_AVIHDR_GeneratingIdx, (unsigned long)pos, len?"%":"MB"); } } @@ -678,7 +676,7 @@ stream_seek(demuxer->stream,8+demuxer->filepos+skip); } priv->idx_size=priv->idx_pos; - mp_msg(MSGT_HEADER,MSGL_INFO,"AVI: Generated index table for %d chunks!\n",priv->idx_size); + mp_msg(MSGT_HEADER,MSGL_INFO,MSGTR_MPDEMUX_AVIHDR_IdxGeneratedForHowManyChunks,priv->idx_size); if(verbose>=2) print_index(priv->idx,priv->idx_size); /* Write generated index to a file */ @@ -687,7 +685,7 @@ unsigned int i; if ((fp=fopen(index_file_save, "w")) == NULL) { - mp_msg(MSGT_HEADER,MSGL_ERR, "Couldn't write index file %s: %s\n", index_file_save, strerror(errno)); + mp_msg(MSGT_HEADER,MSGL_ERR, MSGTR_MPDEMUX_AVIHDR_Failed2WriteIdxFile, index_file_save, strerror(errno)); return; } fwrite("MPIDX1", 6, 1, fp); @@ -697,7 +695,7 @@ fwrite(idx, sizeof(AVIINDEXENTRY), 1, fp); } fclose(fp); - mp_msg(MSGT_HEADER,MSGL_INFO, "Saved index file: %s\n", index_file_save); + mp_msg(MSGT_HEADER,MSGL_INFO, MSGTR_MPDEMUX_AVIHDR_IdxFileSaved, index_file_save); } } } Index: url.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/url.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- url.c 6 Sep 2005 21:45:40 -0000 1.27 +++ url.c 31 Oct 2005 23:37:41 -0000 1.28 @@ -12,6 +12,7 @@ #include "url.h" #include "mp_msg.h" +#include "help_mp.h" URL_t* url_new(const char* url) { @@ -27,19 +28,19 @@ // Create temp filename space unescfilename=malloc(strlen(url)+1); if (!unescfilename ) { - mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); + mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MPDEMUX_URL_MallocFailed); goto err_out; } escfilename=malloc(strlen(url)*3+1); if (!escfilename ) { - mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); + mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MPDEMUX_URL_MallocFailed); goto err_out; } // Create the URL container Curl = (URL_t*)malloc(sizeof(URL_t)); if( Curl==NULL ) { - mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); + mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MPDEMUX_URL_MallocFailed); goto err_out; } @@ -56,7 +57,7 @@ // Copy the url in the URL container Curl->url = strdup(escfilename); if( Curl->url==NULL ) { - mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); + mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MPDEMUX_URL_MallocFailed); goto err_out; } mp_msg(MSGT_OPEN,MSGL_V,"Filename for url is now %s\n",escfilename); @@ -76,7 +77,7 @@ pos1 = ptr1-escfilename; Curl->protocol = (char*)malloc(pos1+1); if( Curl->protocol==NULL ) { - mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); + mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MPDEMUX_URL_MallocFailed); goto err_out; } strncpy(Curl->protocol, escfilename, pos1); @@ -98,7 +99,7 @@ int len = ptr2-ptr1; Curl->username = (char*)malloc(len+1); if( Curl->username==NULL ) { - mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); + mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MPDEMUX_URL_MallocFailed); goto err_out; } strncpy(Curl->username, ptr1, len); @@ -111,7 +112,7 @@ Curl->username[ptr3-ptr1]='\0'; Curl->password = (char*)malloc(len2+1); if( Curl->password==NULL ) { - mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); + mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MPDEMUX_URL_MallocFailed); goto err_out; } strncpy( Curl->password, ptr3+1, len2); @@ -163,7 +164,7 @@ // copy the hostname in the URL container Curl->hostname = (char*)malloc(pos2-pos1+1); if( Curl->hostname==NULL ) { - mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); + mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MPDEMUX_URL_MallocFailed); goto err_out; } strncpy(Curl->hostname, ptr1, pos2-pos1); @@ -178,7 +179,7 @@ // copy the path/filename in the URL container Curl->file = strdup(ptr2); if( Curl->file==NULL ) { - mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); + mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MPDEMUX_URL_MallocFailed); goto err_out; } } @@ -187,7 +188,7 @@ if( Curl->file==NULL ) { Curl->file = (char*)malloc(2); if( Curl->file==NULL ) { - mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); + mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MPDEMUX_URL_MallocFailed); goto err_out; } strcpy(Curl->file, "/"); @@ -273,7 +274,7 @@ *outbuf++=c; // already // dont escape again - mp_msg(MSGT_NETWORK,MSGL_ERR,"string appears to be already escaped in url_escape %c%c1%c2\n",c,c1,c2); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_URL_StringAlreadyEscaped,c,c1,c2); // error as this should not happen against RFC 2396 // to escape a string twice } else {

1 0

CVS: main/libvo vo_gl.c,1.106,1.107
by syncmail＠mplayerhq.hu 31 Oct '05

31 Oct '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv18061 Modified Files: vo_gl.c Log Message: 10l typo, nomanyfmts should be used against playback problems. Index: vo_gl.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_gl.c,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- vo_gl.c 31 Oct 2005 13:56:16 -0000 1.106 +++ vo_gl.c 31 Oct 2005 13:57:37 -0000 1.107 @@ -760,7 +760,7 @@ gl_target = GL_TEXTURE_2D; if (many_fmts) mp_msg (MSGT_VO, MSGL_INFO, "[gl] using extended formats. " - "Use -vo gl:manyfmts if playback fails.\n"); + "Use -vo gl:nomanyfmts if playback fails.\n"); mp_msg (MSGT_VO, MSGL_V, "[gl] Using %d as slice height " "(0 means image height).\n", slice_height); if( !vo_init() ) return -1; // Can't open X11

1 0

[MPlayer-cvslog] CVS: main/libvo gl_common.c, 1.31, 1.32 gl_common.h, 1.21, 1.22 vo_gl.c, 1.105, 1.106
by syncmail＠mplayerhq.hu 31 Oct '05

31 Oct '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv10672 Modified Files: gl_common.c gl_common.h vo_gl.c Log Message: More consistent and sane types. Also avoids some gcc 4 warnings. Index: gl_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/gl_common.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- gl_common.c 3 Oct 2005 14:25:04 -0000 1.31 +++ gl_common.c 31 Oct 2005 13:56:16 -0000 1.32 @@ -154,7 +154,7 @@ * \return 1 if format is supported by OpenGL, 0 if not. * \ingroup gltexture */ -int glFindFormat(uint32_t fmt, uint32_t *bpp, GLint *gl_texfmt, +int glFindFormat(uint32_t fmt, int *bpp, GLint *gl_texfmt, GLenum *gl_format, GLenum *gl_type) { int supported = 1; @@ -478,7 +478,7 @@ * \ingroup gltexture */ void glUploadTex(GLenum target, GLenum format, GLenum type, - const char *data, int stride, + const void *data, int stride, int x, int y, int w, int h, int slice) { int y_max = y + h; if (w <= 0 || h <= 0) return; Index: gl_common.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/gl_common.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- gl_common.h 1 Oct 2005 12:49:28 -0000 1.21 +++ gl_common.h 31 Oct 2005 13:56:16 -0000 1.22 @@ -184,7 +184,7 @@ const char *glValName(GLint value); -int glFindFormat(uint32_t format, uint32_t *bpp, GLint *gl_texfmt, +int glFindFormat(uint32_t format, int *bpp, GLint *gl_texfmt, GLenum *gl_format, GLenum *gl_type); int glFmt2bpp(GLenum format, GLenum type); void glCreateClearTex(GLenum target, GLenum fmt, GLint filter, @@ -192,7 +192,7 @@ int glCreatePPMTex(GLenum target, GLenum fmt, GLint filter, FILE *f, int *width, int *height, int *maxval); void glUploadTex(GLenum target, GLenum format, GLenum type, - const char *data, int stride, + const void *data, int stride, int x, int y, int w, int h, int slice); void glDrawTex(GLfloat x, GLfloat y, GLfloat w, GLfloat h, GLfloat tx, GLfloat ty, GLfloat tw, GLfloat th, Index: vo_gl.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_gl.c,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- vo_gl.c 13 Oct 2005 19:15:30 -0000 1.105 +++ vo_gl.c 31 Oct 2005 13:56:16 -0000 1.106 @@ -88,8 +88,8 @@ static int eq_ggamma = 0; static int eq_bgamma = 0; -static uint32_t texture_width; -static uint32_t texture_height; +static int texture_width; +static int texture_height; static unsigned int slice_height = 1; @@ -615,7 +615,7 @@ } static uint32_t draw_image(mp_image_t *mpi) { - char *data = mpi->planes[0]; + unsigned char *data = mpi->planes[0]; int slice = slice_height; if (mpi->flags & MP_IMGFLAG_DRAW_CALLBACK) return VO_TRUE;

1 0

CVS: main/libmpdemux demux_aac.c, 1.5, 1.6 demux_asf.c, 1.34, 1.35 demux_audio.c, 1.40, 1.41 demux_avi.c, 1.67, 1.68 demux_mkv.c, 1.50, 1.51 demux_mpc.c, 1.11, 1.12 demux_mpg.c, 1.65, 1.66 demux_ogg.c, 1.80, 1.81 demux_rawaudio.c, 1.13, 1.14 demux_real.c, 1.73, 1.74 demux_ts.c, 1.36, 1.37 demux_ty.c, 1.9, 1.10 demux_vqf.c, 1.4, 1.5 demux_xmms.c, 1.12, 1.13 demuxer.c, 1.207, 1.208
by syncmail＠mplayerhq.hu 30 Oct '05

30 Oct '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv18235 Modified Files: demux_aac.c demux_asf.c demux_audio.c demux_avi.c demux_mkv.c demux_mpc.c demux_mpg.c demux_ogg.c demux_rawaudio.c demux_real.c demux_ts.c demux_ty.c demux_vqf.c demux_xmms.c demuxer.c Log Message: move resync_audio_stream after seeking to demuxer.c Index: demux_aac.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_aac.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- demux_aac.c 13 Oct 2005 18:33:56 -0000 1.5 +++ demux_aac.c 30 Oct 2005 09:19:05 -0000 1.6 @@ -14,8 +14,6 @@ #include "bswap.h" #include "ms_hdr.h" -extern void resync_audio_stream(sh_audio_t *sh_audio); - typedef struct { uint8_t *buf; uint64_t size; /// amount of time of data packets pushed to demuxer->audio (in bytes) @@ -248,7 +246,6 @@ } } sh_audio->delay = priv->last_pts - (ds_tell_pts(demuxer->audio)-sh_audio->a_in_buffer_len)/(float)priv->bitrate; - resync_audio_stream(sh_audio); } Index: demux_asf.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_asf.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- demux_asf.c 2 Sep 2005 08:32:31 -0000 1.34 +++ demux_asf.c 30 Oct 2005 09:19:05 -0000 1.35 @@ -359,7 +359,6 @@ #include "stheader.h" -extern void resync_audio_stream(sh_audio_t *sh_audio); extern void skip_audio_frame(sh_audio_t *sh_audio); static void demux_seek_asf(demuxer_t *demuxer,float rel_seek_secs,int flags){ @@ -390,7 +389,6 @@ ds_fill_buffer(d_video); if(sh_audio){ ds_fill_buffer(d_audio); - resync_audio_stream(sh_audio); } if (d_video->id < 0) Index: demux_audio.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_audio.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- demux_audio.c 20 Oct 2005 15:15:53 -0000 1.40 +++ demux_audio.c 30 Oct 2005 09:19:05 -0000 1.41 @@ -44,7 +44,6 @@ } mp3_hdr_t; extern void free_sh_audio(sh_audio_t* sh); -extern void resync_audio_stream(sh_audio_t *sh_audio); extern void print_wave_header(WAVEFORMATEX *h); int hr_mp3_seek = 0; @@ -496,7 +495,6 @@ if(len > 0) high_res_mp3_seek(demuxer,len); sh_audio->delay = priv->last_pts - (ds_tell_pts(demuxer->audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps; - resync_audio_stream(sh_audio); return; } @@ -527,9 +525,6 @@ } stream_seek(s,pos); - - resync_audio_stream(sh_audio); - } static void demux_close_audio(demuxer_t* demuxer) { Index: demux_avi.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_avi.c,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- demux_avi.c 13 Sep 2005 18:12:48 -0000 1.67 +++ demux_avi.c 30 Oct 2005 09:19:05 -0000 1.68 @@ -617,7 +617,6 @@ } //extern float initial_pts_delay; -extern void resync_audio_stream(sh_audio_t *sh_audio); void demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,int flags){ avi_priv_t *priv=demuxer->priv; @@ -806,7 +805,6 @@ demux_read_data(d_audio,NULL,skip_audio_bytes); //d_audio->pts=0; // PTS is outdated because of the raw data skipping } - resync_audio_stream(sh_audio); // sh_audio->timer=-skip_audio_secs; Index: demux_mkv.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- demux_mkv.c 22 Oct 2005 10:13:28 -0000 1.50 +++ demux_mkv.c 30 Oct 2005 09:19:05 -0000 1.51 @@ -3117,7 +3117,6 @@ free_cached_dps (demuxer); if (!(flags & 2)) /* time in secs */ { - void resync_audio_stream(sh_audio_t *sh_audio); mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv; stream_t *s = demuxer->stream; int64_t target_timecode = 0, diff, min_diff=0xFFFFFFFL; @@ -3228,15 +3227,11 @@ clear_subtitles(demuxer, 0, 1); demux_mkv_fill_buffer(demuxer, NULL); - - if(demuxer->audio->sh != NULL) - resync_audio_stream((sh_audio_t *) demuxer->audio->sh); } else if ((demuxer->movi_end <= 0) || !(flags & 1)) mp_msg (MSGT_DEMUX, MSGL_V, "[mkv] seek unsupported flags\n"); else { - void resync_audio_stream(sh_audio_t *sh_audio); mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv; stream_t *s = demuxer->stream; uint64_t target_filepos; @@ -3274,9 +3269,6 @@ clear_subtitles(demuxer, 0, 1); demux_mkv_fill_buffer(demuxer, NULL); - - if(demuxer->audio->sh != NULL) - resync_audio_stream((sh_audio_t *) demuxer->audio->sh); } } Index: demux_mpc.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mpc.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- demux_mpc.c 12 Oct 2005 21:55:55 -0000 1.11 +++ demux_mpc.c 30 Oct 2005 09:19:05 -0000 1.12 @@ -181,7 +181,6 @@ if (!sh_audio) return; sh_audio->delay = priv->last_pts - (ds_tell_pts(demuxer->audio) - sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps; - resync_audio_stream(sh_audio); } static void demux_close_mpc(demuxer_t* demuxer) { Index: demux_mpg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mpg.c,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- demux_mpg.c 15 Oct 2005 11:51:37 -0000 1.65 +++ demux_mpg.c 30 Oct 2005 09:19:05 -0000 1.66 @@ -669,7 +669,6 @@ return 1; } -extern void resync_audio_stream(sh_audio_t *sh_audio); extern void skip_audio_frame(sh_audio_t *sh_audio); void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,int flags){ @@ -733,7 +732,6 @@ ds_fill_buffer(d_video); if(sh_audio){ ds_fill_buffer(d_audio); - resync_audio_stream(sh_audio); } while(1){ Index: demux_ogg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ogg.c,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- demux_ogg.c 13 Oct 2005 18:33:56 -0000 1.80 +++ demux_ogg.c 30 Oct 2005 09:19:05 -0000 1.81 @@ -1390,8 +1390,6 @@ } -extern void resync_audio_stream(sh_audio_t *sh_audio); - static void demux_ogg_seek(demuxer_t *demuxer,float rel_seek_secs,int flags) { ogg_demuxer_t* ogg_d = demuxer->priv; ogg_sync_state* sync = &ogg_d->sync; @@ -1558,8 +1556,6 @@ vo_osd_changed(OSDTYPE_SUBTITLE); clear_sub = -1; demux_ogg_add_packet(ds,os,ds->id,&op); - if(sh_audio) - resync_audio_stream(sh_audio); return; } } Index: demux_rawaudio.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_rawaudio.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- demux_rawaudio.c 25 Sep 2005 17:29:45 -0000 1.13 +++ demux_rawaudio.c 30 Oct 2005 09:19:05 -0000 1.14 @@ -30,8 +30,6 @@ }; -extern void resync_audio_stream(sh_audio_t *sh_audio); - static demuxer_t* demux_rawaudio_open(demuxer_t* demuxer) { sh_audio_t* sh_audio; WAVEFORMATEX* w; @@ -95,7 +93,6 @@ pos -= (pos % (sh_audio->channels * sh_audio->samplesize) ); stream_seek(s,pos); sh_audio->delay= (pos-ds_tell_pts(demuxer->audio)-sh_audio->a_in_buffer_len) / (float)(sh_audio->wf->nAvgBytesPerSec); - resync_audio_stream(sh_audio); // printf("demux_rawaudio: streamtell=%d\n",(int)stream_tell(demuxer->stream)); } Index: demux_real.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_real.c,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- demux_real.c 2 Sep 2005 08:32:32 -0000 1.73 +++ demux_real.c 30 Oct 2005 09:19:05 -0000 1.74 @@ -1748,8 +1748,6 @@ return; } -extern void resync_audio_stream(sh_audio_t * sh_audio); - /* please upload RV10 samples WITH INDEX CHUNK */ static int demux_seek_real(demuxer_t *demuxer, float rel_seek_secs, int flags) { @@ -1840,8 +1838,6 @@ stream_seek(demuxer->stream, next_offset); demux_real_fill_buffer(demuxer, NULL); - if (sh_audio) - resync_audio_stream(sh_audio); return 1; } Index: demux_ts.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ts.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- demux_ts.c 13 Oct 2005 18:33:56 -0000 1.36 +++ demux_ts.c 30 Oct 2005 09:19:05 -0000 1.37 @@ -223,7 +223,6 @@ #define IS_VIDEO(x) (((x) == VIDEO_MPEG1) || ((x) == VIDEO_MPEG2) || ((x) == VIDEO_MPEG4) || ((x) == VIDEO_H264) || ((x) == VIDEO_AVC)) static int ts_parse(demuxer_t *demuxer, ES_stream_t *es, unsigned char *packet, int probe); -extern void resync_audio_stream( sh_audio_t *sh_audio ); static uint8_t get_packet_size(const unsigned char *buf, int size) { @@ -2991,7 +2990,6 @@ } -extern void resync_audio_stream(sh_audio_t *sh_audio); extern void skip_audio_frame(sh_audio_t *sh_audio); static void reset_fifos(ts_priv_t* priv, int a, int v, int s) @@ -3096,7 +3094,6 @@ if(sh_audio != NULL) { ds_fill_buffer(d_audio); - resync_audio_stream(sh_audio); } while(sh_video != NULL) Index: demux_ty.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ty.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- demux_ty.c 13 Oct 2005 18:33:56 -0000 1.9 +++ demux_ty.c 30 Oct 2005 09:19:05 -0000 1.10 @@ -45,7 +45,6 @@ #include "stheader.h" #include "../sub_cc.h" -extern void resync_audio_stream( sh_audio_t *sh_audio ); extern void skip_audio_frame( sh_audio_t *sh_audio ); extern int sub_justify; @@ -1313,7 +1312,6 @@ if( sh_audio ) { ds_fill_buffer( d_audio ); - resync_audio_stream( sh_audio ); } while( 1 ) Index: demux_vqf.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_vqf.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- demux_vqf.c 13 Oct 2005 18:33:56 -0000 1.4 +++ demux_vqf.c 30 Oct 2005 09:19:05 -0000 1.5 @@ -9,8 +9,6 @@ #include "stheader.h" #include "../libmpcodecs/vqf.h" -extern void resync_audio_stream(sh_audio_t *sh_audio); - static int demux_probe_vqf(demuxer_t* demuxer) { char buf[KEYWORD_BYTES]; @@ -195,7 +193,6 @@ pos -= (pos % (sh_audio->channels * sh_audio->samplesize) ); stream_seek(s,pos); - resync_audio_stream(sh_audio); #endif } Index: demux_xmms.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_xmms.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- demux_xmms.c 2 Sep 2005 08:32:32 -0000 1.12 +++ demux_xmms.c 30 Oct 2005 09:19:05 -0000 1.13 @@ -199,8 +199,6 @@ // ============================ mplayer demuxer stuff =============== -//extern void resync_audio_stream(sh_audio_t *sh_audio); - static int demux_xmms_open(demuxer_t* demuxer) { InputPlugin* ip = NULL; sh_audio_t* sh_audio; Index: demuxer.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v retrieving revision 1.207 retrieving revision 1.208 diff -u -r1.207 -r1.208 --- demuxer.c 23 Sep 2005 22:35:03 -0000 1.207 +++ demuxer.c 30 Oct 2005 09:19:05 -0000 1.208 @@ -21,6 +21,7 @@ #include "../libaf/af_format.h" #include "../libvo/fastmemcpy.h" +extern void resync_audio_stream(sh_audio_t *sh_audio); // Demuxer list extern demuxer_desc_t demuxer_desc_rawaudio; @@ -856,6 +857,8 @@ if (demuxer->desc->seek) demuxer->desc->seek(demuxer,rel_seek_secs,flags); + if (sh_audio) resync_audio_stream(sh_audio); + return 1; }

1 0

CVS: main/libmpdemux demux_demuxers.c,1.6,1.7
by syncmail＠mplayerhq.hu 30 Oct '05

30 Oct '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv26961 Modified Files: demux_demuxers.c Log Message: Provide DEMUXER_CTRL_GET_TIME_LENGTH and DEMUXER_CTRL_GET_PERCENT_POS. Might need some more fine-tuning. together with rev. 1.318 of mencoder.c fixes bug #116 Index: demux_demuxers.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_demuxers.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- demux_demuxers.c 23 Aug 2005 08:03:26 -0000 1.6 +++ demux_demuxers.c 30 Oct 2005 09:13:32 -0000 1.7 @@ -107,6 +107,19 @@ } +static int demux_demuxers_control(demuxer_t *demuxer,int cmd, void *arg){ + dd_priv_t* priv = demuxer->priv; + switch (cmd) { + case DEMUXER_CTRL_GET_TIME_LENGTH: + *((double *)arg) = demuxer_get_time_length(priv->vd); + return DEMUXER_CTRL_OK; + case DEMUXER_CTRL_GET_PERCENT_POS: + *((int *)arg) = demuxer_get_percent_pos(priv->vd); + return DEMUXER_CTRL_OK; + } + return DEMUXER_CTRL_NOTIMPL; +} + demuxer_desc_t demuxer_desc_demuxers = { "Demuxers demuxer", "", // Not selectable @@ -120,5 +133,5 @@ NULL, demux_close_demuxers, demux_demuxers_seek, - NULL + demux_demuxers_control };

1 0

CVS: main mencoder.c,1.317,1.318
by syncmail＠mplayerhq.hu 30 Oct '05

30 Oct '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv25988 Modified Files: mencoder.c Log Message: Provide percentage even when demuxer->movi_start and movi_end are not available Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.317 retrieving revision 1.318 diff -u -r1.317 -r1.318 --- mencoder.c 23 Oct 2005 15:05:11 -0000 1.317 +++ mencoder.c 30 Oct 2005 09:11:40 -0000 1.318 @@ -1398,7 +1398,8 @@ { float t=(GetTimerMS()-timer_start)*0.001f; float len=(demuxer->movi_end-demuxer->movi_start); - float p=len>1000 ? (float)(demuxer->filepos-demuxer->movi_start) / len : 0; + float p=len>1000 ? (float)(demuxer->filepos-demuxer->movi_start) / len : + (demuxer_get_percent_pos(demuxer) / 100.0); #if 0 if(!len && sh_audio && sh_audio->audio.dwLength>100){ p=(sh_audio->audio.dwSampleSize? ds_tell(sh_audio->ds)/sh_audio->audio.dwSampleSize : sh_audio->ds->block_no)

1 0

CVS: main/libmpcodecs vf_screenshot.c,1.6,1.7
by syncmail＠mplayerhq.hu 30 Oct '05

30 Oct '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv3425 Modified Files: vf_screenshot.c Log Message: 10l, uninit() was not used, fixes bug #401 Modified patch from T. Dekker (t dekker <at> student utwente nl) Index: vf_screenshot.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_screenshot.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- vf_screenshot.c 12 Sep 2005 18:33:26 -0000 1.6 +++ vf_screenshot.c 30 Oct 2005 08:45:24 -0000 1.7 @@ -261,6 +261,7 @@ return 0; } +static void uninit(vf_instance_t *vf); // open conflicts with stdio.h at least under MinGW static int screenshot_open(vf_instance_t *vf, char* args) { @@ -271,6 +272,7 @@ vf->start_slice=start_slice; vf->draw_slice=draw_slice; vf->get_image=get_image; + vf->uninit=uninit; vf->priv=malloc(sizeof(struct vf_priv_s)); vf->priv->frameno=0; vf->priv->shot=0;

1 0