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

[Mplayer-cvslog] CVS: main cfg-common.h, 1.126, 1.127 cfg-mencoder.h, 1.75, 1.76 cfg-mplayer.h, 1.212, 1.213 mencoder.c, 1.231, 1.232 mplayer.c, 1.744, 1.745
by attila＠mplayerhq.hu 05 Feb '04

05 Feb '04

Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv15573 Modified Files: cfg-common.h cfg-mencoder.h cfg-mplayer.h mencoder.c mplayer.c Log Message: * changes mencoder's exit code on explicit kill to 2 * add quiet/noquiet to mencoder * dont depend targets on themselfs patch by Oswald Buddenhagen <ossi(a)kde.org> additionaly moved quiet/noquiet and v/verbose to cfg-common.h Index: cfg-common.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-common.h,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- cfg-common.h 11 Jan 2004 17:07:31 -0000 1.126 +++ cfg-common.h 29 Jan 2004 12:01:25 -0000 1.127 @@ -1,5 +1,11 @@ #ifdef MAIN_CONF /* this will be included in conf[] */ +// ------------------------- common optionss -------------------- + {"quiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, + {"noquiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, + {"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 100, NULL}, + {"v", cfg_inc_verbose, CONF_TYPE_FUNC, CONF_GLOBAL|CONF_NOSAVE, 0, 0, NULL}, + // ------------------------- stream options -------------------- #ifdef USE_STREAM_CACHE @@ -266,6 +272,9 @@ #include "config.h" +extern int quiet; +extern int verbose; + // codec/filter opts: (defiend at libmpcodecs/vd.c) extern float screen_size_xy; extern float movie_aspect; Index: cfg-mencoder.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- cfg-mencoder.h 23 Jan 2004 01:13:00 -0000 1.75 +++ cfg-mencoder.h 29 Jan 2004 12:01:25 -0000 1.76 @@ -230,9 +230,6 @@ #include "cfg-common.h" #undef MAIN_CONF -// {"quiet", &quiet, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 100, NULL}, - {"v", cfg_inc_verbose, CONF_TYPE_FUNC, CONF_GLOBAL, 0, 0, NULL}, // {"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, // {"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, // {"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, Index: cfg-mplayer.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v retrieving revision 1.212 retrieving revision 1.213 diff -u -r1.212 -r1.213 --- cfg-mplayer.h 24 Jan 2004 11:53:52 -0000 1.212 +++ cfg-mplayer.h 29 Jan 2004 12:01:25 -0000 1.213 @@ -420,11 +420,7 @@ #undef MAIN_CONF {"identify", &identify, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, - {"quiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, - {"noquiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, {"really-quiet", &verbose, CONF_TYPE_FLAG, CONF_GLOBAL, 0, -10, NULL}, - {"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 100, NULL}, - {"v", cfg_inc_verbose, CONF_TYPE_FUNC, CONF_GLOBAL|CONF_NOSAVE, 0, 0, NULL}, {"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL}, {"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL}, {"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL}, Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.231 retrieving revision 1.232 diff -u -r1.231 -r1.232 --- mencoder.c 23 Jan 2004 01:13:00 -0000 1.231 +++ mencoder.c 29 Jan 2004 12:01:25 -0000 1.232 @@ -129,6 +129,7 @@ //void resync_audio_stream(sh_audio_t *sh_audio){} int verbose=0; // must be global! +int quiet=0; double video_time_usage=0; double vout_time_usage=0; double max_video_time_usage=0; @@ -317,7 +318,7 @@ static void exit_sighandler(int x){ at_eof=1; - interrupted=1; + interrupted=2; /* 1 means error */ } static muxer_t* muxer=NULL; @@ -1376,6 +1377,7 @@ (int)demuxer->filepos, (int)demuxer->movi_end); #else + if(!quiet) { if(verbose>0) { mp_msg(MSGT_AVSYNC,MSGL_STATUS,"Pos:%6.1fs %6df (%2d%%) %3dfps Trem:%4dmin %3dmb A-V:%5.3f [%d:%d] A/Vms %d/%d D/B/S %d/%d/%d \r", mux_v->timer, decoded_frameno, (int)(p*100), @@ -1398,6 +1400,7 @@ (mux_v->timer>1) ? (int)(mux_v->size/mux_v->timer/125) : 0, (mux_a && mux_a->timer>1) ? (int)(mux_a->size/mux_a->timer/125) : 0 ); + } #endif } fflush(stdout); Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.744 retrieving revision 1.745 diff -u -r1.744 -r1.745 --- mplayer.c 12 Jan 2004 03:47:49 -0000 1.744 +++ mplayer.c 29 Jan 2004 12:01:25 -0000 1.745 @@ -82,7 +82,7 @@ int slave_mode=0; int verbose=0; int identify=0; -static int quiet=0; +int quiet=0; #define ABS(x) (((x)>=0)?(x):(-(x))) #define ROUND(x) ((int)((x)<0 ? (x)-0.5 : (x)+0.5))

