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

CVS: main/libmpcodecs vd_realvid.c,1.28,1.29
by syncmail＠mplayerhq.hu 09 Jan '05

09 Jan '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv20001 Modified Files: vd_realvid.c Log Message: 100l, set inited to 0 in uninit, otherwise only first file will play video. Index: vd_realvid.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_realvid.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- vd_realvid.c 3 Nov 2004 02:50:01 -0000 1.28 +++ vd_realvid.c 9 Jan 2005 17:38:12 -0000 1.29 @@ -287,6 +287,7 @@ if(rv_handle) dlclose(rv_handle); #endif rv_handle=NULL; + inited = 0; } // copypaste from demux_real.c - it should match to get it working!

1 0

CVS: main/libao2 ao_dsound.c,1.8,1.9
by syncmail＠mplayerhq.hu 09 Jan '05

09 Jan '05

CVS change done by Sascha Sommer CVS Update of /cvsroot/mplayer/main/libao2 In directory mail:/var2/tmp/cvs-serv5746/libao2 Modified Files: ao_dsound.c Log Message: device selection support Index: ao_dsound.c =================================================================== RCS file: /cvsroot/mplayer/main/libao2/ao_dsound.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ao_dsound.c 28 Dec 2004 19:11:14 -0000 1.8 +++ ao_dsound.c 6 Jan 2005 13:31:02 -0000 1.9 @@ -34,6 +34,7 @@ #include "mp_msg.h" #include "libvo/fastmemcpy.h" #include "osdep/timer.h" +#include "subopt-helper.h" static ao_info_t info = @@ -113,6 +114,8 @@ static int buffer_size = 0; ///size in bytes of the direct sound buffer static int write_offset = 0; ///offset of the write cursor in the direct sound buffer static int min_free_space = 4096; ///if the free space is below this value get_space() will return 0 +static int device_num = 0; ///wanted device number +static GUID device; ///guid of the device /***************************************************************************************/ @@ -166,6 +169,41 @@ } /** +\brief print the commandline help +*/ +static void print_help() +{ + mp_msg(MSGT_AO, MSGL_FATAL, + "\n-ao dsound commandline help:\n" + "Example: mplayer -ao dsound:device=1\n" + " sets 1st device\n" + "\nOptions:\n" + " device=<device-number>\n" + " Sets device number, use -v to get a list\n"); +} + + +/** +\brief enumerate direct sound devices +\return TRUE to continue with the enumeration +*/ +static BOOL CALLBACK DirectSoundEnum(LPGUID guid,LPCSTR desc,LPCSTR module,LPVOID context) +{ + int* device_index=context; + mp_msg(MSGT_AO, MSGL_V,"%i %s ",*device_index,desc); + if(device_num==*device_index){ + mp_msg(MSGT_AO, MSGL_V,"<--"); + if(guid){ + memcpy(&device,guid,sizeof(GUID)); + } + } + mp_msg(MSGT_AO, MSGL_V,"\n"); + (*device_index)++; + return TRUE; +} + + +/** \brief initilize direct sound \return 0 if error, 1 if ok */ @@ -175,21 +213,37 @@ // initialize directsound HRESULT (WINAPI *OurDirectSoundCreate)(LPGUID, LPDIRECTSOUND *, LPUNKNOWN); + HRESULT (WINAPI *OurDirectSoundEnumerate)(LPDSENUMCALLBACKA, LPVOID); + int device_index=0; + opt_t subopts[] = { + {"device", OPT_ARG_INT, &device_num,NULL}, + {NULL} + }; + if (subopt_parse(ao_subdevice, subopts) != 0) { + print_help(); + return 0; + } + hdsound_dll = LoadLibrary("DSOUND.DLL"); if (hdsound_dll == NULL) { mp_msg(MSGT_AO, MSGL_ERR, "ao_dsound: cannot load DSOUND.DLL\n"); return 0; } OurDirectSoundCreate = (void*)GetProcAddress(hdsound_dll, "DirectSoundCreate"); + OurDirectSoundEnumerate = (void*)GetProcAddress(hdsound_dll, "DirectSoundEnumerateA"); - if (OurDirectSoundCreate == NULL) { + if (OurDirectSoundCreate == NULL || OurDirectSoundEnumerate == NULL) { mp_msg(MSGT_AO, MSGL_ERR, "ao_dsound: GetProcAddress FAILED\n"); FreeLibrary(hdsound_dll); return 0; } + + // Enumerate all directsound devices + mp_msg(MSGT_AO, MSGL_V,"ao_dsound: Output Devices:\n"); + OurDirectSoundEnumerate(DirectSoundEnum,&device_index); // Create the direct sound object - if FAILED(OurDirectSoundCreate(NULL, &hds, NULL )) { + if FAILED(OurDirectSoundCreate((device_num)?&device:NULL, &hds, NULL )) { mp_msg(MSGT_AO, MSGL_ERR, "ao_dsound: cannot create a DirectSound device\n"); FreeLibrary(hdsound_dll); return 0;

3 2

CVS: main/libaf af.c, 1.39, 1.40 af.h, 1.22, 1.23 af_channels.c, 1.12, 1.13 af_format.c, 1.23, 1.24 af_lavcresample.c, 1.7, 1.8 af_pan.c, 1.5, 1.6 af_resample.c, 1.23, 1.24
by syncmail＠mplayerhq.hu 08 Jan '05

