May 2002 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/libao2 ao_pcm.c,1.6,1.7 ao_plugin.c,1.17,1.18 pl_delay.c,1.4,1.5 pl_format.c,1.4,1.5 pl_surround.c,1.10,1.11
by pl 30 May '02

30 May '02

Update of /cvsroot/mplayer/main/libao2 In directory mail:/var/tmp.root/cvs-serv4885 Modified Files: ao_pcm.c ao_plugin.c pl_delay.c pl_format.c pl_surround.c Log Message: warning fixes (string.h is required for memset) moved config.h at the top of the include (often avoids 10L when adding a new #include ;) Index: ao_pcm.c =================================================================== RCS file: /cvsroot/mplayer/main/libao2/ao_pcm.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ao_pcm.c 26 Apr 2002 13:07:03 -0000 1.6 +++ ao_pcm.c 30 May 2002 11:53:51 -0000 1.7 @@ -1,7 +1,9 @@ +#include "config.h" + #include <stdio.h> #include <stdlib.h> +#include <string.h> -#include "config.h" #include "bswap.h" #include "afmt.h" #include "audio_out.h" Index: ao_plugin.c =================================================================== RCS file: /cvsroot/mplayer/main/libao2/ao_plugin.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ao_plugin.c 9 May 2002 07:41:25 -0000 1.17 +++ ao_plugin.c 30 May 2002 11:53:51 -0000 1.18 @@ -1,7 +1,8 @@ +#include "../config.h" + #include <stdio.h> #include <stdlib.h> - -#include "../config.h" +#include <string.h> #include "afmt.h" #include "audio_out.h" Index: pl_delay.c =================================================================== RCS file: /cvsroot/mplayer/main/libao2/pl_delay.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pl_delay.c 27 Jan 2002 10:41:43 -0000 1.4 +++ pl_delay.c 30 May 2002 11:53:51 -0000 1.5 @@ -7,6 +7,7 @@ #include <stdio.h> #include <stdlib.h> +#include <string.h> #include "audio_out.h" #include "audio_plugin.h" Index: pl_format.c =================================================================== RCS file: /cvsroot/mplayer/main/libao2/pl_format.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pl_format.c 4 Dec 2001 12:28:26 -0000 1.4 +++ pl_format.c 30 May 2002 11:53:51 -0000 1.5 @@ -9,6 +9,7 @@ #include <stdio.h> #include <stdlib.h> +#include <string.h> #include <unistd.h> #include <inttypes.h> Index: pl_surround.c =================================================================== RCS file: /cvsroot/mplayer/main/libao2/pl_surround.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- pl_surround.c 6 Apr 2002 15:38:28 -0000 1.10 +++ pl_surround.c 30 May 2002 11:53:51 -0000 1.11 @@ -38,6 +38,7 @@ #include <stdio.h> #include <stdlib.h> +#include <string.h> #include <unistd.h> #include "audio_out.h"

1 0

CVS: main configure,1.485,1.486
by Johannes Feigl 30 May '02

30 May '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv30481 Modified Files: configure Log Message: arts added to 'Disabled optional drivers' Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.485 retrieving revision 1.486 diff -u -r1.485 -r1.486 --- configure 29 May 2002 21:23:19 -0000 1.485 +++ configure 30 May 2002 11:42:55 -0000 1.486 @@ -2696,6 +2696,8 @@ _aomodules="arts $_aomodules" _ld_arts=`artsc-config --libs` _inc_arts=`artsc-config --cflags` +else + _noaomodules="arts $_noaomodules" fi echores "$_arts"

1 0

CVS: main/libvo vo_zr.c,1.15,1.16
by Arpi of Ize 30 May '02

30 May '02

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv15412 Modified Files: vo_zr.c Log Message: 10l - noticed by Terry Mohan <tmohan(a)users.sourceforge.net> Index: vo_zr.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_zr.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- vo_zr.c 27 May 2002 18:05:26 -0000 1.15 +++ vo_zr.c 30 May 2002 11:20:58 -0000 1.16 @@ -492,7 +492,7 @@ static uint32_t query_format(uint32_t format) { if(format==IMGFMT_YV12 || format==IMGFMT_YUY2) - return VFCAP_CSP_SUPPORTED|VFCAP_SUPPORTED_BY_HW; + return VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW; return 0; }

1 0

CVS: main/libmpcodecs vd.c,1.39,1.40
by Arpi of Ize 30 May '02

30 May '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv26456 Modified Files: vd.c Log Message: setting mpi's w/h to disp_w/h. it fixes mpeg1 crash when height%16!=0 Index: vd.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- vd.c 20 May 2002 03:25:23 -0000 1.39 +++ vd.c 30 May 2002 01:26:07 -0000 1.40 @@ -260,6 +260,10 @@ // returns NULL or allocated mp_image_t* // Note: buffer allocation may be moved to mpcodecs_config_vo() later... mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, int w, int h){ - return vf_get_image(sh->vfilter,sh->codec->outfmt[sh->outfmtidx],mp_imgtype,mp_imgflag,w,h); + mp_image_t* mpi=vf_get_image(sh->vfilter,sh->codec->outfmt[sh->outfmtidx],mp_imgtype,mp_imgflag,w,h); + mpi->x=mpi->y=0; + mpi->w=sh->disp_w; + mpi->h=sh->disp_h; + return mpi; }

1 0

CVS: main/libmpcodecs ad_pcm.c,1.4,1.5
by Arpi of Ize 30 May '02

30 May '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv29753 Modified Files: ad_pcm.c Log Message: 8bit 'twos' S8 pcm audio support - fixes MOTI1E.MOV Index: ad_pcm.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_pcm.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ad_pcm.c 25 Apr 2002 12:29:55 -0000 1.4 +++ ad_pcm.c 30 May 2002 00:40:55 -0000 1.5 @@ -30,6 +30,9 @@ case 0x11: sh_audio->sample_format=AFMT_IMA_ADPCM;break; case 0x50: sh_audio->sample_format=AFMT_MPEG;break; /* case 0x2000: sh_audio->sample_format=AFMT_AC3; */ + case 0x736F7774: + if(sh_audio->samplesize==1) sh_audio->sample_format=AFMT_S8; // 'twos' + break; default: if(sh_audio->samplesize!=2) sh_audio->sample_format=AFMT_U8; } return 1;

1 0

CVS: main/libmpcodecs vd_vfw.c,1.7,1.8 vf_palette.c,1.2,1.3
by Arpi of Ize 30 May '02

30 May '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv23543 Modified Files: vd_vfw.c vf_palette.c Log Message: grayscaled palette support Index: vd_vfw.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_vfw.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- vd_vfw.c 16 May 2002 23:24:47 -0000 1.7 +++ vd_vfw.c 30 May 2002 00:26:23 -0000 1.8 @@ -94,7 +94,11 @@ if(mpi->imgfmt==IMGFMT_RGB8 || mpi->imgfmt==IMGFMT_BGR8){ // export palette: - mpi->planes[1]=((unsigned char*)&sh->o_bih)+40; +// FIXME: sh->o_bih is cutted down to 40 bytes!!! +// if(sh->o_bih->biSize>40) +// mpi->planes[1]=((unsigned char*)&sh->o_bih)+40; +// else + mpi->planes[1]=NULL; } return mpi; Index: vf_palette.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_palette.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- vf_palette.c 25 May 2002 13:22:28 -0000 1.2 +++ vf_palette.c 30 May 2002 00:26:23 -0000 1.3 @@ -29,6 +29,8 @@ 0 }; +static unsigned int gray_pal[256]; + static unsigned int find_best(struct vf_instance_s* vf, unsigned int fmt){ unsigned int best=0; int ret; @@ -73,6 +75,8 @@ MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, mpi->w, mpi->h); + if(!mpi->planes[1]) mpi->planes[1]=gray_pal; + if(mpi->w==mpi->stride[0] && dmpi->w*(dmpi->bpp>>3)==dmpi->stride[0]){ // no stride conversion needed switch(dmpi->imgfmt&255){ @@ -119,10 +123,12 @@ } static int open(vf_instance_t *vf, char* args){ + unsigned int i; vf->config=config; vf->put_image=put_image; vf->query_format=query_format; vf->priv=malloc(sizeof(struct vf_priv_s)); + for(i=0;i<256;i++) gray_pal[i]=0x01010101*i; return 1; }

1 0

CVS: main/libvo vo_xv.c,1.89,1.90
by Arpi of Ize 30 May '02

30 May '02

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv19462 Modified Files: vo_xv.c Log Message: - some cleanup, removed unused code - no more ignoring offset & stride values from XvImage struct -> fixed shifted/skewed colors with width%8!=0 movies Index: vo_xv.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- vo_xv.c 24 May 2002 00:46:48 -0000 1.89 +++ vo_xv.c 30 May 2002 00:08:47 -0000 1.90 @@ -617,43 +617,48 @@ uint8_t *src; uint8_t *dst; int i; + int srcstride; - dst = xvimage[current_buf]->data + image_width * y + x; + dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[0] + + xvimage[current_buf]->pitches[0]*y + x; src = image[0]; - if(w==stride[0] && w==image_width) memcpy(dst,src,w*h); + if(w==stride[0] && w==xvimage[current_buf]->pitches[0]) memcpy(dst,src,w*h); else for(i=0;i<h;i++) { memcpy(dst,src,w); src+=stride[0]; - dst+=image_width; + dst+=xvimage[current_buf]->pitches[0]; } x/=2;y/=2;w/=2;h/=2; - dst = xvimage[current_buf]->data + image_width * image_height + (image_width>>1) * y + x; - if(image_format!=IMGFMT_YV12) dst+=(image_width>>1)*(image_height>>1); - src = image[2]; - if(w==stride[2] && w==image_width/2) memcpy(dst,src,w*h); + dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[1] + + xvimage[current_buf]->pitches[1]*y + x; + src=image[2];srcstride=stride[2]; + if(image_format!=IMGFMT_YV12){ src=image[1];srcstride=stride[1]; } + if(w==srcstride && w==xvimage[current_buf]->pitches[1]) memcpy(dst,src,w*h); else for(i=0;i<h;i++) { memcpy(dst,src,w); - src+=stride[2]; - dst+=image_width/2; + src+=srcstride; + dst+=xvimage[current_buf]->pitches[1]; } - dst = xvimage[current_buf]->data + image_width * image_height + (image_width>>1) * y + x; - if(image_format==IMGFMT_YV12) dst+=(image_width>>1)*(image_height>>1); - src = image[1]; - if(w==stride[1] && w==image_width/2) memcpy(dst,src,w*h); + dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[2] + + xvimage[current_buf]->pitches[2]*y + x; + src=image[2];srcstride=stride[2]; + if(image_format==IMGFMT_YV12){ src=image[1];srcstride=stride[1]; } + if(w==srcstride && w==xvimage[current_buf]->pitches[2]) memcpy(dst,src,w*h); else for(i=0;i<h;i++) { memcpy(dst,src,w); - src+=stride[1]; - dst+=image_width/2; - } + src+=srcstride; + dst+=xvimage[current_buf]->pitches[2]; + } + return 0; } @@ -665,56 +670,44 @@ case IMGFMT_UYVY: case IMGFMT_YVYU: - // YUY2 packed, flipped -#if 0 - int i; - unsigned short *s=(unsigned short *)src[0]; - unsigned short *d=(unsigned short *)xvimage[current_buf]->data; - s+=image_width*image_height; - for(i=0;i<image_height;i++) { - s-=image_width; - memcpy(d,s,image_width*2); - d+=image_width; - } -#else - memcpy(xvimage[current_buf]->data,src[0],image_width*image_height*2); -#endif - break; +// printf("off=0x%X pitch=%d width=%d \n",xvimage[current_buf]->offsets[0],xvimage[current_buf]->pitches[0],image_width); - case IMGFMT_YV12: - case IMGFMT_I420: - case IMGFMT_IYUV: - - // YV12 planar - memcpy(xvimage[current_buf]->data,src[0],image_width*image_height); - if (xv_format == IMGFMT_YV12) - { - memcpy(xvimage[current_buf]->data+image_width*image_height,src[2],image_width*image_height/4); - memcpy(xvimage[current_buf]->data+image_width*image_height*5/4,src[1],image_width*image_height/4); - } - else - { - memcpy(xvimage[current_buf]->data+image_width*image_height,src[1],image_width*image_height/4); - memcpy(xvimage[current_buf]->data+image_width*image_height*5/4,src[2],image_width*image_height/4); - } - break; + // YUY2 packed + if(image_width*2==xvimage[current_buf]->pitches[0]){ + memcpy(xvimage[current_buf]->data+xvimage[current_buf]->offsets[0], + src[0], image_width*image_height*2); + } else { + unsigned char* s=src[0]; + unsigned char* d=xvimage[current_buf]->data+xvimage[current_buf]->offsets[0]; + int i; + for(i=0;i<image_height;i++) { + memcpy(d,s,image_width*2); + s+=image_width*2; + d+=xvimage[current_buf]->pitches[0]; + } + } + break; case IMGFMT_BGR24: if(flip_flag) // tricky, using negative src stride: rgb24toyv12(src[0]+3*image_width*(image_height-1), - xvimage[current_buf]->data, - xvimage[current_buf]->data+image_width*image_height*5/4, - xvimage[current_buf]->data+image_width*image_height, + xvimage[current_buf]->data+xvimage[current_buf]->offsets[0], + xvimage[current_buf]->data+xvimage[current_buf]->offsets[2], + xvimage[current_buf]->data+xvimage[current_buf]->offsets[1], image_width,image_height, - image_width,image_width/2,-3*image_width); + xvimage[current_buf]->pitches[0], + xvimage[current_buf]->pitches[1], + -3*image_width); else rgb24toyv12(src[0], - xvimage[current_buf]->data, - xvimage[current_buf]->data+image_width*image_height*5/4, - xvimage[current_buf]->data+image_width*image_height, + xvimage[current_buf]->data+xvimage[current_buf]->offsets[0], + xvimage[current_buf]->data+xvimage[current_buf]->offsets[2], + xvimage[current_buf]->data+xvimage[current_buf]->offsets[1], image_width,image_height, - image_width,image_width/2,3*image_width); + xvimage[current_buf]->pitches[0], + xvimage[current_buf]->pitches[1], + 3*image_width); break; } @@ -727,24 +720,26 @@ if(mpi->type==MP_IMGTYPE_IPB && num_buffers<3 && mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; // not enough if(mpi->imgfmt!=image_format || mpi->imgfmt==IMGFMT_BGR24) return VO_FALSE; // needs conversion :( // if(mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; // slow video ram - if(mpi->width==image_width){ - if(mpi->flags&MP_IMGFLAG_PLANAR){ - mpi->planes[0]=xvimage[current_buf]->data; - if(mpi->flags&MP_IMGFLAG_SWAPPED){ - // I420 - mpi->planes[1]=xvimage[current_buf]->data+image_width*image_height; - mpi->planes[2]=mpi->planes[1]+(image_width>>1)*(image_height>>1); - } else { + if( (mpi->flags&(MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_ACCEPT_WIDTH)) || + (mpi->width*(mpi->bpp/8)==xvimage[current_buf]->pitches[0]) ){ + mpi->planes[0]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[0]; + mpi->stride[0]=xvimage[current_buf]->pitches[0]; + mpi->width=mpi->stride[0]/(mpi->bpp/8); + if(mpi->flags&MP_IMGFLAG_PLANAR){ + if(mpi->flags&MP_IMGFLAG_SWAPPED){ + // I420 + mpi->planes[1]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[1]; + mpi->planes[2]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[2]; + mpi->stride[1]=xvimage[current_buf]->pitches[1]; + mpi->stride[2]=xvimage[current_buf]->pitches[2]; + } else { // YV12 - mpi->planes[2]=xvimage[current_buf]->data+image_width*image_height; - mpi->planes[1]=mpi->planes[2]+(image_width>>1)*(image_height>>1); - } - mpi->stride[0]=image_width; - mpi->stride[1]=mpi->stride[2]=image_width/2; - } else { - mpi->planes[0]=xvimage[current_buf]->data; - mpi->stride[0]=image_width*(mpi->bpp>>3); - } + mpi->planes[1]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[2]; + mpi->planes[2]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[1]; + mpi->stride[1]=xvimage[current_buf]->pitches[2]; + mpi->stride[2]=xvimage[current_buf]->pitches[1]; + } + } mpi->flags|=MP_IMGFLAG_DIRECT; // printf("mga: get_image() SUCCESS -> Direct Rendering ENABLED\n"); return VO_TRUE; @@ -758,46 +753,14 @@ /* check image formats */ if(format==IMGFMT_BGR24){ format=IMGFMT_YV12;flag&=~2;flag|=VFCAP_FLIP;} // conversion! for(i = 0; i < formats; i++){ -// printf("Xvideo image format: 0x%x (%4.4s) %s\n", fo[i].id,(char*)&fo[i].id, (fo[i].format == XvPacked) ? "packed" : "planar"); if (fo[i].id == format) return flag; //xv_format = fo[i].id; } return 0; - -/* -switch(format){ - case IMGFMT_YUY2: - case IMGFMT_UYVY: - case IMGFMT_YVYU: - - case IMGFMT_YV12: - case IMGFMT_I420: - case IMGFMT_IYUV: - - case IMGFMT_BGR24: - -// umm, this is a kludge, we need to ask the server.. (see init function above) - return 1; -} -return 0; -*/ - } static void uninit(void) { int i; -#if 0 - - if(!mDisplay) return; - saver_on(mDisplay); // screen saver back on - if(vo_config_count) for( i=0;i<num_buffers;i++ ) deallocate_xvimage( i ); -#ifdef HAVE_XF86VM - vo_vm_close(mDisplay); -#endif - if(vo_config_count) vo_x11_uninit(); - -#else - if ( !vo_config_count ) return; saver_on(mDisplay); // screen saver back on for( i=0;i<num_buffers;i++ ) deallocate_xvimage( i ); @@ -805,8 +768,6 @@ vo_vm_close(mDisplay); #endif vo_x11_uninit(); - -#endif } static uint32_t preinit(const char *arg)

