June 2007 - MPlayer-dev-eng - lists.mplayerhq.hu

Re: [MPlayer-dev-eng] [PATCH] tv:///<input_id> feature][1~
by Andrew Calkin 28 Jun '07

28 Jun '07

This got caught in the spam filter... trying again. //Andrew ----- Forwarded message from Andrew Calkin <andrew.calkin(a)gmail.com> ----- Date: Thu, 28 Jun 2007 02:20:13 +0800 From: Andrew Calkin <andrew.calkin(a)gmail.com> To: mplayer-dev-eng(a)mplayerhq.hu Cc: voroshil(a)gmail.com Subject: Re: [MPlayer-dev-eng] [PATCH] tv:///<input_id> feature On Wed, Jun 27, 2007 at 11:48:34PM +0700, Vladimir Voroshilov wrote: > Attached patch adds tv:///<input_id> syntax which allows users to > start watching their movies from Composite or S-Video input without > touching -tv input= option in config file. > > I hope it will be usefull for standalone boxes like GeexBox. > > > If noone objects, i want to apply it soon. Hi, as a GeeXboX developer, i'd like to say that it would be much appreciated (IOW- you're my hero). Also, small nit: s/detailes/details/ //Andrew P.S. note that I CC'd you directly, in case it didn't make it onto the proper m/l as well. Please take care in case you reply to me directly. ----- End forwarded message -----

1 0

[PATCH] unify x11 window creation an handling
by Reimar Döffinger 27 Jun '07

27 Jun '07

Hello, attached patch makes most x11-based vos use the same code to create and otherwise handle windows in config(). I will apply rather soon, since the current mess makes it absolutely impossible to fix bugs or even get a consistent behaviour. Greetings, Reimar Döffinger

2 2

[PATCH] Silence one warning for muxer_lavf.c
by Carl Eugen Hoyos 27 Jun '07

27 Jun '07

Hi! Attached patch silences one warning when compiling muxer_lavf.c: muxer_lavf.c:243: warning: implicit declaration of function ‘imgfmt2pixfmt’ I'll apply later this week if no one complaints. Carl Eugen Index: fmt-conversion.h =================================================================== --- fmt-conversion.h (Revision 23664) +++ fmt-conversion.h (Arbeitskopie) @@ -3,7 +3,7 @@ #else #include "avutil.h" #endif -#include "img_format.h" +#include "libmpcodecs/img_format.h" enum PixelFormat imgfmt2pixfmt(int fmt) { Index: libmpdemux/muxer_lavf.c =================================================================== --- libmpdemux/muxer_lavf.c (Revision 23664) +++ libmpdemux/muxer_lavf.c (Arbeitskopie) @@ -23,6 +23,7 @@ #include "avformat.h" #endif #include "libavutil/avstring.h" +#include "fmt-conversion.h" extern const struct AVCodecTag *mp_wav_taglists[]; extern const struct AVCodecTag *mp_bmp_taglists[];

1 1

Where to put the code?
by Zuxy Meng 26 Jun '07

26 Jun '07

Hi, I'm planning to support 'stop-xscreensaver' under Windows. It's simple to implement as Windows API provides a heartbeat function. The problem is that this function isn't available on Windows 95 so I have to load it at runtime. But where to put the code? I find no suitable place under osdep and libvo. BTW do I need to add a different option (stop-winscreensaver), change the option's name (to stop-screensaver), or just enable it without altering anything? -- Zuxy Beauty is truth, While truth is beauty. PGP KeyID: E8555ED6

4 4

[PATCH] Recode legacy metadata (was: Moving towards UTF-8)
by Zuxy Meng 26 Jun '07

26 Jun '07

Hello, 2006/10/23, Rich Felker <dalias(a)aerifal.cx>: > On Mon, Oct 23, 2006 at 03:43:15PM +0800, Zuxy Meng wrote: > > >> Then for GBK encoded Chinese, more than 80% the case, the string won't > > >> be a legal UTF-8 symbol and hence the user will see the correct, > > >> unconverted string. > > > > > >Unacceptable. If the string is GBK but the user has a UTF-8 system, it > > >will print nonsense to the terminal (possibly even corrupt terminal > > >control sequences). Maybe now this is rare, but eventually everyone > > >will be using UTF-8. Conversion must never be bypassed. > > > > Well, currently, if the string is in GBK but MSG_CHARSET != GBK, then > > the user has no chance to get anything sane on the terminal, > > regardless of his/her locale, because mp_msg() converts the string at > > its best effort: it'll jump to next byte if the previous one has > > failed, while GBK is a two-byte encoding.... > > Right. I know it doesn't work currently, but replacing a > broken-by-lack-of-sophistication system with a broken-by-design system > is not acceptable. If you're going to try to fix it, fix it right. > Don't add complexity in the form of broken hacks. If complexity is > needed, then spend the complexity on a correct solution rather than > something that will just need to be replaced again.. This is the simplest implementation of Rich's idea. I hope I didn't misunderstand what he meant and the structure is OK. Finer control may be added later. -- Zuxy Beauty is truth, While truth is beauty. PGP KeyID: E8555ED6

