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

patch backlog maintenance
by Diego Biurrun 19 Jun '08

19 Jun '08

Folks, I'm awfully overloaded. Could somebody take over the maintenance of the patch backlog that I took over from Attila some time ago? All you need to do is keep track of all unapplied patches in an mbox or something and make it available from time to time. Sending out periodic reminders from time to time is a plus. Thanks Diego

3 13

Synchronization of players in LAN
by J.A. Gutierrez 18 Jun '08

18 Jun '08

Hello I'm trying to synchronise several players running on several computers connected to a dedicated 10/100 Ethernet switch. Each one reads a different movie (video only) from its internal hard disk, and resolution will be 768x576. I'm thinking of a simple solution: - Add some code at mplayer startup so it will wait for an UDP broadcast packet (sent by a central master in the LAN). This way all the players would start at the same time. - Use NTP to keep in sync all the computers' clocks, and trust mplayer's rtc synchronisation feature. With this simple setup, could we be sure all the players would keep the synchronisation? Or should the master computer track them all and take control on their speeds? How difficult would be to add code so all the player synchronise using the LAN? Or should I use some external clock connected to all serial ports? Or use a totally different approach? Thanks. -- finger spd(a)shiva.cps.unizar.es for PGP / .mailcap tip of the day: / La vida es una carcel application/ms-tnef; cat '%s' > /dev/null / con las puertas abiertas text/x-vcard; cat '%s' > /dev/null / (A. Calamaro)

14 40

[PATCH] Use XScreenSaverSuspend if supported
by Ismail Donmez 28 Dec '07

28 Dec '07

Hi, X.org 7.1 will feature a new function called, XScreenSaverSuspend which can suspend/resume screensavers. This is way more better than the current hacks we have. The patch is by Fredrik Höglund ( fredrik at kde.org ), I am proxying for him since he is not subscribed. Please review/comment or just apply :-) Regards, ismail -- <Terwou> \\o \o> <o/ o//

8 29

[PATCH] updated diff for libdvdread-0.9.5
by Emanuele Giaquinta 15 Aug '07

15 Aug '07

Hi, Attached is the patchset for libdvdread, updated for version 0.9.5. -- Emanuele Giaquinta

7 20

[PATCH] disable mediaLib by default and make test Solaris-only
by Derek E. Lewis 13 Jul '07

13 Jul '07

mediaLib has been broken for quite awhile now on Solaris/SPARC in lavc, and will definitely not be fixed before pre8 is released. Whenever a user encodes using lavc they get a 'thick' green-tint in the output file. A similar event takes place when decoding. mediaLib provides no performance gains for x86 -- in reality, it does the opposite. After doing some quick decoding benchmarks[1] between MPlayer binaries /w mediaLib and w/o mediaLib, I calculated that MPlayer is 2.3x faster on Solaris/x86 if one disables mediaLib, which is not the default, now. I've also made mediaLib a Solaris-only test, and updated the ChangeLog to reflect this patch. Thanks, [1] Tests done using `matrixbench_highdivx_ac3.avi' in the testsuite and lavc for decoding. -- Derek E. Lewis dlewis(a)solnetworks.net http://riemann.solnetworks.net/~dlewis

5 13

NOVIRUS Bug 188 - [Patch] add vob subtitle to mencoder.
by ha shao 30 Apr '07

30 Apr '07

