February 2008 - 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] Fix vf_expand in with non-direct caps
by Pascal Massimino 31 May '08

31 May '08

Hi, attached patch makes sure vf_expand is dealing with direct-capable image before trying to use direct rendering for expanding. I've seen this problem with encoding, where the codec's replicated edges could be made visible upon expansion. skal

2 3

[PATCH] Video mixer with mencoder Part 5/1
by Ötvös Attila 29 May '08

29 May '08

Hi All! This patch is big because download from: http://onebithq.com/root/mplayer/videomixer/download/20080102 Patch file: stream.patch Depend: none I rewrited my shmem stream handle and new pipe mode to sync read/write: stream_shmem.c I create raw video and raw audio encoder to shmem (based ae_pcm & ve_raw): ae_shmem.c and ve_shmem.c I create muxer and demuxer to shmem stream: muxer_shmem.c and demux_shmem.c The mencoder can encoding video/audio to shmem. The mencoder or mplayer can read from shmem. Example: mencoder file.avi -o shmem://1 mplyer shmem://1 Best regards! Attila

2 1

[PATCH] mpvdec move from global var to sh_video_t
by Ötvös Attila 29 May '08

29 May '08

Hi All! This my simple patch moved mpvdec (vd_functions_t) from global var (vd.c) to sh_video_t (stheader.h). Best regards. Attila

2 1

[PATCH] SSE2 optimizations for libmpeg2
by Diego Biurrun 13 Apr '08

13 Apr '08

I found this patch on the libmpeg2 mailing list, here it is, slightly adapted and cleaned up. I could only test compilation without SSE2 as I don't have a SSE2 processor. I'd be happy to hear about test results and benchmarks. Diego

6 20

Add support for vorbis.acm
by Zuxy Meng 10 Apr '08

10 Apr '08

Hi, Quite a few people have problems like "Cannot find codec for audio format 0x6771." Such avi files turn out to have been encoded with an old codec whose binary and source can be found at http://svn.xiph.org/tags/vorbis/vorbisacm_20020708/. The attached patch enables mplayer to play at least some of them, like ftp://upload.mplayerhq.hu/MPlayer/samples/avi/ogg/mode2_ogg.avi. But mode3_ogg.avi seems still broken. -- Zuxy Beauty is truth, While truth is beauty. PGP KeyID: E8555ED6

3 10

Make ffmpeg MPEG1/2 decoder the default?
by Reimar Döffinger 20 Mar '08

20 Mar '08

Hello, libmpeg2 may be still slightly faster (though probably not on the newer CPUs), but it is quite crash-happy and otherwise buggy (see also 34582.mxf in incoming). Thus I am for making FFmpeg decoder the default, any objections? Greetings, Reimar Döffinger

19 55

[PATCH] mmap support for OS/2
by KO Myung-Hun 16 Mar '08

16 Mar '08

