June 2004 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/libmpdemux/realrtsp rtsp.c,1.8,1.9
by syncmail＠mplayerhq.hu 26 Jun '04

26 Jun '04

CVS change done by Alex Beregszaszi Update of /cvsroot/mplayer/main/libmpdemux/realrtsp In directory mail:/var2/tmp/cvs-serv6130 Modified Files: rtsp.c Log Message: cseq starts from 1 according to the standard, patch by Yoshinori Sato Index: rtsp.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/realrtsp/rtsp.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- rtsp.c 25 Apr 2004 00:17:23 -0000 1.8 +++ rtsp.c 26 Jun 2004 10:38:26 -0000 1.9 @@ -632,7 +632,7 @@ s->server_state=0; s->server_caps=0; - s->cseq=0; + s->cseq=1; s->session=NULL; if (user_agent)

1 0

CVS: main/osdep mplayer.rc,1.3,1.4
by syncmail＠mplayerhq.hu 26 Jun '04

26 Jun '04

CVS change done by Sascha Sommer CVS Update of /cvsroot/mplayer/main/osdep In directory mail:/var2/tmp/cvs-serv12176/osdep Modified Files: mplayer.rc Log Message: 10l Index: mplayer.rc =================================================================== RCS file: /cvsroot/mplayer/main/osdep/mplayer.rc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mplayer.rc 25 Jun 2004 16:43:33 -0000 1.3 +++ mplayer.rc 26 Jun 2004 10:16:52 -0000 1.4 @@ -4,7 +4,7 @@ and add resfile.o to OBJS_MPLAYER in Makefile*/ #include <winver.h> -#include "version.h" +#include "../version.h" 1 VERSIONINFO FILEVERSION 0,0,9,0

1 0

CVS: main/libaf af.h,1.19,1.20
by syncmail＠mplayerhq.hu 26 Jun '04

26 Jun '04

CVS change done by Alex Beregszaszi Update of /cvsroot/mplayer/main/libaf In directory mail:/var2/tmp/cvs-serv25275/libaf Modified Files: af.h Log Message: 10 Index: af.h =================================================================== RCS file: /cvsroot/mplayer/main/libaf/af.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- af.h 25 Jun 2004 19:02:53 -0000 1.19 +++ af.h 26 Jun 2004 10:05:13 -0000 1.20 @@ -1,3 +1,6 @@ +#ifndef __aop_h__ +#define __aop_h__ + #include <stdio.h> #include "af_mp.h" @@ -5,9 +8,6 @@ #include "control.h" #include "af_format.h" -#ifndef __aop_h__ -#define __aop_h__ - struct af_instance_s; // Audio data chunk

1 0

CVS: main/libmpdemux asf_mmst_streaming.c, 1.21, 1.22
by syncmail＠mplayerhq.hu 26 Jun '04

26 Jun '04

CVS change done by Alex Beregszaszi Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv10526/libmpdemux Modified Files: asf_mmst_streaming.c Log Message: disable iconv in case setlocale is disabled - compile fix Index: asf_mmst_streaming.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/asf_mmst_streaming.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- asf_mmst_streaming.c 26 Jun 2004 09:54:02 -0000 1.21 +++ asf_mmst_streaming.c 26 Jun 2004 09:55:17 -0000 1.22 @@ -22,6 +22,10 @@ #include <winsock2.h> #endif +#ifndef USE_SETLOCAL +#undef USE_ICONV +#endif + #ifdef USE_ICONV #include <iconv.h> #ifdef USE_LANGINFO

1 0

CVS: main configure,1.878,1.879
by syncmail＠mplayerhq.hu 26 Jun '04

26 Jun '04