Vobsub is quite popular but mencoder don't support it. This patch add the -vobsub -vobsubid to mencode. The codes were mostly copy & paste from mplayer's vobsub sessions (FIXME: tags included). I don't really know what I was doing but it simply works for me. __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com Index: cfg-common.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-common.h,v retrieving revision 1.137 diff -u -r1.137 cfg-common.h --- cfg-common.h 18 Oct 2004 20:41:05 -0000 1.137 +++ cfg-common.h 2 Jan 2005 10:24:51 -0000 @@ -251,6 +251,9 @@ {"sub-bg-alpha", &sub_bg_alpha, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL}, {"sub-no-text-pp", &sub_no_text_pp, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"sub-fuzziness", &sub_match_fuzziness, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL}, + {"vobsub", &vobsub_name, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"vobsubid", &vobsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL}, + #endif #ifdef USE_OSD {"font", &font_name, CONF_TYPE_STRING, 0, 0, 0, NULL}, Index: cfg-mplayer.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v retrieving revision 1.236 diff -u -r1.236 cfg-mplayer.h --- cfg-mplayer.h 27 Dec 2004 19:34:42 -0000 1.236 +++ cfg-mplayer.h 2 Jan 2005 10:24:51 -0000 @@ -327,10 +327,6 @@ {"menu", "OSD menu support was not compiled in.\n", CONF_TYPE_PRINT,0, 0, 0, NULL}, #endif - // these should be moved to -common, and supported in MEncoder - {"vobsub", &vobsub_name, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"vobsubid", &vobsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL}, - {"sstep", &step_sec, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL}, // set a-v distance, should be moved to -common and supported in MEncoder Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.259 diff -u -r1.259 mencoder.c --- mencoder.c 27 Dec 2004 17:30:12 -0000 1.259 +++ mencoder.c 2 Jan 2005 10:24:53 -0000 @@ -196,6 +196,7 @@ float sub_delay=0; float sub_fps=0; int sub_auto = 0; +char *vobsub_name=NULL; int subcc_enabled=0; int suboverlap_enabled = 1; @@ -489,6 +490,28 @@ vo_init_osd(); + //==================== Open VOB-Sub ============================ + if (vobsub_name){ + vo_vobsub=vobsub_open(vobsub_name,spudec_ifo,1,&vo_spudec); + if(vo_vobsub==NULL) + mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,vobsub_name); + }else if(sub_auto && filename && (strlen(filename)>=5)){ + /* try to autodetect vobsub from movie filename ::atmos */ + char *buf = malloc((strlen(filename)-3) * sizeof(char)); + memset(buf,0,strlen(filename)-3); // make sure string is terminated + strncpy(buf, filename, strlen(filename)-4); + vo_vobsub=vobsub_open(buf,spudec_ifo,0,&vo_spudec); + free(buf); + } + + if(vo_vobsub){ + sub_auto=0; // don't do autosub for textsubs if vobsub found + // inited_flags|=INITED_VOBSUB; + vobsub_set_from_lang(vo_vobsub, dvdsub_lang); + // check if vobsub requested only to display forced subtitles + forced_subs_only=vobsub_get_forced_subs_flag(vo_vobsub); + } + stream=open_stream(filename,0,&file_format); if(!stream){ @@ -1131,7 +1154,11 @@ else sscanf(seek_to_sec, "%f", &d); - demux_seek(demuxer, d, 1); + if (demux_seek(demuxer, d, 1)){ + /* FIXME there should be real seeking for vobsub */ + if (vo_vobsub) + vobsub_seek(vo_vobsub, d_video->pts); + } // there is 2 way to handle the -ss option in 3-pass mode: // > 1. do the first pass for the whole file, and use -ss for 2nd/3rd pases only // > 2. do all the 3 passes with the same -ss value @@ -1548,14 +1575,41 @@ // DVD sub: if(vo_spudec||vobsub_writer){ unsigned char* packet=NULL; - int len; - while((len=ds_get_packet_sub(d_dvdsub,&packet))>0){ - mp_msg(MSGT_MENCODER,MSGL_V,"\rDVD sub: len=%d v_pts=%5.3f s_pts=%5.3f \n",len,sh_video->pts,d_dvdsub->pts); - if (vo_spudec) - spudec_assemble(vo_spudec,packet,len,90000*d_dvdsub->pts); - if (vobsub_writer) - vobsub_out_output(vobsub_writer,packet,len,mux_v->timer + d_dvdsub->pts - sh_video->pts); - } + int len, timestamp; + // Get a sub packet from the dvd or a vobsub and make a timestamp relative to sh_video->timer + while(1) { + // FIXME: messed up timer and pts????????? + // Vobsub + if(vo_vobsub) { + if(sh_video->pts+sub_delay>=0) { + len = vobsub_get_packet(vo_vobsub,sh_video->pts+sub_delay,(void**)&packet,&timestamp); + if(len > 0) { + timestamp -= (sh_video->pts + sub_delay - sh_video->timer)*90000; + mp_dbg(MSGT_CPLAYER,MSGL_V,"\rVOB sub: len=%d v_pts=%5.3f v_timer=%5.3f sub=%5.3f ts=%d \n",len,sh_video->pts,sh_video->timer,timestamp / 90000.0,timestamp); + } + } + } else { + // DVD sub + len=ds_get_packet_sub(d_dvdsub,&packet); + if(len > 0) { + float x = d_dvdsub->pts - sh_video->pts; + if (x < -10 || x > 10) // prevent missing subs on pts reset + timestamp = 90000*(sh_video->timer + d_dvdsub->pts + sub_delay - sh_video->pts); + else + timestamp = 90000*(sh_video->timer + sub_delay); + + mp_msg(MSGT_MENCODER,MSGL_V,"\rDVD sub: len=%d v_pts=%5.3f s_pts=%5.3f ts=%d \n",len,sh_video->pts,d_dvdsub->pts,timestamp); + } + } + if (len <= 0 || !packet) break; + if (timestamp < 0) timestamp = 0; + else{ + if (vo_spudec) + spudec_assemble(vo_spudec,packet,len,timestamp); + if (vobsub_writer) + vobsub_out_output(vobsub_writer,packet,len,mux_v->timer + d_dvdsub->pts - sh_video->pts); + } + } if (vo_spudec) { spudec_heartbeat(vo_spudec,90000*sh_video->pts); vo_osd_changed(OSDTYPE_SPU); @@ -1603,6 +1657,11 @@ mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_ErrorWritingFile, out_filename); mencoder_exit(1, NULL); } + +if(vo_vobsub) + vobsub_close(vo_vobsub); + vo_vobsub = NULL; + if(vobsub_writer) vobsub_out_close(vobsub_writer);

