September 2010 - MPlayer-cvslog - lists.mplayerhq.hu

r32408 - trunk/configure
by reimar 29 Sep '10

29 Sep '10

Author: reimar Date: Wed Sep 29 20:26:12 2010 New Revision: 32408 Log: Allow configure to accept nasm instead of yasm again. Still does not build since nasm can not find config.asm without specifying its full path or adding a / at then end of the include path. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Wed Sep 29 20:10:25 2010 (r32407) +++ trunk/configure Wed Sep 29 20:26:12 2010 (r32408) @@ -2701,13 +2701,15 @@ if test -z "$YASMFLAGS" ; then else objformat="elf" fi + yasmdefines="" # currently tested for Linux x86, x86_64 + test "$pic" = "yes" && yasmdefines="$yasmdefines -DPIC" + test -n "$extern_prefix" && yasmdefines="$yasmdefines -DPREFIX" + YASMFLAGS="-f $objformat" x86_64 && YASMFLAGS="$YASMFLAGS -m amd64" - test "$pic" = "yes" && YASMFLAGS="$YASMFLAGS -DPIC" case "$objformat" in elf) test $_debug && YASMFLAGS="$YASMFLAGS -g dwarf2" ;; - *) YASMFLAGS="$YASMFLAGS -DPREFIX" ;; esac else warn_cflags=yes @@ -2715,7 +2717,16 @@ fi echo "pabsw xmm0, xmm0" > $TMPS if test "$_yasm" ; then - yasm_check || die "yasm not found, use --yasm='' if you really want to compile without" + if ! yasm_check ; then + if x86_64 ; then + case "$objformat" in + elf) objformat=elf64 ;; + win32) objformat=win64 ;; + esac + fi + YASMFLAGS="-f $objformat $yasmdefines" + yasm_check || die "yasm not found, use --yasm='' if you really want to compile without" + fi fi if test $_yasm ; then def_yasm='#define HAVE_YASM 1'

1 0

r32407 - trunk/configure
by reimar 29 Sep '10

29 Sep '10

Author: reimar Date: Wed Sep 29 20:10:25 2010 New Revision: 32407 Log: Remove -DARCH_X86_64 from YASMFLAGS, that define is already in config.asm Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Wed Sep 29 20:05:27 2010 (r32406) +++ trunk/configure Wed Sep 29 20:10:25 2010 (r32407) @@ -2703,7 +2703,7 @@ if test -z "$YASMFLAGS" ; then fi # currently tested for Linux x86, x86_64 YASMFLAGS="-f $objformat" - x86_64 && YASMFLAGS="$YASMFLAGS -DARCH_X86_64 -m amd64" + x86_64 && YASMFLAGS="$YASMFLAGS -m amd64" test "$pic" = "yes" && YASMFLAGS="$YASMFLAGS -DPIC" case "$objformat" in elf) test $_debug && YASMFLAGS="$YASMFLAGS -g dwarf2" ;;

1 0

r32406 - in trunk: Makefile configure
by reimar 29 Sep '10

29 Sep '10

Author: reimar Date: Wed Sep 29 20:05:27 2010 New Revision: 32406 Log: config.asm should be generate in ffmpeg/, not the root. Modified: trunk/Makefile trunk/configure Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Wed Sep 29 18:15:42 2010 (r32405) +++ trunk/Makefile Wed Sep 29 20:05:27 2010 (r32406) @@ -993,7 +993,7 @@ distclean: clean testsclean toolsclean d -rm -f config.* codecs.conf.h help_mp.h version.h TAGS tags -rm -f $(VIDIX_PCI_FILES) -rm -f $(call ADD_ALL_EXESUFS,codec-cfg cpuinfo) - -rm -f ffmpeg/libavutil/avconfig.h ffmpeg/config.mak + -rm -f ffmpeg/libavutil/avconfig.h ffmpeg/config.* doxygen: doxygen DOCS/tech/Doxyfile Modified: trunk/configure ============================================================================== --- trunk/configure Wed Sep 29 18:15:42 2010 (r32405) +++ trunk/configure Wed Sep 29 20:05:27 2010 (r32406) @@ -8839,7 +8839,7 @@ for part in $arch $subarch; do echo "%define ARCH_${part}" >> "$TMPS" done -cmp -s "$TMPS" config.asm || mv -f "$TMPS" config.asm +cmp -s "$TMPS" ffmpeg/config.asm || mv -f "$TMPS" ffmpeg/config.asm fi

1 0