2 3

CVS: main/libmpdemux demux_real.c,1.54,1.55
by rfelker＠mplayerhq.hu 02 Feb '04

02 Feb '04

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv27775 Modified Files: demux_real.c Log Message: 1000000000l reported by Steven Schultz (thanks!) when the hell was this c++ crap added? why wasn't it noticed? do all the competent developers --disable-real because we don't watch crappy low-quality files? Index: demux_real.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_real.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- demux_real.c 29 Jan 2004 12:11:13 -0000 1.54 +++ demux_real.c 30 Jan 2004 03:44:00 -0000 1.55 @@ -515,6 +515,7 @@ int flags; int version; int reserved; + demux_packet_t *dp; while(1){ @@ -601,7 +602,7 @@ free(sub_packet_lengths); return 1; } - demux_packet_t *dp = new_demux_packet(len); + dp = new_demux_packet(len); stream_read(demuxer->stream, dp->buffer, len); #ifdef CRACK_MATRIX mp_msg(MSGT_DEMUX, MSGL_V,"*** audio block len=%d\n",len);

3 3

CVS: main/libmpcodecs ve_xvid4.c,1.3,1.4
by attila＠mplayerhq.hu 01 Feb '04

01 Feb '04

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv28676 Modified Files: ve_xvid4.c Log Message: this patch is for xvid4. It adds support for lavc's style display aspect ratio (based on xvid's vfw frontend) and re-enables the chroma_optimizer option. patch by Nico <nsabbi(a)tiscali.it> Index: ve_xvid4.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_xvid4.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ve_xvid4.c 8 Dec 2003 16:56:46 -0000 1.3 +++ ve_xvid4.c 29 Jan 2004 10:41:52 -0000 1.4 @@ -76,6 +76,7 @@ static int xvidenc_cartoon = 0; static int xvidenc_hqacpred = 1; static int xvidenc_chromame = 0; +static int xvidenc_chroma_opt = 0; static int xvidenc_vhq = 0; static int xvidenc_motion = 6; static int xvidenc_stats = 0; @@ -111,6 +112,7 @@ static char *xvidenc_par = NULL; static int xvidenc_par_width = 0; static int xvidenc_par_height = 0; +static float xvidenc_dar_aspect = NULL; m_option_t xvidencopts_conf[] = { @@ -123,6 +125,7 @@ {"quant_type", &xvidenc_quant_method, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"me_quality", &xvidenc_motion, CONF_TYPE_INT, CONF_RANGE, 0, 6, NULL}, {"chroma_me", &xvidenc_chromame, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"chroma_opt", &xvidenc_chroma_opt, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"vhq", &xvidenc_vhq, CONF_TYPE_INT, CONF_RANGE, 0, 4, NULL}, {"max_bframes", &xvidenc_max_bframes, CONF_TYPE_INT, CONF_RANGE, 0, 20, NULL}, {"bquant_ratio", &xvidenc_bquant_ratio, CONF_TYPE_INT, CONF_RANGE, 0, 200, NULL}, @@ -172,6 +175,7 @@ {"par", &xvidenc_par, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"par_width", &xvidenc_par_width, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL}, {"par_height", &xvidenc_par_height, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL}, + {"aspect", &xvidenc_dar_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0, NULL}, /* End of the config array */ {NULL, 0, 0, 0, 0, 0, NULL} @@ -652,6 +656,9 @@ if(xvidenc_hqacpred) { frame->vop_flags |= XVID_VOP_HQACPRED; } + if(xvidenc_chroma_opt) { + frame->vop_flags |= XVID_VOP_CHROMAOPT; + } if(xvidenc_motion > 4) { frame->vop_flags |= XVID_VOP_INTER4V; } @@ -686,6 +693,19 @@ frame->bframe_threshold = xvidenc_bframe_threshold; frame->par = 0; + if(xvidenc_dar_aspect > 0) + { + int dar_x, dar_y; + + dar_x = xvidenc_dar_aspect * 100; + dar_y = 100; + + frame->par = XVID_PAR_EXT; + frame->par_width = (100 * mod->mux->bih->biHeight) / dar_y; + frame->par_height= (100 * mod->mux->bih->biWidth) / dar_x; + } + else + { if(xvidenc_par != NULL) { if(strcasecmp(xvidenc_par, "pal43") == 0) frame->par = XVID_PAR_43_PAL; @@ -712,6 +732,7 @@ else frame->par_height = 1; } + } return; }

