August 2008 - MPlayer-cvslog - lists.mplayerhq.hu

r27492 - in trunk/libswscale: swscale.c swscale.h
by stefano 29 Aug '08

29 Aug '08

Author: stefano Date: Fri Aug 29 20:23:54 2008 New Revision: 27492 Log: Implement swscale_version(). Modified: trunk/libswscale/swscale.c trunk/libswscale/swscale.h Modified: trunk/libswscale/swscale.c ============================================================================== --- trunk/libswscale/swscale.c (original) +++ trunk/libswscale/swscale.c Fri Aug 29 20:23:54 2008 @@ -73,6 +73,11 @@ untested special converters #include "libavutil/x86_cpu.h" #include "libavutil/bswap.h" +unsigned swscale_version(void) +{ + return LIBSWSCALE_VERSION_INT; +} + #undef MOVNTQ #undef PAVGB Modified: trunk/libswscale/swscale.h ============================================================================== --- trunk/libswscale/swscale.h (original) +++ trunk/libswscale/swscale.h Fri Aug 29 20:23:54 2008 @@ -30,7 +30,7 @@ #include "libavutil/avutil.h" #define LIBSWSCALE_VERSION_MAJOR 0 -#define LIBSWSCALE_VERSION_MINOR 5 +#define LIBSWSCALE_VERSION_MINOR 6 #define LIBSWSCALE_VERSION_MICRO 1 #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \ @@ -43,6 +43,11 @@ #define LIBSWSCALE_IDENT "SwS" AV_STRINGIFY(LIBSWSCALE_VERSION) +/** + * Returns the LIBSWSCALE_VERSION_INT constant. + */ +unsigned swscale_version(void); + /* values for the flags, the stuff on the command line is different */ #define SWS_FAST_BILINEAR 1 #define SWS_BILINEAR 2

1 0

r27491 - trunk/cpudetect.c
by diego 29 Aug '08

29 Aug '08

Author: diego Date: Fri Aug 29 19:44:51 2008 New Revision: 27491 Log: Remove pointless '#if 1 [...] #endif' around has_cpuid() function. Modified: trunk/cpudetect.c Modified: trunk/cpudetect.c ============================================================================== --- trunk/cpudetect.c (original) +++ trunk/cpudetect.c Fri Aug 29 19:44:51 2008 @@ -51,7 +51,6 @@ CpuCaps gCpuCaps; static void check_os_katmai_support( void ); -#if 1 // return TRUE if cpuid supported static int has_cpuid(void) { @@ -81,7 +80,6 @@ static int has_cpuid(void) return a != c; } -#endif static void do_cpuid(unsigned int ax, unsigned int *p)

1 0

r27490 - trunk/configure
by diego 29 Aug '08

29 Aug '08

Author: diego Date: Fri Aug 29 18:20:35 2008 New Revision: 27490 Log: Implement check for closesocket(), needed by libavformat, fixes Bugzilla #1257. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Fri Aug 29 18:20:35 2008 @@ -2894,6 +2894,23 @@ fi echores "$_socklen_t" +echocheck "closesocket()" +_closesocket=no +for header in "arpa/inet.h" "winsock2.h" ; do + cat > $TMPC << EOF +#include <$header> +int main(void) { closesocket(); return 0; } +EOF + cc_check && _closesocket=yes && break +done +if test "$_closesocket" = yes ; then + _def_closesocket='#define HAVE_CLOSESOCKET 1' +else + _def_closesocket='#undef HAVE_CLOSESOCKET' +fi +echores "$_closesocket" + + echocheck "network" # FIXME network check if test "$_network" = yes ; then @@ -8625,6 +8642,9 @@ $_def_socklen_t typedef int socklen_t; #endif +/* closesocket() support */ +$_def_closesocket + /* enables / disables cdparanoia support */ $_def_cdparanoia $_def_cddb

1 0

r27489 - in trunk: command.c libmpcodecs/vd_ffmpeg.c libmpdemux/video.c
by aurel 27 Aug '08

27 Aug '08

