November 2010 - MPlayer-dev-eng - lists.mplayerhq.hu

Subtitles modules
by Clément Bœsch 04 Dec '10

04 Dec '10

Hi, subreader.c is huge file with lots of various, and I was planning to extract specific subtitles format functions into sub modules, just like libmpdemux, libmpcodecs, etc. So first step, I'd like to just put specific format functions into specific files: sub/st_jacosub.c sub/st_microdvd.c sub/st_sami.c sub/st_subrip.c ... This will be the first tricky thing since some formats have specific hacky global variable such as previous_sub_end. If I'm not wrong the second step would be to define some instance and info struct just like with at least init, read, postproc, dump and close function. The automatic type detection could be ported in the init function of each type. Does anyone has a grudge against this, or see a big obstacle? Regards, -- Clément B. Not sent from a jesusPhone.

4 9

[PATCH] Add support for login/password in http_proxy env variable
by Clément Bœsch 03 Dec '10

03 Dec '10

Hi, http_proxy:// syntax now well supports proxy authentication, but not in the env variable. So here is a patch to fix that. -- Clément B. Not sent from a jesusPhone.

2 9

[PATCH] Drop MPlayer base64_encode for av_base64_encode
by Clément Bœsch 03 Dec '10

03 Dec '10

Hi, Here is a patch to simplify the base64 computing in the stream module. Since libavutil provide a base64 encode, a factorization was possible, and code gets simplified. I tested the http authentication, but I couldn't for the rtsp one. If anyone has an idea of how the RTSP server can reply a 401, I'd like to hear about :) -- Clément B. Not sent from a jesusPhone.

2 3

Skipping an argument on the command line in mplayer
by Vincenzo De Florio 28 Nov '10

28 Nov '10

Hallo, what is a "clean" way to skip an argument on the command line of mplayer? For instance if I have mplayer file1.avi file2.mpg file3.avi which function should I call / which variable should I set to move directly from e.g argv[1] == "file1.avi" to argv[3] == "file3.avi"? Thank you very much! Cheers, - Vince.

1 0

[PATCH] Mac OS X: fix libao2 compilation on Mac OS X 10.4
by Aaro Koskinen 28 Nov '10

28 Nov '10

Hello, The attached patch enables mplayer compilation on Mac OS X 10.4. I tested it with r32667, and I'm again able to compile the current mplayer and play movies. A.

1 0

[PATCH] Expose the VBV options of Xvid >= 1.1.0 in -xvidencopts
by Lasse Collin 28 Nov '10

28 Nov '10