CVS change done by Alex Beregszaszi Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv30431 Modified Files: configure Log Message: user nl_langinfo if langinfo support present for proper chinese support, feature requested by Shixin Zheng <shixinzheng(a)sjtu.edu.cn> Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.878 retrieving revision 1.879 diff -u -r1.878 -r1.879 --- configure 25 Jun 2004 18:49:24 -0000 1.878 +++ configure 26 Jun 2004 09:54:01 -0000 1.879 @@ -156,6 +156,7 @@ --enable-termios use termios database for key codes [autodetect] --disable-iconv do not use iconv(3) function [autodetect] --disable-setlocale disable setlocale using in mplayer [autodetect] + --disable-langinfo do not use langinfo [autodetect] --enable-lirc enable LIRC (remote control) support [autodetect] --enable-lircc enable LIRCCD (LIRC client daemon) input [autodetect] --enable-joystick enable joystick support [disable] @@ -1177,6 +1178,7 @@ _dxr2=auto _dxr3=auto _iconv=auto +_langinfo=auto _rtc=auto _ossaudio=auto _arts=auto @@ -1336,6 +1338,8 @@ --disable-dxr3) _dxr3=no ;; --enable-iconv) _iconv=yes ;; --disable-iconv) _iconv=no ;; + --enable-langinfo) _langinfo=yes ;; + --disable-langinfo) _langinfo=no ;; --enable-rtc) _rtc=yes ;; --disable-rtc) _rtc=no ;; --enable-mp1e) _mp1e=yes ;; @@ -2035,6 +2039,23 @@ echores "$_iconv" +echocheck "langinfo" +if test "$_langinfo" = auto ; then + cat > $TMPC <<EOF +#include <langinfo.h> +int main(void) { nl_langinfo(CODESET); return 0; } +EOF + _langinfo=no + cc_check && _langinfo=yes +fi +if test "$_langinfo" = yes ; then + _def_langinfo='#define USE_LANGINFO 1' +else + _def_langinfo='#undef USE_LANGINFO' +fi +echores "$_langinfo" + + echocheck "language" test -z "$_language" && _language=$LINGUAS _language=`echo $_language | sed 's/,/ /g'` @@ -6353,6 +6374,9 @@ /* define this to use iconv(3) function to codepage conversions */ $_def_iconv +/* define this to use nl_langinfo function */ +$_def_langinfo + /* define this to use RTC (/dev/rtc) for video timers (LINUX only) */ $_def_rtc

1 0

CVS: main/libmpdemux asf_mmst_streaming.c, 1.20, 1.21
by syncmail＠mplayerhq.hu 26 Jun '04

26 Jun '04

CVS change done by Alex Beregszaszi Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv30431/libmpdemux Modified Files: asf_mmst_streaming.c Log Message: user nl_langinfo if langinfo support present for proper chinese support, feature requested by Shixin Zheng <shixinzheng(a)sjtu.edu.cn> Index: asf_mmst_streaming.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/asf_mmst_streaming.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- asf_mmst_streaming.c 7 Jun 2004 19:23:04 -0000 1.20 +++ asf_mmst_streaming.c 26 Jun 2004 09:54:02 -0000 1.21 @@ -23,8 +23,11 @@ #endif #ifdef USE_ICONV -#include <locale.h> #include <iconv.h> +#ifdef USE_LANGINFO +#include <langinfo.h> +#endif +#include <locale.h> #endif #include "url.h" @@ -490,8 +493,12 @@ /* prepare for the url encoding conversion */ #ifdef USE_ICONV setlocale(LC_CTYPE, ""); +#ifdef USE_LANGINFO + url_conv = iconv_open("UTF-16LE",nl_langinfo(CODESET)); +#else url_conv = iconv_open("UTF-16LE",setlocale(LC_CTYPE, NULL)); #endif +#endif snprintf (str, 1023, "\034\003NSPlayer/7.0.0.1956; {33715801-BAB3-9D85-24E9-03B90328270A}; Host: %s", url1->hostname); string_utf16 (data, str, strlen(str));

1 0

CVS: main/libao2 ao_sdl.c,1.31,1.32
by syncmail＠mplayerhq.hu 26 Jun '04

26 Jun '04

CVS change done by Alex Beregszaszi Update of /cvsroot/mplayer/main/libao2 In directory mail:/var2/tmp/cvs-serv21633 Modified Files: ao_sdl.c Log Message: make the internal sdl mixer optional, idea by Reimar Doffinger Index: ao_sdl.c =================================================================== RCS file: /cvsroot/mplayer/main/libao2/ao_sdl.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- ao_sdl.c 7 May 2004 16:12:30 -0000 1.31 +++ ao_sdl.c 26 Jun 2004 09:21:07 -0000 1.32 @@ -35,6 +35,9 @@ LIBAO_EXTERN(sdl) +// turn this on if you want to use the slower SDL_MixAudio +#undef USE_SDL_INTERNAL_MIXER + // Samplesize used by the SDLlib AudioSpec struct #ifdef WIN32 #define SAMPLESIZE 2048 @@ -53,7 +56,9 @@ static unsigned int buf_write=0; static unsigned int buf_read_pos=0; static unsigned int buf_write_pos=0; +#ifdef USE_SDL_INTERNAL_MIXER static unsigned char volume=SDL_MIX_MAXVOLUME; +#endif static int full_buffers=0; static int buffered_bytes=0; @@ -87,7 +92,11 @@ x=BUFFSIZE-buf_read_pos; if(x>len) x=len; if (x>buffered_bytes) x=buffered_bytes; +#ifdef USE_SDL_INTERNAL_MIXER SDL_MixAudio(data+len2,buffer[buf_read]+buf_read_pos,x,volume); +#else + memcpy(data+len2,buffer[buf_read]+buf_read_pos,x); +#endif len2+=x; len-=x; buffered_bytes-=x; buf_read_pos+=x; if(buf_read_pos>=BUFFSIZE){ @@ -121,6 +130,7 @@ // to set/get/query special features/parameters static int control(int cmd,void *arg){ +#ifdef USE_SDL_INTERNAL_MIXER switch (cmd) { case AOCONTROL_GET_VOLUME: { @@ -137,7 +147,8 @@ return CONTROL_OK; } } - return -1; +#endif + return CONTROL_UNKNOWN; } // SDL Callback function