3 3

[Mplayer-cvslog] CVS: main/libmpcodecs vf_rgbtest.c, NONE, 1.1 vf.c, 1.99, 1.100 Makefile, 1.120, 1.121
by michael＠mplayerhq.hu 01 Feb '04

01 Feb '04

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv18095 Modified Files: vf.c Makefile Added Files: vf_rgbtest.c Log Message: rgb test pattern generator, so we could change everything to match alex's definition of rgb/bgr --- NEW FILE --- #include <stdio.h> #include <stdlib.h> #include <string.h> #include <inttypes.h> #include "../config.h" #include "../mp_msg.h" #include "img_format.h" #include "mp_image.h" #include "vf.h" #include "../libvo/fastmemcpy.h" //===========================================================================// struct vf_priv_s { unsigned int fmt; }; static unsigned int getfmt(unsigned int outfmt){ switch(outfmt){ case IMGFMT_RGB15: case IMGFMT_RGB16: case IMGFMT_RGB24: case IMGFMT_RGB32: case IMGFMT_BGR15: case IMGFMT_BGR16: case IMGFMT_BGR24: case IMGFMT_BGR32: return outfmt; } return 0; } static void put_pixel(uint8_t *buf, int x, int y, int stride, int r, int g, int b, int fmt){ switch(fmt){ case IMGFMT_RGB15: ((uint16_t*)(buf + y*stride))[x]= ((r>>3)<<10) | ((g>>3)<<5) | (b>>3); break; case IMGFMT_BGR15: ((uint16_t*)(buf + y*stride))[x]= ((b>>3)<<10) | ((g>>3)<<5) | (r>>3); break; case IMGFMT_RGB16: ((uint16_t*)(buf + y*stride))[x]= ((r>>3)<<11) | ((g>>2)<<5) | (b>>3); break; case IMGFMT_BGR16: ((uint16_t*)(buf + y*stride))[x]= ((b>>3)<<11) | ((g>>2)<<5) | (r>>3); break; /* case IMGFMT_RGB32_ME: ((uint32_t*)(buf + y*stride))[x]= (r<<16) | (g<<8) | b; break; case IMGFMT_BGR32_ME: ((uint32_t*)(buf + y*stride))[x]= (b<<16) | (g<<8) | r; break;*/ case IMGFMT_RGB24: buf[3*x + y*stride + 0]= r; buf[3*x + y*stride + 1]= g; buf[3*x + y*stride + 2]= b; break; case IMGFMT_BGR24: buf[3*x + y*stride + 0]= b; buf[3*x + y*stride + 1]= g; buf[3*x + y*stride + 2]= r; break; case IMGFMT_RGB32: buf[4*x + y*stride + 0]= r; buf[4*x + y*stride + 1]= g; buf[4*x + y*stride + 2]= b; break; case IMGFMT_BGR32: buf[4*x + y*stride + 0]= b; buf[4*x + y*stride + 1]= g; buf[4*x + y*stride + 2]= r; break; /* case IMGFMT_ARGB32: buf[4*x + y*stride + 1]= r; buf[4*x + y*stride + 2]= g; buf[4*x + y*stride + 3]= b; break; case IMGFMT_ABGR32: buf[4*x + y*stride + 1]= b; buf[4*x + y*stride + 2]= g; buf[4*x + y*stride + 3]= r; break;*/ } } static int config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ vf->priv->fmt=getfmt(outfmt); mp_msg(MSGT_VFILTER,MSGL_V,"rgb test format:%s\n", vo_format_name(outfmt)); return vf_next_config(vf,width,height,d_width,d_height,flags,vf->priv->fmt); } static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ mp_image_t *dmpi; int x, y; // hope we'll get DR buffer: dmpi=vf_get_image(vf->next,vf->priv->fmt, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, mpi->w, mpi->h); for(y=0; y<mpi->h; y++){ for(x=0; x<mpi->w; x++){ int c= 256*x/mpi->w; int r=0,g=0,b=0; if(3*y<mpi->h) r=c; else if(3*y<2*mpi->h) g=c; else b=c; put_pixel(dmpi->planes[0], x, y, dmpi->stride[0], r, g, b, vf->priv->fmt); } } return vf_next_put_image(vf,dmpi); } //===========================================================================// static int query_format(struct vf_instance_s* vf, unsigned int outfmt){ unsigned int fmt=getfmt(outfmt); if(!fmt) return 0; return vf_next_query_format(vf,fmt) & (~VFCAP_CSP_SUPPORTED_BY_HW); } static int open(vf_instance_t *vf, char* args){ vf->config=config; vf->put_image=put_image; vf->query_format=query_format; vf->priv=malloc(sizeof(struct vf_priv_s)); return 1; } vf_info_t vf_info_rgbtest = { "rgbtest", "rgbtest", "Michael Niedermayer", "", open, NULL }; //===========================================================================// Index: vf.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.c,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- vf.c 29 Jan 2004 09:50:17 -0000 1.99 +++ vf.c 30 Jan 2004 17:38:15 -0000 1.100 @@ -84,6 +84,7 @@ extern vf_info_t vf_info_spp; extern vf_info_t vf_info_yuvcsp; extern vf_info_t vf_info_kerndeint; +extern vf_info_t vf_info_rgbtest; // list of available filters: static vf_info_t* filter_list[]={ @@ -159,6 +160,7 @@ #endif &vf_info_yuvcsp, &vf_info_kerndeint, + &vf_info_rgbtest, NULL }; Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/Makefile,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- Makefile 29 Jan 2004 09:50:17 -0000 1.120 +++ Makefile 30 Jan 2004 17:38:15 -0000 1.121 @@ -14,7 +14,7 @@ VIDEO_SRCS_OPT=vd_realvid.c vd_ffmpeg.c vd_dshow.c vd_dmo.c vd_vfw.c vd_vfwex.c vd_odivx.c vd_divx4.c vd_zrmjpeg.c vd_xanim.c vd_xvid.c vd_xvid4.c vd_libdv.c vd_qtvideo.c vd_theora.c VIDEO_SRCS=dec_video.c vd.c $(VIDEO_SRCS_NAT) $(VIDEO_SRCS_LIB) $(VIDEO_SRCS_OPT) -VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c vf_down3dright.c vf_field.c vf_denoise3d.c vf_hqdn3d.c vf_detc.c vf_telecine.c vf_tfields.c vf_ivtc.c vf_ilpack.c vf_dsize.c vf_decimate.c vf_softpulldown.c vf_tinterlace.c vf_pullup.c pullup.c vf_framestep.c vf_tile.c vf_delogo.c vf_fil.c vf_hue.c vf_spp.c vf_yuvcsp.c vf_filmdint.c vf_kerndeint.c +VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c vf_down3dright.c vf_field.c vf_denoise3d.c vf_hqdn3d.c vf_detc.c vf_telecine.c vf_tfields.c vf_ivtc.c vf_ilpack.c vf_dsize.c vf_decimate.c vf_softpulldown.c vf_tinterlace.c vf_pullup.c pullup.c vf_framestep.c vf_tile.c vf_delogo.c vf_fil.c vf_hue.c vf_spp.c vf_yuvcsp.c vf_filmdint.c vf_kerndeint.c vf_rgbtest.c ifeq ($(HAVE_FFPOSTPROCESS),yes) VFILTER_SRCS += vf_pp.c endif