The VBV options allow restricting the peak bitrate for hardware player compatibility. Earlier the VBV options were only indirectly available via the profiles. When using profiles, vbv_peakrate is no longer incorrectly multiplied by three (the incorrect code was copied from Xvid itself). It doesn't matter in practice at all though because Xvid uses vbv_peakrate only for some debug checks. It has no effect on the encoded output. diff -ru mplayer-export-2010-11-08.orig/DOCS/man/en/mplayer.1 mplayer-export-2010-11-08/DOCS/man/en/mplayer.1 --- mplayer-export-2010-11-08.orig/DOCS/man/en/mplayer.1 2010-10-29 16:54:42.000000000 +0300 +++ mplayer-export-2010-11-08/DOCS/man/en/mplayer.1 2010-11-09 17:12:08.606668370 +0200 @@ -10276,7 +10276,7 @@ . .PP .sp 1 -The following option is only available in Xvid 1.1.x. +The following options are only available in Xvid 1.1.x and later. . .TP .B bvhq=<0|1> @@ -10286,9 +10286,32 @@ This produces nicer-looking B-frames while incurring almost no performance penalty (default: 1). . +.TP +.B vbv_bufsize=<0...> (two pass mode only) +Specify the video buffering verifier (VBV) buffer size in bits +(default: 0 \- VBV check disabled). +VBV allows restricting peak bitrate to make the video play properly +on hardware players. +For example, the Home profile uses vbv_bufsize=3145728. +If you set vbv_bufsize you should set also vbv_maxrate. +Note that there is no vbv_peakrate because Xvid does not actually +use it for bitrate controlling; the other VBV options are enough +to restrict the peak bitrate. +. +.TP +.B vbv_initial=<0...vbv_bufsize> (two pass mode only) +Specify the initial fill of the VBV buffer in bits +(default: 75% of vbv_bufsize). +The default is probably what you want. +. +.TP +.B vbv_maxrate=<0...> (two pass mode only) +Specify the maximum processing rate in bits/s (default: 0). +For example, the Home profile uses vbv_maxrate=4854000. +. .PP .sp 1 -The following option is only available in the 1.2.x version of Xvid. +The following option is only available in Xvid 1.2.x and later. . .TP .B threads=<0\-n> diff -ru mplayer-export-2010-11-08.orig/libmpcodecs/ve_xvid4.c mplayer-export-2010-11-08/libmpcodecs/ve_xvid4.c --- mplayer-export-2010-11-08.orig/libmpcodecs/ve_xvid4.c 2010-10-29 16:54:42.000000000 +0300 +++ mplayer-export-2010-11-08/libmpcodecs/ve_xvid4.c 2010-11-09 17:18:00.026668371 +0200 @@ -209,6 +209,10 @@ static int xvidenc_vbr_kfthreshold = 0; static int xvidenc_vbr_container_frame_overhead = 24; /* mencoder uses AVI container */ +static int xvidenc_vbv_size = 0; +static int xvidenc_vbv_initial = 0; +static int xvidenc_vbv_maxrate = 0; + // commandline profile option string - default to unrestricted static char *xvidenc_profile = "unrestricted"; @@ -296,6 +300,11 @@ {"kfthreshold", &xvidenc_vbr_kfthreshold, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL}, {"container_frame_overhead", &xvidenc_vbr_container_frame_overhead, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL}, + /* section [vbv] */ + {"vbv_bufsize", &xvidenc_vbv_size, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL}, + {"vbv_initial", &xvidenc_vbv_initial, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL}, + {"vbv_maxrate", &xvidenc_vbv_maxrate, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL}, + /* Section Aspect Ratio */ {"par", &xvidenc_par, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"par_width", &xvidenc_par_width, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL}, @@ -781,13 +790,44 @@ /* VBV */ #if XVID_API >= XVID_MAKE_API(4,1) - pass2->vbv_size = selected_profile->max_vbv_size; - pass2->vbv_initial = (selected_profile->max_vbv_size*3)>>2; /* 75% */ - pass2->vbv_maxrate = selected_profile->max_bitrate; - pass2->vbv_peakrate = selected_profile->vbv_peakrate*3; + if(xvidenc_vbv_size > 0) { + if(selected_profile->max_vbv_size > 0 && xvidenc_vbv_size > selected_profile->max_vbv_size) { + mp_msg(MSGT_MENCODER,MSGL_ERR, + "xvid:[ERROR] Selected profile limits vbv_bufsize <= %d\n", selected_profile->max_vbv_size); + return BAD; + } + + pass2->vbv_size = xvidenc_vbv_size; + } else { + pass2->vbv_size = selected_profile->max_vbv_size; + } + + if(xvidenc_vbv_initial > 0) { + if(xvidenc_vbv_initial > pass2->vbv_size) { + mp_msg(MSGT_MENCODER,MSGL_ERR, + "xvid:[ERROR] vbv_initial must be <= vbv_bufsize\n"); + return BAD; + } + + pass2->vbv_initial = xvidenc_vbv_initial; + } else { + pass2->vbv_initial = (pass2->vbv_size*3)>>2; /* 75% */ + } + + if(xvidenc_vbv_maxrate > 0) { + if(selected_profile->max_bitrate > 0 && xvidenc_vbv_maxrate > selected_profile->max_bitrate) { + mp_msg(MSGT_MENCODER,MSGL_ERR, + "xvid:[ERROR] Selected profile limits vbv_maxrate <= %d\n", selected_profile->max_bitrate); + return BAD; + } + + pass2->vbv_maxrate = xvidenc_vbv_maxrate; + } else { + pass2->vbv_maxrate = selected_profile->max_bitrate; + } + + pass2->vbv_peakrate = selected_profile->vbv_peakrate; /* Useless */ #endif -// XXX: xvidcore currently provides a "peak bits over 3 seconds" constraint. -// according to the latest dxn literature, a 1 second constraint is now used create->profile = selected_profile->id; -- Lasse Collin | IRC: Larhzu @ IRCnet & Freenode

