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

[MPlayer-cvslog] CVS: main/libmpdvdkit2 libdvdcss_changes.diff, 1.5, 1.6 libdvdread_changes.diff, 1.6, 1.7
by syncmail＠mplayerhq.hu 24 Oct '05

24 Oct '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/libmpdvdkit2 In directory mail:/var2/tmp/cvs-serv30211 Modified Files: libdvdcss_changes.diff libdvdread_changes.diff Log Message: 10l to Reimar: common.h belongs to libdvdcss, not libdvdread. Index: libdvdcss_changes.diff =================================================================== RCS file: /cvsroot/mplayer/main/libmpdvdkit2/libdvdcss_changes.diff,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libdvdcss_changes.diff 9 Oct 2005 10:18:24 -0000 1.5 +++ libdvdcss_changes.diff 24 Oct 2005 09:29:15 -0000 1.6 @@ -1,3 +1,17 @@ +--- common.h 2005-10-11 10:55:45.000000000 +0200 ++++ common.h 2005-10-11 14:07:42.000000000 +0200 +@@ -50,10 +53,9 @@ + # define PATH_MAX MAX_PATH + #endif + +-#define lseek _lseeki64 +- + /* several type definitions */ + # if defined( __MINGW32__ ) ++#define lseek _lseeki64 + # if !defined( _OFF_T_ ) + typedef long long _off_t; + typedef _off_t off_t; --- css.c 2005-07-11 14:24:09.000000000 +0200 +++ css.c 2005-10-01 20:14:37.000000000 +0200 @@ -53,7 +56,7 @@ Index: libdvdread_changes.diff =================================================================== RCS file: /cvsroot/mplayer/main/libmpdvdkit2/libdvdread_changes.diff,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libdvdread_changes.diff 11 Oct 2005 12:17:09 -0000 1.6 +++ libdvdread_changes.diff 24 Oct 2005 09:29:15 -0000 1.7 @@ -70,21 +70,6 @@ x = ((((x) & 0xff00) >> 8) | \ (((x) & 0x00ff) << 8)) diff -Naur dvdread.orig/.cvsignore dvdread/.cvsignore -diff -Naur dvdread.orig/common.h dvdread/common.h ---- dvdread.orig/common.h 2005-10-11 10:55:45.000000000 +0200 -+++ dvdread/common.h 2005-10-11 14:07:42.000000000 +0200 -@@ -50,10 +50,9 @@ - # define PATH_MAX MAX_PATH - #endif - --#define lseek _lseeki64 -- - /* several type definitions */ - # if defined( __MINGW32__ ) -+#define lseek _lseeki64 - # if !defined( _OFF_T_ ) - typedef long long _off_t; - typedef _off_t off_t; diff -Naur dvdread.orig/dvd_input.c dvdread/dvd_input.c --- dvdread.orig/dvd_input.c 2005-06-23 00:18:54.000000000 +0200 +++ dvdread/dvd_input.c 2005-06-23 00:30:23.000000000 +0200

1 0

CVS: main/libmpcodecs ve_x264.c,1.36,1.37
by syncmail＠mplayerhq.hu 24 Oct '05

24 Oct '05

