May 2014 - MPlayer-dev-eng - lists.mplayerhq.hu

Homepage skin download issue
by Ingo Brückl 09 Sep '15

09 Sep '15

Yesterday, I updated hwswskin to 1.3, but it still isn't downloadable. Is the generation of the skin download tarballs working? Ingo

3 8

[PATCH] mencoder slang vobsub fix
by Edward Batutis 09 Sep '14

09 Sep '14

Hi, This is my very first patch for mplayer/mencoder. This patch allows mencoder -slang <lang> <some video file> -vobsub <some sub/idx path> ... to select a language from a SUB/IDX combination. For example: mencoder -slang en /movie/my.avi -vobsub /movie ... where /movie contains a my.sub and my.idx. This will select language 'en' from the idx/sub. Without this patch you always get subtitle zero, whatever it may be. Why this wasn't fixed long ago - who knows. Mplayer does the right thing. Not mencoder. =Ed

2 4

[PATCH] Fix key_down_event SEGFALT
by spunit262 . 04 Sep '14

04 Sep '14

I discovered by messing around that using key_down_event with a large random value (ex SPACE | MP_NO_REPEAT_KEY) can cause a segfalt. I found the problem to be that isprint is only defined for values in the range of an unsigned char and the value EOF. The patch adds a simple check before isprint in mp_input_get_key_name to make sure the value is in isprint's range.

2 1

Danish translation ought to be renamed
by Ingo Brückl 14 Aug '14

14 Aug '14

Does anyone mind me renaming the Danish translation from help_mp-dk.h to help_mp-da.h and protocolling this in the Changelog? (AFAICS, there are no dependencies to be considered.) There is no ISO 639-1 language code "dk", Danish is "da". Ingo

2 2

[PATCH] use correct type of timestamps when recording from v4l2, fix #2176
by Jarek Czekalski 10 Jun '14

10 Jun '14

Mencoder should detect whether timestamps used by v4l2 come from monotonic or realtime clock. This is important for Linux kernels >=3.10. Details in bug report #2176 [1] Patch for stream/tvi_v4l2.c against r36970 attached. [1] https://trac.mplayerhq.hu/ticket/2176

2 2

[PATCH] refresh end_pos in stream_file.c
by Davide Baldo 31 May '14

31 May '14

This improvement allow to download and watch a file at the same time without having to re-open mplayer to refresh the end_pos of the stream. I'm not sure about the impact of lseek() at each read, should be trivial in any OS but i'm not sure about it. I attached the patch as well. Index: stream/stream_file.c =================================================================== --- stream/stream_file.c (revision 37205) +++ stream/stream_file.c (working copy) @@ -64,7 +64,13 @@ int r = read(s->fd,buffer,max_len); // We are certain this is EOF, do not retry if (max_len && r == 0) s->eof = 1; - return (r <= 0) ? -1 : r; + int bytes_num = (r <= 0) ? -1 : r; + if (bytes_num > 0 && s->fd != STDIN_FILENO) { + off_t current = lseek(s->fd,0,SEEK_CUR); + s->end_pos = lseek(s->fd,0,SEEK_END); + lseek(s->fd,current,SEEK_SET); + } + return bytes_num; } static int write_buffer(stream_t *s, char* buffer, int len) { @@ -81,6 +87,7 @@ } static int seek(stream_t *s, int64_t newpos) { + s->end_pos = lseek(s->fd,0,SEEK_END); s->pos = newpos; if(lseek(s->fd,s->pos,SEEK_SET)<0) { s->eof=1;

3 3

[PATCH 1/2] subreader: Split a monster if() into multiple parts.
by Reimar Döffinger 27 May '14

27 May '14