r32399 - in trunk: . Makefile common.mak configure subdir.mak
by diego 28 Sep '10

28 Sep '10

Author: diego Date: Tue Sep 28 22:46:19 2010 New Revision: 32399 Log: Use a single svn:externals declaration for all of FFmpeg. This avoids duplicating parts of the FFmpeg build system locally, which is a brittle and maintenance-heavy process. Deleted: trunk/common.mak trunk/subdir.mak Modified: trunk/ (props changed) trunk/Makefile trunk/configure Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Tue Sep 28 22:40:28 2010 (r32398) +++ trunk/Makefile Tue Sep 28 22:46:19 2010 (r32399) @@ -717,12 +717,12 @@ SRCS_MENCODER = mencoder.c \ $(SRCS_MENCODER-yes) -COMMON_LIBS-$(FFMPEG_A) += libavformat/libavformat.a \ - libavcodec/libavcodec.a \ - libavcore/libavcore.a \ - libavutil/libavutil.a \ - libpostproc/libpostproc.a \ - libswscale/libswscale.a +COMMON_LIBS-$(FFMPEG_A) += ffmpeg/libavformat/libavformat.a \ + ffmpeg/libavcodec/libavcodec.a \ + ffmpeg/libavcore/libavcore.a \ + ffmpeg/libavutil/libavutil.a \ + ffmpeg/libpostproc/libpostproc.a \ + ffmpeg/libswscale/libswscale.a COMMON_LIBS += $(COMMON_LIBS-yes) OBJS_COMMON += $(addsuffix .o, $(basename $(SRCS_COMMON))) @@ -754,24 +754,24 @@ DIRS = . \ libaf \ libao2 \ libass \ - libavcodec \ - libavcodec/alpha \ - libavcodec/arm \ - libavcodec/bfin \ - libavcodec/mlib \ - libavcodec/ppc \ - libavcodec/sh4 \ - libavcodec/sparc \ - libavcodec/x86 \ - libavcore \ - libavformat \ - libavutil \ - libavutil/arm \ - libavutil/bfin \ - libavutil/ppc \ - libavutil/sh4 \ - libavutil/tomi \ - libavutil/x86 \ + ffmpeg/libavcodec \ + ffmpeg/libavcodec/alpha \ + ffmpeg/libavcodec/arm \ + ffmpeg/libavcodec/bfin \ + ffmpeg/libavcodec/mlib \ + ffmpeg/libavcodec/ppc \ + ffmpeg/libavcodec/sh4 \ + ffmpeg/libavcodec/sparc \ + ffmpeg/libavcodec/x86 \ + ffmpeg/libavcore \ + ffmpeg/libavformat \ + ffmpeg/libavutil \ + ffmpeg/libavutil/arm \ + ffmpeg/libavutil/bfin \ + ffmpeg/libavutil/ppc \ + ffmpeg/libavutil/sh4 \ + ffmpeg/libavutil/tomi \ + ffmpeg/libavutil/x86 \ libdvdcss \ libdvdnav \ libdvdnav/vm \ @@ -783,12 +783,12 @@ DIRS = . \ libmpdemux \ libmpeg2 \ libpostproc \ - libswscale \ - libswscale/bfin \ - libswscale/mlib \ - libswscale/ppc \ - libswscale/sparc \ - libswscale/x86 \ + ffmpeg/libswscale \ + ffmpeg/libswscale/bfin \ + ffmpeg/libswscale/mlib \ + ffmpeg/libswscale/ppc \ + ffmpeg/libswscale/sparc \ + ffmpeg/libswscale/x86 \ libvo \ loader \ loader/dshow \ @@ -817,8 +817,8 @@ FFMPEGPARTS = libavcodec \ libpostproc \ libswscale \ -FFMPEGLIBS = $(foreach part, $(FFMPEGPARTS), $(part)/$(part).a) -FFMPEGFILES = $(foreach part, $(FFMPEGPARTS), $(wildcard $(part)/*.[chS] $(part)/*/*.[chS])) +FFMPEGLIBS = $(foreach part, $(FFMPEGPARTS), ffmpeg/$(part)/$(part).a) +FFMPEGFILES = $(foreach part, $(FFMPEGPARTS), $(wildcard ffmpeg/$(part)/*.[chS] ffmpeg/$(part)/*/*.[chS])) @@ -853,7 +853,7 @@ mencoder$(EXESUF) mplayer$(EXESUF): $(CC) -o $@ $^ $(EXTRALIBS) codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h - $(HOST_CC) -O -DCODECS2HTML -I. -o $@ $< + $(HOST_CC) -O -DCODECS2HTML -I. -Iffmpeg -o $@ $< codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf ./$^ > $@ @@ -990,10 +990,10 @@ clean: distclean: clean testsclean toolsclean driversclean dhahelperclean -rm -rf DOCS/tech/doxygen -rm -f $(call ADD_ALL_DIRS,/*.d) - -rm -f config.log config.mak config.h codecs.conf.h help_mp.h \ - version.h $(VIDIX_PCI_FILES) TAGS tags + -rm -f config.* codecs.conf.h help_mp.h version.h TAGS tags + -rm -f $(VIDIX_PCI_FILES) -rm -f $(call ADD_ALL_EXESUFS,codec-cfg cpuinfo) - -rm -f libavutil/avconfig.h + -rm -f ffmpeg/libavutil/avconfig.h ffmpeg/config.mak doxygen: doxygen DOCS/tech/Doxyfile @@ -1011,14 +1011,14 @@ tags: TEST_OBJS = mp_msg.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h help_mp.h $(TEST_OBJS) - $(CC) -I. -DTESTING -o $@ $^ + $(CC) -I. -Iffmpeg -DTESTING -o $@ $^ codecs2html$(EXESUF): codec-cfg.c help_mp.h $(TEST_OBJS) - $(CC) -I. -DCODECS2HTML -o $@ $^ + $(CC) -I. -Iffmpeg -DCODECS2HTML -o $@ $^ libvo/aspecttest$(EXESUF): libvo/aspect.o libvo/geometry.o $(TEST_OBJS) -LOADER_TEST_OBJS = $(SRCS_WIN32_EMULATION:.c=.o) $(SRCS_QTX_EMULATION:.S=.o) libavutil/libavutil.a osdep/mmap_anon.o cpudetect.o path.o $(TEST_OBJS) +LOADER_TEST_OBJS = $(SRCS_WIN32_EMULATION:.c=.o) $(SRCS_QTX_EMULATION:.S=.o) ffmpeg/libavutil/libavutil.a osdep/mmap_anon.o cpudetect.o path.o $(TEST_OBJS) loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): CFLAGS += -g loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): $(LOADER_TEST_OBJS) @@ -1058,7 +1058,7 @@ toolsclean: TOOLS/bmovl-test$(EXESUF): -lSDL_image TOOLS/subrip$(EXESUF): vobsub.o spudec.o unrar_exec.o libvo/aclib.o \ - libswscale/libswscale.a libavutil/libavutil.a $(TEST_OBJS) + ffmpeg/libswscale/libswscale.a ffmpeg/libavutil/libavutil.a $(TEST_OBJS) TOOLS/vfw2menc$(EXESUF): -lwinmm -lole32 Modified: trunk/configure ============================================================================== --- trunk/configure Tue Sep 28 22:40:28 2010 (r32398) +++ trunk/configure Tue Sep 28 22:46:19 2010 (r32399) @@ -583,22 +583,22 @@ _libavcodec_mpegaudio_hp=yes _libopencore_amrnb=auto _libopencore_amrwb=auto libopenjpeg=auto -libavdecoders_all=$(sed -n 's/^[^#]*DEC.*(.*, *$.*$).*/\1_decoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') +libavdecoders_all=$(sed -n 's/^[^#]*DEC.*(.*, *$.*$).*/\1_decoder/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') libavdecoders=$(echo $libavdecoders_all | sed -e 's/ LIB[A-Z0-9_]*_DECODER//g') -libavencoders_all=$(sed -n 's/^[^#]*ENC.*(.*, *$.*$).*/\1_encoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') +libavencoders_all=$(sed -n 's/^[^#]*ENC.*(.*, *$.*$).*/\1_encoder/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') libavencoders=$(echo $libavencoders_all | sed -e 's/ LIB[A-Z0-9_]*_ENCODER//g' -e s/AAC_ENCODER//) -libavparsers_all=$(sed -n 's/^[^#]*PARSER.*(.*, *$.*$).*/\1_parser/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') +libavparsers_all=$(sed -n 's/^[^#]*PARSER.*(.*, *$.*$).*/\1_parser/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') libavparsers=$libavparsers_all -libavbsfs_all=$(sed -n 's/^[^#]*BSF.*(.*, *$.*$).*/\1_bsf/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') +libavbsfs_all=$(sed -n 's/^[^#]*BSF.*(.*, *$.*$).*/\1_bsf/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') libavbsfs=$libavbsfs_all -libavhwaccels_all=$(sed -n 's/^[^#]*HWACCEL.*(.*, *$.*$).*/\1_hwaccel/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') +libavhwaccels_all=$(sed -n 's/^[^#]*HWACCEL.*(.*, *$.*$).*/\1_hwaccel/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') # Disable all hardware accelerators for now. libavhwaccels= -libavdemuxers_all=$(sed -n 's/^[^#]*DEMUX.*(.*, *$.*$).*/\1_demuxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]') +libavdemuxers_all=$(sed -n 's/^[^#]*DEMUX.*(.*, *$.*$).*/\1_demuxer/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]') libavdemuxers=$(echo $libavdemuxers_all | sed -e 's/ LIB[A-Z0-9_]*_DEMUXER//g' -e s/REDIR_DEMUXER// -e s/AVISYNTH_DEMUXER//) -libavmuxers_all=$(sed -n 's/^[^#]*_MUX.*(.*, *$.*$).*/\1_muxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]') +libavmuxers_all=$(sed -n 's/^[^#]*_MUX.*(.*, *$.*$).*/\1_muxer/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]') libavmuxers=$(echo $libavmuxers_all | sed -e 's/ LIB[A-Z0-9_]*_MUXER//g' -e s/RTP_MUXER// -e s/RTSP_MUXER//) -libavprotocols_all=$(sed -n 's/^[^#]*PROTOCOL.*(.*, *$.*$).*/\1_protocol/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]') +libavprotocols_all=$(sed -n 's/^[^#]*PROTOCOL.*(.*, *$.*$).*/\1_protocol/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]') libavprotocols=$libavprotocols_all _mencoder=yes _mplayer=yes @@ -1476,7 +1476,7 @@ else # if test -z "$_target" fi fi -extra_cflags="-I. $extra_cflags" +extra_cflags="-I. -Iffmpeg $extra_cflags" _timer=timer-linux.c _getch=getch2.c if freebsd ; then @@ -6934,11 +6934,11 @@ echores "$_librtmp" echocheck "FFmpeg" -test -d libavutil || +test -d ffmpeg/libavutil || die "MPlayer will not compile without libavutil in the source tree." ffmpeg=no if test "$ffmpeg_a" = auto ; then - test -d libavcore && ffmpeg_a=yes && ffmpeg=yes + test -d ffmpeg/libavcore && ffmpeg_a=yes && ffmpeg=yes elif test "$ffmpeg_so" = auto ; then ffmpeg_so=no if $_pkg_config --exists libavcore ; then @@ -8251,7 +8251,7 @@ YASMDEP = $_yasm YASMFLAGS = $YASMFLAGS CONFIG_STATIC = yes -SRC_PATH = .. +SRC_PATH = ../.. BUILD_ROOT = .. LIBPREF = lib LIBSUF = .a @@ -8828,7 +8828,7 @@ $def_av_fast_unaligned EOF # Do not overwrite an unchanged avconfig.h to avoid superfluous rebuilds. -cmp -s "$TMPH" libavutil/avconfig.h || mv -f "$TMPH" libavutil/avconfig.h +cmp -s "$TMPH" ffmpeg/libavutil/avconfig.h || mv -f "$TMPH" ffmpeg/libavutil/avconfig.h if x86; then @@ -8842,6 +8842,12 @@ done cmp -s "$TMPS" config.asm || mv -f "$TMPS" config.asm fi + +# Create a config.mak for FFmpeg that includes MPlayer's config.mak. +cat > ffmpeg/config.mak << EOF +include ../../config.mak +EOF + ############################################################################# cat << EOF

1 0

r32391 - in trunk/libfaad2: common.h local_changes.diff
by reimar 27 Sep '10

27 Sep '10

Author: reimar Date: Mon Sep 27 20:37:43 2010 New Revision: 32391 Log: Fix condition for compiling lrintf, fixes compilation on cygwin/MinGW. Modified: trunk/libfaad2/common.h trunk/libfaad2/local_changes.diff Modified: trunk/libfaad2/common.h ============================================================================== --- trunk/libfaad2/common.h Mon Sep 27 19:28:23 2010 (r32390) +++ trunk/libfaad2/common.h Mon Sep 27 20:37:43 2010 (r32391) @@ -317,7 +317,7 @@ char *strchr(), *strrchr(); } return i; } - #elif (defined(__i386__) && defined(__GNUC__)) && __STDC_VERSION__ >= 199901L + #elif (defined(__i386__) && defined(__GNUC__)) && __STDC_VERSION__ < 199901L #define HAS_LRINTF // from http://www.stereopsis.com/FPU.html static INLINE int lrintf(float f) Modified: trunk/libfaad2/local_changes.diff ============================================================================== --- trunk/libfaad2/local_changes.diff Mon Sep 27 19:28:23 2010 (r32390) +++ trunk/libfaad2/local_changes.diff Mon Sep 27 20:37:43 2010 (r32391) @@ -77,7 +77,7 @@ return i; } - #elif (defined(__i386__) && defined(__GNUC__)) -+ #elif (defined(__i386__) && defined(__GNUC__)) && __STDC_VERSION__ >= 199901L ++ #elif (defined(__i386__) && defined(__GNUC__)) && __STDC_VERSION__ < 199901L #define HAS_LRINTF // from http://www.stereopsis.com/FPU.html static INLINE int lrintf(float f)