Author: aurel Date: Wed Aug 27 13:31:53 2008 New Revision: 27489 Log: handle the lavfpref demuxer in the same way as the lavf one Modified: trunk/command.c trunk/libmpcodecs/vd_ffmpeg.c trunk/libmpdemux/video.c Modified: trunk/command.c ============================================================================== --- trunk/command.c (original) +++ trunk/command.c Wed Aug 27 13:31:53 2008 @@ -1356,6 +1356,7 @@ static int mp_property_sub(m_option_t * if ((mpctx->demuxer->type == DEMUXER_TYPE_MATROSKA || mpctx->demuxer->type == DEMUXER_TYPE_LAVF + || mpctx->demuxer->type == DEMUXER_TYPE_LAVF_PREFERRED || mpctx->demuxer->type == DEMUXER_TYPE_OGG) && d_sub && d_sub->sh && dvdsub_id >= 0) { const char* lang = ((sh_sub_t*)d_sub->sh)->lang; Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c (original) +++ trunk/libmpcodecs/vd_ffmpeg.c Wed Aug 27 13:31:53 2008 @@ -755,7 +755,8 @@ static mp_image_t* decode(sh_video_t *sh avctx->hurry_up=(flags&3)?((flags&2)?2:1):0; - if(sh->ds->demuxer->type != DEMUXER_TYPE_LAVF) + if(sh->ds->demuxer->type != DEMUXER_TYPE_LAVF && + sh->ds->demuxer->type != DEMUXER_TYPE_LAVF_PREFERRED) if( sh->format == mmioFOURCC('R', 'V', '1', '0') || sh->format == mmioFOURCC('R', 'V', '1', '3') || sh->format == mmioFOURCC('R', 'V', '2', '0') Modified: trunk/libmpdemux/video.c ============================================================================== --- trunk/libmpdemux/video.c (original) +++ trunk/libmpdemux/video.c Wed Aug 27 13:31:53 2008 @@ -587,6 +587,7 @@ int video_read_frame(sh_video_t* sh_vide } break; case DEMUXER_TYPE_LAVF: + case DEMUXER_TYPE_LAVF_PREFERRED: if((int)sh_video->fps==1000 || (int)sh_video->fps<=1){ double next_pts = ds_get_next_pts(d_video); double d= (next_pts != MP_NOPTS_VALUE) ? next_pts - d_video->pts : d_video->pts-pts1;

3 2

r27484 - trunk/libmpdemux/demux_lavf.c
by aurel 27 Aug '08

27 Aug '08

Author: aurel Date: Tue Aug 26 23:12:48 2008 New Revision: 27484 Log: prefer libavformat to demux matroska files I can't spot any regression anymore. If you find one, please tell me. Modified: trunk/libmpdemux/demux_lavf.c Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c (original) +++ trunk/libmpdemux/demux_lavf.c Tue Aug 26 23:12:48 2008 @@ -183,6 +183,7 @@ static const char *preferred_list[] = { "mov,mp4,m4a,3gp,3g2,mj2", "mpc", "mpc8", + "matroska", NULL };

4 8

Re: [MPlayer-cvslog] r27484 - trunk/libmpdemux/demux_lavf.c
by Anton Khirnov 27 Aug '08

27 Aug '08

On Wed, 2008-08-27 at 01:47 +0200, Aurelien Jacobs wrote: > Uoti Urpala wrote: > > > On Tue, 2008-08-26 at 23:12 +0200, aurel wrote: > > > Log: > > > prefer libavformat to demux matroska files > > > I can't spot any regression anymore. If you find one, please tell me. > > > > - the timestamp bug causing lost/broken subtitles is still there > > I've no idea of what you're talking about here. > Bugreport somewhere ? Issue 588 on FFmpeg bugtracker. Anton

1 0

r27486 - in trunk/liba52: bitstream.h liba52_changes.diff
by diego 26 Aug '08

26 Aug '08

Author: diego Date: Wed Aug 27 00:38:12 2008 New Revision: 27486 Log: Drop av_always_inline definition. It is duplicated from libavutil and unlikely to make any difference. This reduces the diff to upstream. Modified: trunk/liba52/bitstream.h trunk/liba52/liba52_changes.diff Modified: trunk/liba52/bitstream.h ============================================================================== --- trunk/liba52/bitstream.h (original) +++ trunk/liba52/bitstream.h Wed Aug 27 00:38:12 2008 @@ -26,12 +26,6 @@ */ /* code from ffmpeg/libavcodec */ -#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC_ == 3 && __GNUC_MINOR__ > 0) -# define av_always_inline __attribute__((always_inline)) inline -#else -# define av_always_inline inline -#endif - #if defined(__sparc__) || defined(hpux) /* * the alt bitstream reader performs unaligned memory accesses; that doesn't work @@ -47,7 +41,7 @@ # define unaligned32(a) (*(uint32_t*)(a)) #else # ifdef __GNUC__ -static av_always_inline uint32_t unaligned32(const void *v) { +static inline uint32_t unaligned32(const void *v) { struct Unaligned { uint32_t i; } __attribute__((packed)); @@ -86,7 +80,7 @@ static inline uint32_t unaligned32(const # else # define swab32(x) __generic_swab32(x) - static av_always_inline const uint32_t __generic_swab32(uint32_t x) + static inline const uint32_t __generic_swab32(uint32_t x) { return ((((uint8_t*)&x)[0] << 24) | (((uint8_t*)&x)[1] << 16) | (((uint8_t*)&x)[2] << 8) | (((uint8_t*)&x)[3])); Modified: trunk/liba52/liba52_changes.diff ============================================================================== --- trunk/liba52/liba52_changes.diff (original) +++ trunk/liba52/liba52_changes.diff Wed Aug 27 00:38:12 2008 @@ -75,17 +75,11 @@ --- liba52/bitstream.h 2006-06-12 15:05:07.000000000 +0200 +++ liba52/bitstream.h 2006-06-05 02:23:02.000000000 +0200 -@@ -21,6 +25,48 @@ +@@ -21,6 +25,42 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +/* code from ffmpeg/libavcodec */ -+#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC_ == 3 && __GNUC_MINOR__ > 0) -+# define av_always_inline __attribute__((always_inline)) inline -+#else -+# define av_always_inline inline -+#endif -+ +#if defined(__sparc__) || defined(hpux) +/* + * the alt bitstream reader performs unaligned memory accesses; that doesn't work @@ -101,7 +95,7 @@ +# define unaligned32(a) (*(uint32_t*)(a)) +#else +# ifdef __GNUC__ -+static av_always_inline uint32_t unaligned32(const void *v) { ++static inline uint32_t unaligned32(const void *v) { + struct Unaligned { + uint32_t i; + } __attribute__((packed)); @@ -142,7 +136,7 @@ - (((uint8_t*)&x)[2] << 8) | (((uint8_t*)&x)[3])) - +# define swab32(x) __generic_swab32(x) -+ static av_always_inline const uint32_t __generic_swab32(uint32_t x) ++ static inline const uint32_t __generic_swab32(uint32_t x) + { + return ((((uint8_t*)&x)[0] << 24) | (((uint8_t*)&x)[1] << 16) | + (((uint8_t*)&x)[2] << 8) | (((uint8_t*)&x)[3]));

1 0

r27485 - in trunk/liba52: bitstream.h liba52_changes.diff
by diego 26 Aug '08

26 Aug '08

Author: diego Date: Tue Aug 26 23:29:54 2008 New Revision: 27485 Log: Rename always_inline macro to av_always_inline so as not to clash with with __attribute__((always_inline)) declarations. This fixes the build on Mac OS X 10.4.11. Modified: trunk/liba52/bitstream.h trunk/liba52/liba52_changes.diff Modified: trunk/liba52/bitstream.h ============================================================================== --- trunk/liba52/bitstream.h (original) +++ trunk/liba52/bitstream.h Tue Aug 26 23:29:54 2008 @@ -27,9 +27,9 @@ /* code from ffmpeg/libavcodec */ #if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC_ == 3 && __GNUC_MINOR__ > 0) -# define always_inline __attribute__((always_inline)) inline +# define av_always_inline __attribute__((always_inline)) inline #else -# define always_inline inline +# define av_always_inline inline #endif #if defined(__sparc__) || defined(hpux) @@ -47,7 +47,7 @@ # define unaligned32(a) (*(uint32_t*)(a)) #else # ifdef __GNUC__ -static always_inline uint32_t unaligned32(const void *v) { +static av_always_inline uint32_t unaligned32(const void *v) { struct Unaligned { uint32_t i; } __attribute__((packed)); @@ -86,7 +86,7 @@ static inline uint32_t unaligned32(const # else # define swab32(x) __generic_swab32(x) - static always_inline const uint32_t __generic_swab32(uint32_t x) + static av_always_inline const uint32_t __generic_swab32(uint32_t x) { return ((((uint8_t*)&x)[0] << 24) | (((uint8_t*)&x)[1] << 16) | (((uint8_t*)&x)[2] << 8) | (((uint8_t*)&x)[3])); Modified: trunk/liba52/liba52_changes.diff ============================================================================== --- trunk/liba52/liba52_changes.diff (original) +++ trunk/liba52/liba52_changes.diff Tue Aug 26 23:29:54 2008 @@ -81,9 +81,9 @@ +/* code from ffmpeg/libavcodec */ +#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC_ == 3 && __GNUC_MINOR__ > 0) -+# define always_inline __attribute__((always_inline)) inline ++# define av_always_inline __attribute__((always_inline)) inline +#else -+# define always_inline inline ++# define av_always_inline inline +#endif + +#if defined(__sparc__) || defined(hpux) @@ -101,7 +101,7 @@ +# define unaligned32(a) (*(uint32_t*)(a)) +#else +# ifdef __GNUC__ -+static always_inline uint32_t unaligned32(const void *v) { ++static av_always_inline uint32_t unaligned32(const void *v) { + struct Unaligned { + uint32_t i; + } __attribute__((packed)); @@ -142,7 +142,7 @@ - (((uint8_t*)&x)[2] << 8) | (((uint8_t*)&x)[3])) - +# define swab32(x) __generic_swab32(x) -+ static always_inline const uint32_t __generic_swab32(uint32_t x) ++ static av_always_inline const uint32_t __generic_swab32(uint32_t x) + { + return ((((uint8_t*)&x)[0] << 24) | (((uint8_t*)&x)[1] << 16) | + (((uint8_t*)&x)[2] << 8) | (((uint8_t*)&x)[3]));

1 0

r27483 - trunk/vobsub.c
by reimar 26 Aug '08

26 Aug '08

Author: reimar Date: Tue Aug 26 20:41:04 2008 New Revision: 27483 Log: Fix forumla -> formula in comment Modified: trunk/vobsub.c Modified: trunk/vobsub.c ============================================================================== --- trunk/vobsub.c (original) +++ trunk/vobsub.c Tue Aug 26 20:41:04 2008 @@ -803,8 +803,8 @@ vobsub_parse_origin(vobsub_t *vob, const unsigned int vobsub_palette_to_yuv(unsigned int pal) { int r, g, b, y, u, v; - // Palette in idx file is not rgb value, it was calculated by wrong forumla. - // Here's reversed forumla of the one used to generate palette in idx file. + // Palette in idx file is not rgb value, it was calculated by wrong formula. + // Here's reversed formula of the one used to generate palette in idx file. r = pal >> 16 & 0xff; g = pal >> 8 & 0xff; b = pal & 0xff;

1 0

r27482 - trunk/libao2/ao_oss.c
by ranma 25 Aug '08

25 Aug '08

Author: ranma Date: Sun Aug 24 15:52:54 2008 New Revision: 27482 Log: Fix 'cast from pointer to integer of different size' on 64bit architectures. Casting to long should work for 32bit and 64bit and not make a difference to the boolean operation (since 'format' is always 32bit (int) the upper 32bit of 'arg' won't matter, but the compiler should be happy now. Casting both to unsigned makes sure the compiler isn't messing things up by sign-extending 'format' to 64bit before masking) Modified: trunk/libao2/ao_oss.c Modified: trunk/libao2/ao_oss.c ============================================================================== --- trunk/libao2/ao_oss.c (original) +++ trunk/libao2/ao_oss.c Sun Aug 24 15:52:54 2008 @@ -166,7 +166,7 @@ static int control(int cmd,void *arg){ { int format; if (!ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &format)) - if (format & (int)arg) + if ((unsigned int)format & (unsigned long)arg) return CONTROL_TRUE; return CONTROL_FALSE; }

2 1