08 Jan '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libaf In directory mail:/var2/tmp/cvs-serv15266/libaf Modified Files: af.c af.h af_channels.c af_format.c af_lavcresample.c af_pan.c af_resample.c Log Message: always cancel down fractions (frac_t) to avoid overflows and playback problems (e.g. when using resample and equalizer filters together, see http://mplayerhq.hu/pipermail/mplayer-users/2004-December/050058.html) Index: af.c =================================================================== RCS file: /cvsroot/mplayer/main/libaf/af.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- af.c 3 Jan 2005 18:59:16 -0000 1.39 +++ af.c 8 Jan 2005 21:34:06 -0000 1.40 @@ -524,8 +524,7 @@ register frac_t mul = {1,1}; // Iterate through all filters do{ - mul.n *= af->mul.n; - mul.d *= af->mul.d; + af_frac_mul(&mul, &af->mul); af=af->next; }while(af); return t * (((len/t)*mul.n + 1)/mul.d); @@ -542,8 +541,7 @@ register frac_t mul = {1,1}; // Iterate through all filters do{ - mul.n *= af->mul.n; - mul.d *= af->mul.d; + af_frac_mul(&mul, &af->mul); af=af->next; }while(af); return t * (((len/t) * mul.d - 1)/mul.n); @@ -567,8 +565,7 @@ register frac_t mul = {1,1}; // Iterate through all filters and calculate total multiplication factor do{ - mul.n *= af->mul.n; - mul.d *= af->mul.d; + af_frac_mul(&mul, &af->mul); af=af->next; }while(af); // Sanity check @@ -645,6 +642,49 @@ return NULL; } +/** + * \brief calculate greatest common divisior of a and b. + * Extended for negative and 0 values. If both are 0 the result is 1. + * The sign of the result will be so that it has the same sign as b. + */ +int af_gcd(register int a, register int b) { + int b_org = b; + while (b != 0) { + a %= b; + if (a == 0) + break; + b %= a; + } + // the result is either in a or b. As the other one is 0 just add them. + a += b; + if (!a) + return 1; + if (a * b_org < 0) + return -a; + return a; +} + +/** + * \brief cancel down a fraction f + */ +void af_frac_cancel(frac_t *f) { + int gcd = af_gcd(f->n, f->d); + f->n /= gcd; + f->d /= gcd; +} + +/** + * \brief multiply out by in and store result in out. + * the resulting fraction wil be cancelled down + * if in and out were. + */ +void af_frac_mul(frac_t *out, const frac_t *in) { + int gcd1 = af_gcd(out->n, in->d); + int gcd2 = af_gcd(in->n, out->d); + out->n = (out->n / gcd1) * (in->n / gcd2); + out->d = (out->d / gcd2) * (in->d / gcd1); +} + void af_help (void) { int i = 0; af_msg(AF_MSG_INFO, "Available audio filters:\n"); Index: af.h =================================================================== RCS file: /cvsroot/mplayer/main/libaf/af.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- af.h 1 Jan 2005 18:46:56 -0000 1.22 +++ af.h 8 Jan 2005 21:34:06 -0000 1.23 @@ -28,6 +28,10 @@ int d; // Denominator } frac_t; +int af_gcd(register int a, register int b); +void af_frac_cancel(frac_t *f); +void af_frac_mul(frac_t *out, const frac_t *in); + // Flags used for defining the behavior of an audio filter #define AF_FLAGS_REENTRANT 0x00000000 #define AF_FLAGS_NOT_REENTRANT 0x00000001 Index: af_channels.c =================================================================== RCS file: /cvsroot/mplayer/main/libaf/af_channels.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- af_channels.c 29 Jul 2004 16:23:16 -0000 1.12 +++ af_channels.c 8 Jan 2005 21:34:06 -0000 1.13 @@ -151,6 +151,7 @@ af->data->bps = ((af_data_t*)arg)->bps; af->mul.n = af->data->nch; af->mul.d = ((af_data_t*)arg)->nch; + af_frac_cancel(&af->mul); return check_routes(s,((af_data_t*)arg)->nch,af->data->nch); case AF_CONTROL_COMMAND_LINE:{ int nch = 0; Index: af_format.c =================================================================== RCS file: /cvsroot/mplayer/main/libaf/af_format.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- af_format.c 6 Jan 2005 14:32:08 -0000 1.23 +++ af_format.c 8 Jan 2005 21:34:06 -0000 1.24 @@ -306,6 +306,7 @@ af->data->nch = ((af_data_t*)arg)->nch; af->mul.n = af->data->bps; af->mul.d = ((af_data_t*)arg)->bps; + af_frac_cancel(&af->mul); af->play = play; // set default Index: af_lavcresample.c =================================================================== RCS file: /cvsroot/mplayer/main/libaf/af_lavcresample.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- af_lavcresample.c 31 Dec 2004 13:14:01 -0000 1.7 +++ af_lavcresample.c 8 Jan 2005 21:34:06 -0000 1.8 @@ -40,7 +40,6 @@ // Initialization and runtime control static int control(struct af_instance_s* af, int cmd, void* arg) { - int g; af_resample_t* s = (af_resample_t*)af->setup; af_data_t *data= (af_data_t*)arg; int out_rate, test_output_res; // helpers for checking input format @@ -54,9 +53,9 @@ if (af->data->nch > CHANS) af->data->nch = CHANS; af->data->format = AF_FORMAT_S16_NE; af->data->bps = 2; - g= ff_gcd(af->data->rate, data->rate); - af->mul.n = af->data->rate/g; - af->mul.d = data->rate/g; + af->mul.n = af->data->rate; + af->mul.d = data->rate; + af_frac_cancel(&af->mul); af->delay = 500*s->filter_length/(double)min(af->data->rate, data->rate); if(s->avrctx) av_resample_close(s->avrctx); Index: af_pan.c =================================================================== RCS file: /cvsroot/mplayer/main/libaf/af_pan.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- af_pan.c 27 Dec 2004 17:30:13 -0000 1.5 +++ af_pan.c 8 Jan 2005 21:34:06 -0000 1.6 @@ -41,6 +41,7 @@ af->data->bps = 4; af->mul.n = af->data->nch; af->mul.d = ((af_data_t*)arg)->nch; + af_frac_cancel(&af->mul); if((af->data->format != ((af_data_t*)arg)->format) || (af->data->bps != ((af_data_t*)arg)->bps)){ Index: af_resample.c =================================================================== RCS file: /cvsroot/mplayer/main/libaf/af_resample.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- af_resample.c 29 Dec 2004 19:50:44 -0000 1.23 +++ af_resample.c 8 Jan 2005 21:34:06 -0000 1.24 @@ -62,22 +62,6 @@ int setup; // Setup parameters cmdline or through postcreate } af_resample_t; -// Euclids algorithm for calculating Greatest Common Divisor GCD(a,b) -static inline int gcd(register int a, register int b) -{ - register int r = min(a,b); - a=max(a,b); - b=r; - - r=a%b; - while(r!=0){ - a=b; - b=r; - r=a%b; - } - return b; -} - // Fast linear interpolation resample with modest audio quality static int linint(af_data_t* c,af_data_t* l, af_resample_t* s) { @@ -202,11 +186,12 @@ s->step); af->mul.n = af->data->rate; af->mul.d = n->rate; + af_frac_cancel(&af->mul); return rv; } // Calculate up and down sampling factors - d=gcd(af->data->rate,n->rate); + d=af_gcd(af->data->rate,n->rate); // If sloppy resampling is enabled limit the upsampling factor if(((s->setup & FREQ_MASK) == FREQ_SLOPPY) && (af->data->rate/d > 5000)){ @@ -214,7 +199,7 @@ int dn=n->rate/2; int m=2; while(af->data->rate/(d*m) > 5000){ - d=gcd(up,dn); + d=af_gcd(up,dn); up/=2; dn/=2; m*=2; } d*=m;