1 0

r32390 - trunk/configure
by diego 27 Sep '10

27 Sep '10

Author: diego Date: Mon Sep 27 19:28:23 2010 New Revision: 32390 Log: Remove unnecessary Xlib.h #include from xf86keysym check. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Mon Sep 27 19:23:40 2010 (r32389) +++ trunk/configure Mon Sep 27 19:28:23 2010 (r32390) @@ -4445,7 +4445,6 @@ echocheck "XF86keysym" if test "$_xf86keysym" = auto; then _xf86keysym=no cat > $TMPC <<EOF -#include <X11/Xlib.h> #include <X11/XF86keysym.h> int main(void) { return XF86XK_AudioPause; } EOF

1 0

r32389 - trunk/mp3lib/dct64_sse.c
by diego 27 Sep '10

27 Sep '10

Author: diego Date: Mon Sep 27 19:23:40 2010 New Revision: 32389 Log: Revert accidentally committed changes. Modified: trunk/mp3lib/dct64_sse.c Modified: trunk/mp3lib/dct64_sse.c ============================================================================== --- trunk/mp3lib/dct64_sse.c Mon Sep 27 19:18:39 2010 (r32388) +++ trunk/mp3lib/dct64_sse.c Mon Sep 27 19:23:40 2010 (r32389) @@ -8,8 +8,7 @@ #include "libavutil/mem.h" #include "mpg123.h" -extern const unsigned int __attribute__((aligned(16))) costab_mmx[]; -//extern float __attribute__((aligned(16))) costab_mmx[]; +extern float __attribute__((aligned(16))) costab_mmx[]; static const int ppnn[4] __attribute__((aligned(16))) = { 0, 0, 1 << 31, 1 << 31 };