2 4

Re: [MPlayer-dev-eng] mencoder problems with large video frames (in this case huffyuv)
by Øyvind Vågen Jægtnes 25 Jun '07

25 Jun '07

Loren Merritt wrote: > On Mon, 25 Jun 2007, Øyvind Vågen Jægtnes wrote: > >> But when i playback with mplayer i get errors like this: >> Error generating huffman table, 13 >> Error while decoding frame! >> Error generating huffman table, 13 >> Error while decoding frame! >> Error generating huffman table, 10 >> Error while decoding frame! >> Error generating huffman table, 47 >> Error while decoding frame! >> >> The number after the errors comes from me editing the line 256 in >> libavcodec/huffyuv.c to: >> av_log(NULL, AV_LOG_ERROR, "Error generating huffman table, %i\n", bits); >> just to see what number it stumbles on. > > Wait, you're saying that > > if(bits & 1){ > av_log(NULL, AV_LOG_ERROR, "Error generating huffman table, %i\n", bits); > return -1; > } > > printed 10? See a problem with the arithmetic there? > > --Loren Merritt > Ok i've narrowed down the bug to a spesific patch. Everything before patch: r9069 | lorenm | 2007-05-19 04:32:59 +0200 (Sat, 19 May 2007) | 2 lines change brute force search to min-heap. 3.6x faster generate_len_table, 8% faster ffvhuff encoding. works fine (this is everything newest revision except for the huffyuv.c file). All patches from 9069 -> now has the huffman table error. http://193.239.155.190/random/mencoder/ are the builds we tested and the working one is the 9055 one. to reproduce the error: <+infernix> heres how i reproduce <+infernix> mencoder -oac pcm -nosound -o huffyuv_table_sample.avi -ovc lavc -lavcopts vcodec=ffvhuff:vstrict=-1:pred=2:context=1 huffyuv_table_sample.264 <+infernix> mplayer -vo null huffyuv_table_sample.avi <+infernix> at about frame 175-190 you'll see 2 or 3 errors the huffyuv_table_sample.264 is uploaded to: ftp://upload.mplayerhq.hu/MPlayer/incoming -- Øyvind Jægtnes

1 0

Re: [MPlayer-dev-eng] mencoder problems with large video frames (in this case huffyuv)
by Øyvind Vågen Jægtnes 25 Jun '07

25 Jun '07

Loren Merritt wrote: > On Mon, 25 Jun 2007, Øyvind Vågen Jægtnes wrote: > >> But when i playback with mplayer i get errors like this: >> Error generating huffman table, 13 >> Error while decoding frame! >> Error generating huffman table, 13 >> Error while decoding frame! >> Error generating huffman table, 10 >> Error while decoding frame! >> Error generating huffman table, 47 >> Error while decoding frame! >> >> The number after the errors comes from me editing the line 256 in >> libavcodec/huffyuv.c to: >> av_log(NULL, AV_LOG_ERROR, "Error generating huffman table, %i\n", bits); >> just to see what number it stumbles on. > > Wait, you're saying that > > if(bits & 1){ > av_log(NULL, AV_LOG_ERROR, "Error generating huffman table, %i\n", bits); > return -1; > } > > printed 10? See a problem with the arithmetic there? > Yes i found that odd aswell. But thats what came out of the run .. and its consistant and reproducable. Anyway, it aborts all the frames with errors and produces a duplicate of the last which results in bad video. ffv1 seems to work though with the 4 mb buffer change, but its a bit slower then huffyuv. --- Øyvind Jægtnes

1 0

[PATCH] get rid of my_memcpy_pic code duplication
by Reimar Döffinger 25 Jun '07

25 Jun '07

Hello, Seems rather stupid that each filter has this filter copy-and-pasted (esp. since they also do void * arithmetic). I have not properly benchmarked it, but I don't think there is even a real need for those functions to be static inline at all. Ok to apply? Greetings, Reimar Döffinger

3 3

mencoder problems with large video frames (in this case huffyuv)
by Øyvind Vågen Jægtnes 25 Jun '07

25 Jun '07

Hi, I'm trying to make mencoder create a huffyuv avi via avs2yuv.exe. This also happened with the ffv1 codec. The first problem was that i got "encoded frame too large" errors from mencoder.exe which originates from huffyuv.c. The video is 1920x1040 so the resulting frame goes over 2 mb at some points. I got a tip to edit the line 744 in mencoder.c: mux_v->buffer_size=0x200000; // 2MB to mux_v->buffer_size=0x400000; // 4MB After this the encode went fine and i stopped getting the "encoded frame too large" errors. But when i playback with mplayer i get errors like this: Error generating huffman table, 13 Error while decoding frame! Error generating huffman table, 13 Error while decoding frame! Error generating huffman table, 10 Error while decoding frame! Error generating huffman table, 47 Error while decoding frame! The number after the errors comes from me editing the line 256 in libavcodec/huffyuv.c to: av_log(NULL, AV_LOG_ERROR, "Error generating huffman table, %i\n", bits); just to see what number it stumbles on. If you guys need more info or some samples off the resulting .avi and/or source please let me know. --- Øyvind Jægtnes lorrides(a)gmail.com