1 0

CVS: main spudec.c,1.44,1.45
by syncmail＠mplayerhq.hu 08 Jan '05

08 Jan '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv13435 Modified Files: spudec.c Log Message: Fix black line on right of subtitle with -spuaa 4 by setting alpha of border pixels to 0 after scaling, not before. Index: spudec.c =================================================================== RCS file: /cvsroot/mplayer/main/spudec.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- spudec.c 18 Sep 2004 00:08:16 -0000 1.44 +++ spudec.c 8 Jan 2005 21:06:04 -0000 1.45 @@ -808,15 +808,6 @@ } if (spu->scaled_image) { unsigned int x, y; - /* Kludge: draw_alpha needs width multiple of 8. */ - if (spu->scaled_width < spu->scaled_stride) - for (y = 0; y < spu->scaled_height; ++y) { - memset(spu->scaled_aimage + y * spu->scaled_stride + spu->scaled_width, 0, - spu->scaled_stride - spu->scaled_width); - /* FIXME: Why is this one needed? */ - memset(spu->scaled_image + y * spu->scaled_stride + spu->scaled_width, 0, - spu->scaled_stride - spu->scaled_width); - } if (spu->scaled_width <= 1 || spu->scaled_height <= 1) { goto nothing_to_do; } @@ -1061,6 +1052,12 @@ } } nothing_to_do: + /* Kludge: draw_alpha needs width multiple of 8. */ + if (spu->scaled_width < spu->scaled_stride) + for (y = 0; y < spu->scaled_height; ++y) { + memset(spu->scaled_aimage + y * spu->scaled_stride + spu->scaled_width, 0, + spu->scaled_stride - spu->scaled_width); + } spu->scaled_frame_width = dxs; spu->scaled_frame_height = dys; }

1 0

CVS: main/libmpcodecs ad_ffmpeg.c, 1.16, 1.17 vd_ffmpeg.c, 1.139, 1.140 ve_lavc.c, 1.106, 1.107
by syncmail＠mplayerhq.hu 08 Jan '05