5 4

Vidix driver for FX5500
by Pascal Yu 24 Jan '07

24 Jan '07

Hi All, Just subscribed to this mplayer developer list. I'm using mplayer inside GEEXBOX. As Khyron, geexbox developer, suggested I should check the list here for a possible patch.(not asking for a patch) I recently switched to a FX5500 256M card for its SVideo out and possible vidix driver, later found vidix driver doesn't work for this card, only vesa. But the PIII CPU inside the box is not so powerful. Did few changed for nvidia_vid.c and pci.db enabled it to recgonize FX5500, also 256M instead of 128M plus some memory alignment. Added several lines to video filter expand, finished the last two features mentioned in mplayer Doc but missing from its source support, aspect and roundup. This is also a work around fix for some diagonally lines show in some media that I played, I think this issue could be common for NV30 architech or NV34 or NV34B, which my card is. Should I send the modification I made, eveyone interested? Thanks, Pascal

3 2

vidix status??
by Reimar Döffinger 24 Jan '07

24 Jan '07

Hi, I've been trying to sync out vidix with the CVS versions, just to see that some of our files are newer (e.g. unichrome_vid), some are older and some a completely different! And most of the changes are only cosmetics. So what to do about it?? Greetings, Reimar DÃ¶ffinger

5 14

[PATCH] Maintain subtitles in pts order in spudec.c
by Wolfram Gloger 24 Jan '07

24 Jan '07