1 0

r32388 - in trunk: configure mp3lib/dct64_sse.c
by diego 27 Sep '10

27 Sep '10

Author: diego Date: Mon Sep 27 19:18:39 2010 New Revision: 32388 Log: Drop two unnecessary Xlib.h #includes and use helper functions. Modified: trunk/configure trunk/mp3lib/dct64_sse.c Modified: trunk/configure ============================================================================== --- trunk/configure Mon Sep 27 14:10:59 2010 (r32387) +++ trunk/configure Mon Sep 27 19:18:39 2010 (r32388) @@ -4242,11 +4242,6 @@ echores "$_x11_headers" echocheck "X11" if test "$_x11" = auto && test "$_x11_headers" = yes ; then - cat > $TMPC <<EOF -#include <X11/Xlib.h> -#include <X11/Xutil.h> -int main(void) { XCreateWindow(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); return 0; } -EOF for I in "" -L/usr/X11R7/lib -L/usr/local/lib -L/usr/X11R6/lib -L/usr/lib/X11R6 \ -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/local/lib64 -L/usr/X11R6/lib64 \ -L/usr/lib ; do @@ -4255,8 +4250,8 @@ EOF else _ld_tmp="$I -lXext -lX11 $_ld_pthread" fi - cc_check $_ld_tmp && libs_mplayer="$libs_mplayer $_ld_tmp" \ - && _x11=yes && break + statement_check X11/Xutil.h 'XCreateWindow(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)' $_ld_tmp && + libs_mplayer="$libs_mplayer $_ld_tmp" && _x11=yes && break done fi if test "$_x11" = yes ; then @@ -4406,13 +4401,8 @@ echores "$_vdpau" echocheck "Xinerama" if test "$_xinerama" = auto ; then - cat > $TMPC <<EOF -#include <X11/Xlib.h> -#include <X11/extensions/Xinerama.h> -int main(void) { XineramaIsActive(0); return 0; } -EOF _xinerama=no - cc_check -lXinerama && _xinerama=yes + statement_check X11/extensions/Xinerama.h 'XineramaIsActive(0)' -lXinerama && _xinerama=yes fi if test "$_xinerama" = yes ; then Modified: trunk/mp3lib/dct64_sse.c ============================================================================== --- trunk/mp3lib/dct64_sse.c Mon Sep 27 14:10:59 2010 (r32387) +++ trunk/mp3lib/dct64_sse.c Mon Sep 27 19:18:39 2010 (r32388) @@ -8,7 +8,8 @@ #include "libavutil/mem.h" #include "mpg123.h" -extern float __attribute__((aligned(16))) costab_mmx[]; +extern const unsigned int __attribute__((aligned(16))) costab_mmx[]; +//extern float __attribute__((aligned(16))) costab_mmx[]; static const int ppnn[4] __attribute__((aligned(16))) = { 0, 0, 1 << 31, 1 << 31 };