08 Jan '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv30499/libmpcodecs Modified Files: ad_ffmpeg.c vd_ffmpeg.c ve_lavc.c Log Message: change malloc and free to av_ variants where needed. Index: ad_ffmpeg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_ffmpeg.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ad_ffmpeg.c 21 Sep 2004 20:34:46 -0000 1.16 +++ ad_ffmpeg.c 8 Jan 2005 19:16:21 -0000 1.17 @@ -72,7 +72,7 @@ /* alloc extra data */ if (sh_audio->wf && sh_audio->wf->cbSize > 0) { - lavc_context->extradata = malloc(sh_audio->wf->cbSize); + lavc_context->extradata = av_malloc(sh_audio->wf->cbSize); lavc_context->extradata_size = sh_audio->wf->cbSize; memcpy(lavc_context->extradata, (char *)sh_audio->wf + sizeof(WAVEFORMATEX), lavc_context->extradata_size); @@ -120,9 +120,8 @@ if (avcodec_close(lavc_context) < 0) mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_CantCloseCodec); - if (lavc_context->extradata) - free(lavc_context->extradata); - free(lavc_context); + av_freep(&lavc_context->extradata); + av_freep(&lavc_context); } static int control(sh_audio_t *sh,int cmd,void* arg, ...) Index: vd_ffmpeg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- vd_ffmpeg.c 17 Dec 2004 07:34:23 -0000 1.139 +++ vd_ffmpeg.c 8 Jan 2005 19:16:21 -0000 1.140 @@ -281,7 +281,7 @@ { avctx->flags |= CODEC_FLAG_EXTERN_HUFF; avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER); - avctx->extradata = malloc(avctx->extradata_size); + avctx->extradata = av_malloc(avctx->extradata_size); memcpy(avctx->extradata, sh->bih+sizeof(BITMAPINFOHEADER), avctx->extradata_size); @@ -303,7 +303,7 @@ || sh->format == mmioFOURCC('R', 'V', '4', '0') ){ avctx->extradata_size= 8; - avctx->extradata = malloc(avctx->extradata_size); + avctx->extradata = av_malloc(avctx->extradata_size); if(sh->bih->biSize!=sizeof(*sh->bih)+8){ /* only 1 packet per frame & sub_id from fourcc */ ((uint32_t*)avctx->extradata)[0] = 0; @@ -338,7 +338,7 @@ )) { avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER); - avctx->extradata = malloc(avctx->extradata_size); + avctx->extradata = av_malloc(avctx->extradata_size); memcpy(avctx->extradata, sh->bih+1, avctx->extradata_size); } /* Pass palette to codec */ @@ -359,7 +359,7 @@ if (sh->ImageDesc && sh->format == mmioFOURCC('S','V','Q','3')){ avctx->extradata_size = (*(int*)sh->ImageDesc) - sizeof(int); - avctx->extradata = malloc(avctx->extradata_size); + avctx->extradata = av_malloc(avctx->extradata_size); memcpy(avctx->extradata, ((int*)sh->ImageDesc)+1, avctx->extradata_size); } @@ -395,22 +395,14 @@ if (avcodec_close(avctx) < 0) mp_msg(MSGT_DECVIDEO,MSGL_ERR, MSGTR_CantCloseCodec); - if (avctx->extradata_size) - free(avctx->extradata); - avctx->extradata=NULL; + av_freep(&avctx->extradata); #if LIBAVCODEC_BUILD >= 4689 - if (avctx->palctrl) - free(avctx->palctrl); - avctx->palctrl=NULL; -#endif - if(avctx->slice_offset!=NULL) - free(avctx->slice_offset); - avctx->slice_offset=NULL; - - if (avctx) - free(avctx); - if (ctx->pic) - free(ctx->pic); + av_freep(&avctx->palctrl); +#endif + av_freep(&avctx->slice_offset); + + av_freep(&avctx); + av_freep(&ctx->pic); if (ctx) free(ctx); } @@ -601,7 +593,7 @@ #if LIBAVCODEC_BUILD >= 4689 // Palette support: libavcodec copies palette to *data[1] if (mpi->bpp == 8) - mpi->planes[1] = malloc(AVPALETTE_SIZE); + mpi->planes[1] = av_malloc(AVPALETTE_SIZE); #endif pic->data[0]= mpi->planes[0]; @@ -677,8 +669,8 @@ } // Palette support: free palette buffer allocated in get_buffer - if ( mpi && (mpi->bpp == 8) && (mpi->planes[1] != NULL)) - free(mpi->planes[1]); + if ( mpi && (mpi->bpp == 8)) + av_freep(&mpi->planes[1]); #if LIBAVCODEC_BUILD >= 4644 if(pic->type!=FF_BUFFER_TYPE_USER){ @@ -751,7 +743,7 @@ dp_hdr_t *hdr= (dp_hdr_t*)data; if(avctx->slice_offset==NULL) - avctx->slice_offset= malloc(sizeof(int)*1000); + avctx->slice_offset= av_malloc(sizeof(int)*1000); // for(i=0; i<25; i++) printf("%02X ", ((uint8_t*)data)[i]); Index: ve_lavc.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- ve_lavc.c 1 Dec 2004 20:32:05 -0000 1.106 +++ ve_lavc.c 8 Jan 2005 19:16:21 -0000 1.107 @@ -437,7 +437,7 @@ char *tmp; lavc_venc_context->intra_matrix = - malloc(sizeof(*lavc_venc_context->intra_matrix)*64); + av_malloc(sizeof(*lavc_venc_context->intra_matrix)*64); i = 0; while ((tmp = strsep(&lavc_param_intra_matrix, ",")) && (i < 64)) @@ -448,10 +448,7 @@ } if (i != 64) - { - free(lavc_venc_context->intra_matrix); - lavc_venc_context->intra_matrix = NULL; - } + av_freep(&lavc_venc_context->intra_matrix); else mp_msg(MSGT_MENCODER, MSGL_V, "Using user specified intra matrix\n"); } @@ -460,7 +457,7 @@ char *tmp; lavc_venc_context->inter_matrix = - malloc(sizeof(*lavc_venc_context->inter_matrix)*64); + av_malloc(sizeof(*lavc_venc_context->inter_matrix)*64); i = 0; while ((tmp = strsep(&lavc_param_inter_matrix, ",")) && (i < 64)) @@ -471,10 +468,7 @@ } if (i != 64) - { - free(lavc_venc_context->inter_matrix); - lavc_venc_context->inter_matrix = NULL; - } + av_freep(&lavc_venc_context->inter_matrix); else mp_msg(MSGT_MENCODER, MSGL_V, "Using user specified inter matrix\n"); } @@ -652,7 +646,7 @@ size= ftell(stats_file); fseek(stats_file, 0, SEEK_SET); - lavc_venc_context->stats_in= malloc(size + 1); + lavc_venc_context->stats_in= av_malloc(size + 1); lavc_venc_context->stats_in[size]=0; if(fread(lavc_venc_context->stats_in, size, 1, stats_file)<1){ @@ -728,8 +722,7 @@ } /* free second pass buffer, its not needed anymore */ - if(lavc_venc_context->stats_in) free(lavc_venc_context->stats_in); - lavc_venc_context->stats_in= NULL; + av_freep(&lavc_venc_context->stats_in); if(lavc_venc_context->bits_per_sample) mux_v->bih->biBitCount= lavc_venc_context->bits_per_sample; if(lavc_venc_context->extradata_size){ @@ -907,12 +900,8 @@ #endif #if LIBAVCODEC_BUILD >= 4675 - if (lavc_venc_context->intra_matrix) - free(lavc_venc_context->intra_matrix); - lavc_venc_context->intra_matrix = NULL; - if (lavc_venc_context->inter_matrix) - free(lavc_venc_context->inter_matrix); - lavc_venc_context->inter_matrix = NULL; + av_freep(&lavc_venc_context->intra_matrix); + av_freep(&lavc_venc_context->inter_matrix); #endif avcodec_close(lavc_venc_context); @@ -920,11 +909,9 @@ if(stats_file) fclose(stats_file); /* free rc_override */ - if(lavc_venc_context->rc_override) free(lavc_venc_context->rc_override); - lavc_venc_context->rc_override= NULL; + av_freep(&lavc_venc_context->rc_override); - if(vf->priv->context) free(vf->priv->context); - vf->priv->context= NULL; + av_freep(&vf->priv->context); } //===========================================================================//