2 1

[PATCH] Allow to set network timeout
by Carl Eugen Hoyos 24 Jun '07

24 Jun '07

Hi! On 2007-06-18 13:28, Dominik 'Rathann' Mierzejewski wrote: > On Monday, 18 June 2007 at 10:53, cehoyos wrote: > > Author: cehoyos > > Date: Mon Jun 18 10:53:53 2007 > > New Revision: 23574 > > > > Log: > > Stop playing at eof or if no data arrives for ten seconds. > > Please make the timeout configurable. Attached is a patch that allows to configure the network timeout. I won't apply unless someone approves it. Please comment, Carl Eugen Index: cfg-common.h =================================================================== --- cfg-common.h (Revision 23588) +++ cfg-common.h (Arbeitskopie) @@ -57,6 +57,7 @@ {"ipv4-only-proxy", &network_ipv4_only_proxy, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"reuse-socket", &reuse_socket, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, {"noreuse-socket", &reuse_socket, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, + {"network-timeout", &network_timeout, CONF_TYPE_INT, 0, 0, 0, NULL}, #ifdef HAVE_AF_INET6 {"prefer-ipv6", &network_prefer_ipv4, CONF_TYPE_FLAG, 0, 1, 0, NULL}, #else @@ -68,6 +69,7 @@ {"passwd", "MPlayer was compiled without streaming (network) support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, {"bandwidth", "MPlayer was compiled without streaming (network) support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, {"user-agent", "MPlayer was compiled without streaming (network) support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, + {"network-timeout", "MPlayer was compiled without streaming (network) support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #endif #ifdef STREAMING_LIVE555 @@ -366,6 +368,7 @@ extern char *network_useragent; extern int network_cookies_enabled; extern char *cookies_file; +extern int network_timeout; extern int network_prefer_ipv4; extern int network_ipv4_only_proxy; Index: stream/network.c =================================================================== --- stream/network.c (Revision 23588) +++ stream/network.c (Arbeitskopie) @@ -41,13 +41,14 @@ extern int stream_cache_size; /* Variables for the command line option -user, -passwd, -bandwidth, - -user-agent and -nocookies */ + -user-agent, -nocookies and -network-timeout */ char *network_username=NULL; char *network_password=NULL; int network_bandwidth=0; int network_cookies_enabled = 0; char *network_useragent=NULL; +int network_timeout=10; /* IPv6 options */ int network_ipv4_only_proxy = 0; Index: libmpdemux/demux_rtp.cpp =================================================================== --- libmpdemux/demux_rtp.cpp (Revision 23588) +++ libmpdemux/demux_rtp.cpp (Arbeitskopie) @@ -72,6 +72,7 @@ extern "C" char* network_username; extern "C" char* network_password; +extern "C" int network_timeout; static char* openURL_rtsp(RTSPClient* client, char const* url) { // If we were given a user name (and optional password), then use them: if (network_username != NULL) { @@ -505,7 +506,8 @@ TaskScheduler& scheduler = bufferQueue->readSource()->envir().taskScheduler(); int delay = bufferQueue->prevPacketPTS * 1.05 > - rtpState->mediaSession->playEndTime() ? 1000000 : 10000000; + rtpState->mediaSession->playEndTime() ? + network_timeout * 100000 : network_timeout * 1000000; task = scheduler.scheduleDelayedTask(delay, onSourceClosure, bufferQueue); scheduler.doEventLoop(&bufferQueue->blockingFlag); scheduler.unscheduleDelayedTask(task); Index: DOCS/man/en/mplayer.1 =================================================================== --- DOCS/man/en/mplayer.1 (Revision 23588) +++ DOCS/man/en/mplayer.1 (Arbeitskopie) @@ -1441,6 +1441,10 @@ .PD 1 . .TP +.B \-network-timeout (LIVE555 only) +Set network timeout. When 95% are played, a thenth is used. +. +.TP .B \-ni (AVI only) Force usage of non-interleaved AVI parser (fixes playback of some bad AVI files). Index: DOCS/man/de/mplayer.1 =================================================================== --- DOCS/man/de/mplayer.1 (Revision 23588) +++ DOCS/man/de/mplayer.1 (Arbeitskopie) @@ -1498,6 +1498,10 @@ .PD 1 . .TP +.B \-network-timeout (nur bei LIVE555) +Setzt das Netzwerktimeout fest. Nach 95% des Streams wird ein Zehntel verwendet. +. +.TP .B \-ni (nur bei AVI) Erzwingt die Benutzung des nicht-interleaved-AVI-Parsers (was die Wiedergabe einiger schlechter AVI-Dateien ermöglicht).

3 4