1 0

CVS: main/libmpcodecs dec_video.c,1.136,1.137
by Arpi of Ize 29 May '02

29 May '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv13979 Modified Files: dec_video.c Log Message: restore original bih->biCompression if codec init failed Index: dec_video.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_video.c,v retrieving revision 1.136 retrieving revision 1.137 diff -u -r1.136 -r1.137 --- dec_video.c 20 May 2002 03:25:23 -0000 1.136 +++ dec_video.c 29 May 2002 22:39:25 -0000 1.137 @@ -135,13 +135,18 @@ } int init_video(sh_video_t *sh_video,char* codecname,int vfm,int status){ + unsigned int orig_fourcc=sh_video->bih?sh_video->bih->biCompression:0; sh_video->codec=NULL; sh_video->vf_inited=0; - while((sh_video->codec=find_codec(sh_video->format, - sh_video->bih?((unsigned int*) &sh_video->bih->biCompression):NULL, - sh_video->codec,0) )){ - // ok we found one codec + + while(1){ int i; + // restore original fourcc: + if(sh_video->bih) sh_video->bih->biCompression=orig_fourcc; + if(!(sh_video->codec=find_codec(sh_video->format, + sh_video->bih?((unsigned int*) &sh_video->bih->biCompression):NULL, + sh_video->codec,0) )) break; + // ok we found one codec if(sh_video->codec->flags&CODECS_FLAG_SELECTED) continue; // already tried & failed if(codecname && strcmp(sh_video->codec->name,codecname)) continue; // -vc if(vfm>=0 && sh_video->codec->driver!=vfm) continue; // vfm doesn't match