1 0

CVS: main mplayer.c, 1.756, 1.757 mixer.c, 1.15, 1.16 mixer.h, 1.5, 1.6
by syncmail＠mplayerhq.hu 26 Jun '04

26 Jun '04

CVS change done by Alex Beregszaszi Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv6074 Modified Files: mplayer.c mixer.c mixer.h Log Message: New 'Mixer API' with ability to change volume through libaf (this part was written by Reimar Doffinger) and lesser global variables Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.756 retrieving revision 1.757 diff -u -r1.756 -r1.757 --- mplayer.c 10 Jun 2004 11:16:44 -0000 1.756 +++ mplayer.c 26 Jun 2004 09:14:20 -0000 1.757 @@ -524,6 +524,8 @@ extern void mp_input_register_options(m_config_t* cfg); #include "mixer.h" +static mixer_t mixer; + #include "cfg-mplayer.h" void parse_cfgfiles( m_config_t* conf ) @@ -1902,6 +1904,9 @@ } #endif } + mixer.audio_out = audio_out; + mixer.afilter = sh_audio->afilter; + mixer.volstep = 3; } current_module="av_init"; @@ -2488,7 +2493,7 @@ edl_decision = 1; next_edl_record = next_edl_record->next; } else if( next_edl_record->action == EDL_MUTE ) { - mixer_mute(); + mixer_mute(&mixer); #ifdef DEBUG_EDL printf( "\nEDL_MUTE: [%f]\n", next_edl_record->start_sec ); #endif @@ -2657,25 +2662,27 @@ if( abs ) { - mixer_setvolume( (float)v, (float)v ); + mixer_setvolume(&mixer, (float)v, (float)v ); } else { if(v > 0) - mixer_incvolume(); + mixer_incvolume(&mixer); else - mixer_decvolume(); + mixer_decvolume(&mixer); } #ifdef USE_OSD if(osd_level && sh_video){ + float vol; osd_visible=sh_video->fps; // 1 sec vo_osd_progbar_type=OSD_VOLUME; - vo_osd_progbar_value=(mixer_getbothvolume()*256.0)/100.0; + mixer_getbothvolume(&mixer, &vol); + vo_osd_progbar_value=(vol*256.0)/100.0; vo_osd_changed(OSDTYPE_PROGBAR); } #endif } break; case MP_CMD_MUTE: - mixer_mute(); + mixer_mute(&mixer); break; case MP_CMD_LOADFILE : { play_tree_t* e = play_tree_new(); Index: mixer.c =================================================================== RCS file: /cvsroot/mplayer/main/mixer.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- mixer.c 24 Jan 2004 11:53:52 -0000 1.15 +++ mixer.c 26 Jun 2004 09:14:20 -0000 1.16 @@ -1,4 +1,3 @@ - #include <string.h> #ifndef __MINGW32__ #include <sys/ioctl.h> @@ -8,82 +7,105 @@ #include <unistd.h> #include "config.h" -#include "mixer.h" #include "libao2/audio_out.h" +#include "libaf/af.h" +#include "mixer.h" -extern ao_functions_t *audio_out; +#include "help_mp.h" char * mixer_device=NULL; char * mixer_channel=NULL; -int muted = 0; -float mute_l = 0.0f; -float mute_r = 0.0f; - -void mixer_getvolume( float *l,float *r ) +void mixer_getvolume(mixer_t *mixer, float *l, float *r) { ao_control_vol_t vol; *l=0; *r=0; - if(audio_out){ - if(CONTROL_OK != audio_out->control(AOCONTROL_GET_VOLUME,&vol)) - return; + if(mixer->audio_out){ + if(CONTROL_OK != mixer->audio_out->control(AOCONTROL_GET_VOLUME,&vol)) { + if (!mixer->afilter) + return; + else { + float db_vals[AF_NCH]; + if (!af_control_any_rev(mixer->afilter, + AF_CONTROL_VOLUME_LEVEL | AF_CONTROL_GET, db_vals)) + return; + af_from_dB (2, db_vals, db_vals, 20.0, -200.0, 60.0); + vol.left = db_vals[0] * 90.0; + vol.right = db_vals[1] * 90.0; + } + } *r=vol.right; *l=vol.left; } } -void mixer_setvolume( float l,float r ) +void mixer_setvolume(mixer_t *mixer, float l, float r) { ao_control_vol_t vol; vol.right=r; vol.left=l; - if(audio_out){ - if(CONTROL_OK != audio_out->control(AOCONTROL_SET_VOLUME,&vol)) - return; + if(mixer->audio_out){ + if(CONTROL_OK != mixer->audio_out->control(AOCONTROL_SET_VOLUME,&vol)) { + if (mixer->afilter) + return; + else { + // af_volume uses values in dB + float db_vals[AF_NCH]; + int i; + // a volume of 90% will give 0 dB (no change) + // like this, amplification is possible as well + db_vals[0] = l / 90.0; + db_vals[1] = r / 90.0; + for (i = 2; i < AF_NCH; i++) { + db_vals[i] = (l + r) / 180.0; + } + af_to_dB (AF_NCH, db_vals, db_vals, 20.0); + if (!af_control_any_rev(mixer->afilter, + AF_CONTROL_VOLUME_LEVEL | AF_CONTROL_SET, db_vals)) { + mp_msg(MSGT_GLOBAL, MSGL_HINT, MSGTR_NeedAfVolume); + return; + } + } + } } - muted=0; + mixer->muted=0; } -#define MIXER_CHANGE 3 - -void mixer_incvolume( void ) +void mixer_incvolume(mixer_t *mixer) { float mixer_l, mixer_r; - mixer_getvolume( &mixer_l,&mixer_r ); - mixer_l += MIXER_CHANGE; + mixer_getvolume(mixer, &mixer_l, &mixer_r); + mixer_l += mixer->volstep; if ( mixer_l > 100 ) mixer_l = 100; - mixer_r += MIXER_CHANGE; + mixer_r += mixer->volstep; if ( mixer_r > 100 ) mixer_r = 100; - mixer_setvolume( mixer_l,mixer_r ); + mixer_setvolume(mixer, mixer_l, mixer_r); } -void mixer_decvolume( void ) +void mixer_decvolume(mixer_t *mixer) { float mixer_l, mixer_r; - mixer_getvolume( &mixer_l,&mixer_r ); - mixer_l -= MIXER_CHANGE; + mixer_getvolume(mixer, &mixer_l, &mixer_r); + mixer_l -= mixer->volstep; if ( mixer_l < 0 ) mixer_l = 0; - mixer_r -= MIXER_CHANGE; + mixer_r -= mixer->volstep; if ( mixer_r < 0 ) mixer_r = 0; - mixer_setvolume( mixer_l,mixer_r ); + mixer_setvolume(mixer, mixer_l, mixer_r); } -float mixer_getbothvolume( void ) +void mixer_getbothvolume(mixer_t *mixer, float *b) { float mixer_l, mixer_r; - mixer_getvolume( &mixer_l,&mixer_r ); - return ( mixer_l + mixer_r ) / 2; + mixer_getvolume(mixer, &mixer_l, &mixer_r); + *b = ( mixer_l + mixer_r ) / 2; } -void mixer_mute( void ) +void mixer_mute(mixer_t *mixer) { - if ( muted ) mixer_setvolume( mute_l,mute_r ); + if (mixer->muted) mixer_setvolume(mixer, mixer->last_l, mixer->last_r); else { - mixer_getvolume( &mute_l,&mute_r ); - mixer_setvolume( 0,0 ); - muted=1; + mixer_getvolume(mixer, &mixer->last_l, &mixer->last_r); + mixer_setvolume(mixer, 0, 0); + mixer->muted=1; } } - - - Index: mixer.h =================================================================== RCS file: /cvsroot/mplayer/main/mixer.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mixer.h 24 Jan 2004 11:53:52 -0000 1.5 +++ mixer.h 26 Jun 2004 09:14:20 -0000 1.6 @@ -1,19 +1,28 @@ - #ifndef __MPLAYER_MIXER #define __MPLAYER_MIXER +#include "libaf/af.h" +#include "libao2/audio_out.h" + extern char * mixer_device; extern char * mixer_channel; -extern int muted; -extern void mixer_getvolume( float *l,float *r ); -extern void mixer_setvolume( float l,float r ); -extern void mixer_incvolume( void ); -extern void mixer_decvolume( void ); -extern float mixer_getbothvolume( void ); -void mixer_mute( void ); +typedef struct mixer_s { + ao_functions_t *audio_out; + af_stream_t *afilter; + int volstep; + int muted; + float last_l, last_r; +} mixer_t; + +void mixer_getvolume(mixer_t *mixer, float *l, float *r); +void mixer_setvolume(mixer_t *mixer, float l, float r); +void mixer_incvolume(mixer_t *mixer); +void mixer_decvolume(mixer_t *mixer); +void mixer_getbothvolume(mixer_t *mixer, float *b); +void mixer_mute(mixer_t *mixer); //extern void mixer_setbothvolume( int v ); -#define mixer_setbothvolume( v ) mixer_setvolume( v,v ) +#define mixer_setbothvolume(m, v) mixer_setvolume(m, v, v) #endif