Hi/2. This patch add a simple mmap support for OS/2. -- KO Myung-Hun Using Mozilla SeaMonkey 1.1.8 Under OS/2 Warp 4 for Korean with FixPak #15 On AMD ThunderBird 750 MHz with 512 MB RAM Korean OS/2 User Community : http://www.ecomstation.co.kr Index: osdep/mmap.h =================================================================== --- osdep/mmap.h (revision 0) +++ osdep/mmap.h (revision 0) @@ -0,0 +1,73 @@ +/* + * mmap.h : mmap declaration header for sys/mman.h missing system + * + * Copyright (c) 2008 KO Myung-Hun (komh(a)chollian.net) + * + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MMAP_H +#define MMAP_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* + * Protections are chosen from these bits, or-ed together + */ +#define PROT_NONE 0x00 /* no permissions */ +#define PROT_READ 0x01 /* pages can be read */ +#define PROT_WRITE 0x02 /* pages can be written */ +#define PROT_EXEC 0x04 /* pages can be executed */ + +/* + * Flags contain sharing type and options. + * Sharing types; choose one. + */ +#define MAP_SHARED 0x0001 /* share changes */ +#define MAP_PRIVATE 0x0002 /* changes are private */ +#define MAP_FIXED 0x0010 /* map addr must be exactly as requested */ + +/* + * Mapping type + */ +#define MAP_ANON 0x1000 /* allocated from memory, swap space */ + +/* MAP_FAILED is defined in config.h */ +#if 0 +/* + * Error return from mmap() + */ +#ifndef MAP_FAILED +#define MAP_FAILED ((void *)-1) +#endif +#endif + +#ifndef _MMAP_DECLARED +#define _MMAP_DECLARED +void *mmap( void *addr, size_t len, int prot, int flags, int fildes, off_t off ); +#endif +int munmap( void *addr, size_t len ); +int mprotect( void *addr, size_t len, int prot ); + +#ifdef __cplusplus +} +#endif + +#endif + Index: osdep/mmap-os2.c =================================================================== --- osdep/mmap-os2.c (revision 0) +++ osdep/mmap-os2.c (revision 0) @@ -0,0 +1,212 @@ +/* + * mmap-os2.c : Very simple implementation of mmap function for OS/2 + * + * Copyright (c) 2008 KO Myung-Hun (komh(a)chollian.net) + * + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#define INCL_DOS +#include <os2.h> + +#include <stdio.h> +#include <stdlib.h> +#include <io.h> +#include <sys/types.h> + +#include "config.h" +#include "mmap.h" +#include "mmap_anon.h" + +struct os2_mmap_s; +typedef struct os2_mmap_s +{ + void *addr; + size_t len; + int flags; + struct os2_mmap_s *prev; + struct os2_mmap_s *next; +} os2_mmap; +static os2_mmap *_mmap = NULL; + +void *mmap( void *addr, size_t len, int prot, int flags, int fildes, off_t off ) +{ + os2_mmap *new_mmap; + + ULONG fl; + ULONG rc; + + void *ret; + + if( prot & PROT_WRITE ) + { + if( flags & MAP_SHARED ) + return MAP_FAILED; + + if( !( flags & MAP_PRIVATE )) + return MAP_FAILED; + } + + if( flags & MAP_FIXED ) + { + ULONG cb; + + cb = len; + rc = DosQueryMem( addr, &cb, &fl ); + if( rc || ( cb < len )) + return MAP_FAILED; + + rc = DosSetMem( addr, len, fPERM ); + if( rc ) + return MAP_FAILED; + + ret = addr; + } + else + { + // Allocate tiled memory compatible with 16-bit selectors + // 'fs_seg' in 'ldt_keeper.c' need this attr + rc = DosAllocMem( &ret, len, fALLOC ); + if( rc ) + return MAP_FAILED; + } + + new_mmap = ( os2_mmap * )malloc( sizeof( os2_mmap )); + new_mmap->addr = ret; + new_mmap->len = len; + new_mmap->flags = flags; + new_mmap->prev = _mmap; + new_mmap->next = NULL; + + if( _mmap ) + _mmap->next = new_mmap; + _mmap = new_mmap; + + if( !( flags & MAP_ANON )) + { + int pos; + + /* Now read in the file */ + if(( pos = lseek( fildes, off, SEEK_SET )) == -1) + { + munmap( ret, len ); + + return MAP_FAILED; + } + + read( fildes, ret, len ); + lseek( fildes, pos, SEEK_SET ); /* Restore the file pointer */ + } + + fl = 0; + + if( prot & PROT_READ ) + fl |= PAG_READ; + + if( prot & PROT_WRITE ) + fl |= PAG_WRITE; + + if( prot & PROT_EXEC ) + fl |= PAG_EXECUTE; + + if( prot & PROT_NONE ) + fl |= PAG_GUARD; + + rc = DosSetMem( ret, len, fl ); + if( rc ) + { + munmap( ret, len ); + + return MAP_FAILED; + } + + return ret; +} + +int munmap( void *addr, size_t len ) +{ + os2_mmap *mm; + + for( mm = _mmap; mm; mm = mm->prev ) + { + if( mm->addr == addr ) + break; + } + + if( mm ) + { + + if( !( mm->flags & MAP_FIXED )) + DosFreeMem( addr ); + + if( mm->next ) + mm->next->prev = mm->prev; + + if( mm->prev ) + mm->prev->next = mm->next; + + if( _mmap == mm ) + _mmap = mm->prev; + + free( mm ); + + return 0; + } + + return -1; +} + +int mprotect( void *addr, size_t len, int prot ) +{ + os2_mmap *mm; + + for( mm = _mmap; mm; mm = mm->prev ) + { + if( mm->addr == addr ) + break; + } + + if( mm ) + { + ULONG fl; + + fl = 0; + + if( prot & PROT_READ ) + fl |= PAG_READ; + + if( prot & PROT_WRITE ) + fl |= PAG_WRITE; + + if( prot & PROT_EXEC ) + fl |= PAG_EXECUTE; + + if( prot & PROT_NONE ) + fl |= PAG_GUARD; + + if( DosSetMem( addr, len, fl ) == 0 ) + return 0; + } + + return -1; +} + +void *mmap_anon( void *addr, size_t len, int prot, int flags, off_t off ) +{ + return mmap( addr, len, prot, flags | MAP_ANON, -1, off ); +} + Index: osdep/Makefile =================================================================== --- osdep/Makefile (revision 26091) +++ osdep/Makefile (working copy) @@ -27,8 +27,16 @@ ifeq ($(TARGET_OS),OS/2) getch = getch2-os2.c endif + +ifneq ($(HAVE_SYS_MMAN_H),yes) +ifeq ($(TARGET_OS),OS/2) +mmap = mmap-os2.c +endif +endif + SRCS_COMMON += $(timer) SRCS_COMMON += $(getch) +SRCS_COMMON += $(mmap) include ../mpcommon.mak