1 0

CVS: main/libvo vo_gl.c,1.62,1.63
by syncmail＠mplayerhq.hu 08 Jan '05

08 Jan '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv7085 Modified Files: vo_gl.c Log Message: set sub_bg_alpha only to 255 when using hardware OSD. Index: vo_gl.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_gl.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- vo_gl.c 31 Dec 2004 14:58:49 -0000 1.62 +++ vo_gl.c 8 Jan 2005 17:58:56 -0000 1.63 @@ -159,6 +159,7 @@ glFindFormat(format, &image_bytes, &gl_texfmt, &gl_format, &gl_type); image_bytes = (image_bytes + 7) / 8; + if (use_osd) sub_bg_alpha = 255; // We need alpha = 255 for invisible part of the OSD int_pause = 0;

1 0

CVS: main/libaf af_ladspa.c,1.2,1.3
by syncmail＠mplayerhq.hu 08 Jan '05

08 Jan '05

CVS change done by Alex Beregszaszi Update of /cvsroot/mplayer/main/libaf In directory mail:/var2/tmp/cvs-serv16824 Modified Files: af_ladspa.c Log Message: 100l, mp_msg instead af_msg Index: af_ladspa.c =================================================================== RCS file: /cvsroot/mplayer/main/libaf/af_ladspa.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- af_ladspa.c 28 Dec 2004 01:47:40 -0000 1.2 +++ af_ladspa.c 6 Jan 2005 11:40:34 -0000 1.3 @@ -74,19 +74,10 @@ /* Local Includes */ #include "af.h" -#include "../mp_msg.h" #include "../help_mp.h" /* ------------------------------------------------------------------------- */ -/* Defines */ - -/* why, o why, wasn't it defined like this in the first place? */ - -#define MSGT_AF MSGT_AFILTER - -/* ------------------------------------------------------------------------- */ - /* Filter specific data */ typedef struct af_ladspa_s @@ -254,33 +245,33 @@ } if (setup->ninputs == 0) { - mp_msg(MSGT_AF, MSGL_WARN, "%s: %s\n", setup->myname, + af_msg(AF_MSG_WARN, "%s: %s\n", setup->myname, MSGTR_AF_LADSPA_WarnNoInputs); } else if (setup->ninputs == 1) { - mp_msg(MSGT_AF, MSGL_V, "%s: this is a mono effect\n", setup->myname); + af_msg(AF_MSG_VERBOSE, "%s: this is a mono effect\n", setup->myname); } else if (setup->ninputs == 2) { - mp_msg(MSGT_AF, MSGL_V, "%s: this is a stereo effect\n", setup->myname); + af_msg(AF_MSG_VERBOSE, "%s: this is a stereo effect\n", setup->myname); } if (setup->ninputs > 2) { - mp_msg(MSGT_AF, MSGL_ERR, "%s: %s\n", setup->myname, + af_msg(AF_MSG_ERROR, "%s: %s\n", setup->myname, MSGTR_AF_LADSPA_ErrMultiChannel); return AF_ERROR; } if (setup->noutputs == 0) { - mp_msg(MSGT_AF, MSGL_ERR, "%s: %s\n", setup->myname, + af_msg(AF_MSG_ERROR, "%s: %s\n", setup->myname, MSGTR_AF_LADSPA_ErrNoOutputs); return AF_ERROR; } if (setup->noutputs != setup->ninputs ) { - mp_msg(MSGT_AF, MSGL_ERR, "%s: %s\n", setup->myname, + af_msg(AF_MSG_ERROR, "%s: %s\n", setup->myname, MSGTR_AF_LADSPA_ErrInOutDiff); return AF_ERROR; } - mp_msg(MSGT_AF, MSGL_V, "%s: this plugin has %d input control(s)\n", + af_msg(AF_MSG_VERBOSE, "%s: this plugin has %d input control(s)\n", setup->myname, setup->ninputcontrols); /* Print list of controls and its range of values it accepts */ @@ -288,18 +279,18 @@ for (i=0; i<setup->ninputcontrols; i++) { p = setup->inputcontrolsmap[i]; hint = pdes->PortRangeHints[p]; - mp_msg(MSGT_AF, MSGL_V, " --- %d %s [", i, pdes->PortNames[p]); + af_msg(AF_MSG_VERBOSE, " --- %d %s [", i, pdes->PortNames[p]); if (LADSPA_IS_HINT_BOUNDED_BELOW(hint.HintDescriptor)) { - mp_msg(MSGT_AF, MSGL_V, "%0.2f , ", hint.LowerBound); + af_msg(AF_MSG_VERBOSE, "%0.2f , ", hint.LowerBound); } else { - mp_msg(MSGT_AF, MSGL_V, "... , "); + af_msg(AF_MSG_VERBOSE, "... , "); } if (LADSPA_IS_HINT_BOUNDED_ABOVE(hint.HintDescriptor)) { - mp_msg(MSGT_AF, MSGL_V, "%0.2f]\n", hint.UpperBound); + af_msg(AF_MSG_VERBOSE, "%0.2f]\n", hint.UpperBound); } else { - mp_msg(MSGT_AF, MSGL_V, "...]\n"); + af_msg(AF_MSG_VERBOSE, "...]\n"); } } @@ -346,9 +337,9 @@ * this. (path separator, shared objects extension, * et cetera). */ - mp_msg(MSGT_AF, MSGL_V, "\ton windows, only absolute pathnames " + af_msg(AF_MSG_VERBOSE, "\ton windows, only absolute pathnames " "are supported\n"); - mp_msg(MSGT_AF, MSGL_V, "\ttrying %s\n", filename); + af_msg(AF_MSG_VERBOSE, "\ttrying %s\n", filename); return dlopen(filename, flag); # endif @@ -389,7 +380,7 @@ } strcpy(buf+needslash+(end-start), filename); - mp_msg(MSGT_AF, MSGL_V, "\ttrying %s\n", buf); + af_msg(AF_MSG_VERBOSE, "\ttrying %s\n", buf); result=dlopen(buf, flag); free(buf); @@ -403,7 +394,7 @@ } /* end if there's a ladspapath */ /* last resort, just open it again, so the dlerror() message is correct */ - mp_msg(MSGT_AF, MSGL_V, "\ttrying %s\n", filename); + af_msg(AF_MSG_VERBOSE, "\ttrying %s\n", filename); return dlopen(filename,flag); } @@ -430,18 +421,18 @@ int i; /* load library */ - mp_msg(MSGT_AF, MSGL_V, "%s: loading ladspa plugin library %s\n", + af_msg(AF_MSG_VERBOSE, "%s: loading ladspa plugin library %s\n", setup->myname, setup->file); setup->libhandle = mydlopen(setup->file, RTLD_NOW); if (!setup->libhandle) { - mp_msg(MSGT_AF, MSGL_ERR, "%s: %s %s\n\t%s\n", setup->myname, + af_msg(AF_MSG_ERROR, "%s: %s %s\n\t%s\n", setup->myname, MSGTR_AF_LADSPA_ErrFailedToLoad, setup->file, dlerror() ); return AF_ERROR; } - mp_msg(MSGT_AF, MSGL_V, "%s: library found.\n", setup->myname); + af_msg(AF_MSG_VERBOSE, "%s: library found.\n", setup->myname); /* find descriptor function */ dlerror(); @@ -449,7 +440,7 @@ "ladspa_descriptor"); if (!descriptor_function) { - mp_msg(MSGT_AF, MSGL_ERR, "%s: %s\n\t%s\n", setup->myname, + af_msg(AF_MSG_ERROR, "%s: %s\n\t%s\n", setup->myname, MSGTR_AF_LADSPA_ErrNoDescriptor, dlerror()); return AF_ERROR; } @@ -457,33 +448,33 @@ /* if label == help, list all labels in library and exit */ if (strcmp(setup->label, "help") == 0) { - mp_msg(MSGT_AF, MSGL_INFO, "%s: %s %s:\n", setup->myname, + af_msg(AF_MSG_INFO, "%s: %s %s:\n", setup->myname, MSGTR_AF_LADSPA_AvailableLabels, setup->file); for (i=0; ; i++) { ladspa_descriptor = descriptor_function(i); if (ladspa_descriptor == NULL) { return AF_ERROR; } - mp_msg(MSGT_AF, MSGL_INFO, " %-16s - %s (%lu)\n", + af_msg(AF_MSG_INFO, " %-16s - %s (%lu)\n", ladspa_descriptor->Label, ladspa_descriptor->Name, ladspa_descriptor->UniqueID); } } - mp_msg(MSGT_AF, MSGL_V, "%s: looking for label\n", setup->myname); + af_msg(AF_MSG_VERBOSE, "%s: looking for label\n", setup->myname); /* find label in library */ for (i=0; ; i++) { ladspa_descriptor = descriptor_function(i); if (ladspa_descriptor == NULL) { - mp_msg(MSGT_AF, MSGL_ERR, "%s: %s\n", setup->myname, + af_msg(AF_MSG_ERROR, "%s: %s\n", setup->myname, MSGTR_AF_LADSPA_ErrLabelNotFound); return AF_ERROR; } if (strcmp(ladspa_descriptor->Label, setup->label) == 0) { setup->plugin_descriptor = ladspa_descriptor; - mp_msg(MSGT_AF, MSGL_V, "%s: %s found\n", setup->myname, + af_msg(AF_MSG_VERBOSE, "%s: %s found\n", setup->myname, setup->label); return AF_OK; } @@ -504,7 +495,7 @@ */ static int af_ladspa_malloc_failed(char *myname) { - mp_msg(MSGT_AF, MSGL_ERR, "%s: %s\n", myname, MSGTR_MemAllocFailed); + af_msg(AF_MSG_ERROR, "%s: %s\n", myname, MSGTR_MemAllocFailed); return AF_ERROR; } @@ -565,7 +556,7 @@ */ if (!arg) { - mp_msg(MSGT_AF, MSGL_ERR, "%s: %s\n", setup->myname, + af_msg(AF_MSG_ERROR, "%s: %s\n", setup->myname, MSGTR_AF_LADSPA_ErrNoSuboptions); return AF_ERROR; } @@ -577,7 +568,7 @@ buf[0] = '\0'; sscanf(arg, "%[^:]", buf); if (buf[0] == '\0') { - mp_msg(MSGT_AF, MSGL_ERR, "%s: %s\n", setup->myname, + af_msg(AF_MSG_ERROR, "%s: %s\n", setup->myname, MSGTR_AF_LADSPA_ErrNoLibFile); free(buf); return AF_ERROR; @@ -585,7 +576,7 @@ arg += strlen(buf); setup->file = strdup(buf); if (!setup->file) return af_ladspa_malloc_failed(setup->myname); - mp_msg(MSGT_AF, MSGL_V, "%s: file --> %s\n", setup->myname, + af_msg(AF_MSG_VERBOSE, "%s: file --> %s\n", setup->myname, setup->file); if (*(char*)arg != '\0') arg++; /* read ':' */ @@ -593,7 +584,7 @@ buf[0] = '\0'; sscanf(arg, "%[^:]", buf); if (buf[0] == '\0') { - mp_msg(MSGT_AF, MSGL_ERR, "%s: %s\n", setup->myname, + af_msg(AF_MSG_ERROR, "%s: %s\n", setup->myname, MSGTR_AF_LADSPA_ErrNoLabel); free(buf); return AF_ERROR; @@ -601,7 +592,7 @@ arg += strlen(buf); setup->label = strdup(buf); if (!setup->label) return af_ladspa_malloc_failed(setup->myname); - mp_msg(MSGT_AF, MSGL_V, "%s: label --> %s\n", setup->myname, + af_msg(AF_MSG_VERBOSE, "%s: label --> %s\n", setup->myname, setup->label); /* if (*(char*)arg != '0') arg++; */ /* read ':' */ @@ -629,14 +620,14 @@ for(i=0; i<setup->ninputcontrols; i++) { if (!arg || (*(char*)arg != ':') ) { - mp_msg(MSGT_AF, MSGL_ERR, "%s: %s\n", setup->myname, + af_msg(AF_MSG_ERROR, "%s: %s\n", setup->myname, MSGTR_AF_LADSPA_ErrNotEnoughControls); return AF_ERROR; } arg++; r = sscanf(arg, "%f", &val); if (r!=1) { - mp_msg(MSGT_AF, MSGL_ERR, "%s: %s\n", setup->myname, + af_msg(AF_MSG_ERROR, "%s: %s\n", setup->myname, MSGTR_AF_LADSPA_ErrNotEnoughControls); return AF_ERROR; } @@ -644,16 +635,16 @@ arg = strchr(arg, ':'); } - mp_msg(MSGT_AF, MSGL_V, "%s: input controls: ", setup->myname); + af_msg(AF_MSG_VERBOSE, "%s: input controls: ", setup->myname); for(i=0; i<setup->ninputcontrols; i++) { - mp_msg(MSGT_AF, MSGL_V, "%0.4f ", + af_msg(AF_MSG_VERBOSE, "%0.4f ", setup->inputcontrols[setup->inputcontrolsmap[i]]); } - mp_msg(MSGT_AF, MSGL_V, "\n"); + af_msg(AF_MSG_VERBOSE, "\n"); /* check boundaries of inputcontrols */ - mp_msg(MSGT_AF, MSGL_V, "%s: checking boundaries of input controls\n", + af_msg(AF_MSG_VERBOSE, "%s: checking boundaries of input controls\n", setup->myname); for(i=0; i<setup->ninputcontrols; i++) { int p = setup->inputcontrolsmap[i]; @@ -663,18 +654,18 @@ if (LADSPA_IS_HINT_BOUNDED_BELOW(hint.HintDescriptor) && val < hint.LowerBound) { - mp_msg(MSGT_AF, MSGL_ERR, MSGTR_AF_LADSPA_ErrControlBelow, + af_msg(AF_MSG_ERROR, MSGTR_AF_LADSPA_ErrControlBelow, setup->myname, i, hint.LowerBound); return AF_ERROR; } if (LADSPA_IS_HINT_BOUNDED_ABOVE(hint.HintDescriptor) && val > hint.UpperBound) { - mp_msg(MSGT_AF, MSGL_ERR, MSGTR_AF_LADSPA_ErrControlAbove, + af_msg(AF_MSG_ERROR, MSGTR_AF_LADSPA_ErrControlAbove, setup->myname, i, hint.UpperBound); return AF_ERROR; } } - mp_msg(MSGT_AF, MSGL_V, "%s: all controls have sane values\n", + af_msg(AF_MSG_VERBOSE, "%s: all controls have sane values\n", setup->myname); /* All is well! */ @@ -706,7 +697,7 @@ const LADSPA_Descriptor *pdes = setup->plugin_descriptor; if (setup->myname) { - mp_msg(MSGT_AF, MSGL_V, "%s: cleaning up\n", setup->myname); + af_msg(AF_MSG_VERBOSE, "%s: cleaning up\n", setup->myname); free(setup->myname); } @@ -801,7 +792,7 @@ */ if (setup->nch != 0) { - mp_msg(MSGT_AF, MSGL_DBG2, "%s: bufsize change; free old buffer\n", + af_msg(AF_MSG_DEBUG1, "%s: bufsize change; free old buffer\n", setup->myname); if(setup->inbufs) { @@ -826,7 +817,7 @@ setup->inbufs = calloc(nch, sizeof(float*)); setup->outbufs = calloc(nch, sizeof(float*)); - mp_msg(MSGT_AF, MSGL_DBG2, "%s: bufsize = %d\n", + af_msg(AF_MSG_DEBUG1, "%s: bufsize = %d\n", setup->myname, setup->bufsize); for(i=0; i<nch; i++) { @@ -989,6 +980,3 @@ } /* ------------------------------------------------------------------------- */ - -#undef MSGT_AF -