2 1

r32387 - trunk/m_config.c
by diego 27 Sep '10

27 Sep '10

Author: diego Date: Mon Sep 27 14:10:59 2010 New Revision: 32387 Log: cosmetics: Move some functions around to avoid ugly forward declarations. Modified: trunk/m_config.c Modified: trunk/m_config.c ============================================================================== --- trunk/m_config.c Mon Sep 27 13:54:17 2010 (r32386) +++ trunk/m_config.c Mon Sep 27 14:10:59 2010 (r32387) @@ -36,20 +36,116 @@ #define MAX_PROFILE_DEPTH 20 -static int -parse_profile(const m_option_t *opt, const char *name, const char *param, void *dst, int src); -static void -set_profile(const m_option_t *opt, void* dst, const void* src); +static int parse_profile(const m_option_t *opt, const char *name, + const char *param, void *dst, int src) +{ + m_config_t *config = opt->priv; + char **list = NULL; + int i, r; + if (param && !strcmp(param, "help")) { + m_profile_t *p; + if (!config->profiles) { + mp_msg(MSGT_CFGPARSER, MSGL_INFO, MSGTR_NoProfileDefined); + return M_OPT_EXIT-1; + } + mp_msg(MSGT_CFGPARSER, MSGL_INFO, MSGTR_AvailableProfiles); + for (p = config->profiles; p; p = p->next) + mp_msg(MSGT_CFGPARSER, MSGL_INFO, "\t%s\t%s\n", p->name, + p->desc ? p->desc : ""); + mp_msg(MSGT_CFGPARSER, MSGL_INFO, "\n"); + return M_OPT_EXIT-1; + } -static int -show_profile(m_option_t *opt, char* name, char *param); + r = m_option_type_string_list.parse(opt, name, param, &list,src); + if (r < 0) + return r; + if (!list || !list[0]) + return M_OPT_INVALID; + for (i = 0; list[i]; i++) + if (!m_config_get_profile(config,list[i])) { + mp_msg(MSGT_CFGPARSER, MSGL_WARN, MSGTR_UnknownProfile, list[i]); + r = M_OPT_INVALID; + } + if (dst) + m_option_copy(opt, dst, &list); + else + m_option_free(opt, &list); + return r; +} static void -m_config_add_option(m_config_t *config, const m_option_t *arg, const char* prefix); +set_profile(const m_option_t *opt, void *dst, const void *src) +{ + m_config_t *config = opt->priv; + m_profile_t *p; + char **list = NULL; + int i; + if (!src || !*(char***)src) + return; + m_option_copy(opt,&list,src); + for (i = 0; list[i]; i++) { + p = m_config_get_profile(config, list[i]); + if (!p) + continue; + m_config_set_profile(config, p); + } + m_option_free(opt, &list); +} -static int -list_options(m_option_t *opt, char* name, char *param); +static int show_profile(m_option_t *opt, char* name, char *param) +{ + m_config_t *config = opt->priv; + m_profile_t *p; + int i, j; + if (!param) + return M_OPT_MISSING_PARAM; + if (!(p = m_config_get_profile(config, param))) { + mp_msg(MSGT_CFGPARSER, MSGL_ERR, MSGTR_UnknownProfile, param); + return M_OPT_EXIT - 1; + } + if (!config->profile_depth) + mp_msg(MSGT_CFGPARSER, MSGL_INFO, MSGTR_Profile, param, + p->desc ? p->desc : ""); + config->profile_depth++; + for (i = 0; i < p->num_opts; i++) { + char spc[config->profile_depth + 1]; + for (j = 0; j < config->profile_depth; j++) + spc[j] = ' '; + spc[config->profile_depth] = '\0'; + + mp_msg(MSGT_CFGPARSER, MSGL_INFO, "%s%s=%s\n", spc, + p->opts[2 * i], p->opts[2 * i + 1]); + + if (config->profile_depth < MAX_PROFILE_DEPTH && + !strcmp(p->opts[2*i],"profile")) { + char *e, *list = p->opts[2 * i + 1]; + while ((e = strchr(list, ','))) { + int l = e-list; + char tmp[l+1]; + if (!l) + continue; + memcpy(tmp, list, l); + tmp[l] = '\0'; + show_profile(opt, name, tmp); + list = e+1; + } + if (list[0] != '\0') + show_profile(opt, name, list); + } + } + config->profile_depth--; + if (!config->profile_depth) + mp_msg(MSGT_CFGPARSER, MSGL_INFO, "\n"); + return M_OPT_EXIT - 1; +} + +static int list_options(m_option_t *opt, char* name, char *param) +{ + m_config_t *config = opt->priv; + m_config_print_option_list(config); + return M_OPT_EXIT; +} m_config_t* m_config_new(void) { @@ -500,107 +596,3 @@ m_config_set_profile(m_config_t* config, m_config_set_option(config,p->opts[2*i],p->opts[2*i+1]); config->profile_depth--; } - -static int -parse_profile(const m_option_t *opt, const char *name, const char *param, void *dst, int src) -{ - m_config_t* config = opt->priv; - char** list = NULL; - int i,r; - if(param && !strcmp(param,"help")) { - m_profile_t* p; - if(!config->profiles) { - mp_msg(MSGT_CFGPARSER, MSGL_INFO, MSGTR_NoProfileDefined); - return M_OPT_EXIT-1; - } - mp_msg(MSGT_CFGPARSER, MSGL_INFO, MSGTR_AvailableProfiles); - for(p = config->profiles ; p ; p = p->next) - mp_msg(MSGT_CFGPARSER, MSGL_INFO, "\t%s\t%s\n",p->name, - p->desc ? p->desc : ""); - mp_msg(MSGT_CFGPARSER, MSGL_INFO, "\n"); - return M_OPT_EXIT-1; - } - - r = m_option_type_string_list.parse(opt,name,param,&list,src); - if(r < 0) return r; - if(!list || !list[0]) return M_OPT_INVALID; - for(i = 0 ; list[i] ; i++) - if(!m_config_get_profile(config,list[i])) { - mp_msg(MSGT_CFGPARSER, MSGL_WARN, MSGTR_UnknownProfile, - list[i]); - r = M_OPT_INVALID; - } - if(dst) - m_option_copy(opt,dst,&list); - else - m_option_free(opt,&list); - return r; -} - -static void -set_profile(const m_option_t *opt, void *dst, const void *src) { - m_config_t* config = opt->priv; - m_profile_t* p; - char** list = NULL; - int i; - if(!src || !*(char***)src) return; - m_option_copy(opt,&list,src); - for(i = 0 ; list[i] ; i++) { - p = m_config_get_profile(config,list[i]); - if(!p) continue; - m_config_set_profile(config,p); - } - m_option_free(opt,&list); -} - -static int -show_profile(m_option_t *opt, char* name, char *param) { - m_config_t* config = opt->priv; - m_profile_t* p; - int i,j; - if(!param) return M_OPT_MISSING_PARAM; - if(!(p = m_config_get_profile(config,param))) { - mp_msg(MSGT_CFGPARSER, MSGL_ERR, MSGTR_UnknownProfile, param); - return M_OPT_EXIT-1; - } - if(!config->profile_depth) - mp_msg(MSGT_CFGPARSER, MSGL_INFO, MSGTR_Profile, param, - p->desc ? p->desc : ""); - config->profile_depth++; - for(i = 0 ; i < p->num_opts ; i++) { - char spc[config->profile_depth+1]; - for(j = 0 ; j < config->profile_depth ; j++) - spc[j] = ' '; - spc[config->profile_depth] = '\0'; - - mp_msg(MSGT_CFGPARSER, MSGL_INFO, "%s%s=%s\n", spc, - p->opts[2*i], p->opts[2*i+1]); - - - if(config->profile_depth < MAX_PROFILE_DEPTH && - !strcmp(p->opts[2*i],"profile")) { - char* e,*list = p->opts[2*i+1]; - while((e = strchr(list,','))) { - int l = e-list; - char tmp[l+1]; - if(!l) continue; - memcpy(tmp,list,l); - tmp[l] = '\0'; - show_profile(opt,name,tmp); - list = e+1; - } - if(list[0] != '\0') - show_profile(opt,name,list); - } - } - config->profile_depth--; - if(!config->profile_depth) mp_msg(MSGT_CFGPARSER, MSGL_INFO, "\n"); - return M_OPT_EXIT-1; -} - -static int -list_options(m_option_t *opt, char* name, char *param) { - m_config_t* config = opt->priv; - m_config_print_option_list(config); - return M_OPT_EXIT; -}