3 2

CVS: main subreader.c, 1.127, 1.128 subreader.h, 1.29, 1.30
by attila＠mplayerhq.hu 01 Feb '04

01 Feb '04

Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv1595 Modified Files: subreader.c subreader.h Log Message: Fix the PJS (aka dunnowhat) subtitles patch by Salvador Eduardo Tropea <salvador(a)inti.gov.ar> Index: subreader.c =================================================================== RCS file: /cvsroot/mplayer/main/subreader.c,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- subreader.c 24 Jan 2004 12:54:05 -0000 1.127 +++ subreader.c 29 Jan 2004 10:53:19 -0000 1.128 @@ -3,7 +3,7 @@ * * Written by laaz * Some code cleanup & realloc() by A'rpi/ESP-team - * dunnowhat sub format by szabi + * */ @@ -544,15 +544,46 @@ } } -subtitle *sub_read_line_dunnowhat(FILE *fd,subtitle *current) { +/* + * PJS subtitles reader. + * That's the "Phoenix Japanimation Society" format. + * I found some of them in http://www.scriptsclub.org/ (used for anime). + * The time is in tenths of second. + * + * by set, based on code by szabi (dunnowhat sub format ;-) + */ +subtitle *sub_read_line_pjs(FILE *fd,subtitle *current) { char line[LINE_LEN+1]; - char text[LINE_LEN+1]; + char text[LINE_LEN+1], *s, *d; if (!fgets (line, LINE_LEN, fd)) return NULL; - if (sscanf (line, "%ld,%ld,\"%[^\"]", &(current->start), - &(current->end), text) <3) + /* skip spaces */ + for (s=line; *s && isspace(*s); s++); + /* allow empty lines at the end of the file */ + if (*s==0) + return NULL; + /* get the time */ + if (sscanf (s, "%ld,%ld,", &(current->start), + &(current->end)) <2) { return ERR; + } + /* the files I have are in tenths of second */ + current->start *= 10; + current->end *= 10; + /* walk to the beggining of the string */ + for (; *s; s++) if (*s==',') break; + if (*s) { + for (s++; *s; s++) if (*s==',') break; + if (*s) s++; + } + if (*s!='"') { + return ERR; + } + /* copy the string to the text buffer */ + for (s++, d=text; *s && *s!='"'; s++, d++) + *d=*s; + *d=0; current->text[0] = strdup(text); current->lines = 1; @@ -946,7 +977,7 @@ if (!memcmp(line, "Dialogue: ", 10)) {*uses_time=1; return SUB_SSA;} if (sscanf (line, "%d,%d,\"%c", &i, &i, (char *) &i) == 3) - {*uses_time=0;return SUB_DUNNOWHAT;} + {*uses_time=1;return SUB_PJS;} if (sscanf (line, "FORMAT=%d", &i) == 1) {*uses_time=0; return SUB_MPSUB;} if (sscanf (line, "FORMAT=TIM%c", &p)==1 && p=='E') @@ -1198,7 +1229,7 @@ { sub_read_line_vplayer, NULL, "vplayer" }, { sub_read_line_rt, NULL, "rt" }, { sub_read_line_ssa, sub_pp_ssa, "ssa" }, - { sub_read_line_dunnowhat, NULL, "dunnowhat" }, + { sub_read_line_pjs, NULL, "pjs" }, { sub_read_line_mpsub, NULL, "mpsub" }, { sub_read_line_aqt, NULL, "aqt" }, { sub_read_line_subviewer2, NULL, "subviewer 2.0" }, Index: subreader.h =================================================================== RCS file: /cvsroot/mplayer/main/subreader.h,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- subreader.h 21 Sep 2003 13:20:00 -0000 1.29 +++ subreader.h 29 Jan 2004 10:53:19 -0000 1.30 @@ -14,7 +14,7 @@ #define SUB_VPLAYER 4 #define SUB_RT 5 #define SUB_SSA 6 -#define SUB_DUNNOWHAT 7 // FIXME what format is it ? +#define SUB_PJS 7 #define SUB_MPSUB 8 #define SUB_AQTITLE 9 #define SUB_SUBVIEWER2 10