1 0

CVS: main Makefile, 1.291, 1.292 mplayer.rc, 1.3, NONE
by syncmail＠mplayerhq.hu 25 Jun '04

25 Jun '04

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv9620 Modified Files: Makefile Removed Files: mplayer.rc Log Message: mplayer.rc moved to osdep where it belongs, approved by Sascha. Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.291 retrieving revision 1.292 diff -u -r1.291 -r1.292 --- Makefile 25 Jun 2004 18:11:13 -0000 1.291 +++ Makefile 25 Jun 2004 19:21:17 -0000 1.292 @@ -204,12 +204,12 @@ endif ifeq ($(TARGET_WIN32),yes) -OBJS_MPLAYER += mplayer-rc.o +OBJS_MPLAYER += osdep/mplayer-rc.o endif $(PRG): $(MPLAYER_DEP) ifeq ($(TARGET_WIN32),yes) - windres -o mplayer-rc.o mplayer.rc + windres -o osdep/mplayer-rc.o osdep/mplayer.rc endif $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) -lm --- mplayer.rc DELETED ---

1 0

CVS: main/libaf af.c,1.27,1.28 af.h,1.18,1.19
by syncmail＠mplayerhq.hu 25 Jun '04

25 Jun '04

CVS change done by Alex Beregszaszi Update of /cvsroot/mplayer/main/libaf In directory mail:/var2/tmp/cvs-serv1098 Modified Files: af.c af.h Log Message: Send a command throught the filter chain until some item returns AF_OK. Patch by Reimar Doeffinger Index: af.c =================================================================== RCS file: /cvsroot/mplayer/main/libaf/af.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- af.c 27 Jan 2004 06:45:43 -0000 1.27 +++ af.c 25 Jun 2004 19:02:53 -0000 1.28 @@ -82,7 +82,6 @@ af_instance_t* af_create(af_stream_t* s, char* name) { char* cmdline = name; - char* delim = "="; // Allocate space for the new filter and reset all pointers af_instance_t* new=malloc(sizeof(af_instance_t)); @@ -93,7 +92,7 @@ memset(new,0,sizeof(af_instance_t)); // Check for commandline parameters - strsep(&cmdline, delim); + strsep(&cmdline, "="); // Find filter from name if(NULL == (new->info=af_find(name))) @@ -598,3 +597,16 @@ af->data->len=len; return AF_OK; } + +// send control to all filters, starting with the last until +// one responds with AF_OK +int af_control_any_rev (af_stream_t* s, int cmd, void* arg) { + int res = AF_UNKNOWN; + af_instance_t* filt = s->last; + while (filt && res != AF_OK) { + res = filt->control(filt, cmd, arg); + filt = filt->prev; + } + return (res == AF_OK); +} + Index: af.h =================================================================== RCS file: /cvsroot/mplayer/main/libaf/af.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- af.h 17 Jan 2003 01:00:07 -0000 1.18 +++ af.h 25 Jun 2004 19:02:53 -0000 1.19 @@ -151,6 +151,11 @@ // Filter data chunk through the filters in the list af_data_t* af_play(af_stream_t* s, af_data_t* data); +// send control to all filters, starting with the last until +// one accepts the command with AF_OK. +// Returns true if accepting filter was found. +int af_control_any_rev (af_stream_t* s, int cmd, void* arg); + /* Calculate how long the output from the filters will be given the input length "len". The calculated length is >= the actual length */

1 0