1 0

CVS: main/libmpcodecs ve_lavc.c,1.14,1.15
by Arpi of Ize 29 May '02

29 May '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv23150 Modified Files: ve_lavc.c Log Message: new options to support Michael's libavcodec patch, #ifdefed slightly modified version of Michael's ffmpeg-preview-michael-20020529-mplayer.diff Index: ve_lavc.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ve_lavc.c 5 May 2002 00:31:40 -0000 1.14 +++ ve_lavc.c 29 May 2002 21:34:29 -0000 1.15 @@ -53,11 +53,17 @@ static float lavc_param_vqcompress = 0.5; static float lavc_param_vqblur = 0.5; static float lavc_param_vb_qfactor = 2.0; +static float lavc_param_vb_qoffset = 0.0; static int lavc_param_vmax_b_frames = 0; static int lavc_param_keyint = -1; static int lavc_param_vpass = 0; static int lavc_param_vrc_strategy = 2; static int lavc_param_vb_strategy = 0; +static int lavc_param_luma_elim_threshold = 3; +static int lavc_param_chroma_elim_threshold = 5; +static int lavc_param_packet_size= 0; +static int lavc_param_strict= 0; +static int lavc_param_data_partitioning= 0; #include "cfgparser.h" @@ -80,6 +86,14 @@ {"vpass", &lavc_param_vpass, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL}, {"vrc_strategy", &lavc_param_vrc_strategy, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL}, {"vb_strategy", &lavc_param_vb_strategy, CONF_TYPE_INT, CONF_RANGE, 0, 1, NULL}, +#ifdef CODEC_FLAG_PART + {"vb_qoffset", &lavc_param_vb_qoffset, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 31.0, NULL}, + {"vlelim", &lavc_param_luma_elim_threshold, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL}, + {"vcelim", &lavc_param_chroma_elim_threshold, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL}, + {"vpsize", &lavc_param_packet_size, CONF_TYPE_INT, CONF_RANGE, 0, 100000000, NULL}, + {"vstrict", &lavc_param_strict, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"vdpart", &lavc_param_data_partitioning, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART, NULL}, +#endif {"keyint", &lavc_param_keyint, CONF_TYPE_INT, 0, 0, 0, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} }; @@ -127,7 +141,16 @@ lavc_venc_context.b_quant_factor= lavc_param_vb_qfactor; lavc_venc_context.rc_strategy= lavc_param_vrc_strategy; lavc_venc_context.b_frame_strategy= lavc_param_vb_strategy; - + +#ifdef CODEC_FLAG_PART + lavc_venc_context.b_quant_offset= lavc_param_vb_qoffset; + lavc_venc_context.luma_elim_threshold= lavc_param_luma_elim_threshold; + lavc_venc_context.chroma_elim_threshold= lavc_param_chroma_elim_threshold; + lavc_venc_context.rtp_payload_size= lavc_param_packet_size; + if(lavc_param_packet_size )lavc_venc_context.rtp_mode=1; + lavc_venc_context.strict_std_compliance= lavc_param_strict; +#endif + /* keyframe interval */ if (lavc_param_keyint >= 0) /* != -1 */ lavc_venc_context.gop_size = lavc_param_keyint; @@ -149,6 +172,9 @@ } lavc_venc_context.flags|= lavc_param_v4mv ? CODEC_FLAG_4MV : 0; +#ifdef CODEC_FLAG_PART + lavc_venc_context.flags|= lavc_param_data_partitioning; +#endif /* lavc internal 2pass bitrate control */ if(lavc_param_vpass==1)

1 0

CVS: main configure,1.484,1.485
by Arpi of Ize 29 May '02

29 May '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv15948 Modified Files: configure Log Message: fixed arts detection Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.484 retrieving revision 1.485 diff -u -r1.484 -r1.485 --- configure 28 May 2002 09:48:45 -0000 1.484 +++ configure 29 May 2002 21:23:19 -0000 1.485 @@ -2680,7 +2680,13 @@ if test "$_arts" = auto ; then _arts=no if ( artsc-config --version ) >> "$TMPLOG" 2>&1 ; then - _arts=yes + +cat > $TMPC << EOF +#include <artsc.h> +int main(void) { return 0; } +EOF +cc_check `artsc-config --libs` `artsc-config --cflags` && ( "$TMPO" >> "$TMPLOG" 2>&1 ) && _arts=yes + fi fi

1 0