2 1

CVS: main/libmpdemux yuv4mpeg.c, 1.1, 1.2 yuv4mpeg.h, 1.3, 1.4
by syncmail＠mplayerhq.hu 08 Jan '05

08 Jan '05

CVS change done by Rik Snel CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv3658/libmpdemux Modified Files: yuv4mpeg.c yuv4mpeg.h Log Message: replace almost obsolete email address: snel(a)phys.uu.nl -> rsnel(a)cube.dyndns.org Index: yuv4mpeg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/yuv4mpeg.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- yuv4mpeg.c 27 Dec 2001 02:08:31 -0000 1.1 +++ yuv4mpeg.c 8 Jan 2005 14:32:26 -0000 1.2 @@ -4,7 +4,7 @@ * Copyright (C) 2001 Matthew J. Marjanovic <maddog(a)mir.com> * * This file is ripped from the lavtools package (mjpeg.sourceforge.net) - * Ported to mplayer by Rik Snel <snel(a)phys.uu.nl> + * Ported to mplayer by Rik Snel <rsnel(a)cube.dyndns.org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Index: yuv4mpeg.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/yuv4mpeg.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- yuv4mpeg.h 30 May 2003 17:38:43 -0000 1.3 +++ yuv4mpeg.h 8 Jan 2005 14:32:26 -0000 1.4 @@ -7,7 +7,7 @@ * Copyright (C) 2001 Matthew J. Marjanovic <maddog(a)mir.com> * * This file is ripped from the lavtools package (mjpeg.sourceforge.net) - * Ported to mplayer by Rik Snel <snel(a)phys.uu.nl> + * Ported to mplayer by Rik Snel <rsnel(a)cube.dyndns.org> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License