Should make code more maintainable. Also make sure all input variables are properly reset before each test. --- sub/subreader.c | 59 ++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 44 insertions(+), 15 deletions(-) diff --git a/sub/subreader.c b/sub/subreader.c index 0a9711c..3c42552 100644 --- a/sub/subreader.c +++ b/sub/subreader.c @@ -594,28 +594,57 @@ static subtitle *sub_read_line_rt(stream_t *st,subtitle *current, int utf16) { char line[LINE_LEN+1]; int a1,a2,a3,a4,b1,b2,b3,b4; char *p=NULL,*next=NULL; - int len,plen; + int plen; while (!current->text[0]) { + int match = 0; if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL; //TODO: it seems that format of time is not easily determined, it may be 1:12, 1:12.0 or 0:1:12.0 //to describe the same moment in time. Maybe there are even more formats in use. //if ((len=sscanf (line, "<Time Begin=\"%d:%d:%d.%d\" End=\"%d:%d:%d.%d\"",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) - plen=a1=a2=a3=a4=b1=b2=b3=b4=0; - if ( - ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d.%d\" %*[Ee]nd=\"%d.%d\"%*[^<]<clear/>%n",&a3,&a4,&b3,&b4,&plen)) < 4) && - ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d.%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a3,&a4,&b2,&b3,&b4,&plen)) < 5) && - ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d\" %*[Ee]nd=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&b2,&b3,&plen)) < 4) && - ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&b2,&b3,&b4,&plen)) < 5) && -// ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\" %*[Ee]nd=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&b2,&b3,&plen)) < 5) && - ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&b2,&b3,&b4,&plen)) < 6) && - ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d:%d.%d\" %*[Ee]nd=\"%d:%d:%d.%d\"%*[^<]<clear/>%n",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4,&plen)) < 8) && + if (!match) { + plen=a1=a2=a3=a4=b1=b2=b3=b4=0; + match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d.%d\" %*[Ee]nd=\"%d.%d\"%*[^<]<clear/>%n",&a3,&a4,&b3,&b4,&plen) >= 4; + } + if (!match) { + plen=a1=a2=a3=a4=b1=b2=b3=b4=0; + match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d.%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a3,&a4,&b2,&b3,&b4,&plen) >= 5; + } + if (!match) { + plen=a1=a2=a3=a4=b1=b2=b3=b4=0; + match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d:%d\" %*[Ee]nd=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&b2,&b3,&plen) >= 4; + } + if (!match) { + plen=a1=a2=a3=a4=b1=b2=b3=b4=0; + match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d:%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&b2,&b3,&b4,&plen) >= 5; + } +// sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\" %*[Ee]nd=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&b2,&b3,&plen) >= 5 + if (!match) { + plen=a1=a2=a3=a4=b1=b2=b3=b4=0; + match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&b2,&b3,&b4,&plen) >= 6; + } + if (!match) { + plen=a1=a2=a3=a4=b1=b2=b3=b4=0; + match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d:%d:%d.%d\" %*[Ee]nd=\"%d:%d:%d.%d\"%*[^<]<clear/>%n",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4,&plen) >= 8; + } //now try it without end time - ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d.%d\"%*[^<]<clear/>%n",&a3,&a4,&plen)) < 2) && - ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&plen)) < 2) && - ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&plen)) < 3) && - ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d:%d.%d\"%*[^<]<clear/>%n",&a1,&a2,&a3,&a4,&plen)) < 4) - ) + if (!match) { + plen=a1=a2=a3=a4=b1=b2=b3=b4=0; + match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d.%d\"%*[^<]<clear/>%n",&a3,&a4,&plen) >= 2; + } + if (!match) { + plen=a1=a2=a3=a4=b1=b2=b3=b4=0; + match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&plen) >= 2; + } + if (!match) { + plen=a1=a2=a3=a4=b1=b2=b3=b4=0; + match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&plen) >= 3; + } + if (!match) { + plen=a1=a2=a3=a4=b1=b2=b3=b4=0; + match = sscanf(line, "<%*[tT]ime %*[bB]egin=\"%d:%d:%d.%d\"%*[^<]<clear/>%n",&a1,&a2,&a3,&a4,&plen) >= 4; + } + if (!match) continue; current->start = a1*360000+a2*6000+a3*100+a4/10; current->end = b1*360000+b2*6000+b3*100+b4/10; -- 2.0.0.rc4

2 4

[patch] RT subtitle timestamp parsing buggy
by hhaamu＠gmail.com 27 May '14

27 May '14

Hi The subtitle parser for .rt subtitles fails on hh:mm:ss and hh:mm:ss.ff type of timestamps and generally thinks they should all be displayed on the 0-second mark. This only happens when there is no 'end' attribute for the subtitles. For example, the following lines <time begin="01:39.40"/><clear/> It's different now. <time begin="00:02:14.7"/><clear/> Look... parse to [1]: 01:01:39.04 01:01:41.01 {~} It's different now. 00:00:02.00 00:00:08.00 {~} Look... The code is a long chain of sscanf() functions. There are two issues at play here: 1) sscanf sets a1, a2 etc even when the whole line does not match. The lines that try to parse begin/end tags will partially match and set those variables, leading to faulty timestamps. The variables should be reset to zero after each match attempt. 2) The line that tries matching for mm:ss timestamps actually matches more than it is supposed to. The mm:ss.ff and hh:mm:ss.ff lines are never run. Attached is a minimal patch that fixes these two issues. (It moves the problematic match downwards and resets the variables as necessary.) Other concerns relating to the surrounding code: 1) the 'len' variable sits completely unused and can be removed. 2) the timestamp calculation lines (a1*360000+a2*6000+a3*100+a4/10) assume that the fourth value parsed (a4) is in milliseconds. This assumption does not hold: the subtitle files I have are marked in tenths of a second. I'm not sure it can be fixed without rewriting the parsing code. [1] Incidentally, the -dumpjacosub option creates a dumpsub.jss file rather than the dumpsub.js file promised on the man page.

3 5

[PATCH] Expunge printf from vidix/
by Arne Bochem 16 May '14

16 May '14

While tracking down a case of "-really-quiet isn't really quiet" in #mplayer yesterday, I noticed that most vidix related code uses printf instead of mp_msg. The attached patch gets rid of printf in favour of mp_msg. It also adds proper module attribution to a few messages in vidix/ that were missing it (e.g. in vidix/drivers.c). Caveats: Most messages are MSGL_STATUS. This could use some more thought, but it should be an improvement anyway. Also, I can't really test the vidix code, but it compiles and I don't really see how this could have broken anything. Regards, Arne Bochem

3 4

Problems with RLE8 and CRAM encoding in MKV
by Mats Peterson 13 May '14

13 May '14

Hello. I have tried to convert some old AVI files with RLE8 and CRAM encoding to MKV, using "mkvmerge -o <outfile> <infile>". MPlayer has no problems playing the AVI files, however, playing the MKV files results in audio only, with a blank screen. Where lies the problem? In mkvmerge or mplayer? You can find samples at http://alicja.homelinux.com/~mats/stuff/vidsamp/. Mats -- Mats Peterson http://alicja.homelinux.com/~mats/

3 2