2 1

CVS: main configure,1.834,1.835
by syncmail＠mplayerhq.hu 01 Feb '04

01 Feb '04

CVS change done by Alex Beregszaszi Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv25760 Modified Files: configure Log Message: add libvo to include list for lavc Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.834 retrieving revision 1.835 diff -u -r1.834 -r1.835 --- configure 30 Jan 2004 09:07:28 -0000 1.834 +++ configure 31 Jan 2004 23:00:00 -0000 1.835 @@ -5835,7 +5835,7 @@ INSTALL = $_install # OPTFLAGS = -O4 $_profile $_debug $_march $_mcpu -pipe -fomit-frame-pointer -ffast-math EXTRA_INC = $_inc_extra $_inc_gtk -OPTFLAGS = $CFLAGS \$(EXTRA_INC) +OPTFLAGS = -I../libvo/ -I../../libvo $CFLAGS \$(EXTRA_INC) STRIPBINARIES = $_stripbinaries $_live_libs_def

1 0

CVS: main configure,1.834,1.835
by syncmail＠mplayerhq.hu 31 Jan '04

31 Jan '04

CVS change done by Alex Beregszaszi Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv27616 Modified Files: configure Log Message: add libvo to include list for lavc Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.834 retrieving revision 1.835 diff -u -r1.834 -r1.835 --- configure 30 Jan 2004 09:07:28 -0000 1.834 +++ configure 31 Jan 2004 22:44:48 -0000 1.835 @@ -5835,7 +5835,7 @@ INSTALL = $_install # OPTFLAGS = -O4 $_profile $_debug $_march $_mcpu -pipe -fomit-frame-pointer -ffast-math EXTRA_INC = $_inc_extra $_inc_gtk -OPTFLAGS = $CFLAGS \$(EXTRA_INC) +OPTFLAGS = -I../libvo/ $CFLAGS \$(EXTRA_INC) STRIPBINARIES = $_stripbinaries $_live_libs_def