CVS change done by Loren Merritt CVS Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv16369/libmpcodecs Modified Files: ve_x264.c Log Message: sync to x264 r334 (crf) Index: ve_x264.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_x264.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- ve_x264.c 8 Oct 2005 22:28:27 -0000 1.36 +++ ve_x264.c 24 Oct 2005 04:39:18 -0000 1.37 @@ -60,6 +60,7 @@ static int bitrate = -1; static int qp_constant = 26; +static int rf_constant = 0; static int frame_ref = 1; static int keyint_max = 250; static int keyint_min = 25; @@ -118,6 +119,8 @@ m_option_t x264encopts_conf[] = { {"bitrate", &bitrate, CONF_TYPE_INT, CONF_RANGE, 0, 24000000, NULL}, {"qp_constant", &qp_constant, CONF_TYPE_INT, CONF_RANGE, 0, 51, NULL}, + {"qp", &qp_constant, CONF_TYPE_INT, CONF_RANGE, 0, 51, NULL}, + {"crf", &rf_constant, CONF_TYPE_INT, CONF_RANGE, 1, 50, NULL}, {"frameref", &frame_ref, CONF_TYPE_INT, CONF_RANGE, 1, 16, NULL}, {"keyint", &keyint_max, CONF_TYPE_INT, CONF_RANGE, 1, 24000000, NULL}, {"keyint_min", &keyint_min, CONF_TYPE_INT, CONF_RANGE, 1, 24000000, NULL}, @@ -231,6 +234,7 @@ mod->param.b_cabac = cabac; mod->param.rc.i_qp_constant = qp_constant; + mod->param.rc.i_rf_constant = rf_constant; if(qp_min > qp_constant) qp_min = qp_constant; if(qp_max < qp_constant)

1 0

CVS: main configure,1.1092,1.1093
by syncmail＠mplayerhq.hu 24 Oct '05

24 Oct '05

CVS change done by Loren Merritt CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv16369 Modified Files: configure Log Message: sync to x264 r334 (crf) Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.1092 retrieving revision 1.1093 diff -u -r1.1092 -r1.1093 --- configure 23 Oct 2005 13:55:23 -0000 1.1092 +++ configure 24 Oct 2005 04:39:18 -0000 1.1093 @@ -6138,7 +6138,7 @@ cat > $TMPC << EOF #include <inttypes.h> #include <x264.h> -#if X264_BUILD < 36 +#if X264_BUILD < 37 #error We do not support old versions of x264. Get the latest from SVN. #endif int main(void) { x264_encoder_open((void*)0); return 0; }

1 0

CVS: main/DOCS/tech mpcf.txt,1.83,1.84
by syncmail＠mplayerhq.hu 23 Oct '05

23 Oct '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/DOCS/tech In directory mail:/var2/tmp/cvs-serv21595 Modified Files: mpcf.txt Log Message: author list prettyprinting Index: mpcf.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/mpcf.txt,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- mpcf.txt 23 Oct 2005 16:49:56 -0000 1.83 +++ mpcf.txt 23 Oct 2005 16:50:27 -0000 1.84 @@ -749,12 +749,12 @@ Folks from the MPlayer developers mailing list (http://www.mplayerhq.hu/) Authors in alphabetical order: (FIXME! Tell us if we left you out) - Beregszaszi, Alex (alex(a)fsn.hu) - Bunkus, Moritz (moritz(a)bunkus.org) - Diedrich, Tobias (ranma+mplayer(a)tdiedrich.de) - Felker, Rich (dalias(a)aerifal.cx) - Franz, Fabian (FabianFranz(a)gmx.de) - Gereoffy, Arpad (arpi(a)thot.banki.hu) - Hess, Andreas (jaska(a)gmx.net) - Niedermayer, Michael (michaelni(a)gmx.at) - Shimon, Oded (ods15(a)ods15.dyndns.org) + Beregszaszi, Alex (alex(a)fsn.hu) + Bunkus, Moritz (moritz(a)bunkus.org) + Diedrich, Tobias (ranma+mplayer(a)tdiedrich.de) + Felker, Rich (dalias(a)aerifal.cx) + Franz, Fabian (FabianFranz(a)gmx.de) + Gereoffy, Arpad (arpi(a)thot.banki.hu) + Hess, Andreas (jaska(a)gmx.net) + Niedermayer, Michael (michaelni(a)gmx.at) + Shimon, Oded (ods15(a)ods15.dyndns.org)

1 0

CVS: main/DOCS/tech mpcf.txt,1.82,1.83
by syncmail＠mplayerhq.hu 23 Oct '05

23 Oct '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/DOCS/tech In directory mail:/var2/tmp/cvs-serv6597 Modified Files: mpcf.txt Log Message: Reformat section titles so that it becomes easier to tell sections and subsections apart. Index: mpcf.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/mpcf.txt,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- mpcf.txt 6 Oct 2005 11:08:43 -0000 1.82 +++ mpcf.txt 23 Oct 2005 16:49:56 -0000 1.83 @@ -1,9 +1,11 @@ - NUT Open Container Format DRAFT 20050909 - ---------------------------------------- +======================================== +NUT Open Container Format DRAFT 20050909 +======================================== - Intro: +Intro: +====== Features / goals: (supported by the format, not necessarily by a specific implementation) @@ -30,19 +32,25 @@ resync times - Definitions: + +Definitions: +============ MUST the specific part must be done to conform to this standard SHOULD it is recommended to be done that way, but not strictly required - Syntax: +Syntax: +======= Since NUT heavily uses variable length fields, the simplest way to describe it is using a pseudocode approach. - Conventions: + + +Conventions: +============ The data types have a name, used in the bitstream syntax description, a short text description and a pseudocode (functional) definition, optional notes may @@ -64,8 +72,9 @@ The functional definition has a C-like syntax. - Type definitions: +Type definitions: +================= f(n) (n fixed bits in big-endian order) u(n) (unsigned number encoded in n bits in MSB-first order) @@ -95,9 +104,12 @@ value b - Bitstream syntax: - Common elements: +Bitstream syntax: +================= + +Common elements: +---------------- packet header: forward ptr v @@ -278,7 +290,8 @@ } - Tag description: +Tag description: +---------------- forward_ptr size of the packet data (exactly the distance from the first byte @@ -585,7 +598,9 @@ {"Disposition" , "UTF8"}, }; - Structure: + +Structure: +---------- the headers MUST be in exactly the following order (to simplify demuxer design) main header @@ -606,24 +621,38 @@ there MUST be a sync point immediately before the first frame after any headers - Index + +Index: +------ + Note: with realtime streaming, there is no end, so no index there either An index SHOULD be written for every stream. Indices MUST be placed at end of file. Indices MAY be repeated for a stream. - Info frames + +Info frames: +------------ + Info frames can be used to describe the file or some part of it (chapters) - Unknown packets + +Unknown packets: +---------------- + MUST be ignored by the demuxer - demuxer (non-normative) + +demuxer (non-normative): +------------------------ in the absence of a valid header at the beginning, players SHOULD search for backup headers starting at offset 2^x; for each x players SHOULD end their search at a particular offset when any startcode is found (including syncpoint) - Semantic requirements + + +Semantic requirements: +====================== If more than one stream of a given stream class is present, each one MUST have info tags specifying disposition, and if applicable, language. @@ -633,7 +662,9 @@ duplicate the role of a container. any such file is to be considered invalid. - Sample code (Public Domain, & untested) + +Sample code (Public Domain, & untested): +======================================== typedef BufferContext{ uint8_t *buf; @@ -711,7 +742,10 @@ return pts; } - Authors + + +Authors: +======== Folks from the MPlayer developers mailing list (http://www.mplayerhq.hu/) Authors in alphabetical order: (FIXME! Tell us if we left you out)

1 0

CVS: main/libvo vo_vesa.c,1.108,1.109
by syncmail＠mplayerhq.hu 23 Oct '05

23 Oct '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv7196 Modified Files: vo_vesa.c Log Message: Make include paths consistent among files in libvo. Since -I.. is added to the CFLAGS in the Makefile this should be safe. Index: vo_vesa.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_vesa.c,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- vo_vesa.c 18 Aug 2005 11:26:04 -0000 1.108 +++ vo_vesa.c 23 Oct 2005 16:19:32 -0000 1.109 @@ -44,8 +44,8 @@ #include "vosub_vidix.h" #endif -#include "../postproc/swscale.h" -#include "../libmpcodecs/vf_scale.h" +#include "postproc/swscale.h" +#include "libmpcodecs/vf_scale.h" #ifdef HAVE_PNG

1 0

CVS: main/libvo sub.c,1.80,1.81
by syncmail＠mplayerhq.hu 23 Oct '05

23 Oct '05

CVS change done by Richard Felker CVS Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv29793/libvo Modified Files: sub.c Log Message: make bottom alignment the default since it's the only sane mode when sub_pos is near bottom (default) Index: sub.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/sub.c,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- sub.c 23 Oct 2005 15:34:39 -0000 1.80 +++ sub.c 23 Oct 2005 15:35:28 -0000 1.81 @@ -61,7 +61,7 @@ int sub_utf8=0; int sub_pos=100; int sub_width_p=100; -int sub_alignment=0; /* 0=top, 1=center, 2=bottom */ +int sub_alignment=2; /* 0=top, 1=center, 2=bottom */ int sub_visibility=1; int sub_bg_color=0; /* subtitles background color */ int sub_bg_alpha=0;

1 0

CVS: main/libvo sub.c,1.79,1.80
by syncmail＠mplayerhq.hu 23 Oct '05

23 Oct '05

CVS change done by Richard Felker CVS Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv16010/libvo Modified Files: sub.c Log Message: reverse incorrect sub alignment change, ok'd by diego Index: sub.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/sub.c,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- sub.c 23 Oct 2005 14:25:56 -0000 1.79 +++ sub.c 23 Oct 2005 15:34:39 -0000 1.80 @@ -627,7 +627,7 @@ } /// vertical alignment h = dys - obj->y; - if (sub_alignment == 0) + if (sub_alignment == 2) obj->y = dys * sub_pos / 100 - h; else if (sub_alignment == 1) obj->y = dys * sub_pos / 100 - h / 2;

1 0

CVS: main/libmpcodecs vf_expand.c,1.31,1.32
by syncmail＠mplayerhq.hu 23 Oct '05

23 Oct '05

CVS change done by Richard Felker CVS Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv10011/libmpcodecs Modified Files: vf_expand.c Log Message: 10l to whoever got aspect upside-down.. it's w/h, not h/w. hope this doesn't bother anyone already using it too much Index: vf_expand.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_expand.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- vf_expand.c 8 Jul 2005 06:39:47 -0000 1.31 +++ vf_expand.c 23 Oct 2005 15:25:10 -0000 1.32 @@ -183,10 +183,10 @@ else if( vf->priv->exp_h<height ) vf->priv->exp_h=height; #endif if (vf->priv->aspect) { - if (vf->priv->exp_h < vf->priv->exp_w * vf->priv->aspect) { - vf->priv->exp_h = vf->priv->exp_w * vf->priv->aspect; + if (vf->priv->exp_h < vf->priv->exp_w / vf->priv->aspect) { + vf->priv->exp_h = vf->priv->exp_w / vf->priv->aspect; } else { - vf->priv->exp_w = vf->priv->exp_h / vf->priv->aspect; + vf->priv->exp_w = vf->priv->exp_h * vf->priv->aspect; } } if (vf->priv->round > 1) { // round up.

1 0

CVS: main/libvo sub.c,1.78,1.79
by syncmail＠mplayerhq.hu 23 Oct '05

23 Oct '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv14011/libvo Modified Files: sub.c Log Message: The conditions for bottom (2) and top (1) subtitle alignment are reversed. patch by Paul TT < paultt == at -- hackerjournal == dot -- it > Index: sub.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/sub.c,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- sub.c 10 Apr 2005 11:54:31 -0000 1.78 +++ sub.c 23 Oct 2005 14:25:56 -0000 1.79 @@ -627,7 +627,7 @@ } /// vertical alignment h = dys - obj->y; - if (sub_alignment == 2) + if (sub_alignment == 0) obj->y = dys * sub_pos / 100 - h; else if (sub_alignment == 1) obj->y = dys * sub_pos / 100 - h / 2;

2 1