[Mplayer-cvslog] CVS: main/libmpcodecs ve_divx4.c, 1.14, 1.15 ve_lavc.c, 1.92, 1.93 ve_libdv.c, 1.9, 1.10 ve_nuv.c, 1.2, 1.3 ve_qtvideo.c, 1.7, 1.8 ve_raw.c, 1.1, 1.2 ve_vfw.c, 1.15, 1.16 ve_xvid.c, 1.26, 1.27 ve_xvid4.c, 1.6, 1.7
Tobias Diedrich CVS
syncmail at mplayerhq.hu
Wed Mar 24 16:16:39 CET 2004
CVS change done by Tobias Diedrich CVS
Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv31245/libmpcodecs
Modified Files:
ve_divx4.c ve_lavc.c ve_libdv.c ve_nuv.c ve_qtvideo.c ve_raw.c
ve_vfw.c ve_xvid.c ve_xvid4.c
Log Message:
Use aspect from encoder for AVI vprp header
Index: ve_divx4.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_divx4.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ve_divx4.c 13 Aug 2003 16:29:29 -0000 1.14
+++ ve_divx4.c 24 Mar 2004 15:16:36 -0000 1.15
@@ -211,6 +211,7 @@
mux_v->bih->biWidth=width;
mux_v->bih->biHeight=height;
mux_v->bih->biSizeImage=width*height*3;
+ mux_v->aspect = (float)d_width/d_height;
if(!divx4_param.bitrate) divx4_param.bitrate=800000;
else if(divx4_param.bitrate<=16000) divx4_param.bitrate*=1000;
Index: ve_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- ve_lavc.c 7 Feb 2004 00:19:42 -0000 1.92
+++ ve_lavc.c 24 Mar 2004 15:16:36 -0000 1.93
@@ -519,6 +519,7 @@
#else
lavc_venc_context->aspect_ratio= ratio;
#endif
+ mux_v->aspect = ratio;
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);
@@ -529,8 +530,9 @@
#if LIBAVCODEC_BUILD >= 4687
lavc_venc_context->sample_aspect_ratio = av_d2q((float)d_width/d_height*height / width, 255);
#else
- lavc_venc_context->aspect_ratio = (float)d_width/d_height;
+ lavc_venc_context->aspect_ratio =
#endif
+ mux_v->aspect = (float)d_width/d_height;
/* keyframe interval */
if (lavc_param_keyint >= 0) /* != -1 */
Index: ve_libdv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_libdv.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ve_libdv.c 20 Jan 2004 05:39:12 -0000 1.9
+++ ve_libdv.c 24 Mar 2004 15:16:36 -0000 1.10
@@ -55,6 +55,7 @@
mux_v->bih->biWidth=width;
mux_v->bih->biHeight=height;
mux_v->bih->biSizeImage=mux_v->bih->biWidth*mux_v->bih->biHeight*(mux_v->bih->biBitCount/8);
+ mux_v->aspect = (float)d_width/d_height;
return 1;
}
Index: ve_nuv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_nuv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ve_nuv.c 4 Mar 2003 13:26:09 -0000 1.2
+++ ve_nuv.c 24 Mar 2004 15:16:36 -0000 1.3
@@ -80,6 +80,7 @@
mux_v->bih->biWidth=width;
mux_v->bih->biHeight=height;
mux_v->bih->biSizeImage=mux_v->bih->biWidth*mux_v->bih->biHeight*(mux_v->bih->biBitCount/8);
+ mux_v->aspect = (float)d_width/d_height;
vf->priv->buffer = realloc(vf->priv->buffer,vf->priv->buf_size);
vf->priv->tbl_wrote = 0;
Index: ve_qtvideo.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_qtvideo.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ve_qtvideo.c 15 Feb 2003 17:45:10 -0000 1.7
+++ ve_qtvideo.c 24 Mar 2004 15:16:36 -0000 1.8
@@ -129,6 +129,7 @@
mux_v->bih->biWidth=width;
mux_v->bih->biHeight=height;
mux_v->bih->biSizeImage=width*height*2;
+ mux_v->aspect = (float)d_width/d_height;
Index: ve_raw.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_raw.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ve_raw.c 17 Feb 2004 12:43:07 -0000 1.1
+++ ve_raw.c 24 Mar 2004 15:16:36 -0000 1.2
@@ -83,6 +83,7 @@
int ret;
mux_v->bih->biWidth = width;
mux_v->bih->biHeight = height;
+ mux_v->aspect = (float)d_width/d_height;
ret = set_format(vf, outfmt);
if (!ret) return 0;
Index: ve_vfw.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_vfw.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ve_vfw.c 13 Aug 2003 16:29:29 -0000 1.15
+++ ve_vfw.c 24 Mar 2004 15:16:36 -0000 1.16
@@ -217,6 +217,7 @@
vfw_bih->biWidth=width;
vfw_bih->biHeight=height;
vfw_bih->biSizeImage=width*height*((vfw_bih->biBitCount+7)/8);
+ mux_v->aspect = (float)d_width/d_height;
if(!vfw_start_encoder(vfw_bih, mux_v->bih)) return 0;
Index: ve_xvid.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_xvid.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ve_xvid.c 12 Nov 2003 00:43:42 -0000 1.26
+++ ve_xvid.c 24 Mar 2004 15:16:36 -0000 1.27
@@ -172,6 +172,7 @@
fp->mux->bih->biWidth = width;
fp->mux->bih->biHeight = height;
fp->mux->bih->biSizeImage = fp->mux->bih->biWidth * fp->mux->bih->biHeight * 3;
+ fp->mux->aspect = (float)d_width/d_height;
mp_msg(MSGT_MENCODER,MSGL_INFO,"videocodec: XViD (%dx%d fourcc=%x [%.4s])\n",
width, height, fp->mux->bih->biCompression, (char *)&fp->mux->bih->biCompression);
Index: ve_xvid4.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_xvid4.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ve_xvid4.c 6 Feb 2004 23:45:53 -0000 1.6
+++ ve_xvid4.c 24 Mar 2004 15:16:36 -0000 1.7
@@ -339,6 +339,7 @@
mod->mux->bih->biHeight = height;
mod->mux->bih->biSizeImage =
mod->mux->bih->biWidth * mod->mux->bih->biHeight * 3;
+ mod->mux->aspect = (float)d_width/d_height;
/* Message the FourCC type */
mp_msg(MSGT_MENCODER, MSGL_INFO,
More information about the MPlayer-cvslog
mailing list