4 12

[PATCH] Win32 loader for OS/2
by KO Myung-Hun 10 Mar '08

10 Mar '08

Hi/2. These patches enable Win32 loader support for OS/2 -- KO Myung-Hun Using Mozilla SeaMonkey 1.1.8 Under OS/2 Warp 4 for Korean with FixPak #15 On AMD ThunderBird 750 MHz with 512 MB RAM Korean OS/2 User Community : http://www.ecomstation.co.kr Index: loader/dmo/DMO_VideoDecoder.c =================================================================== --- loader/dmo/DMO_VideoDecoder.c (revision 26108) +++ loader/dmo/DMO_VideoDecoder.c (working copy) @@ -39,7 +39,7 @@ #include <fcntl.h> #include <errno.h> #include <sys/types.h> -#ifndef __MINGW32__ +#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif #include <stdio.h> Index: loader/ext.c =================================================================== --- loader/ext.c (revision 26108) +++ loader/ext.c (working copy) @@ -18,13 +18,18 @@ #include <malloc.h> #endif #include <unistd.h> +#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> +#endif #include <errno.h> #include <fcntl.h> #include <string.h> #include <stdarg.h> #include <ctype.h> +#ifndef HAVE_SYS_MMAN_H +#include "osdep/mmap.h" +#endif #include "osdep/mmap_anon.h" #include "wine/windef.h" #include "wine/winbase.h" Index: loader/wrapper.S =================================================================== --- loader/wrapper.S (revision 26108) +++ loader/wrapper.S (working copy) @@ -1,4 +1,4 @@ -.section .data + .data .globl caller_return caller_return: .long 0 @@ -12,7 +12,7 @@ wrapper_target: .long null_call -.section .text + .text .globl null_call .type null_call, @function .balign 16,0x90 Index: loader/win32.c =================================================================== --- loader/win32.c (revision 26108) +++ loader/win32.c (working copy) @@ -68,7 +68,11 @@ #include <kstat.h> #endif +#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> +#else +#include "osdep/mmap.h" +#endif #include "osdep/mmap_anon.h" #if HAVE_VSSCANF Index: loader/dshow/DS_VideoDecoder.c =================================================================== --- loader/dshow/DS_VideoDecoder.c (revision 26108) +++ loader/dshow/DS_VideoDecoder.c (working copy) @@ -39,7 +39,7 @@ #include <fcntl.h> #include <errno.h> #include <sys/types.h> -#ifndef __MINGW32__ +#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif #include <stdio.h> Index: loader/pe_image.c =================================================================== --- loader/pe_image.c (revision 26108) +++ loader/pe_image.c (working copy) @@ -51,6 +51,8 @@ #include <fcntl.h> #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> +#else +#include "osdep/mmap.h" #endif #include "wine/windef.h" #include "wine/winbase.h" Index: loader/ldt_keeper.c =================================================================== --- loader/ldt_keeper.c (revision 26108) +++ loader/ldt_keeper.c (working copy) @@ -23,10 +23,15 @@ #include <stdlib.h> #include <errno.h> #include <fcntl.h> +#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> +#endif #include <sys/types.h> #include <stdio.h> #include <unistd.h> +#ifndef HAVE_SYS_MMAN_H +#include "osdep/mmap.h" +#endif #include "osdep/mmap_anon.h" #include "mp_msg.h" #include "help_mp.h" @@ -105,8 +110,13 @@ #endif +#ifndef __OS2__ /* user level (privilege level: 3) ldt (1<<2) segment selector */ #define LDT_SEL(idx) ((idx) << 3 | 1 << 2 | 3) +#else +/* we converted flat to sel already, so just return itself */ +#define LDT_SEL(sel) (sel) +#endif /* i got this value from wine sources, it's the first free LDT entry */ #if (defined(__APPLE__) || defined(__FreeBSD__)) && defined(LDT_AUTO_ALLOC) @@ -276,6 +286,11 @@ } #endif +#ifdef __OS2__ + /* convert flat addr to sel */ + fs_ldt = ( unsigned int )(( unsigned long )fs_seg >> 13 | 7 ); +#endif + Setup_FS_Segment(); ldt_fs->prev_struct = malloc(8); Index: loader/module.c =================================================================== --- loader/module.c (revision 26108) +++ loader/module.c (working copy) @@ -26,7 +26,9 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> +#endif #include <inttypes.h> #include "wine/windef.h" @@ -742,6 +744,48 @@ #ifdef EMU_QTX_API +#ifdef __OS2__ +uint32_t _System DosQueryMem( void *, uint32_t *, uint32_t * ); + +static int isValidPtr( void *p ) +{ + uint32_t cb = 1; + uint32_t fl; + + if( DosQueryMem( p, &cb, &fl )) + return 0; + +#ifdef DEBUG_QTX_API + printf("addr = %p, cb = %d, fl = %08X : ", p, cb, fl ); + if( fl & 0x10 ) + printf("COMMIT "); + if( fl & 0x2000 ) + printf("SHARED "); + if( fl & 0x4000 ) + printf("FREE "); + if( fl & 0x10000 ) + printf("BASE "); + if( fl & 0x01 ) + printf("READ "); + if( fl & 0x02 ) + printf("WRITE "); + if( fl & 0x04 ) + printf("EXEC "); + if( fl & 0x08 ) + printf("GUARD "); + printf("\n"); +#endif + + // Occasionally, ptr with 'EXEC' attr is passed. + // On OS/2, however, malloc() never set 'EXEC' attr. + // So ptr with 'EXEC' attr is invalid. + if( fl & 0x04 ) + return 0; + + return 1; +} +#endif + static uint32_t ret_array[4096]; static int ret_i=0; @@ -756,6 +800,7 @@ int plen=-1; // find the code: +#ifndef __OS2__ dptr=0x62b67ae0;dptr+=2*((reg->eax>>16)&255); // printf("FUNC: flag=%d ptr=%p\n",dptr[0],dptr[1]); if(dptr[0]&255){ @@ -790,6 +835,7 @@ pwrapper=dptr[1]; } } +#endif for(i=0;qt_fv_list[i].name;i++){ if(qt_fv_list[i].id==reg->eax){ @@ -842,7 +888,11 @@ #endif return 1; case 0x15002f: //DisposePtr +#ifndef __OS2__ if(((uint32_t *)stack_base)[1]>=0x60000000) +#else + if( !isValidPtr((void *)((uint32_t *)stack_base)[1])) +#endif printf("WARNING! Invalid Ptr handle!\n"); else free((void *)((uint32_t *)stack_base)[1]); Index: loader/wrapper.h =================================================================== --- loader/wrapper.h (revision 26108) +++ loader/wrapper.h (working copy) @@ -9,12 +9,12 @@ typedef int (*wrapper_func_t)(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags); -extern wrapper_func_t report_entry, report_ret; +extern wrapper_func_t report_entry __asm__("report_entry"), report_ret __asm__("report_ret"); -extern void (*wrapper_target)(void); +extern void (*wrapper_target)(void) __asm__("wrapper_target"); -extern int wrapper(void); -extern int null_call(void); +extern int wrapper(void) __asm__("wrapper"); +extern int null_call(void) __asm__("null_call"); #endif /* MPLAYER_WRAPPER_H */ Index: loader/Makefile =================================================================== --- loader/Makefile (revision 26108) +++ loader/Makefile (working copy) @@ -35,6 +35,11 @@ CFLAGS+=-fno-omit-frame-pointer $(CFLAG_NO_OMIT_LEAF_FRAME_POINTER) +ifeq ($(TARGET_OS),OS/2) +wrapper.o : wrapper.S + $(CC) -Zomf -c -o $@ $^ +endif + TEST_OBJS = $(LIBNAME_COMMON) ../cpudetect.o ../mp_msg.o ../mp_fifo.o ../osdep/libosdep.a TEST_LDFLAGS = -ltermcap -ldl -lm -lpthread -g

4 13