Hi! I think subtitles in spudec.c should be maintained in start_pts order. E.g. when detecting timestamps and substreams in demux_mpg_open(), a subtitle from near the end of the input file can be read, which subsequently "blocks" the list -- the first packet is never taken in spudec_heartbeat(). Alternatively, demux_mpg_open() could at its end flush the queue with spudec_reset(), but I think the following is also very simple and preferable, because it is also tolerant against subtitles in the wrong order in a broken input file. Regards, Wolfram. diff -urb MPlayer-1.0pre7/spudec.c MPlayer-1.0pre7-wg/spudec.c --- MPlayer-1.0pre7/spudec.c Sat Jan 8 22:06:04 2005 +++ MPlayer-1.0pre7-wg/spudec.c Fri Sep 23 14:19:29 2005 @@ -95,11 +95,22 @@ static void spudec_queue_packet(spudec_handle_t *this, packet_t *packet) { - if (this->queue_head == NULL) + packet_t *last = 0, *p = this->queue_head; + while (p && p->start_pts<packet->start_pts) { + last = p; + p = p->next; + } + if (last) { + packet->next = last->next; + last->next = packet; + if (last == this->queue_tail) + this->queue_tail = packet; + } else { + packet->next = p; this->queue_head = packet; - else - this->queue_tail->next = packet; + if (!p) this->queue_tail = packet; + } } static packet_t *spudec_dequeue_packet(spudec_handle_t *this)

2 3

[PATCH] Various updates to GIF demuxer
by John Koleszar 16 Jan '07

16 Jan '07