1 0

CVS: main/libmpcodecs vd_zrmjpeg.c, 1.1, 1.2 vf_zrmjpeg.c, 1.3, 1.4
by syncmail＠mplayerhq.hu 08 Jan '05

08 Jan '05

CVS change done by Rik Snel CVS Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv3658/libmpcodecs Modified Files: vd_zrmjpeg.c vf_zrmjpeg.c Log Message: replace almost obsolete email address: snel(a)phys.uu.nl -> rsnel(a)cube.dyndns.org Index: vd_zrmjpeg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_zrmjpeg.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vd_zrmjpeg.c 4 Nov 2003 19:58:37 -0000 1.1 +++ vd_zrmjpeg.c 8 Jan 2005 14:32:26 -0000 1.2 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003 Rik Snel <snel(a)phys.uu.nl>, license GPL v2 + * Copyright (C) 2005 Rik Snel <rsnel(a)cube.dyndns.org>, license GPL v2 * - based on vd_mpegpes.c by A'rpi (C) 2002-2003 * - guess_mjpeg_type code stolen from lav_io.c (C) 2000 Rainer Johanni * <Rainer(a)Johanni.de> from the mjpegtools package Index: vf_zrmjpeg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_zrmjpeg.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- vf_zrmjpeg.c 16 Feb 2004 14:41:04 -0000 1.3 +++ vf_zrmjpeg.c 8 Jan 2005 14:32:26 -0000 1.4 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003 Rik Snel <snel(a)phys.uu.nl>, license GPL v2 + * Copyright (C) 2005 Rik Snel <rsnel(a)cube.dyndns.org>, license GPL v2 * - based on vd_lavc.c by A'rpi (C) 2002-2003 * - parts from ffmpeg Copyright (c) 2000-2003 Fabrice Bellard *

