From 9000920a11f07bbb88ce12e0efff65f2f0c8cf5c Mon Sep 17 00:00:00 2001 From: Christophe Massiot Date: Fri, 9 Aug 2002 23:47:23 +0000 Subject: [PATCH] * Trivial resampler plug-in (resampling still non-functional) * Begun writing some hooks for forthcoming S/PDIF support * ./modules/access/vcd/cdrom.c: compile fix for Darwin --- configure | 363 +++++++++--------- configure.in | 1 + include/audio_output.h | 21 +- include/defs.h.in | 2 +- include/vlc_symbols.h | 4 +- modules/access/vcd/cdrom.c | 10 +- modules/audio_filter/converter/float32tos16.c | 4 +- modules/audio_filter/resampler/Makefile | 1 + modules/audio_filter/resampler/trivial.c | 93 +++++ modules/audio_output/file.c | 6 +- modules/audio_output/oss.c | 21 +- src/audio_output/audio_output.c | 22 +- src/audio_output/filters.c | 15 +- src/audio_output/input.c | 6 +- src/audio_output/output.c | 6 +- src/misc/modules_plugin.h | 2 +- 16 files changed, 349 insertions(+), 228 deletions(-) create mode 100644 modules/audio_filter/resampler/Makefile create mode 100644 modules/audio_filter/resampler/trivial.c diff --git a/configure b/configure index 42aa4228b1..ec05cb19d6 100755 --- a/configure +++ b/configure @@ -5661,6 +5661,7 @@ PLUGINS="${PLUGINS} codec/mpeg_video/idct/idct codec/mpeg_video/idct/idctclassic #PLUGINS="${PLUGINS} codec/a52old/imdct/imdct codec/a52old/downmix/downmix codec/mpeg_audio/mpeg_audio codec/a52old/a52old codec/lpcm/lpcm codec/spdif/spdif" PLUGINS="${PLUGINS} video_filter/deinterlace/deinterlace video_filter/invert video_filter/wall video_filter/transform video_filter/distort video_filter/clone video_filter/crop" PLUGINS="${PLUGINS} audio_filter/converter/float32tos16" +PLUGINS="${PLUGINS} audio_filter/resampler/trivial" PLUGINS="${PLUGINS} audio_mixer/trivial" PLUGINS="${PLUGINS} audio_output/file" #PLUGINS="${PLUGINS} visualization/scope/scope" @@ -5673,20 +5674,20 @@ SSE_MODULES="codec/a52old/imdct/imdctsse codec/a52old/downmix/downmixsse" ALTIVEC_MODULES="codec/mpeg_video/idct/idctaltivec codec/mpeg_video/motion/motionaltivec misc/memcpy/memcpyaltivec" echo $ac_n "checking if \$CC groks MMX inline assembly""... $ac_c" 1>&6 -echo "configure:5677: checking if \$CC groks MMX inline assembly" >&5 +echo "configure:5678: checking if \$CC groks MMX inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_mmx_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS}" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mmx_inline=yes else @@ -5704,20 +5705,20 @@ if test "x${ac_cv_mmx_inline}" != "xno"; then fi echo $ac_n "checking if \$CC groks MMX EXT inline assembly""... $ac_c" 1>&6 -echo "configure:5708: checking if \$CC groks MMX EXT inline assembly" >&5 +echo "configure:5709: checking if \$CC groks MMX EXT inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_mmxext_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS}" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mmxext_inline=yes else @@ -5735,20 +5736,20 @@ if test "x${ac_cv_mmxext_inline}" != "xno"; then fi echo $ac_n "checking if \$CC groks 3D Now! inline assembly""... $ac_c" 1>&6 -echo "configure:5739: checking if \$CC groks 3D Now! inline assembly" >&5 +echo "configure:5740: checking if \$CC groks 3D Now! inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_3dnow_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS}" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5753: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_3dnow_inline=yes else @@ -5770,20 +5771,20 @@ EOF fi echo $ac_n "checking if \$CC groks SSE inline assembly""... $ac_c" 1>&6 -echo "configure:5774: checking if \$CC groks SSE inline assembly" >&5 +echo "configure:5775: checking if \$CC groks SSE inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_sse_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS}" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sse_inline=yes else @@ -5808,20 +5809,20 @@ fi # we should be able to remove this test with future versions of mingw32 if test "x${SYS}" != "xmingw32"; then echo $ac_n "checking if \$CC groks AltiVec inline assembly""... $ac_c" 1>&6 -echo "configure:5812: checking if \$CC groks AltiVec inline assembly" >&5 +echo "configure:5813: checking if \$CC groks AltiVec inline assembly" >&5 if eval "test \"`echo '$''{'ac_cv_altivec_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS}" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5826: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_altivec_inline=yes else @@ -5830,14 +5831,14 @@ else rm -rf conftest* CFLAGS="${save_CFLAGS} -Wa,-m7400" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_altivec_inline="-Wa,-m7400" else @@ -5868,21 +5869,21 @@ EOF fi echo $ac_n "checking if \$CC groks AltiVec C extensions""... $ac_c" 1>&6 -echo "configure:5872: checking if \$CC groks AltiVec C extensions" >&5 +echo "configure:5873: checking if \$CC groks AltiVec C extensions" >&5 if eval "test \"`echo '$''{'ac_cv_c_altivec'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS="${save_CFLAGS} -faltivec" # Darwin test cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5887: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_altivec=-faltivec else @@ -5893,14 +5894,14 @@ else # Linux/PPC test CFLAGS="${save_CFLAGS} ${idctaltivec_CFLAGS} -fvec" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_altivec="-fvec" else @@ -5930,20 +5931,20 @@ EOF fi echo $ac_n "checking if linker needs -framework vecLib""... $ac_c" 1>&6 -echo "configure:5934: checking if linker needs -framework vecLib" >&5 +echo "configure:5935: checking if linker needs -framework vecLib" >&5 if eval "test \"`echo '$''{'ac_cv_ld_altivec'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else LDFLAGS="${vlc_LDFLAGS} -framework vecLib" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_ld_altivec=yes else @@ -6075,17 +6076,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6079: checking for $ac_hdr" >&5 +echo "configure:6080: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6116,7 +6117,7 @@ done else echo $ac_n "checking for libdvdcss.a in ${with_dvdcss_tree}""... $ac_c" 1>&6 -echo "configure:6120: checking for libdvdcss.a in ${with_dvdcss_tree}" >&5 +echo "configure:6121: checking for libdvdcss.a in ${with_dvdcss_tree}" >&5 real_dvdcss_tree="`cd ${with_dvdcss_tree} 2>/dev/null && pwd`" if test "x${real_dvdcss_tree}" = "x" then @@ -6142,7 +6143,7 @@ echo "configure:6120: checking for libdvdcss.a in ${with_dvdcss_tree}" >&5 ;; *) echo $ac_n "checking for dvdcss headers in ${with_dvdcss}""... $ac_c" 1>&6 -echo "configure:6146: checking for dvdcss headers in ${with_dvdcss}" >&5 +echo "configure:6147: checking for dvdcss headers in ${with_dvdcss}" >&5 if test -f ${with_dvdcss}/include/dvdcss/dvdcss.h then echo "$ac_t""yes" 1>&6 @@ -6184,17 +6185,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6188: checking for $ac_hdr" >&5 +echo "configure:6189: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6198: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6199: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6216,14 +6217,14 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then EOF cat > conftest.$ac_ext < int main() { void foo() { int i=DVD_VIDEO_LB_LEN; } ; return 0; } EOF -if { (eval echo configure:6227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6228: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PLUGINS="${PLUGINS} access/dvdread/dvdread" @@ -6288,17 +6289,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6292: checking for $ac_hdr" >&5 +echo "configure:6293: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6303: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6370,17 +6371,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6374: checking for $ac_hdr" >&5 +echo "configure:6375: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6384: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6409,7 +6410,7 @@ done else echo $ac_n "checking for libdvbpsi.a in ${with_dvbpsi_tree}""... $ac_c" 1>&6 -echo "configure:6413: checking for libdvbpsi.a in ${with_dvbpsi_tree}" >&5 +echo "configure:6414: checking for libdvbpsi.a in ${with_dvbpsi_tree}" >&5 real_dvbpsi_tree="`cd ${with_dvbpsi_tree} 2>/dev/null && pwd`" if test "x${real_dvbpsi_tree}" = "x" then @@ -6432,7 +6433,7 @@ echo "configure:6413: checking for libdvbpsi.a in ${with_dvbpsi_tree}" >&5 ;; *) echo $ac_n "checking for dvbpsi headers in ${with_dvbpsi}""... $ac_c" 1>&6 -echo "configure:6436: checking for dvbpsi headers in ${with_dvbpsi}" >&5 +echo "configure:6437: checking for dvbpsi headers in ${with_dvbpsi}" >&5 if test "x${with_dvbpsi}" = "x" then test_LDFLAGS="" @@ -6444,17 +6445,17 @@ echo "configure:6436: checking for dvbpsi headers in ${with_dvbpsi}" >&5 CPPFLAGS="${save_CPPFLAGS} ${test_CFLAGS}" ac_safe=`echo "dvbpsi/dr.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dvbpsi/dr.h""... $ac_c" 1>&6 -echo "configure:6448: checking for dvbpsi/dr.h" >&5 +echo "configure:6449: checking for dvbpsi/dr.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6458: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6459: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6502,17 +6503,17 @@ then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6506: checking for $ac_hdr" >&5 +echo "configure:6507: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6552,7 +6553,7 @@ fi if test "x${enable_vcd}" != "xno" then cat > conftest.$ac_ext < EOF @@ -6567,7 +6568,7 @@ rm -f conftest* cat > conftest.$ac_ext < EOF @@ -6611,12 +6612,12 @@ if test "x${SYS}" != "xnto" && test "x${SYS}" != "xmingw32" then have_ipv6=0 echo $ac_n "checking for inet_pton""... $ac_c" 1>&6 -echo "configure:6615: checking for inet_pton" >&5 +echo "configure:6616: checking for inet_pton" >&5 if eval "test \"`echo '$''{'ac_cv_func_inet_pton'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_inet_pton=yes" else @@ -6658,7 +6659,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_pton in -lresolv""... $ac_c" 1>&6 -echo "configure:6662: checking for inet_pton in -lresolv" >&5 +echo "configure:6663: checking for inet_pton in -lresolv" >&5 ac_lib_var=`echo resolv'_'inet_pton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6666,7 +6667,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6702,9 +6703,9 @@ fi fi echo $ac_n "checking for sockaddr_in6 in netinet/in.h""... $ac_c" 1>&6 -echo "configure:6706: checking for sockaddr_in6 in netinet/in.h" >&5 +echo "configure:6707: checking for sockaddr_in6 in netinet/in.h" >&5 cat > conftest.$ac_ext < EOF @@ -6725,9 +6726,9 @@ fi if test "x${SYS}" = "xmingw32" then echo $ac_n "checking for getaddrinfo in ws2tcpip.h""... $ac_c" 1>&6 -echo "configure:6729: checking for getaddrinfo in ws2tcpip.h" >&5 +echo "configure:6730: checking for getaddrinfo in ws2tcpip.h" >&5 cat > conftest.$ac_ext < EOF @@ -6798,7 +6799,7 @@ fi { echo "configure: error: ${with_mad_tree} directory doesn't exist" 1>&2; exit 1; } fi echo $ac_n "checking for mad.h in ${real_mad_tree}/libmad""... $ac_c" 1>&6 -echo "configure:6802: checking for mad.h in ${real_mad_tree}/libmad" >&5 +echo "configure:6803: checking for mad.h in ${real_mad_tree}/libmad" >&5 if test -f ${real_mad_tree}/libmad/mad.h then echo "$ac_t""yes" 1>&6 @@ -6806,7 +6807,7 @@ echo "configure:6802: checking for mad.h in ${real_mad_tree}/libmad" >&5 mad_LDFLAGS="${mad_LDFLAGS} -L${real_mad_tree}/libmad/.libs" LDFLAGS="${save_LDFLAGS} ${mad_LDFLAGS}" echo $ac_n "checking for mad_bit_init in -lmad""... $ac_c" 1>&6 -echo "configure:6810: checking for mad_bit_init in -lmad" >&5 +echo "configure:6811: checking for mad_bit_init in -lmad" >&5 ac_lib_var=`echo mad'_'mad_bit_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6814,7 +6815,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmad $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6862,17 +6863,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6866: checking for $ac_hdr" >&5 +echo "configure:6867: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6877: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6900,7 +6901,7 @@ fi done echo $ac_n "checking for mad_bit_init in -lmad""... $ac_c" 1>&6 -echo "configure:6904: checking for mad_bit_init in -lmad" >&5 +echo "configure:6905: checking for mad_bit_init in -lmad" >&5 ac_lib_var=`echo mad'_'mad_bit_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6908,7 +6909,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmad $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6986,7 +6987,7 @@ fi if test "x${with_ffmpeg_tree}" != "x" then echo $ac_n "checking for libavcodec.a in ${with_ffmpeg_tree}""... $ac_c" 1>&6 -echo "configure:6990: checking for libavcodec.a in ${with_ffmpeg_tree}" >&5 +echo "configure:6991: checking for libavcodec.a in ${with_ffmpeg_tree}" >&5 real_ffmpeg_tree="`cd ${with_ffmpeg_tree} 2>/dev/null && pwd`" if test "x${real_ffmpeg_tree}" = x then @@ -7007,7 +7008,7 @@ echo "configure:6990: checking for libavcodec.a in ${with_ffmpeg_tree}" >&5 CFLAGS="${save_CFLAGS} ${ffmpeg_CFLAGS}" LDFLAGS="${save_LDFLAGS} ${ffmpeg_LDFLAGS} -lm" echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6 -echo "configure:7011: checking for avcodec_init in -lavcodec" >&5 +echo "configure:7012: checking for avcodec_init in -lavcodec" >&5 ac_lib_var=`echo avcodec'_'avcodec_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7015,7 +7016,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lavcodec $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7064,17 +7065,17 @@ if test "x${enable_mp4}" = "xyes" then ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for zlib.h""... $ac_c" 1>&6 -echo "configure:7068: checking for zlib.h" >&5 +echo "configure:7069: checking for zlib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7078: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7079: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7091,7 +7092,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for inflateEnd in -lz""... $ac_c" 1>&6 -echo "configure:7095: checking for inflateEnd in -lz" >&5 +echo "configure:7096: checking for inflateEnd in -lz" >&5 ac_lib_var=`echo z'_'inflateEnd | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7099,7 +7100,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7168,7 +7169,7 @@ fi { echo "configure: error: ${with_a52_tree} directory doesn't exist" 1>&2; exit 1; } fi echo $ac_n "checking for a52.h in ${real_a52_tree}/include""... $ac_c" 1>&6 -echo "configure:7172: checking for a52.h in ${real_a52_tree}/include" >&5 +echo "configure:7173: checking for a52.h in ${real_a52_tree}/include" >&5 if test -f ${real_a52_tree}/include/a52.h then echo "$ac_t""yes" 1>&6 @@ -7176,7 +7177,7 @@ echo "configure:7172: checking for a52.h in ${real_a52_tree}/include" >&5 a52_LDFLAGS="${a52_LDFLAGS} -L${real_a52_tree}/liba52/.libs" LDFLAGS="${save_LDFLAGS} ${a52_LDFLAGS}" echo $ac_n "checking for a52_free in -la52""... $ac_c" 1>&6 -echo "configure:7180: checking for a52_free in -la52" >&5 +echo "configure:7181: checking for a52_free in -la52" >&5 ac_lib_var=`echo a52'_'a52_free | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7184,7 +7185,7 @@ else ac_save_LIBS="$LIBS" LIBS="-la52 -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7249,17 +7250,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7253: checking for $ac_hdr" >&5 +echo "configure:7254: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7281,7 +7282,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then EOF echo $ac_n "checking for a52_free in -la52""... $ac_c" 1>&6 -echo "configure:7285: checking for a52_free in -la52" >&5 +echo "configure:7286: checking for a52_free in -la52" >&5 ac_lib_var=`echo a52'_'a52_free | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7289,7 +7290,7 @@ else ac_save_LIBS="$LIBS" LIBS="-la52 -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7364,17 +7365,17 @@ then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7368: checking for $ac_hdr" >&5 +echo "configure:7369: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7378: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7379: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7417,17 +7418,17 @@ then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7421: checking for $ac_hdr" >&5 +echo "configure:7422: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7431: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7432: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7479,17 +7480,17 @@ if test "x${enable_x11}" != "xno" && do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7483: checking for $ac_hdr" >&5 +echo "configure:7484: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7535,17 +7536,17 @@ if test "x${enable_xvideo}" != "xno" && do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7539: checking for $ac_hdr" >&5 +echo "configure:7540: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7549: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7550: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7568,7 +7569,7 @@ EOF CFLAGS="${save_CFLAGS} -L${x_libraries} -lX11 -lXext" echo $ac_n "checking for XvPutImage in -lXv_pic""... $ac_c" 1>&6 -echo "configure:7572: checking for XvPutImage in -lXv_pic" >&5 +echo "configure:7573: checking for XvPutImage in -lXv_pic" >&5 ac_lib_var=`echo Xv_pic'_'XvPutImage | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7576,7 +7577,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXv_pic $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7609,7 +7610,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for XvPutImage in -lXv""... $ac_c" 1>&6 -echo "configure:7613: checking for XvPutImage in -lXv" >&5 +echo "configure:7614: checking for XvPutImage in -lXv" >&5 ac_lib_var=`echo Xv'_'XvPutImage | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7617,7 +7618,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7688,7 +7689,7 @@ fi # Extract the first word of "sdl12-config", so it can be a program name with args. set dummy sdl12-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7692: checking for $ac_word" >&5 +echo "configure:7693: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SDL12_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7728,7 +7729,7 @@ fi # Extract the first word of "sdl11-config", so it can be a program name with args. set dummy sdl11-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7732: checking for $ac_word" >&5 +echo "configure:7733: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SDL11_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7769,7 +7770,7 @@ fi # Extract the first word of "sdl-config", so it can be a program name with args. set dummy sdl-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7773: checking for $ac_word" >&5 +echo "configure:7774: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7814,17 +7815,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7818: checking for $ac_hdr" >&5 +echo "configure:7819: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7894,17 +7895,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7898: checking for $ac_hdr" >&5 +echo "configure:7899: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7908: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7933,7 +7934,7 @@ done else echo $ac_n "checking for directX headers in ${with_directx}""... $ac_c" 1>&6 -echo "configure:7937: checking for directX headers in ${with_directx}" >&5 +echo "configure:7938: checking for directX headers in ${with_directx}" >&5 if test -f ${with_directx}/ddraw.h then PLUGINS="${PLUGINS} video_output/directx/directx" @@ -7960,17 +7961,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7964: checking for $ac_hdr" >&5 +echo "configure:7965: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7974: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7975: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8065,17 +8066,17 @@ if test "x${enable_aa}" = "xyes" then ac_safe=`echo "aalib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for aalib.h""... $ac_c" 1>&6 -echo "configure:8069: checking for aalib.h" >&5 +echo "configure:8070: checking for aalib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8079: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8080: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8126,17 +8127,17 @@ then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8130: checking for $ac_hdr" >&5 +echo "configure:8131: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8159,7 +8160,7 @@ EOF PLUGINS="${PLUGINS} audio_output/oss" echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6 -echo "configure:8163: checking for main in -lossaudio" >&5 +echo "configure:8164: checking for main in -lossaudio" >&5 ac_lib_var=`echo ossaudio'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8167,14 +8168,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lossaudio $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8210,7 +8211,7 @@ if test "${enable_esd+set}" = set; then # Extract the first word of "esd-config", so it can be a program name with args. set dummy esd-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8214: checking for $ac_word" >&5 +echo "configure:8215: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8261,7 +8262,7 @@ if test "${enable_arts+set}" = set; then # Extract the first word of "artsc-config", so it can be a program name with args. set dummy artsc-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8265: checking for $ac_word" >&5 +echo "configure:8266: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ARTS_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8311,17 +8312,17 @@ if test "${enable_alsa+set}" = set; then then ac_safe=`echo "alsa/asoundlib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for alsa/asoundlib.h""... $ac_c" 1>&6 -echo "configure:8315: checking for alsa/asoundlib.h" >&5 +echo "configure:8316: checking for alsa/asoundlib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8325: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8326: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8338,7 +8339,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6 -echo "configure:8342: checking for main in -lasound" >&5 +echo "configure:8343: checking for main in -lasound" >&5 ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8346,14 +8347,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8435,7 +8436,7 @@ fi # Extract the first word of "gtk12-config", so it can be a program name with args. set dummy gtk12-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8439: checking for $ac_word" >&5 +echo "configure:8440: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK12_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8474,7 +8475,7 @@ fi # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8478: checking for $ac_word" >&5 +echo "configure:8479: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8523,17 +8524,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8527: checking for $ac_hdr" >&5 +echo "configure:8528: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8537: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8593,7 +8594,7 @@ fi # Extract the first word of "gtk12-config", so it can be a program name with args. set dummy gtk12-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8597: checking for $ac_word" >&5 +echo "configure:8598: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK12_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8632,7 +8633,7 @@ fi # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8636: checking for $ac_word" >&5 +echo "configure:8637: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8681,17 +8682,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8685: checking for $ac_hdr" >&5 +echo "configure:8686: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8736,7 +8737,7 @@ if test "${enable_gnome+set}" = set; then # Extract the first word of "gnome-config", so it can be a program name with args. set dummy gnome-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8740: checking for $ac_word" >&5 +echo "configure:8741: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8780,17 +8781,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8784: checking for $ac_hdr" >&5 +echo "configure:8785: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8794: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8795: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8877,17 +8878,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8881: checking for $ac_hdr" >&5 +echo "configure:8882: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8930,17 +8931,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8934: checking for $ac_hdr" >&5 +echo "configure:8935: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9011,17 +9012,17 @@ if test "x${enable_xosd}" = "xyes" then ac_safe=`echo "xosd.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for xosd.h""... $ac_c" 1>&6 -echo "configure:9015: checking for xosd.h" >&5 +echo "configure:9016: checking for xosd.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9025: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9060,17 +9061,17 @@ if test "x${enable_lirc}" = "xyes" then ac_safe=`echo "lirc/lirc_client.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for lirc/lirc_client.h""... $ac_c" 1>&6 -echo "configure:9064: checking for lirc/lirc_client.h" >&5 +echo "configure:9065: checking for lirc/lirc_client.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9087,7 +9088,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for lirc_init in -llirc_client""... $ac_c" 1>&6 -echo "configure:9091: checking for lirc_init in -llirc_client" >&5 +echo "configure:9092: checking for lirc_init in -llirc_client" >&5 ac_lib_var=`echo lirc_client'_'lirc_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9095,7 +9096,7 @@ else ac_save_LIBS="$LIBS" LIBS="-llirc_client $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9161,7 +9162,7 @@ fi ;; *) echo $ac_n "checking whether the byte order is big-endian""... $ac_c" 1>&6 -echo "configure:9165: checking whether the byte order is big-endian" >&5 +echo "configure:9166: checking whether the byte order is big-endian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9243,7 +9244,7 @@ if test "${enable_pth+set}" = set; then enableval="$enable_pth" if test "x${enable_pth}" = "xyes"; then echo $ac_n "checking for pth_init in -lpth""... $ac_c" 1>&6 -echo "configure:9247: checking for pth_init in -lpth" >&5 +echo "configure:9248: checking for pth_init in -lpth" >&5 ac_lib_var=`echo pth'_'pth_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9251,7 +9252,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpth $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9290,7 +9291,7 @@ else fi cat > conftest.$ac_ext < EOF @@ -9316,7 +9317,7 @@ if test "${enable_st+set}" = set; then enableval="$enable_st" if test "x${enable_st}" = "xyes"; then echo $ac_n "checking for st_init in -lst""... $ac_c" 1>&6 -echo "configure:9320: checking for st_init in -lst" >&5 +echo "configure:9321: checking for st_init in -lst" >&5 ac_lib_var=`echo st'_'st_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9324,7 +9325,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lst $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9363,7 +9364,7 @@ else fi cat > conftest.$ac_ext < EOF @@ -9399,7 +9400,7 @@ then # Extract the first word of "mozilla-config", so it can be a program name with args. set dummy mozilla-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9403: checking for $ac_word" >&5 +echo "configure:9404: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MOZILLA_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9437,7 +9438,7 @@ fi if test "x${SYS}" != "xmingw32"; then LDFLAGS="${save_LDFLAGS} -L${x_libraries}" echo $ac_n "checking for XtStrings in -lXt""... $ac_c" 1>&6 -echo "configure:9441: checking for XtStrings in -lXt" >&5 +echo "configure:9442: checking for XtStrings in -lXt" >&5 ac_lib_var=`echo Xt'_'XtStrings | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9445,7 +9446,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else diff --git a/configure.in b/configure.in index 1217a315dd..5e228978c7 100644 --- a/configure.in +++ b/configure.in @@ -445,6 +445,7 @@ PLUGINS="${PLUGINS} codec/mpeg_video/idct/idct codec/mpeg_video/idct/idctclassic #PLUGINS="${PLUGINS} codec/a52old/imdct/imdct codec/a52old/downmix/downmix codec/mpeg_audio/mpeg_audio codec/a52old/a52old codec/lpcm/lpcm codec/spdif/spdif" PLUGINS="${PLUGINS} video_filter/deinterlace/deinterlace video_filter/invert video_filter/wall video_filter/transform video_filter/distort video_filter/clone video_filter/crop" PLUGINS="${PLUGINS} audio_filter/converter/float32tos16" +PLUGINS="${PLUGINS} audio_filter/resampler/trivial" PLUGINS="${PLUGINS} audio_mixer/trivial" PLUGINS="${PLUGINS} audio_output/file" #PLUGINS="${PLUGINS} visualization/scope/scope" diff --git a/include/audio_output.h b/include/audio_output.h index a6fc838a22..bf10162991 100644 --- a/include/audio_output.h +++ b/include/audio_output.h @@ -2,7 +2,7 @@ * audio_output.h : audio output interface ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: audio_output.h,v 1.53 2002/08/08 00:35:10 sam Exp $ + * $Id: audio_output.h,v 1.54 2002/08/09 23:46:53 massiot Exp $ * * Authors: Christophe Massiot * @@ -42,9 +42,11 @@ struct audio_sample_format_t #define AOUT_FMT_S8 0x00000040 #define AOUT_FMT_U16_LE 0x00000080 /* Little endian U16 */ #define AOUT_FMT_U16_BE 0x00000100 /* Big endian U16 */ -#define AOUT_FMT_A52 0x00000400 /* ATSC A/52 (for SP/DIF) */ -#define AOUT_FMT_FLOAT32 0x00000800 -#define AOUT_FMT_FIXED32 0x00001000 +#define AOUT_FMT_SPDIF 0x00000400 /* S/PDIF hardware support */ +#define AOUT_FMT_FLOAT32 0x00010000 +#define AOUT_FMT_FIXED32 0x00020000 +#define AOUT_FMT_A52 0x00100000 +#define AOUT_FMT_DTS 0x00200000 #define AOUT_FMTS_IDENTICAL( p_first, p_second ) ( \ (p_first->i_format == p_second->i_format) \ @@ -60,6 +62,11 @@ struct audio_sample_format_t # define AOUT_FMT_U16_NE AOUT_FMT_U16_LE #endif +#define AOUT_FMT_IS_SPDIF( p_format ) \ + ( (p_format->i_format == AOUT_FMT_SPDIF) \ + || (p_format->i_format == AOUT_FMT_A52) \ + || (p_format->i_format == AOUT_FMT_DTS) ) + /***************************************************************************** * aout_buffer_t : audio output buffer *****************************************************************************/ @@ -74,6 +81,8 @@ struct aout_buffer_t struct aout_buffer_t * p_next; }; +#define AOUT_SPDIF_FRAME 1536 + /***************************************************************************** * Prototypes *****************************************************************************/ @@ -84,7 +93,9 @@ VLC_EXPORT( void, aout_DeleteInstance, ( aout_instance_t * ) ); VLC_EXPORT( aout_buffer_t *, aout_BufferNew, ( aout_instance_t *, aout_input_t *, size_t ) ); VLC_EXPORT( void, aout_BufferDelete, ( aout_instance_t *, aout_input_t *, aout_buffer_t * ) ); VLC_EXPORT( void, aout_BufferPlay, ( aout_instance_t *, aout_input_t *, aout_buffer_t * ) ); -VLC_EXPORT( int, aout_FormatToBytes, ( audio_sample_format_t * p_format ) ); +VLC_EXPORT( int, aout_FormatTo, ( audio_sample_format_t * p_format, int ) ); +#define aout_FormatToByterate(a,b) aout_FormatTo(a,b) +#define aout_FormatToSize(a,b) aout_FormatTo(a,b) /* From input.c : */ #define aout_InputNew(a,b,c) __aout_InputNew(VLC_OBJECT(a),b,c) diff --git a/include/defs.h.in b/include/defs.h.in index 17bf78f6fe..26fa1b082b 100644 --- a/include/defs.h.in +++ b/include/defs.h.in @@ -1,4 +1,4 @@ -/* include/defs.h.in. Generated automatically from configure.in by autoheader 2.13. */ +/* include/defs.h.in. Generated automatically from configure.in by autoheader. */ /* Define if using alloca.c. */ #undef C_ALLOCA diff --git a/include/vlc_symbols.h b/include/vlc_symbols.h index e9a71fa96a..0c6026ee59 100644 --- a/include/vlc_symbols.h +++ b/include/vlc_symbols.h @@ -36,7 +36,7 @@ struct module_symbols_t int (* __vlc_thread_create_inner) ( vlc_object_t *, char *, int, char *, void * ( * ) ( void * ), vlc_bool_t ) ; int (* __vlc_threads_end_inner) ( vlc_object_t * ) ; int (* __vlc_threads_init_inner) ( vlc_object_t * ) ; - int (* aout_FormatToBytes_inner) ( audio_sample_format_t * p_format ) ; + int (* aout_FormatTo_inner) ( audio_sample_format_t * p_format, int ) ; int (* input_AccessInit_inner) ( input_thread_t * ) ; int (* input_AddInfo_inner) ( input_info_category_t *, char *, char *, ... ) ; int (* input_ChangeArea_inner) ( input_thread_t *, input_area_t * ) ; @@ -205,7 +205,7 @@ struct module_symbols_t # define aout_BufferNew p_symbols->aout_BufferNew_inner # define aout_BufferPlay p_symbols->aout_BufferPlay_inner # define aout_DeleteInstance p_symbols->aout_DeleteInstance_inner -# define aout_FormatToBytes p_symbols->aout_FormatToBytes_inner +# define aout_FormatTo p_symbols->aout_FormatTo_inner # define aout_InputDelete p_symbols->aout_InputDelete_inner # define aout_OutputNextBuffer p_symbols->aout_OutputNextBuffer_inner # define config_Duplicate p_symbols->config_Duplicate_inner diff --git a/modules/access/vcd/cdrom.c b/modules/access/vcd/cdrom.c index ef14514c3b..135ca2ba79 100644 --- a/modules/access/vcd/cdrom.c +++ b/modules/access/vcd/cdrom.c @@ -2,7 +2,7 @@ * cdrom.c: cdrom tools ***************************************************************************** * Copyright (C) 1998-2001 VideoLAN - * $Id: cdrom.c,v 1.2 2002/08/08 22:28:22 sam Exp $ + * $Id: cdrom.c,v 1.3 2002/08/09 23:47:22 massiot Exp $ * * Author: Johan Bilien * Jon Lech Johansen @@ -62,7 +62,7 @@ * Platform specific *****************************************************************************/ #if defined( SYS_DARWIN ) -CDTOC *getTOC( const char * ); +CDTOC *getTOC( vlc_object_t *, const char * ); #define freeTOC( p ) free( (void*)p ) int getNumberOfDescriptors( CDTOC * ); int getNumberOfTracks( CDTOC *, int ); @@ -81,7 +81,7 @@ int ioctl_GetTrackCount( vlc_object_t * p_this, int i_fd, const char *psz_dev ) CDTOC *pTOC; int i_descriptors; - if( ( pTOC = getTOC( psz_dev ) ) == NULL ) + if( ( pTOC = getTOC( p_this, psz_dev ) ) == NULL ) { msg_Err( p_this, "failed to get the TOC" ); return( -1 ); @@ -134,7 +134,7 @@ int * ioctl_GetSectors( vlc_object_t *p_this, int i_fd, const char *psz_dev ) int i_leadout = -1; CDTOCDescriptor *pTrackDescriptors; - if( ( pTOC = getTOC( psz_dev ) ) == NULL ) + if( ( pTOC = getTOC( p_this, psz_dev ) ) == NULL ) { msg_Err( p_this, "failed to get the TOC" ); return( NULL ); @@ -334,7 +334,7 @@ int ioctl_ReadSector( vlc_object_t *p_this, /**************************************************************************** * getTOC: get the TOC ****************************************************************************/ -CDTOC *getTOC( const char *psz_dev ) +CDTOC *getTOC( vlc_object_t * p_this, const char *psz_dev ) { mach_port_t port; char *psz_devname; diff --git a/modules/audio_filter/converter/float32tos16.c b/modules/audio_filter/converter/float32tos16.c index fc7468ec35..8ee754ff4a 100644 --- a/modules/audio_filter/converter/float32tos16.c +++ b/modules/audio_filter/converter/float32tos16.c @@ -2,7 +2,7 @@ * float32tos16.c : converter from float32 to signed 16 bits integer ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: float32tos16.c,v 1.1 2002/08/08 22:26:56 massiot Exp $ + * $Id: float32tos16.c,v 1.2 2002/08/09 23:47:22 massiot Exp $ * * Authors: Christophe Massiot * @@ -94,5 +94,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, else *p_out = *p_in * 32768.0; p_in++; p_out++; } + + p_out_buf->i_nb_samples = p_in_buf->i_nb_samples; } diff --git a/modules/audio_filter/resampler/Makefile b/modules/audio_filter/resampler/Makefile new file mode 100644 index 0000000000..b49f81393a --- /dev/null +++ b/modules/audio_filter/resampler/Makefile @@ -0,0 +1 @@ +trivial_SOURCES = trivial.c diff --git a/modules/audio_filter/resampler/trivial.c b/modules/audio_filter/resampler/trivial.c new file mode 100644 index 0000000000..59b1c38daf --- /dev/null +++ b/modules/audio_filter/resampler/trivial.c @@ -0,0 +1,93 @@ +/***************************************************************************** + * trivial.c : trivial resampler (skips samples or pads with zeroes) + ***************************************************************************** + * Copyright (C) 2002 VideoLAN + * $Id: trivial.c,v 1.1 2002/08/09 23:47:22 massiot Exp $ + * + * Authors: Christophe Massiot + * + * This program 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. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + *****************************************************************************/ + +/***************************************************************************** + * Preamble + *****************************************************************************/ +#include +#include /* malloc(), free() */ +#include + +#include +#include "audio_output.h" +#include "aout_internal.h" + +/***************************************************************************** + * Local prototypes + *****************************************************************************/ +static int Create ( vlc_object_t * ); + +static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, + aout_buffer_t * ); + +/***************************************************************************** + * Module descriptor + *****************************************************************************/ +vlc_module_begin(); + set_description( _("aout filter for trivial resampling") ); + set_capability( "audio filter", 1 ); + set_callbacks( Create, NULL ); +vlc_module_end(); + +/***************************************************************************** + * Create: allocate trivial mixer + ***************************************************************************** + * This function allocates and initializes a Crop vout method. + *****************************************************************************/ +static int Create( vlc_object_t *p_this ) +{ + aout_filter_t * p_filter = (aout_filter_t *)p_this; + + p_filter->pf_do_work = DoWork; + p_filter->b_in_place = 1; + + return 0; +} + +/***************************************************************************** + * DoWork: convert a buffer + *****************************************************************************/ +static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, + aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf ) +{ + int i_in_nb = p_in_buf->i_nb_samples; + int i_out_nb = i_in_nb * p_filter->output.i_rate + / p_filter->input.i_rate; + + if ( p_out_buf != p_in_buf ) + { + /* For whatever reason the buffer allocator decided to allocate + * a new buffer. */ + p_aout->p_vlc->pf_memcpy( p_out_buf->p_buffer, p_in_buf->p_buffer, + __MIN(i_out_nb, i_in_nb) ); + } + + if ( i_out_nb > i_in_nb ) + { + /* Pad with zeroes. */ + memset( p_out_buf->p_buffer + i_in_nb, 0, i_out_nb - i_in_nb ); + } + + p_out_buf->i_nb_samples = i_out_nb; +} + diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c index 4f3e97b343..4b3d3c6fba 100644 --- a/modules/audio_output/file.c +++ b/modules/audio_output/file.c @@ -2,7 +2,7 @@ * file.c : audio output which writes the samples to a file ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: file.c,v 1.2 2002/08/08 22:28:22 sam Exp $ + * $Id: file.c,v 1.3 2002/08/09 23:47:23 massiot Exp $ * * Authors: Christophe Massiot * @@ -136,8 +136,8 @@ static int SetFormat( aout_instance_t * p_aout ) static void Play( aout_instance_t * p_aout, aout_buffer_t * p_buffer ) { if( fwrite( p_buffer->p_buffer, - p_buffer->i_nb_samples - * aout_FormatToBytes( &p_aout->output.output ), 1, + aout_FormatToSize( &p_aout->output.output, + p_buffer->i_nb_samples ), 1, (FILE *)p_aout->output.p_sys ) != 1 ) { msg_Err( p_aout, "write error (%s)", strerror(errno) ); diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c index 55f6d3d8af..bd1931c13c 100644 --- a/modules/audio_output/oss.c +++ b/modules/audio_output/oss.c @@ -2,7 +2,7 @@ * oss.c : OSS /dev/dsp module for vlc ***************************************************************************** * Copyright (C) 2000-2002 VideoLAN - * $Id: oss.c,v 1.3 2002/08/08 22:28:22 sam Exp $ + * $Id: oss.c,v 1.4 2002/08/09 23:47:23 massiot Exp $ * * Authors: Michel Kaempf * Samuel Hocevar @@ -170,15 +170,24 @@ static int SetFormat( aout_instance_t *p_aout ) } /* Set the output format */ - i_format = AOUT_FMT_S16_NE; + if ( AOUT_FMT_IS_SPDIF( &p_aout->output.output ) ) + { + p_aout->output.output.i_format = i_format = AOUT_FMT_SPDIF; + p_aout->output.i_nb_samples = 1; + } + else + { + p_aout->output.output.i_format = i_format = AOUT_FMT_S16_NE; + p_aout->output.i_nb_samples = DEFAULT_FRAME_SIZE; + } + if( ioctl( p_sys->i_fd, SNDCTL_DSP_SETFMT, &i_format ) < 0 - || i_format != AOUT_FMT_S16_NE ) + || i_format != p_aout->output.output.i_format ) { msg_Err( p_aout, "cannot set audio output format (%i)", i_format ); return -1; } - p_aout->output.output.i_format = AOUT_FMT_S16_NE; /* FIXME */ if ( p_aout->output.output.i_channels > 2 ) @@ -222,8 +231,6 @@ static int SetFormat( aout_instance_t *p_aout ) p_aout->output.output.i_rate = i_rate; } - p_aout->output.i_nb_samples = DEFAULT_FRAME_SIZE; - p_sys->b_initialized = VLC_TRUE; return 0; @@ -299,7 +306,7 @@ static int OSSThread( aout_instance_t * p_aout ) continue; } - i_bytes_per_sample = aout_FormatToBytes( &p_aout->output.output ); + i_bytes_per_sample = aout_FormatToSize( &p_aout->output.output, 1 ); next_date = (mtime_t)GetBufInfo( p_aout ) * 1000000 / i_bytes_per_sample / p_aout->output.output.i_rate; diff --git a/src/audio_output/audio_output.c b/src/audio_output/audio_output.c index 3f0e4b02fa..a963385878 100644 --- a/src/audio_output/audio_output.c +++ b/src/audio_output/audio_output.c @@ -2,7 +2,7 @@ * audio_output.c : audio output instance ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: audio_output.c,v 1.90 2002/08/07 21:36:56 massiot Exp $ + * $Id: audio_output.c,v 1.91 2002/08/09 23:47:23 massiot Exp $ * * Authors: Christophe Massiot * @@ -159,10 +159,10 @@ void aout_BufferPlay( aout_instance_t * p_aout, aout_input_t * p_input, } /***************************************************************************** - * aout_FormatToBytes : return the number bytes/sample for format - * (didn't know where else to put it) + * aout_FormatTo : compute the number of bytes/sample for format (used for + * aout_FormatToByterate and aout_FormatToSize) *****************************************************************************/ -int aout_FormatToBytes( audio_sample_format_t * p_format ) +int aout_FormatTo( audio_sample_format_t * p_format, int i_multiplier ) { int i_result; @@ -185,14 +185,18 @@ int aout_FormatToBytes( audio_sample_format_t * p_format ) i_result = 4; break; - case AOUT_FMT_A52: - i_result = 1; /* This is a bit special... sample == byte */ - break; + case AOUT_FMT_SPDIF: + case AOUT_FMT_A52: /* Actually smaller and variable, but who cares ? */ + case AOUT_FMT_DTS: /* Unimplemented and untested */ + /* Please note that we don't multiply by multiplier, because i_rate + * and i_nb_samples do not have any sense for S/PDIF (yes, it + * _is_ kludgy). --Meuuh */ + return AOUT_SPDIF_FRAME; default: - i_result = 0; /* will segfault much sooner... */ + return 0; /* will segfault much sooner... */ } - return i_result * p_format->i_channels; + return i_result * p_format->i_channels * i_multiplier; } diff --git a/src/audio_output/filters.c b/src/audio_output/filters.c index fe4f00a64f..f21c4c70d9 100644 --- a/src/audio_output/filters.c +++ b/src/audio_output/filters.c @@ -2,7 +2,7 @@ * filters.c : audio output filters management ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: filters.c,v 1.1 2002/08/07 21:36:56 massiot Exp $ + * $Id: filters.c,v 1.2 2002/08/09 23:47:23 massiot Exp $ * * Authors: Christophe Massiot * @@ -26,12 +26,13 @@ *****************************************************************************/ #include /* calloc(), malloc(), free() */ #include + +#include + #ifdef HAVE_ALLOCA_H # include #endif -#include - #include "audio_output.h" #include "aout_internal.h" @@ -160,10 +161,10 @@ void aout_FiltersHintBuffers( aout_instance_t * p_aout, { aout_filter_t * p_filter = pp_filters[i]; - int i_output_size = aout_FormatToBytes( &p_filter->output ) - * p_filter->output.i_rate; - int i_input_size = aout_FormatToBytes( &p_filter->input ) - * p_filter->input.i_rate; + int i_output_size = aout_FormatToByterate( &p_filter->output, + p_filter->output.i_rate ); + int i_input_size = aout_FormatToByterate( &p_filter->input, + p_filter->input.i_rate ); p_first_alloc->i_bytes_per_sec = __MAX( p_first_alloc->i_bytes_per_sec, i_output_size ); diff --git a/src/audio_output/input.c b/src/audio_output/input.c index a78b39ac86..5cdd79b4d1 100644 --- a/src/audio_output/input.c +++ b/src/audio_output/input.c @@ -2,7 +2,7 @@ * input.c : internal management of input streams for the audio output ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: input.c,v 1.1 2002/08/07 21:36:56 massiot Exp $ + * $Id: input.c,v 1.2 2002/08/09 23:47:23 massiot Exp $ * * Authors: Christophe Massiot * @@ -116,8 +116,8 @@ static aout_input_t * InputNew( aout_instance_t * p_aout, /* i_bytes_per_sec is still == -1 if no filters */ p_input->input_alloc.i_bytes_per_sec = __MAX( p_input->input_alloc.i_bytes_per_sec, - aout_FormatToBytes( &p_input->input ) - * p_input->input.i_rate ); + aout_FormatToByterate( &p_input->input, + p_input->input.i_rate ) ); /* Allocate in the heap, it is more convenient for the decoder. */ p_input->input_alloc.i_alloc_type = AOUT_ALLOC_HEAP; diff --git a/src/audio_output/output.c b/src/audio_output/output.c index f456fcd683..072361c4af 100644 --- a/src/audio_output/output.c +++ b/src/audio_output/output.c @@ -2,7 +2,7 @@ * output.c : internal management of output streams for the audio output ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: output.c,v 1.1 2002/08/07 21:36:56 massiot Exp $ + * $Id: output.c,v 1.2 2002/08/09 23:47:23 massiot Exp $ * * Authors: Christophe Massiot * @@ -110,8 +110,8 @@ int aout_OutputNew( aout_instance_t * p_aout, /* Prepare hints for the buffer allocator. */ p_aout->mixer.output_alloc.i_alloc_type = AOUT_ALLOC_HEAP; p_aout->mixer.output_alloc.i_bytes_per_sec - = aout_FormatToBytes( &p_aout->output.output ) - * p_aout->output.output.i_rate; + = aout_FormatToByterate( &p_aout->output.output, + p_aout->output.output.i_rate ); aout_FiltersHintBuffers( p_aout, p_aout->output.pp_filters, p_aout->output.i_nb_filters, diff --git a/src/misc/modules_plugin.h b/src/misc/modules_plugin.h index 00d4963a6d..3e8bca0423 100644 --- a/src/misc/modules_plugin.h +++ b/src/misc/modules_plugin.h @@ -184,7 +184,7 @@ static const char * module_error( char *psz_buffer ) (p_symbols)->aout_BufferNew_inner = aout_BufferNew; \ (p_symbols)->aout_BufferDelete_inner = aout_BufferDelete; \ (p_symbols)->aout_BufferPlay_inner = aout_BufferPlay; \ - (p_symbols)->aout_FormatToBytes_inner = aout_FormatToBytes; \ + (p_symbols)->aout_FormatTo_inner = aout_FormatTo; \ (p_symbols)->__aout_InputNew_inner = __aout_InputNew; \ (p_symbols)->aout_InputDelete_inner = aout_InputDelete; \ (p_symbols)->aout_OutputNextBuffer_inner = aout_OutputNextBuffer; \ -- 2.39.2