Hi, Attached patch adds support for several animated gif features that either weren't supported by or outright crashed mplayer, including variable frame sizes, interlacing, transparency, and some alternative frame update methods. Also fixed a bug extracting timestamps, which was probably introduced by a change in giflib, since the code in question dates back to rev 1.1. Samples (courtesy of gifanimations.com) here: ftp://opensource:opensource@ftp.on2.com/gifanimations_com-samples.tar.bz2 Comments/testing welcome. Cheers, John Index: libmpdemux/demux_gif.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_gif.c,v retrieving revision 1.5 diff -u -r1.5 demux_gif.c --- libmpdemux/demux_gif.c 5 Aug 2005 19:57:46 -0000 1.5 +++ libmpdemux/demux_gif.c 3 Feb 2006 20:50:45 -0000 @@ -19,8 +19,21 @@ #include "stheader.h" #include <gif_lib.h> -static int current_pts = 0; -static unsigned char *pallete = NULL; + +struct gif_priv_s { + GifFileType* gif_hndl; + unsigned char* pallete; + unsigned char* canvas; + unsigned int canvas_sz; +}; +#define gif_hndl (((struct gif_priv_s*)(demuxer->priv))->gif_hndl) +#define pallete (((struct gif_priv_s*)(demuxer->priv))->pallete) +#define canvas (((struct gif_priv_s*)(demuxer->priv))->canvas) +#define canvas_sz (((struct gif_priv_s*)(demuxer->priv))->canvas_sz) + +static int current_pts = 0, + ilace_offset[] = { 0, 4, 2, 1 }, + ilace_jmp[] = { 8, 8, 4, 2 }; #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F') @@ -40,13 +53,16 @@ static int demux_gif_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) { - GifFileType *gif = (GifFileType *)demuxer->priv; + GifFileType *gif = gif_hndl; sh_video_t *sh_video = (sh_video_t *)demuxer->video->sh; GifRecordType type = UNDEFINED_RECORD_TYPE; int len = 0; demux_packet_t *dp = NULL; ColorMapObject *effective_map = NULL; char *buf = NULL; + int trans = 0; + int trans_color = 0; + int reaction = 0; while (type != IMAGE_DESC_RECORD_TYPE) { if (DGifGetRecordType(gif, &type) == GIF_ERROR) { @@ -70,8 +86,13 @@ } if (code == 0xF9) { int frametime = 0; - if (p[0] == 4) // is the length correct? - frametime = (p[1] << 8) | p[2]; // set the time, centiseconds + if (p[0] == 4) { // is the length correct? + frametime = (p[3] << 8) | p[2]; // set the time, centiseconds + reaction = (p[1] >> 2) & 0x3; + // Get transparancy info + trans = p[1] & 0x1; + trans_color = p[4]; + } current_pts += frametime; } else if ((code == 0xFE) && (verbose)) { // comment extension // print iff verbose @@ -103,21 +124,35 @@ } len = gif->Image.Width * gif->Image.Height; - dp = new_demux_packet(len); + dp = new_demux_packet(canvas_sz); buf = malloc(len); memset(buf, 0, len); - memset(dp->buffer, 0, len); + memcpy(dp->buffer, canvas, canvas_sz); - if (DGifGetLine(gif, buf, len) == GIF_ERROR) { - PrintGifError(); - return 0; // oops + if(gif->Image.Interlace) { + int i,j; + for(i = 0; i < 4; i++) { + for(j = ilace_offset[i]; j < gif->Image.Height; j += ilace_jmp[i]) { + if (DGifGetLine(gif, buf + (j * gif->Image.Width), gif->Image.Width) + == GIF_ERROR) + { + PrintGifError(); + return 0; // oops + } + } + } + } else { + if (DGifGetLine(gif, buf, len) == GIF_ERROR) { + PrintGifError(); + return 0; // oops + } } effective_map = gif->Image.ColorMap; if (effective_map == NULL) effective_map = gif->SColorMap; { - int y; + int y,x,width,height; // copy the pallete for (y = 0; y < 256; y++) { @@ -127,15 +162,55 @@ pallete[(y * 4) + 3] = 0; } - for (y = 0; y < gif->Image.Height; y++) { + // Use the canvas w/h as a bounding box for the blit + height = gif->Image.Height; + width = gif->Image.Width; + if(gif->Image.Top + gif->Image.Height > gif->SHeight) + height = gif->SHeight - gif->Image.Top; + if(gif->Image.Left + gif->Image.Width > gif->SWidth) + width = gif->SWidth - gif->Image.Left; + + for (y = 0; y < height; y++) { unsigned char *drow = dp->buffer; unsigned char *gbuf = buf + (y * gif->Image.Width); - drow += gif->Image.Width * (y + gif->Image.Top); + drow += gif->SWidth * (y + gif->Image.Top); drow += gif->Image.Left; - memcpy(drow, gbuf, gif->Image.Width); + if(!trans) { + // No transparancy, can do a fast blit + memcpy(drow, gbuf, width); + } else { + // Do a byte by byte blit for all non transparant pixels. + for (x = 0; x < width; x++) { + if(gbuf[x] != trans_color) + drow[x] = gbuf[x]; + } + } } + + switch(reaction) { + case 1: + // Preserve the current frame contents for the next frame. + memcpy(canvas, dp->buffer, canvas_sz); + break; + case 2: + // Fill the image area with the background color + for (y = 0; y < height; y++) { + unsigned char *drow = canvas; + drow += gif->SWidth * (y + gif->Image.Top); + drow += gif->Image.Left; + memset(drow, gif->SBackGroundColor, width); + } + break; + case 3: + // Preserve the previous frame contents for the next frame. + // No action required. + break; + default: + // Wipe the whole canvas with the background color + memset(canvas, gif->SBackGroundColor, canvas_sz); + } } free(buf); @@ -199,16 +274,19 @@ sh_video->bih->biCompression = sh_video->format; sh_video->bih->biBitCount = 8; sh_video->bih->biPlanes = 2; - pallete = (unsigned char *)(sh_video->bih + 1); + demuxer->priv = malloc(sizeof(struct gif_priv_s)); + pallete = (unsigned char *)(sh_video->bih + 1); + canvas_sz = gif->SWidth * gif->SHeight; + gif_hndl = gif; + canvas = malloc(canvas_sz); + memset(canvas, gif->SBackGroundColor, canvas_sz); - demuxer->priv = gif; - return demuxer; } static void demux_close_gif(demuxer_t* demuxer) { - GifFileType *gif = (GifFileType *)demuxer->priv; + GifFileType *gif = gif_hndl; if(!gif) return; @@ -217,6 +295,8 @@ PrintGifError(); demuxer->stream->fd = 0; + if(demuxer->priv) + free(demuxer->priv); demuxer->priv = NULL; }

4 12