1 0

CVS: main/libvo vo_zr2.c, 1.6, 1.7 vo_zr.c, 1.29, 1.30
by syncmail＠mplayerhq.hu 08 Jan '05

08 Jan '05

CVS change done by Rik Snel CVS Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv3658/libvo Modified Files: vo_zr2.c vo_zr.c Log Message: replace almost obsolete email address: snel(a)phys.uu.nl -> rsnel(a)cube.dyndns.org Index: vo_zr2.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_zr2.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- vo_zr2.c 8 Jan 2005 14:25:22 -0000 1.6 +++ vo_zr2.c 8 Jan 2005 14:32:25 -0000 1.7 @@ -32,7 +32,7 @@ static vo_info_t info = { "Zoran ZR360[56]7/ZR36060 Driver (DC10(+)/buz/lml33/MatroxRR)", "zr2", - "Rik Snel <snel(a)phys.uu.nl>", + "Rik Snel <rsnel(a)cube.dyndns.org>", "" }; Index: vo_zr.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_zr.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- vo_zr.c 28 Oct 2004 01:15:52 -0000 1.29 +++ vo_zr.c 8 Jan 2005 14:32:25 -0000 1.30 @@ -34,7 +34,7 @@ { "Zoran ZR360[56]7/ZR36060 Driver (DC10(+)/buz/lml33/MatroxRR)", "zr", - "Rik Snel <snel(a)phys.uu.nl>", + "Rik Snel <rsnel(a)cube.dyndns.org>", "" };

1 0