1 0

r32386 - in trunk: m_config.c m_config.h
by diego 27 Sep '10

27 Sep '10

Author: diego Date: Mon Sep 27 13:54:17 2010 New Revision: 32386 Log: Mark some function parameters that are not modified as const. patch by Clément Bœsch, ubitux gmail com Modified: trunk/m_config.c trunk/m_config.h Modified: trunk/m_config.c ============================================================================== --- trunk/m_config.c Mon Sep 27 10:35:33 2010 (r32385) +++ trunk/m_config.c Mon Sep 27 13:54:17 2010 (r32386) @@ -279,7 +279,7 @@ m_config_register_options(m_config_t *co } static m_config_option_t* -m_config_get_co(m_config_t *config, char* arg) { +m_config_get_co(const m_config_t *config, char *arg) { m_config_option_t *co; for(co = config->opts ; co ; co = co->next ) { @@ -295,7 +295,7 @@ m_config_get_co(m_config_t *config, char } static int -m_config_parse_option(m_config_t *config, char* arg, char* param,int set) { +m_config_parse_option(const m_config_t *config, char *arg, char *param, int set) { m_config_option_t *co; int r = 0; @@ -386,7 +386,7 @@ m_config_set_option(m_config_t *config, } int -m_config_check_option(m_config_t *config, char* arg, char* param) { +m_config_check_option(const m_config_t *config, char *arg, char *param) { int r; mp_msg(MSGT_CFGPARSER, MSGL_DBG2,"Checking %s=%s\n",arg,param); r=m_config_parse_option(config,arg,param,0); @@ -399,7 +399,7 @@ m_config_check_option(m_config_t *config const m_option_t* -m_config_get_option(m_config_t *config, char* arg) { +m_config_get_option(const m_config_t *config, char *arg) { m_config_option_t *co; #ifdef MP_DEBUG @@ -417,7 +417,7 @@ m_config_get_option(m_config_t *config, void -m_config_print_option_list(m_config_t *config) { +m_config_print_option_list(const m_config_t *config) { char min[50],max[50]; m_config_option_t* co; int count = 0; @@ -450,7 +450,7 @@ m_config_print_option_list(m_config_t *c } m_profile_t* -m_config_get_profile(m_config_t* config, char* name) { +m_config_get_profile(const m_config_t *config, char *name) { m_profile_t* p; for(p = config->profiles ; p ; p = p->next) if(!strcmp(p->name,name)) return p; Modified: trunk/m_config.h ============================================================================== --- trunk/m_config.h Mon Sep 27 10:35:33 2010 (r32385) +++ trunk/m_config.h Mon Sep 27 13:54:17 2010 (r32386) @@ -156,20 +156,20 @@ m_config_set_option(m_config_t *config, * \return See \ref OptionParserReturn. */ int -m_config_check_option(m_config_t *config, char* arg, char* param); +m_config_check_option(const m_config_t *config, char *arg, char *param); /// Get the option matching the given name. /** \param config The config object. * \param arg The option's name. */ const struct m_option* -m_config_get_option(m_config_t *config, char* arg); +m_config_get_option(const m_config_t *config, char *arg); /// Print a list of all registered options. /** \param config The config object. */ void -m_config_print_option_list(m_config_t *config); +m_config_print_option_list(const m_config_t *config); /// \addtogroup ConfigProfiles ///@{ @@ -180,7 +180,7 @@ m_config_print_option_list(m_config_t *c * \return The profile object or NULL. */ m_profile_t* -m_config_get_profile(m_config_t* config, char* name); +m_config_get_profile(const m_config_t *config, char *name); /// Get the profile with the given name, creating it if necessary. /** \param config The config object.

1 0