December 2005 - 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

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 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]play rmvb file with changing resolution
by 陆然 02 Sep '06

02 Sep '06

Hi, This patch is for some rmvb file that change the resolution during the playing, these video usually made by join two rmvb file together, I've reported the bug to the mplayer-users list and uploaded some sample file to mplayer's ftp. Basicly, I add some code to detect the resolution change from the output of the rmvb codec, if either the width or the height of the movie is changed, just reconfig the vo. I modified the vf.c to realloc a mp_image if the height or the width is changed, I did this only to the TEMP type, I don't know the other types should be changed too, since I don't know how to test if there is any regressions. -- Best Regards, LR

3 2

[PATCH] OSD localization third try
by Paul TT 15 Jun '06

15 Jun '06

patch updated... subject to comments again :-) PaulTT PS: if noone complains, because i already did the changes pointed out to me, i'll commit this tonite, ok?

7 23

[PATCH] Better ARM support for mplayer/ffmpeg, ported from atty fork
by Bernhard Rosenkraenzer 28 May '06

28 May '06

Hi, while playing with some new hardware, I found it's running a forked mplayer -- and it looks like they're following the GPL. The maintainer's page is here: http://atty.jp/?Zaurus/mplayer Unfortunately it's mostly in Japanese, so it's hard to figure out any details. Their code looks quite interesting (at least to those of us w/ ARM CPUs). The patches I've attached are the patches from atty.jp with a couple of modifications by myself: - ported to current CVS - reverted their change of removing SNOW support from ffmpeg - cleaned up their bswap mess - removed DOS-style linebreaks from various files - reverted their moving "audiocodec mad" in front of "audiocodec ffmp3" in codecs.conf The mplayer part contains some hunks that aren't just for arm optimizations (e.g. they put some stuff into demux_audio.c to detect a Xing mp3 header), so this shouldn't be applied blindly. LLaP bero

5 11

[PATCH] CPU detection related
by Zuxy 17 May '06

17 May '06

Hi, cputable.h.diff contains information update, bug fixes and punctuation modifications to the original cputable.h. I suppose there's no reason to reject it:-) cpudetect.h.diff and cpudetect.c.diff together change the original behavior of mplayer: it first determines whether the CPU has a built-in namestring; if so, then the namestring is displayed and codenames in cputable.h aren't used; if not it'll fall back to the original behavior, looking up the cputable.h. I've explained the reasons for the last two patches in another thread. However, I don't go radical by removing cputable.h at all and depending on built-in namestring only, partly because only P4 or newer Intel CPUs have a namestring (all AMD CPUs supporting cpuid support namestring), and in memory of those who have collected all the odd codenames as well:-) The team are to decide whether to apply only cputable.h.diff, or apply all the three. In the latter case mplayer may contain dead codes and data, those that should never be executed or accessed on a commercially available CPU. -- Zuxy Beauty is truth, While truth is beauty. PGP KeyID: E8555ED6

6 23

[PATCH] dvdnav
by Ötvös Attila 08 May '06

08 May '06

Hi All. I am created a patch mplayer and gmplayer to using dvd menu. Implemented: - still frame menu (partially) - spu menu buttons (partially) - can be used mouse with menu selection (partially) - simple light box menu button (new OSDTYPE) - time length of vts domain stream - can be selection the subtitle language with "vobsub_lang" command ('j') - can be dvd menu trought set audio and subtitle languages - new menu item in gmplayer (in gtk menu) - can be set dvd menu languages The patch is big (185 kbyte), hence donwload this about link: http://members.chello.hu/dc/mplayer/ (I am sorry to say that my English knowledge isn't good.) Best regards! Attila

16 106