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

CVS: main/libvo vo_xv.c,1.144,1.145
by Attila Kinali CVS 12 Jan '04

12 Jan '04

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv22550 Modified Files: vo_xv.c Log Message: add port parameter to -vo xv based on patch from Jean-Yves Simon <lethalwp(a)tiscali.be> Index: vo_xv.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- vo_xv.c 31 Aug 2003 22:27:10 -0000 1.144 +++ vo_xv.c 6 Sep 2003 13:40:00 -0000 1.145 @@ -593,14 +593,22 @@ XvPortID xv_p; int busy_ports=0; + xv_port = 0; + if(arg) { - mp_msg(MSGT_VO,MSGL_ERR,"vo_xv: Unknown subdevice: %s\n",arg); - return ENOSYS; + if ((strlen(arg) >= 6) && !strncmp(arg, "port=", 5)) + { + xv_port = atoi(arg+5); + } + else + { + mp_msg(MSGT_VO,MSGL_ERR,"vo_xv: Unknown subdevice: %s\n",arg); + return ENOSYS; + } } if (!vo_init()) return -1; - xv_port = 0; /* check for Xvideo extension */ if (Success != XvQueryExtension(mDisplay,&ver,&rel,&req,&ev,&err)){ mp_msg(MSGT_VO,MSGL_ERR,"Sorry, Xv not supported by this X11 version/driver\n"); @@ -610,11 +618,22 @@ /* check for Xvideo support */ if (Success != XvQueryAdaptors(mDisplay,DefaultRootWindow(mDisplay), &adaptors,&ai)){ - mp_msg(MSGT_VO,MSGL_ERR,"Xv: XvQueryAdaptors failed"); + mp_msg(MSGT_VO,MSGL_ERR,"Xv: XvQueryAdaptors failed\n"); return -1; } /* check adaptors */ + if(xv_port >= adaptors) + { + mp_msg(MSGT_VO, MSGL_WARN,"Xv: Invalid port parameter, overriding with port 0\n"); + xv_port = 0; + } + if (xv_port) + { + if (XvGrabPort(mDisplay, xv_port, CurrentTime)) + xv_port = 0; + } + for (i = 0; i < adaptors && xv_port == 0; i++){ if ((ai[i].type & XvInputMask) && (ai[i].type & XvImageMask)) { for (xv_p = ai[i].base_id; xv_p < ai[i].base_id+ai[i].num_ports; ++xv_p)

4 3

CVS: main/libmpcodecs vf_spp.c,NONE,1.1 Makefile,1.111,1.112 vf.c,1.94,1.95
by Michael Niedermayer CVS 16 Nov '03

16 Nov '03

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv27417 Modified Files: Makefile vf.c Added Files: vf_spp.c Log Message: simple alternative postprocessing filter --- NEW FILE --- /* Copyright (C) 2003 Michael Niedermayer <michaelni(a)gmx.at> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* * This implementation is based on an algorithm described in * "Aria Nosratinia Embedded Post-Processing for * Enhancement of Compressed Images (1999)" * (http://citeseer.nj.nec.com/nosratinia99embedded.html) */ #include <stdio.h> #include <stdlib.h> #include <string.h> #include <inttypes.h> #include <math.h> #include "../config.h" #include "../mp_msg.h" #include "../cpudetect.h" #include "../libavcodec/avcodec.h" #include "../libavcodec/dsputil.h" #ifdef HAVE_MALLOC_H #include <malloc.h> #endif #include "img_format.h" #include "mp_image.h" #include "vf.h" #include "../libvo/fastmemcpy.h" #define XMIN(a,b) ((a) < (b) ? (a) : (b)) //===========================================================================// const uint8_t __attribute__((aligned(8))) dither[8][8]={ { 0, 48, 12, 60, 3, 51, 15, 63, }, { 32, 16, 44, 28, 35, 19, 47, 31, }, { 8, 56, 4, 52, 11, 59, 7, 55, }, { 40, 24, 36, 20, 43, 27, 39, 23, }, { 2, 50, 14, 62, 1, 49, 13, 61, }, { 34, 18, 46, 30, 33, 17, 45, 29, }, { 10, 58, 6, 54, 9, 57, 5, 53, }, { 42, 26, 38, 22, 41, 25, 37, 21, }, }; const uint8_t offset[64][2]= { {0,0}, {4,4}, {0,4}, {4,0}, {2,2}, {6,6}, {2,6}, {6,2}, {0,2}, {4,6}, {0,6}, {4,2}, {2,0}, {6,4}, {2,4}, {6,0}, {1,1}, {5,5}, {1,5}, {5,1}, {3,3}, {7,7}, {3,7}, {7,3}, {1,3}, {5,7}, {1,7}, {5,3}, {3,1}, {7,5}, {3,5}, {7,1}, {0,1}, {4,5}, {0,5}, {4,1}, {2,3}, {6,7}, {2,7}, {6,3}, {0,3}, {4,7}, {0,7}, {4,3}, {2,1}, {6,5}, {2,5}, {6,1}, {1,0}, {5,4}, {1,4}, {5,0}, {3,2}, {7,6}, {3,6}, {7,2}, {1,2}, {5,6}, {1,6}, {5,2}, {3,0}, {7,4}, {3,4}, {7,0}, }; struct vf_priv_s { int log2_count; int qp; int mpeg2; unsigned int outfmt; int temp_stride; uint8_t *src; int16_t *temp; AVCodecContext *avctx; DSPContext dsp; }; #define SHIFT 22 static inline void requantize(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation){ int i; const int qmul= qp<<1; const int qadd= (qp-1)|1; const int qinv= ((1<<(SHIFT-3)) + qmul/2)/ qmul; int bias= 0; //FIXME unsigned int threshold1, threshold2; threshold1= (1<<SHIFT) - bias - 1; threshold2= (threshold1<<1); memset(dst, 0, 64*sizeof(DCTELEM)); dst[0]= (src[0] + 4)>>3;; for(i=1; i<64; i++){ int level= qinv*src[i]; if(((unsigned)(level+threshold1))>threshold2){ const int j= permutation[i]; if(level>0){ level= (bias + level)>>SHIFT; dst[j]= level*qmul + qadd; }else{ level= (bias - level)>>SHIFT; dst[j]= -level*qmul - qadd; } } } } static inline void add_block(int16_t *dst, int stride, DCTELEM block[64]){ int x,y; for(y=0; y<8; y++){ for(x=0; x<8; x++){ dst[x + y*stride]+= block[x + y*8]; } } } static void filter(struct vf_priv_s *p, uint8_t *dst, uint8_t *src, int dst_stride, int src_stride, int width, int height, uint8_t *qp_store, int qp_stride, int is_luma){ int x, y, i; const int count= 1<<p->log2_count; const int log2_scale= 6-p->log2_count; const int stride= p->temp_stride; uint64_t block_align[32]; DCTELEM *block = (DCTELEM *)block_align; DCTELEM *block2= (DCTELEM *)(block_align+16); for(y=0; y<height; y++){ memcpy(p->src + 8 + 8*stride + y*stride, src + y*src_stride, width); memset(p->temp + 8*stride + y*stride, 0, stride*sizeof(int16_t)); for(x=0; x<8; x++){ int index= 8 + 8*stride + y*stride; p->src[index - x - 1]= p->src[index + x ]; p->src[index + width + x ]= p->src[index + width - x - 1]; } } for(y=0; y<8; y++){ memcpy(p->src + ( 7-y)*stride, p->src + ( y+8)*stride, stride); memcpy(p->src + (width+8+y)*stride, p->src + (width-y+7)*stride, stride); } //FIXME (try edge emu) for(y=0; y<height+8; y+=8){ for(x=0; x<width+8; x+=8){ const int qps= 3 + is_luma; int qp; if(p->qp) qp= p->qp; else{ qp= qp_store[ (XMIN(x, width-1)>>qps) + (XMIN(y, height-1)>>qps) * qp_stride]; if(p->mpeg2) qp>>=1; } for(i=0; i<count; i++){ const int x1= x + offset[i][0]; const int y1= y + offset[i][1]; const int index= x1 + y1*stride; p->dsp.get_pixels(block, p->src + index, stride); p->dsp.fdct(block); requantize(block2, block, qp, p->dsp.idct_permutation); p->dsp.idct(block2); add_block(p->temp + index, stride, block2); } } } for(y=0; y<height; y++){ uint8_t *d= dither[y&7]; for(x=0; x<width; x+=8){ const int index= 8 + 8*stride + x + y*stride; dst[x + y*src_stride + 0]= ((p->temp[index + 0]<<log2_scale) + d[0])>>6; dst[x + y*src_stride + 1]= ((p->temp[index + 1]<<log2_scale) + d[1])>>6; dst[x + y*src_stride + 2]= ((p->temp[index + 2]<<log2_scale) + d[2])>>6; dst[x + y*src_stride + 3]= ((p->temp[index + 3]<<log2_scale) + d[3])>>6; dst[x + y*src_stride + 4]= ((p->temp[index + 4]<<log2_scale) + d[4])>>6; dst[x + y*src_stride + 5]= ((p->temp[index + 5]<<log2_scale) + d[5])>>6; dst[x + y*src_stride + 6]= ((p->temp[index + 6]<<log2_scale) + d[6])>>6; dst[x + y*src_stride + 7]= ((p->temp[index + 7]<<log2_scale) + d[7])>>6; } } //FIXME reorder for better caching } 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->temp_stride= (width+16+15)&(~15); vf->priv->temp= malloc(vf->priv->temp_stride*(height+16)*sizeof(int16_t)); vf->priv->src = malloc(vf->priv->temp_stride*(height+16)*sizeof(uint8_t)); return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ if(mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change if(mpi->imgfmt!=vf->priv->outfmt) return; // colorspace differ // ok, we can do pp in-place (or pp disabled): vf->dmpi=vf_get_image(vf->next,mpi->imgfmt, mpi->type, mpi->flags, mpi->w, mpi->h); mpi->planes[0]=vf->dmpi->planes[0]; mpi->stride[0]=vf->dmpi->stride[0]; mpi->width=vf->dmpi->width; if(mpi->flags&MP_IMGFLAG_PLANAR){ mpi->planes[1]=vf->dmpi->planes[1]; mpi->planes[2]=vf->dmpi->planes[2]; mpi->stride[1]=vf->dmpi->stride[1]; mpi->stride[2]=vf->dmpi->stride[2]; } mpi->flags|=MP_IMGFLAG_DIRECT; } static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ mp_image_t *dmpi; if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ // no DR, so get a new image! hope we'll get DR buffer: vf->dmpi=vf_get_image(vf->next,vf->priv->outfmt, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, mpi->w,mpi->h); } dmpi= vf->dmpi; vf->priv->mpeg2= mpi->qscale_type; filter(vf->priv, dmpi->planes[0], mpi->planes[0], dmpi->stride[0], mpi->stride[0], mpi->w, mpi->h, mpi->qscale, mpi->qstride, 1); filter(vf->priv, dmpi->planes[1], mpi->planes[1], dmpi->stride[1], mpi->stride[1], mpi->w>>1, mpi->h>>1, mpi->qscale, mpi->qstride, 0); filter(vf->priv, dmpi->planes[2], mpi->planes[2], dmpi->stride[2], mpi->stride[2], mpi->w>>1, mpi->h>>1, mpi->qscale, mpi->qstride, 0); vf_clone_mpi_attributes(dmpi, mpi); #ifdef HAVE_MMX if(gCpuCaps.hasMMX) asm volatile ("emms\n\t"); #endif #ifdef HAVE_MMX2 if(gCpuCaps.hasMMX2) asm volatile ("sfence\n\t"); #endif return vf_next_put_image(vf,dmpi); } static void uninit(struct vf_instance_s* vf){ if(!vf->priv) return; if(vf->priv->temp) free(vf->priv->temp); vf->priv->temp= NULL; if(vf->priv->src) free(vf->priv->src); vf->priv->src= NULL; if(vf->priv->avctx) free(vf->priv->avctx); vf->priv->avctx= NULL; free(vf->priv); vf->priv=NULL; } //===========================================================================// static int query_format(struct vf_instance_s* vf, unsigned int fmt){ switch(fmt) { case IMGFMT_YV12: case IMGFMT_I420: case IMGFMT_IYUV: return vf_next_query_format(vf,vf->priv->outfmt); } return 0; } static unsigned int fmt_list[]={ IMGFMT_YV12, IMGFMT_I420, IMGFMT_IYUV, 0 }; static int open(vf_instance_t *vf, char* args){ vf->config=config; vf->put_image=put_image; vf->get_image=get_image; vf->query_format=query_format; vf->uninit=uninit; vf->priv=malloc(sizeof(struct vf_priv_s)); memset(vf->priv, 0, sizeof(struct vf_priv_s)); vf->priv->avctx= avcodec_alloc_context(); dsputil_init(&vf->priv->dsp, vf->priv->avctx); vf->priv->log2_count= 6; if (args) sscanf(args, "%d:%d", &vf->priv->log2_count, &vf->priv->qp); // check csp: vf->priv->outfmt=vf_match_csp(&vf->next,fmt_list,IMGFMT_YV12); if(!vf->priv->outfmt) { uninit(vf); return 0; // no csp match :( } return 1; } vf_info_t vf_info_spp = { "simple postprocess", "spp", "Michael Niedermayer", "", open, NULL }; //===========================================================================// Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/Makefile,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- Makefile 23 Oct 2003 18:36:02 -0000 1.111 +++ Makefile 26 Oct 2003 23:07:21 -0000 1.112 @@ -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_xanim.c vd_xvid.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 +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 ifeq ($(HAVE_FFPOSTPROCESS),yes) VFILTER_SRCS += vf_pp.c endif Index: vf.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.c,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- vf.c 23 Oct 2003 18:36:02 -0000 1.94 +++ vf.c 26 Oct 2003 23:07:21 -0000 1.95 @@ -79,6 +79,7 @@ extern vf_info_t vf_info_tile; extern vf_info_t vf_info_delogo; extern vf_info_t vf_info_hue; +extern vf_info_t vf_info_spp; // list of available filters: static vf_info_t* filter_list[]={ @@ -145,6 +146,9 @@ &vf_info_tile, &vf_info_delogo, &vf_info_hue, +#ifdef USE_LIBAVCODEC + &vf_info_spp, +#endif NULL };

6 10

CVS: main/libvo jpeg_enc.c,1.17,1.18
by Rik Snel CVS 03 Nov '03

03 Nov '03

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv2024 Modified Files: jpeg_enc.c Log Message: ffmpeg sync patch by Alex (thank you), I changed qmin and qmax to be 1 and 31 in the caller Index: jpeg_enc.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/jpeg_enc.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- jpeg_enc.c 21 Oct 2003 20:49:55 -0000 1.17 +++ jpeg_enc.c 24 Oct 2003 16:44:05 -0000 1.18 @@ -74,12 +74,12 @@ }; static void convert_matrix(MpegEncContext *s, int (*qmat)[64], - uint16_t (*qmat16)[64], uint16_t (*qmat16_bias)[64], - const uint16_t *quant_matrix, int bias) + uint16_t (*qmat16)[2][64], const uint16_t *quant_matrix, + int bias, int qmin, int qmax) { int qscale; - for(qscale=1; qscale<32; qscale++){ + for(qscale=qmin; qscale<qmax; qscale++){ int i; if (s->dsp.fdct == ff_jpeg_fdct_islow) { for (i = 0; i < 64; i++) { @@ -113,12 +113,11 @@ so (1<<19) / 16 >= (1<<19) / (qscale * quant_matrix[i]) >= (1<<19) / 7905 so 32768 >= (1<<19) / (qscale * quant_matrix[i]) >= 67 */ - qmat [qscale][i] = (1 << QMAT_SHIFT_MMX) / (qscale * quant_matrix[i]); - qmat16[qscale][i] = (1 << QMAT_SHIFT_MMX) / (qscale * quant_matrix[j]); + qmat [qscale][i] = (int)((uint64_t_C(1) << QMAT_SHIFT_MMX) / (qscale * quant_matrix[j])); + qmat16[qscale][0][i] = (1 << QMAT_SHIFT_MMX) / (qscale * quant_matrix[j]); - if(qmat16[qscale][i]==0 || qmat16[qscale][i]==128*256) qmat16[qscale][i]=128*256-1; - - qmat16_bias[qscale][i]= ROUNDED_DIV(bias<<(16-QUANT_BIAS_SHIFT), qmat16[qscale][i]); + if(qmat16[qscale][0][i]==0 || qmat16[qscale][0][i]==128*256) qmat16[qscale][0][i]=128*256-1; + qmat16[qscale][1][i]= ROUNDED_DIV(bias<<(16-QUANT_BIAS_SHIFT), qmat16[qscale][0][i]); } } } @@ -368,8 +367,7 @@ j->s->intra_matrix[i] = CLAMP_TO_8BIT( (ff_mpeg1_default_intra_matrix[i]*j->s->qscale) >> 3); convert_matrix(j->s, j->s->q_intra_matrix, j->s->q_intra_matrix16, - j->s->q_intra_matrix16_bias, - j->s->intra_matrix, j->s->intra_quant_bias); + j->s->intra_matrix, j->s->intra_quant_bias, 1, 31); return j; }

4 8

CVS: main/libmpcodecs ve_lavc.c,1.78,1.79 vd_ffmpeg.c,1.105,1.106
by Michael Niedermayer CVS 03 Nov '03

03 Nov '03

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv21418 Modified Files: ve_lavc.c vd_ffmpeg.c Log Message: sample_aspect_ratio Index: ve_lavc.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- ve_lavc.c 7 Oct 2003 11:45:09 -0000 1.78 +++ ve_lavc.c 20 Oct 2003 21:21:42 -0000 1.79 @@ -445,7 +445,11 @@ } if (e && ratio > 0.1 && ratio < 10.0) { +#if LIBAVCODEC_BUILD >= 4687 + lavc_venc_context->sample_aspect_ratio= av_d2q(ratio * height / width, 30000); +#else lavc_venc_context->aspect_ratio= ratio; +#endif mp_dbg(MSGT_MENCODER, MSGL_DBG2, "aspect_ratio: %f\n", ratio); } else { mp_dbg(MSGT_MENCODER, MSGL_ERR, "aspect ratio: cannot parse \"%s\"\n", lavc_param_aspect); @@ -453,7 +457,11 @@ } } else if (lavc_param_autoaspect) +#if LIBAVCODEC_BUILD >= 4687 + lavc_venc_context->sample_aspect_ratio = av_d2q((float)d_width/d_height*height / width, 30000); +#else lavc_venc_context->aspect_ratio = (float)d_width/d_height; +#endif /* keyframe interval */ if (lavc_param_keyint >= 0) /* != -1 */ Index: vd_ffmpeg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- vd_ffmpeg.c 9 Oct 2003 21:21:46 -0000 1.105 +++ vd_ffmpeg.c 20 Oct 2003 21:21:42 -0000 1.106 @@ -383,14 +383,19 @@ static int init_vo(sh_video_t *sh){ vd_ffmpeg_ctx *ctx = sh->context; AVCodecContext *avctx = ctx->avctx; +#if LIBAVCODEC_BUILD >= 4687 + float aspect= av_q2d(avctx->sample_aspect_ratio) * avctx->width / avctx->height; +#else + float aspect= avctx->aspect_ratio; +#endif - if (avctx->aspect_ratio != ctx->last_aspect || + if ( aspect != ctx->last_aspect || avctx->width != sh->disp_w || avctx->height != sh->disp_h || !ctx->vo_inited) { - mp_msg(MSGT_DECVIDEO, MSGL_V, "[ffmpeg] aspect_ratio: %f\n", avctx->aspect_ratio); - ctx->last_aspect = avctx->aspect_ratio; + mp_msg(MSGT_DECVIDEO, MSGL_V, "[ffmpeg] aspect_ratio: %f\n", aspect); + ctx->last_aspect = aspect; // if(ctx->last_aspect>=0.01 && ctx->last_aspect<100) if(sh->aspect==0.0) sh->aspect = ctx->last_aspect;

2 1

CVS: main/etc cygwin_inttypes.h,1.1,NONE
by Diego Biurrun CVS 01 Nov '03

01 Nov '03

Update of /cvsroot/mplayer/main/etc In directory mail:/var/tmp.root/cvs-serv2586/etc Removed Files: cygwin_inttypes.h Log Message: Moved to FTP site http://www.mplayerhq.hu/MPlayer/releases/win32-beta/contrib/inttypes.h --- cygwin_inttypes.h DELETED ---

4 4

CVS: main/libvo jpeg_enc.c,1.18,1.19
by Rik Snel CVS 31 Oct '03

31 Oct '03

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv16813 Modified Files: jpeg_enc.c Log Message: function convert_matrix() is fixed (off-by-one error) and it is now called with the optimal arguments so that it doesn't do unneeded work, the change was inspired by a comment from Alex Index: jpeg_enc.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/jpeg_enc.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- jpeg_enc.c 24 Oct 2003 16:44:05 -0000 1.18 +++ jpeg_enc.c 31 Oct 2003 22:22:46 -0000 1.19 @@ -79,7 +79,7 @@ { int qscale; - for(qscale=qmin; qscale<qmax; qscale++){ + for(qscale=qmin; qscale<=qmax; qscale++){ int i; if (s->dsp.fdct == ff_jpeg_fdct_islow) { for (i = 0; i < 64; i++) { @@ -367,7 +367,7 @@ j->s->intra_matrix[i] = CLAMP_TO_8BIT( (ff_mpeg1_default_intra_matrix[i]*j->s->qscale) >> 3); convert_matrix(j->s, j->s->q_intra_matrix, j->s->q_intra_matrix16, - j->s->intra_matrix, j->s->intra_quant_bias, 1, 31); + j->s->intra_matrix, j->s->intra_quant_bias, 8, 8); return j; }

1 0

CVS: main/libmpcodecs vf_spp.c,1.13,1.14
by Michael Niedermayer CVS 31 Oct '03

31 Oct '03

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv16223 Modified Files: vf_spp.c Log Message: 1000l Index: vf_spp.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_spp.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- vf_spp.c 31 Oct 2003 12:59:51 -0000 1.13 +++ vf_spp.c 31 Oct 2003 13:23:33 -0000 1.14 @@ -23,7 +23,6 @@ * (http://citeseer.nj.nec.com/nosratinia99embedded.html) */ -#ifdef USE_LIBAVCODEC #include <stdio.h> #include <stdlib.h> @@ -32,6 +31,9 @@ #include <math.h> #include "../config.h" + +#ifdef USE_LIBAVCODEC + #include "../mp_msg.h" #include "../cpudetect.h" #include "../libavcodec/avcodec.h" @@ -497,4 +499,4 @@ NULL }; -#endif //USE_LIBAVCODEC \ No newline at end of file +#endif //USE_LIBAVCODEC

1 0

CVS: main/libmpcodecs vf_spp.c,1.12,1.13
by Michael Niedermayer CVS 31 Oct '03

31 Oct '03

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv13164 Modified Files: vf_spp.c Log Message: 10l Index: vf_spp.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_spp.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- vf_spp.c 28 Oct 2003 20:49:33 -0000 1.12 +++ vf_spp.c 31 Oct 2003 12:59:51 -0000 1.13 @@ -23,6 +23,8 @@ * (http://citeseer.nj.nec.com/nosratinia99embedded.html) */ +#ifdef USE_LIBAVCODEC + #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -495,4 +497,4 @@ NULL }; -//===========================================================================// +#endif //USE_LIBAVCODEC \ No newline at end of file

1 0

CVS: main mplayer.c,1.734,1.735
by Moritz Bunkus CVS 30 Oct '03

30 Oct '03

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv16136 Modified Files: mplayer.c Log Message: Do not display VobSubs whose timecodes are < 0 which would make all VobSubs appear from the start on upon seeking. Patch by "Reder, Uwe" <Uwe.Reder(a)3SOFT.de>. Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.734 retrieving revision 1.735 diff -u -r1.734 -r1.735 --- mplayer.c 23 Oct 2003 22:44:25 -0000 1.734 +++ mplayer.c 30 Oct 2003 15:02:16 -0000 1.735 @@ -3639,7 +3639,7 @@ } if(len<=0 || !packet) break; if(timestamp < 0) timestamp = 0; - spudec_assemble(vo_spudec,packet,len,timestamp); + else spudec_assemble(vo_spudec,packet,len,timestamp); } /* detect wether the sub has changed or not */

1 0

CVS: main configure,1.797,1.798
by Moritz Bunkus CVS 30 Oct '03

30 Oct '03

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv14766 Modified Files: configure Log Message: Removed temporary .cpp file used during the Matroska test. Updated the libebml and libmatroska requirements to at least v0.6.0 for both. There have been changes in the lacing code, and users WILL come and complain why mplayer, linked against older versions, will have issues playing newer files. Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.797 retrieving revision 1.798 diff -u -r1.797 -r1.798 --- configure 27 Oct 2003 01:06:35 -0000 1.797 +++ configure 30 Oct 2003 14:57:06 -0000 1.798 @@ -4374,7 +4374,7 @@ echores "$_theora" -echocheck "Matroska support (0.5.0 or later)" +echocheck "Matroska support (0.6.0 or later)" if test "$_matroska" != no ; then _matroska=no _TMPC=$TMPC @@ -4383,11 +4383,11 @@ #include <ebml/EbmlVersion.h> #include <matroska/KaxVersion.h> -#if LIBEBML_VERSION < 000500 +#if LIBEBML_VERSION < 000600 #error libebml is too old #endif -#if LIBMATROSKA_VERSION < 000500 +#if LIBMATROSKA_VERSION < 000600 #error libmatroska is too old #endif @@ -4402,6 +4402,7 @@ _inc_extra=$_saved_inc_extra fi fi + rm ${TMPC} > /dev/null 2> /dev/null TMPC=$_TMPC fi if test "$_matroska" = yes ; then

1 0