1 0

changes
by Arpi 31 Jan '04

31 Jan '04

Hi, Alex has modified syncmail (cvslog mail generator script) to send mails with syncmail-(a)-mplayerhq.hu at from:, so i could finally change this list to members-only too. also people replying to author instead of mails will suck it well, as there is no such address :) A'rpi / Astral & ESP-team -- Developer of MPlayer G2, the Movie Framework for all - http://www.MPlayerHQ.hu

1 0

CVS: main/libmpdemux demux_mkv.c,1.6,1.7
by mosu＠mplayerhq.hu 31 Jan '04

31 Jan '04

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv15075 Modified Files: demux_mkv.c Log Message: Do not try to seek beyond the end of the stream when parsing the headers. Index: demux_mkv.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- demux_mkv.c 27 Jan 2004 06:02:29 -0000 1.6 +++ demux_mkv.c 31 Jan 2004 09:54:09 -0000 1.7 @@ -1237,7 +1237,8 @@ length -= l + il; if (seek_id == 0 || seek_id == MATROSKA_ID_CLUSTER - || seek_pos == EBML_UINT_INVALID) + || seek_pos == EBML_UINT_INVALID || + ((mkv_d->segment_start + seek_pos) >= (uint64_t)demuxer->movi_end)) continue; saved_pos = stream_tell (s);

1 0

CVS: main/libmpdemux demux_ogg.c,1.42,1.43
by mosu＠mplayerhq.hu 31 Jan '04

31 Jan '04

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv8198 Modified Files: demux_ogg.c Log Message: Cleanup and small improvement in seeking if the final_granulepos is known. Patch by Michael Behrisch <behrisch(a)informatik.hu-berlin.de> Index: demux_ogg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ogg.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- demux_ogg.c 6 Jan 2004 11:22:32 -0000 1.42 +++ demux_ogg.c 31 Jan 2004 09:38:01 -0000 1.43 @@ -1090,20 +1090,14 @@ oss = &os->stream; if(ogg_d->syncpoints) { - float time_pos = flags & 1 ? 0 : os->lastpos/ rate; - if(flags & 2) { - if(ogg_d->syncpoints) - time_pos += ogg_d->syncpoints[ogg_d->num_syncpoint].granulepos / rate * rel_seek_secs; + gp = flags & 1 ? 0 : os->lastpos; + if(flags & 2) + gp += ogg_d->syncpoints[ogg_d->num_syncpoint].granulepos * rel_seek_secs; else - time_pos += (demuxer->movi_end - demuxer->movi_start) * rel_seek_secs; - } else - time_pos += rel_seek_secs; - - gp = time_pos * rate; + gp += rel_seek_secs * rate; for(sp = 0; sp < ogg_d->num_syncpoint ; sp++) { - if(ogg_d->syncpoints[sp].granulepos >= gp) - break; + if(ogg_d->syncpoints[sp].granulepos >= gp) break; } if(sp >= ogg_d->num_syncpoint) @@ -1114,8 +1108,12 @@ pos = flags & 1 ? 0 : ogg_d->pos; if(flags & 2) pos += (demuxer->movi_end - demuxer->movi_start) * rel_seek_secs; + else { + if (ogg_d->final_granulepos > 0) + pos += rel_seek_secs * (demuxer->movi_end - demuxer->movi_start) / (ogg_d->final_granulepos / rate); else pos += rel_seek_secs * ogg_d->pos / (os->lastpos / rate); + } if (pos < 0) pos = 0; else if (pos > (demuxer->movi_end - demuxer->movi_start))

1 0