2 4

[PATCHES] 4 small patches for various code improvements
by Clément Bœsch 25 Nov '10

25 Nov '10

Hi, I'd like to commit the 4 small attched patches if no one care. -- Clément B. Not sent from a jesusPhone.

4 5

[PATCH] Fix the crash when failing to open a font file with -ass
by KO Myung-Hun 23 Nov '10

23 Nov '10

Hi/2. Check the validity of an argument, font. If failing to open a font file when using -ass, it becomes NULL and causes MPlayer to be crashed. -- KO Myung-Hun Using Mozilla SeaMonkey 2.0.9 Under OS/2 Warp 4 for Korean with FixPak #15 On AMD ThunderBird 1GHz with 512 MB RAM Korean OS/2 User Community : http://www.ecomstation.co.kr

2 3

Re: [MPlayer-dev-eng] [PATCH] Subtitles directories
by Clément Bœsch 21 Nov '10

21 Nov '10

On Sun, Nov 21, 2010 at 02:08:21PM -0500, Paul Arthur wrote: > On 2010-11-21, Clément Bœsch <ubitux(a)gmail.com> wrote: > > > On Sun, Nov 21, 2010 at 12:05:58PM +0100, Cl=C3=A9ment B=C5=93sch > > wrote: > > > >> On Sat, Nov 20, 2010 at 09:49:44PM +0100, Reimar D=C3=B6ffinger > >> wrote: > >> > >> > Either way, that part is ok. Except for one thing I noticed while > >> > looking through the next patch: For DOS paths you must also > >> > consider ':' a path separator in mp_basename, so that c:test.avi > >> > is treated correctly. > >> > >> OK, then I'll commit this, and make a second patch to fix that. > > > > But since c:test.avi must be supported, I wonder if c:foo:test.avi > > has to > > Not for DOS/Windows. The difference between C:test.avi and C:\test.avi > is that the first one says "I want test.avi in the current working > directory on drive C" (each drive has its own CWD, you see) while the > second one specifies an absolute path. ':' is not a valid filename > character so there's no ambiguity; ':' can only appear once in a valid > DOS filename, and only as part of the drive specification. > Indeed. http://msdn.microsoft.com/en-us/library/aa365247%28v=VS.85%29.aspx confirms this. Thanks. > > The current patch consider ':' as a normal path separator, just like > > subreader.c does, but maybe a smarter thing must be done? > > Should be fine. > OK, applied. > > Index: path.c > >=================================================================== > > --- path.c (revision 32641) > > +++ path.c (working copy) > > @@ -202,6 +202,9 @@ > > s = strrchr(path, '\\'); > > if (s) > > path = s + 1; > > + s = strrchr(path, ':'); > > + if (s) > > + path = s + 1; > > #endif > > s = strrchr(path, '/'); > > return s ? s + 1 : path; > > > _______________________________________________ > MPlayer-dev-eng mailing list > MPlayer-dev-eng(a)mplayerhq.hu > https://lists.mplayerhq.hu/mailman/listinfo/mplayer-dev-eng -- Clément B. Not sent from a jesusPhone.

1 0

[PATCHES] A bunch of http_proxy patches
by Clément Bœsch 21 Nov '10

21 Nov '10

Hi, I'm here again to make some noise, sorry guys. I have a few patches to propose in order to improve the http_proxy support. I used git (through git.mplayerhq.hu mirror) to stack patches, sorry I didn't have the fate to do that with SVN. Anyway, It should be compatible. Regards,

2 59